fda/ch.psi.fda
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved classes

Browse Source
This commit is contained in:
ebner
2014-04-30 07:07:33 +02:00
parent 88f4dd2b19
commit a15356190d
6 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ch.psi.fda/src/main/assembly/bin/scan
View File

@@ -37,4 +37,4 @@ do
done
# Execute java
java -Xmx1024m -XX:MaxPermSize=128m -Dch.psi.fda.home=${APPLICATION_HOME} -Djava.util.logging.config.file=${APPLICATION_HOME}/config/logging.properties $VM_ARGUMENTS -cp $CLASSPATH ch.psi.fda.AcquisitionMain $ARGUMENTS
java -Xmx1024m -XX:MaxPermSize=128m -Dch.psi.fda.home=${APPLICATION_HOME} -Djava.util.logging.config.file=${APPLICATION_HOME}/config/logging.properties $VM_ARGUMENTS -cp $CLASSPATH ch.psi.fda.ui.AcquisitionMain $ARGUMENTS

2
ch.psi.fda/src/main/java/ch/psi/fda/rest/FdaServer.java
View File

@@ -18,7 +18,7 @@ import org.glassfish.jersey.jackson.JacksonFeature;
import org.glassfish.jersey.server.ResourceConfig;
import org.glassfish.grizzly.http.server.HttpServer;
import ch.psi.fda.ApplicationConfigurator;
import ch.psi.fda.ui.ApplicationConfigurator;
import sun.misc.Signal;
import sun.misc.SignalHandler;

5
ch.psi.fda/src/main/java/ch/psi/fda/AcquisitionMain.java → ch.psi.fda/src/main/java/ch/psi/fda/ui/AcquisitionMain.java
View File

@@ -17,7 +17,7 @@
*
*/
package ch.psi.fda;
package ch.psi.fda.ui;
import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
@@ -56,6 +56,9 @@ import com.google.inject.Injector;
import sun.misc.Signal;
import sun.misc.SignalHandler;
import ch.psi.fda.DescriptorProvider;
import ch.psi.fda.EContainer;
import ch.psi.fda.EContainerFactory;
import ch.psi.fda.edescriptor.EDescriptor;
import ch.psi.fda.gui.ProgressPanel;
import ch.psi.fda.gui.ScrollableFlowPanel;

2
ch.psi.fda/src/main/java/ch/psi/fda/ApplicationConfigurator.java → ch.psi.fda/src/main/java/ch/psi/fda/ui/ApplicationConfigurator.java
View File

@@ -17,7 +17,7 @@
*
*/
package ch.psi.fda;
package ch.psi.fda.ui;
import java.io.BufferedWriter;
import java.io.File;

4
ch.psi.fda/src/test/java/ch/psi/fda/AcquisitionMainTest.java
View File

@@ -23,7 +23,7 @@ import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import ch.psi.fda.AcquisitionMain;
import ch.psi.fda.ui.AcquisitionMain;
/**
* @author ebner
@@ -46,7 +46,7 @@ public class AcquisitionMainTest {
}
/**
* Test method for {@link ch.psi.fda.AcquisitionMain#main(java.lang.String[])}.
* Test method for {@link ch.psi.fda.ui.AcquisitionMain#main(java.lang.String[])}.
*/
@Ignore
@Test

2
ch.psi.fda/src/test/java/ch/psi/fda/ApplicationConfiguratorTest.java
View File

@@ -25,7 +25,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import ch.psi.fda.ApplicationConfigurator;
import ch.psi.fda.ui.ApplicationConfigurator;
/**
* @author ebner