diff --git a/ch.psi.fda.cdump/.classpath b/ch.psi.fda.cdump/.classpath index 8be6238..953de0b 100644 --- a/ch.psi.fda.cdump/.classpath +++ b/ch.psi.fda.cdump/.classpath @@ -1,10 +1,36 @@ - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ch.psi.fda.cdump/.settings/org.eclipse.core.resources.prefs b/ch.psi.fda.cdump/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..5b781ec --- /dev/null +++ b/ch.psi.fda.cdump/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding//src/test/java=UTF-8 diff --git a/ch.psi.fda.cdump/.settings/org.eclipse.jdt.core.prefs b/ch.psi.fda.cdump/.settings/org.eclipse.jdt.core.prefs index 37f495c..ec4300d 100644 --- a/ch.psi.fda.cdump/.settings/org.eclipse.jdt.core.prefs +++ b/ch.psi.fda.cdump/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,5 @@ -#Wed Oct 12 13:39:19 CEST 2011 eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/ch.psi.fda.cdump/src/main/assembly/bin/cdump b/ch.psi.fda.cdump/src/main/assembly/bin/cdump index a07952c..7989aea 100644 --- a/ch.psi.fda.cdump/src/main/assembly/bin/cdump +++ b/ch.psi.fda.cdump/src/main/assembly/bin/cdump @@ -35,4 +35,4 @@ do done # Execute java -java $VM_ARGUMENTS -Dch.psi.fda.cdump.config=$BASEDIR/../../config/cdump.properties -cp $CLASSPATH ch.psi.fda.cdump.CdumpMain $ARGUMENTS \ No newline at end of file +java $VM_ARGUMENTS -Dch.psi.fda.cdump.config.file=$BASEDIR/../../config/cdump.properties -cp $CLASSPATH ch.psi.fda.cdump.ui.CdumpMain $ARGUMENTS \ No newline at end of file diff --git a/ch.psi.fda.cdump/src/main/java/ch/psi/fda/cdump/CdumpConfiguration.java b/ch.psi.fda.cdump/src/main/java/ch/psi/fda/cdump/CdumpConfiguration.java index 32bed4d..ba0d300 100644 --- a/ch.psi.fda.cdump/src/main/java/ch/psi/fda/cdump/CdumpConfiguration.java +++ b/ch.psi.fda.cdump/src/main/java/ch/psi/fda/cdump/CdumpConfiguration.java @@ -27,18 +27,33 @@ import java.util.Properties; public class CdumpConfiguration { + public final static String CDUMP_CONFIG = "ch.psi.fda.cdump.config.file"; + private String dataChannel; private int nelements = 65536; private String controlChannel; private String samplingRateChannel; + public CdumpConfiguration(){ + String config = System.getProperty(CDUMP_CONFIG); + + if(config != null){ + loadFile(new File(config)); + } + else{ + throw new RuntimeException("No configuration file specified via -D"+CDUMP_CONFIG+"=..."); + } + } public void loadFile(File file) { Properties properties = new Properties(); - try { - properties.load(new FileReader(file)); - } catch (IOException e) { - throw new RuntimeException("Cannot read file "+file, e); + + if(file!=null){ + try { + properties.load(new FileReader(file)); + } catch (IOException e) { + throw new RuntimeException("Cannot read file "+file, e); + } } dataChannel = properties.getProperty(CdumpConfiguration.class.getPackage().getName()+".dataChannel", ""); diff --git a/ch.psi.fda.cdump/src/main/java/ch/psi/fda/cdump/CdumpMain.java b/ch.psi.fda.cdump/src/main/java/ch/psi/fda/cdump/ui/CdumpMain.java similarity index 81% rename from ch.psi.fda.cdump/src/main/java/ch/psi/fda/cdump/CdumpMain.java rename to ch.psi.fda.cdump/src/main/java/ch/psi/fda/cdump/ui/CdumpMain.java index 3b276fe..e549708 100644 --- a/ch.psi.fda.cdump/src/main/java/ch/psi/fda/cdump/CdumpMain.java +++ b/ch.psi.fda.cdump/src/main/java/ch/psi/fda/cdump/ui/CdumpMain.java @@ -17,7 +17,7 @@ * */ -package ch.psi.fda.cdump; +package ch.psi.fda.cdump.ui; import java.io.File; import java.util.concurrent.Executors; @@ -25,19 +25,18 @@ import java.util.concurrent.atomic.AtomicInteger; import com.google.common.eventbus.AsyncEventBus; import com.google.common.eventbus.EventBus; -import com.google.common.eventbus.Subscribe; -import ch.psi.fda.messages.DataMessage; +import ch.psi.fda.cdump.Cdump; +import ch.psi.fda.cdump.CdumpConfiguration; import ch.psi.fda.serializer.SerializerTXT; import ch.psi.jcae.ChannelService; import ch.psi.jcae.impl.DefaultChannelService; import sun.misc.Signal; import sun.misc.SignalHandler; +@SuppressWarnings("restriction") public class CdumpMain { - public final static String CDUMP_CONFIG = "ch.psi.fda.cdump.config"; - public static void main(String[] args){ final ChannelService cservice = new DefaultChannelService(); @@ -57,35 +56,18 @@ public class CdumpMain { // Calculate data file location/name String fname = args[1]; - CdumpConfiguration cc = new CdumpConfiguration(); - - String config = System.getProperty(CDUMP_CONFIG); - - if(config != null){ - cc.loadFile(new File(config)); - } - else{ - throw new RuntimeException("No configuration file specified via -D"+CDUMP_CONFIG+"=..."); - } File f = new File(fname); f.getParentFile().mkdirs(); // Create data base directory - // Create execution service EventBus eventbus = new AsyncEventBus(Executors.newSingleThreadExecutor()); - final Cdump service = new Cdump(cservice, eventbus, cc); + final Cdump service = new Cdump(cservice, eventbus, new CdumpConfiguration()); SerializerTXT serializer = new SerializerTXT(f); serializer.setShowDimensionHeader(false); eventbus.register(serializer); - eventbus.register(new Object(){ - @Subscribe - public void test(DataMessage m){ - System.out.println(m); - } - }); // Stop/abort handling of acquisition Signal.handle(new Signal("INT"), new SignalHandler() { diff --git a/ch.psi.fda.cdump/src/test/java/ch/psi/fda/cdump/CdumpListenerTest.java b/ch.psi.fda.cdump/src/test/java/ch/psi/fda/cdump/CdumpListenerTest.java index b76f798..89af073 100644 --- a/ch.psi.fda.cdump/src/test/java/ch/psi/fda/cdump/CdumpListenerTest.java +++ b/ch.psi.fda.cdump/src/test/java/ch/psi/fda/cdump/CdumpListenerTest.java @@ -40,7 +40,6 @@ public class CdumpListenerTest { CdumpListener l = new CdumpListener(bus, 4); l.transform(new int[] {1,2,3,4,11,12,13,14}); l.transform(new int[] {5,6,7,8,15,16,17,18}); - } }