From e723f66df3243b30caf6bef03cb8013972d89bba Mon Sep 17 00:00:00 2001 From: Simon Ebner Date: Thu, 3 Oct 2013 14:24:17 +0200 Subject: [PATCH] More cleanup --- .../main/java/ch/psi/fda/aq/Acquisition.java | 6 ++-- ...ion.java => AcquisitionConfiguration.java} | 32 +++++++++---------- .../psi/fda/{aq => }/AcquisitionMainTest.java | 2 +- ...java => AcquisitionConfigurationTest.java} | 10 +++--- .../{core/collector => aq}/CollectorTest.java | 2 +- 5 files changed, 26 insertions(+), 26 deletions(-) rename ch.psi.fda/src/main/java/ch/psi/fda/aq/{AcquisitionEngineConfiguration.java => AcquisitionConfiguration.java} (82%) rename ch.psi.fda/src/test/java/ch/psi/fda/{aq => }/AcquisitionMainTest.java (98%) rename ch.psi.fda/src/test/java/ch/psi/fda/aq/{AcquisitionEngineConfigurationTest.java => AcquisitionConfigurationTest.java} (81%) rename ch.psi.fda/src/test/java/ch/psi/fda/{core/collector => aq}/CollectorTest.java (99%) 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 3011216..daa5fa9 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 @@ -129,7 +129,7 @@ public class Acquisition { // Get Logger private static Logger logger = Logger.getLogger(Acquisition.class.getName()); - private AcquisitionEngineConfiguration configuration; + private AcquisitionConfiguration configuration; private ActionLoop actionLoop; private Collector collector; @@ -151,7 +151,7 @@ public class Acquisition { // private Thread acquisitionThread = null; public Acquisition(){ - configuration = AcquisitionEngineConfiguration.getInstance(); + configuration = AcquisitionConfiguration.getInstance(); actionLoop = null; collector = new Collector(); manipulations = new ArrayList(); @@ -656,7 +656,7 @@ public class Acquisition { // Mapping dimension pre-actions aLoop.getPreActions().addAll(mapActions(dimension.getPreAction())); - Long moveTimeout = AcquisitionEngineConfiguration.getInstance().getActorMoveTimeout(); + Long moveTimeout = AcquisitionConfiguration.getInstance().getActorMoveTimeout(); // Mapping positioners Double stime = 0d; diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/aq/AcquisitionEngineConfiguration.java b/ch.psi.fda/src/main/java/ch/psi/fda/aq/AcquisitionConfiguration.java similarity index 82% rename from ch.psi.fda/src/main/java/ch/psi/fda/aq/AcquisitionEngineConfiguration.java rename to ch.psi.fda/src/main/java/ch/psi/fda/aq/AcquisitionConfiguration.java index 38dcb3c..c300fef 100644 --- a/ch.psi.fda/src/main/java/ch/psi/fda/aq/AcquisitionEngineConfiguration.java +++ b/ch.psi.fda/src/main/java/ch/psi/fda/aq/AcquisitionConfiguration.java @@ -35,11 +35,11 @@ import ch.psi.fda.install.ApplicationConfigurator; * @author ebner * */ -public class AcquisitionEngineConfiguration { +public class AcquisitionConfiguration { - private static final Logger logger = Logger.getLogger(AcquisitionEngineConfiguration.class.getName()); - private static final AcquisitionEngineConfiguration instance = new AcquisitionEngineConfiguration(); + private static final Logger logger = Logger.getLogger(AcquisitionConfiguration.class.getName()); + private static final AcquisitionConfiguration instance = new AcquisitionConfiguration(); private String otfChannelPrefix; private String otfNfsServer; @@ -74,7 +74,7 @@ public class AcquisitionEngineConfiguration { * Default Constructor * The constructor will read the configuration from the /fda.properties file (resource) located in the classpath. */ - private AcquisitionEngineConfiguration(){ + private AcquisitionConfiguration(){ loadConfiguration(); } @@ -82,7 +82,7 @@ public class AcquisitionEngineConfiguration { * Get instance of this configuration * @return configuration */ - public static AcquisitionEngineConfiguration getInstance(){ + public static AcquisitionConfiguration getInstance(){ return(instance); } @@ -108,14 +108,14 @@ public class AcquisitionEngineConfiguration { } // The defaults are set here - otfChannelPrefix = properties.getProperty(AcquisitionEngineConfiguration.class.getPackage().getName()+".otf.channelPrefix", ""); - otfScalerPrefix = properties.getProperty(AcquisitionEngineConfiguration.class.getPackage().getName()+".otf.scalerPrefix", ""); - otfNfsServer = properties.getProperty(AcquisitionEngineConfiguration.class.getPackage().getName()+".otf.nfsServer", ""); - otfNfsShare = properties.getProperty(AcquisitionEngineConfiguration.class.getPackage().getName()+".otf.nfsShare", ""); - otfSmbShare = properties.getProperty(AcquisitionEngineConfiguration.class.getPackage().getName()+".otf.smbShare", ""); - otfUseCrlogic = new Boolean(properties.getProperty(AcquisitionEngineConfiguration.class.getPackage().getName()+".otf.useCrlogic", "false")); - otfCrlogicPrefix = properties.getProperty(AcquisitionEngineConfiguration.class.getPackage().getName()+".otf.crlogicPrefix", ""); - otfCrlogicKeepTmpFiles = new Boolean(properties.getProperty(AcquisitionEngineConfiguration.class.getPackage().getName()+".otf.crlogicKeepTmpFiles", "false")); + otfChannelPrefix = properties.getProperty(AcquisitionConfiguration.class.getPackage().getName()+".otf.channelPrefix", ""); + otfScalerPrefix = properties.getProperty(AcquisitionConfiguration.class.getPackage().getName()+".otf.scalerPrefix", ""); + otfNfsServer = properties.getProperty(AcquisitionConfiguration.class.getPackage().getName()+".otf.nfsServer", ""); + otfNfsShare = properties.getProperty(AcquisitionConfiguration.class.getPackage().getName()+".otf.nfsShare", ""); + otfSmbShare = properties.getProperty(AcquisitionConfiguration.class.getPackage().getName()+".otf.smbShare", ""); + otfUseCrlogic = new Boolean(properties.getProperty(AcquisitionConfiguration.class.getPackage().getName()+".otf.useCrlogic", "false")); + otfCrlogicPrefix = properties.getProperty(AcquisitionConfiguration.class.getPackage().getName()+".otf.crlogicPrefix", ""); + otfCrlogicKeepTmpFiles = new Boolean(properties.getProperty(AcquisitionConfiguration.class.getPackage().getName()+".otf.crlogicKeepTmpFiles", "false")); // Workaround // dataBaseDirectory = properties.getProperty(AcquisitionEngineConfiguration.class.getPackage().getName()+".data.baseDirectory", "."); @@ -126,11 +126,11 @@ public class AcquisitionEngineConfiguration { dataBaseDirectory = "./data"; } - dataFilePrefix = properties.getProperty(AcquisitionEngineConfiguration.class.getPackage().getName()+".data.filePrefix",""); + dataFilePrefix = properties.getProperty(AcquisitionConfiguration.class.getPackage().getName()+".data.filePrefix",""); - actorMoveTimeout = new Long(properties.getProperty(AcquisitionEngineConfiguration.class.getPackage().getName()+".actorMoveTimeout","600000")); + actorMoveTimeout = new Long(properties.getProperty(AcquisitionConfiguration.class.getPackage().getName()+".actorMoveTimeout","600000")); - smptServer= properties.getProperty(AcquisitionEngineConfiguration.class.getPackage().getName()+".notification.host","mail.psi.ch"); + smptServer= properties.getProperty(AcquisitionConfiguration.class.getPackage().getName()+".notification.host","mail.psi.ch"); } diff --git a/ch.psi.fda/src/test/java/ch/psi/fda/aq/AcquisitionMainTest.java b/ch.psi.fda/src/test/java/ch/psi/fda/AcquisitionMainTest.java similarity index 98% rename from ch.psi.fda/src/test/java/ch/psi/fda/aq/AcquisitionMainTest.java rename to ch.psi.fda/src/test/java/ch/psi/fda/AcquisitionMainTest.java index 564be5c..19ee8a0 100644 --- a/ch.psi.fda/src/test/java/ch/psi/fda/aq/AcquisitionMainTest.java +++ b/ch.psi.fda/src/test/java/ch/psi/fda/AcquisitionMainTest.java @@ -16,7 +16,7 @@ * along with this code. If not, see . * */ -package ch.psi.fda.aq; +package ch.psi.fda; import org.junit.After; import org.junit.Before; diff --git a/ch.psi.fda/src/test/java/ch/psi/fda/aq/AcquisitionEngineConfigurationTest.java b/ch.psi.fda/src/test/java/ch/psi/fda/aq/AcquisitionConfigurationTest.java similarity index 81% rename from ch.psi.fda/src/test/java/ch/psi/fda/aq/AcquisitionEngineConfigurationTest.java rename to ch.psi.fda/src/test/java/ch/psi/fda/aq/AcquisitionConfigurationTest.java index f23b61c..4d6c555 100644 --- a/ch.psi.fda/src/test/java/ch/psi/fda/aq/AcquisitionEngineConfigurationTest.java +++ b/ch.psi.fda/src/test/java/ch/psi/fda/aq/AcquisitionConfigurationTest.java @@ -30,16 +30,16 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import ch.psi.fda.aq.AcquisitionEngineConfiguration; +import ch.psi.fda.aq.AcquisitionConfiguration; /** * @author ebner * */ -public class AcquisitionEngineConfigurationTest { +public class AcquisitionConfigurationTest { // Get Logger - private static Logger logger = Logger.getLogger(AcquisitionEngineConfigurationTest.class.getName()); + private static Logger logger = Logger.getLogger(AcquisitionConfigurationTest.class.getName()); /** * @throws java.lang.Exception @@ -59,12 +59,12 @@ public class AcquisitionEngineConfigurationTest { /** - * Test method for {@link ch.psi.fda.aq.AcquisitionEngineConfiguration#getDataFilePrefix()}. + * Test method for {@link ch.psi.fda.aq.AcquisitionConfiguration#getDataFilePrefix()}. * Test whether the supported date macros in the file prefix are resolved */ @Test public void testGetConfiguration() { - AcquisitionEngineConfiguration configuration = AcquisitionEngineConfiguration.getInstance(); + AcquisitionConfiguration configuration = AcquisitionConfiguration.getInstance(); String s = configuration.getDataFilePrefix(); if(s==null){ Assert.fail("No configuration returned for data file prefix"); diff --git a/ch.psi.fda/src/test/java/ch/psi/fda/core/collector/CollectorTest.java b/ch.psi.fda/src/test/java/ch/psi/fda/aq/CollectorTest.java similarity index 99% rename from ch.psi.fda/src/test/java/ch/psi/fda/core/collector/CollectorTest.java rename to ch.psi.fda/src/test/java/ch/psi/fda/aq/CollectorTest.java index 8ecd7e1..b806808 100644 --- a/ch.psi.fda/src/test/java/ch/psi/fda/core/collector/CollectorTest.java +++ b/ch.psi.fda/src/test/java/ch/psi/fda/aq/CollectorTest.java @@ -17,7 +17,7 @@ * */ -package ch.psi.fda.core.collector; +package ch.psi.fda.aq; import static org.junit.Assert.*;