From d92534ec37ca559d6ddd826523a022343f5c42a1 Mon Sep 17 00:00:00 2001 From: Simon Ebner Date: Wed, 16 Oct 2013 10:54:47 +0200 Subject: [PATCH] Removed unnecessary function parameter --- .../src/main/java/ch/psi/fda/AcquisitionMain.java | 11 +---------- .../src/main/java/ch/psi/fda/aq/Acquisition.java | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/AcquisitionMain.java b/ch.psi.fda/src/main/java/ch/psi/fda/AcquisitionMain.java index 3701370..d302a6d 100644 --- a/ch.psi.fda/src/main/java/ch/psi/fda/AcquisitionMain.java +++ b/ch.psi.fda/src/main/java/ch/psi/fda/AcquisitionMain.java @@ -211,9 +211,6 @@ public class AcquisitionMain { ApplicationConfigurator ac = new ApplicationConfigurator(); ac.initializeApplication(); - // Read in base configuration -// AcquisitionEngineConfiguration configuration = AcquisitionEngineConfiguration.getInstance(); - if(!file.exists()){ throw new RuntimeException("File "+file.getAbsolutePath()+" does not exist"); } @@ -265,7 +262,7 @@ public class AcquisitionMain { EventBus b = new AsyncEventBus(Executors.newSingleThreadExecutor()); - DataMessageMetadata dmeta = acquisition.initalize(b, c, vis); + DataMessageMetadata dmeta = acquisition.initalize(b, c); Visualizer visualizer = null; // Only register data visualization task/processor if there are visualizations @@ -320,7 +317,6 @@ public class AcquisitionMain { splitPane.setRightComponent(tpane); frame.add(splitPane); -// frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); frame.addWindowListener(new WindowAdapter(){ @Override public void windowClosing(WindowEvent we){ @@ -411,11 +407,6 @@ public class AcquisitionMain { acquisition.execute(); -// if(visualizer != null){ -// // Stop visualization -// visualizer.stopVisualization(); -// } - } catch (InterruptedException e1) { throw new RuntimeException("Acquisition was interrupted",e1); } diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/aq/Acquisition.java b/ch.psi.fda/src/main/java/ch/psi/fda/aq/Acquisition.java index 828a73c..1077b7e 100644 --- a/ch.psi.fda/src/main/java/ch/psi/fda/aq/Acquisition.java +++ b/ch.psi.fda/src/main/java/ch/psi/fda/aq/Acquisition.java @@ -180,7 +180,7 @@ public class Acquisition { * @param getQueue Flag whether to return a queue or not. If false the return value of the function will be null. * @throws InterruptedException */ - public DataMessageMetadata initalize(EventBus bus, Configuration smodel, boolean getQueue) { + public DataMessageMetadata initalize(EventBus bus, Configuration smodel) { // Create notification agent with globally configured recipients notificationAgent = new NotificationAgent(configuration.getSmptServer(), "fda.notification@psi.ch");