updated version

upgraded to zmq version of xscan
packaged new version
2015-08-13 14:37:35 +02:00 · 2015-08-13 08:23:16 +02:00 · 2015-05-11 13:46:12 +02:00 · 2015-05-05 10:56:41 +02:00 · 2015-05-05 10:50:05 +02:00 · 2014-10-10 13:54:48 +02:00
283 changed files with 2321 additions and 2442 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,2 @@
-/application/target/
-/branding/target/
-/fda.ui.ce/target/
-/fda.ui.cm/target/
-/fda.ui.ee/target/
-/fda.ui.preferences/target/
-/application/data/
-/application/config/
-/application/logs/
-/application/scans/
-/nbactions.xml
-/application/nbactions.xml
-/fda.ui.cdump/target/
-/fda.ui.cdump/nbactions.xml
+target
+.DS_Store
--- a/.project
+++ b/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>ch.psi.fda.ui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
--- a/Readme.md
+++ b/Readme.md
@@ -0,0 +1,42 @@
+
+# Overview
+The `ch.psi.fda.ui` project holds the GUI part of the FDA application. It consists of 3 Maven projects, a parent project, a project holding the 
+application configuration itself (`fda.ui.application`) and a project holding the code (`fda.ui.module`).
+
+Startup parameters and configurations are specificed in `fda.ui.application/src/main/resources/fda.conf`.
+Shell startup scripts are located in the `fda.ui.application/src/main/scripts`.
+
+
+
+# Development
+The application is build via maven (use `-DskipTests=true` option to skip tests) . Use the toplevel `pom.xml` file to build the whole application. After the compilation
+and packaging the resulting application zip file will be located in `fda.ui.application/target`.
+
+## Changing Version
+
+In the ch.psi.fda Eclipse project
+
+  * Change version in pom.xml (remove -SNAPSHOT)
+  * Compile and deploy the new ch.psi.fda jar file (Eclipse) via maven
+  * Run goal: `clean deploy`
+  * Change version in pom.xml (add -SNAPSHOT)
+
+In ch.psi.fda.ui.module (Netbeans) project
+
+  * Change used ch.psi.fda version in `fda.ui.module` project pom (section dependencies) to the version you compiled and deployed before
+  * Change project version in pom.xml of all projects:
+    * pom.xml
+    * fda.ui.application
+    * fda.ui.module
+  * Change version in branding file:
+    * `./branding/src/main/nbm-branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties`
+    * Restart Netbeans (Workaround: due to compiling errors that cannot be otherwise easily resolved)
+  * Right click on fda.ui.parent project and select `Clean and Build`
+  * Start and test GUI from within Netbeans
+
+## Release
+
+  * Locate `fda.ui.application-<version>.zip` in `fda.ui.application/target`
+  * Rename file to `fda-<version>.zip`
+  * Upload file into the releases repository of artifactory (http://yoke/artifactory)
+
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>ch.psi</groupId>
-        <artifactId>fda.ui</artifactId>
-        <version>1.1.30</version>
-    </parent>
-
-    <artifactId>application</artifactId>
-    <packaging>nbm-application</packaging>
-
-    <name>fda.ui - NB App</name>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <netbeans.run.params.ide/>
-        <netbeans.run.params>${netbeans.run.params.ide}</netbeans.run.params>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.netbeans.cluster</groupId>
-            <artifactId>platform</artifactId>
-            <version>${netbeans.version}</version>
-            <type>pom</type>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>branding</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <!-- To run NbModuleSuite functional tests in src/test/java, use nbjunit (assumes RELEASE70 or later):
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-netbeans-modules-nbjunit</artifactId>
-            <version>${netbeans.version}</version>
-            <scope>test</scope>
-        </dependency>
-        -->
-        <!-- To use Jelly in your functional tests, add or replace with:
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-netbeans-modules-jellytools-platform</artifactId>
-            <version>${netbeans.version}</version>
-            <scope>test</scope>
-        </dependency>
-        -->
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>fda.ui.cm</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>fda.ui.ce</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>fda.ui.ee</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>fda.ui.preferences</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>fda.ui.cdump</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>nbm-maven-plugin</artifactId>
-                <configuration>
-                    <etcConfFile>src/main/resources/fda.conf</etcConfFile>
-                </configuration>
-            </plugin>
-            <!-- To run NbModuleSuite in integration-test phase:
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.7.1</version>
-                <configuration>
-                    <systemProperties>
-                        <property>
-                            <name>cluster.path.final</name>
-                            <value>${project.build.directory}/${brandingToken}/${brandingToken}:${project.build.directory}/${brandingToken}/platform</value>
-                        </property>
-                    </systemProperties>
-                </configuration>
-            </plugin>
-            -->
-            <!-- Copy additional start scripts to bin folder -->
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>2.5</version>
-                <executions>
-                    <execution>
-                        <id>copy-resources</id>
-                    <!-- here the phase you need -->
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${basedir}/target/fda/bin</outputDirectory>
-                            <resources>          
-                                <resource>
-                                    <directory>src/main/scripts</directory>
-                                </resource>
-                            </resources>              
-                        </configuration>            
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>deployment</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>nbm-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>extra</id>
-                                <goals>
-                                    <goal>autoupdate</goal>
-                                    <goal>webstart-app</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-</project>
--- a/branding/pom.xml
+++ b/branding/pom.xml
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>ch.psi</groupId>
-        <artifactId>fda.ui</artifactId>
-        <version>1.1.30</version>
-    </parent>
-
-    <artifactId>branding</artifactId>
-    <packaging>nbm</packaging>
-
-    <name>fda.ui - NB App Branding</name>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-netbeans-api-annotations-common</artifactId>
-            <version>${netbeans.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>nbm-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <!-- to have the jar plugin pickup the nbm generated manifest -->
-                    <useDefaultManifestFile>true</useDefaultManifestFile>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.6</version>
-                <executions>
-                    <execution>
-                        <phase>compile</phase>
-                        <configuration>
-                            <target name="run">
-                                  <!-- http://blogs.kiyut.com/tonny/2007/08/06/netbeans-platform-branding-and-version-info/ -->
-<!--    <propertyfile
-        file="src/main//branding/core/core.jar/org/netbeans/core/startup/Bundle.properties" 
-        comment="Updated by build script">
-        <entry key="currentVersion" value="${app.title} ${app.version} " />
-    </propertyfile>-->
- 
-                                <propertyfile
-        file="src/main/nbm-branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties">
-                                    <entry key="CTL_MainWindow_Title" value="FDA ${project.version}" />
-                                    <entry key="CTL_MainWindow_Title_No_Project" value="FDA ${project.version}" />
-                                </propertyfile>
-                                <replaceregexp file="src/main/nbm-branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties" match="^#.*\n" replace="" byline="false" />
-<!--    <propertyfile
-        file="${basedir}/branding/modules/org-netbeans-core.jar/org/netbeans/core/ui/Bundle.properties" 
-        comment="Updated by build script">
-        <entry key="LBL_ProductInformation" value="${app.title}" />
-    </propertyfile>-->
-                            </target>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
--- a/branding/src/main/nbm-branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
+++ b/branding/src/main/nbm-branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
@@ -1,2 +0,0 @@
-CTL_MainWindow_Title=FDA 1.1.30
-CTL_MainWindow_Title_No_Project=FDA 1.1.30
--- a/branding/src/main/nbm/manifest.mf
+++ b/branding/src/main/nbm/manifest.mf
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-OpenIDE-Module-Localizing-Bundle: ch/psi/fda/ui/branding/Bundle.properties
--- a/fda.ui.application/.gitignore
+++ b/fda.ui.application/.gitignore
@@ -0,0 +1,4 @@
+/config/
+/data/
+/scans/
+/logs/
--- a/fda.ui.application/pom.xml
+++ b/fda.ui.application/pom.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>ch.psi</groupId>
+        <artifactId>fda.ui</artifactId>
+        <version>3.5.0_zmq</version>
+    </parent>
+
+    <artifactId>fda.ui.application</artifactId>
+    <packaging>nbm-application</packaging>
+
+    <name>ch.psi.fda.ui.application</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.netbeans.cluster</groupId>
+            <artifactId>platform</artifactId>
+            <version>${netbeans.version}</version>
+            <type>pom</type>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>fda.ui.module</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>nbm-maven-plugin</artifactId>
+                <version>3.13</version>
+                <configuration>
+                    <etcConfFile>src/main/resources/fda.conf</etcConfFile>
+                </configuration>
+            </plugin>
+            <!-- Copy additional start scripts to bin folder -->
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.5</version>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/fda/bin</outputDirectory>
+                            <resources>          
+                                <resource>
+                                    <directory>src/main/scripts</directory>
+                                </resource>
+                            </resources>              
+                        </configuration>            
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
--- a/fda.ui.application/src/main/resources/fda.conf
+++ b/fda.ui.application/src/main/resources/fda.conf
--- a/fda.ui.application/src/main/scripts/fda.bat
+++ b/fda.ui.application/src/main/scripts/fda.bat
--- a/fda.ui.application/src/main/scripts/fda_convert
+++ b/fda.ui.application/src/main/scripts/fda_convert
@@ -37,4 +37,4 @@ do
 done

 # Execute java
-java -Xmx1024m -XX:MaxPermSize=128m -cp $CLASSPATH -Dch.psi.fda.home=${APPLICATION_HOME} -Djava.util.logging.config.file=${APPLICATION_HOME}/config/logging.properties $VM_ARGUMENTS ch.psi.fda.co.ConversionEngine $ARGUMENTS
+java -Xmx1024m -XX:MaxPermSize=128m -cp $CLASSPATH -Dch.psi.fda.home=${APPLICATION_HOME} -Djava.util.logging.config.file=${APPLICATION_HOME}/config/logging.properties $VM_ARGUMENTS ch.psi.fda.ui.ConversionMain $ARGUMENTS
--- a/fda.ui.application/src/main/scripts/fda_scan
+++ b/fda.ui.application/src/main/scripts/fda_scan
@@ -37,4 +37,4 @@ do
 done

 # Execute java
-java -Xmx1024m -XX:MaxPermSize=128m -Dch.psi.fda.home=${APPLICATION_HOME} $VM_ARGUMENTS -cp $CLASSPATH ch.psi.fda.aq.AcquisitionMain $ARGUMENTS
+java -Xmx1024m -XX:MaxPermSize=128m -Dch.psi.fda.home=${APPLICATION_HOME} $VM_ARGUMENTS -cp $CLASSPATH ch.psi.fda.ui.AcquisitionMain $ARGUMENTS
--- a/fda.ui.application/src/main/scripts/fda_vis
+++ b/fda.ui.application/src/main/scripts/fda_vis
@@ -37,4 +37,4 @@ do
 done

 # Execute java
-java -Xmx1024m -XX:MaxPermSize=128m -cp $CLASSPATH -Dch.psi.fda.home=${APPLICATION_HOME} -Djava.util.logging.config.file=${APPLICATION_HOME}/config/logging.properties $VM_ARGUMENTS ch.psi.fda.vis.VisualizationEngine $ARGUMENTS
+java -Xmx1024m -XX:MaxPermSize=128m -cp $CLASSPATH -Dch.psi.fda.home=${APPLICATION_HOME} -Djava.util.logging.config.file=${APPLICATION_HOME}/config/logging.properties $VM_ARGUMENTS ch.psi.fda.ui.VisualizationMain $ARGUMENTS
--- a/fda.ui.cdump/pom.xml
+++ b/fda.ui.cdump/pom.xml
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <artifactId>fda.ui</artifactId>
-        <groupId>ch.psi</groupId>
-        <version>1.1.30</version>
-    </parent>
-
-    <artifactId>fda.ui.cdump</artifactId>
-    <packaging>nbm</packaging>
-
-    <name>fda.ui.cdump NetBeans Module</name>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <repositories>
-        <!--
-        Repository hosting NetBeans modules, especially APIs.
-        Versions are based on IDE releases, e.g.: RELEASE691
-        To create your own repository, use: nbm:populate-repository
-        -->
-        <repository>
-            <id>netbeans</id>
-            <name>NetBeans</name>
-            <url>http://bits.netbeans.org/maven2/</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-netbeans-api-annotations-common</artifactId>
-            <version>${netbeans.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-openide-util</artifactId>
-            <version>${netbeans.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-openide-windows</artifactId>
-            <version>${netbeans.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-netbeans-modules-settings</artifactId>
-            <version>${netbeans.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-openide-io</artifactId>
-            <version>${netbeans.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-openide-util-lookup</artifactId>
-            <version>${netbeans.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-openide-awt</artifactId>
-            <version>${netbeans.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-openide-dialogs</artifactId>
-            <version>${netbeans.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>ch.psi</groupId>
-            <artifactId>fda.ui.preferences</artifactId>
-            <version>${project.version}</version>
-            <type>nbm</type>
-        </dependency>
-        <dependency>
-            <groupId>ch.psi</groupId>
-            <artifactId>cdump</artifactId>
-            <version>0.9.6-SNAPSHOT</version>
-            <type>jar</type>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>nbm-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-
-            <plugin>
-                <!-- NetBeans 6.9+ requires JDK 6 -->
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.3.1</version>
-                <configuration>
-                    <!-- to have the jar plugin pickup the nbm generated manifest -->
-                    <useDefaultManifestFile>true</useDefaultManifestFile>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
--- a/fda.ui.cdump/src/main/java/ch/psi/fda/ui/cdump/CdumpExecutionTopComponent.form
+++ b/fda.ui.cdump/src/main/java/ch/psi/fda/ui/cdump/CdumpExecutionTopComponent.form
@@ -1,99 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" ?>
-
-<Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
-  <AuxValues>
-    <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
-    <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
-    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
-    <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
-    <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
-    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
-    <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
-    <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
-    <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
-  </AuxValues>
-
-  <Layout>
-    <DimensionLayout dim="0">
-      <Group type="103" groupAlignment="0" attributes="0">
-          <Group type="102" attributes="0">
-              <EmptySpace max="-2" attributes="0"/>
-              <Group type="103" groupAlignment="0" attributes="0">
-                  <Group type="102" attributes="0">
-                      <Group type="103" groupAlignment="0" attributes="0">
-                          <Component id="jLabel1" alignment="0" min="-2" max="-2" attributes="0"/>
-                          <Component id="jLabel2" alignment="0" min="-2" max="-2" attributes="0"/>
-                      </Group>
-                      <EmptySpace max="-2" attributes="0"/>
-                      <Group type="103" groupAlignment="0" max="-2" attributes="0">
-                          <Component id="jComboBox1" max="32767" attributes="1"/>
-                          <Component id="jTextField1" alignment="0" pref="173" max="32767" attributes="1"/>
-                      </Group>
-                  </Group>
-                  <Component id="jButton1" alignment="0" min="-2" max="-2" attributes="0"/>
-              </Group>
-              <EmptySpace pref="108" max="32767" attributes="0"/>
-          </Group>
-      </Group>
-    </DimensionLayout>
-    <DimensionLayout dim="1">
-      <Group type="103" groupAlignment="0" attributes="0">
-          <Group type="102" alignment="0" attributes="0">
-              <EmptySpace max="-2" attributes="0"/>
-              <Group type="103" groupAlignment="3" attributes="0">
-                  <Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
-                  <Component id="jComboBox1" alignment="3" min="-2" max="-2" attributes="0"/>
-              </Group>
-              <EmptySpace max="-2" attributes="0"/>
-              <Group type="103" groupAlignment="3" attributes="0">
-                  <Component id="jLabel2" alignment="3" min="-2" max="-2" attributes="0"/>
-                  <Component id="jTextField1" alignment="3" min="-2" max="-2" attributes="0"/>
-              </Group>
-              <EmptySpace max="-2" attributes="0"/>
-              <Component id="jButton1" min="-2" max="-2" attributes="0"/>
-              <EmptySpace pref="187" max="32767" attributes="0"/>
-          </Group>
-      </Group>
-    </DimensionLayout>
-  </Layout>
-  <SubComponents>
-    <Component class="javax.swing.JComboBox" name="jComboBox1">
-      <Properties>
-        <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
-          <Connection code="new javax.swing.DefaultComboBoxModel(RunConfiguration.rates)" type="code"/>
-        </Property>
-      </Properties>
-    </Component>
-    <Component class="javax.swing.JLabel" name="jLabel1">
-      <Properties>
-        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="ch/psi/fda/ui/cdump/Bundle.properties" key="CdumpExecutionTopComponent.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-        </Property>
-      </Properties>
-    </Component>
-    <Component class="javax.swing.JTextField" name="jTextField1">
-      <Properties>
-        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="ch/psi/fda/ui/cdump/Bundle.properties" key="CdumpExecutionTopComponent.jTextField1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-        </Property>
-      </Properties>
-    </Component>
-    <Component class="javax.swing.JLabel" name="jLabel2">
-      <Properties>
-        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="ch/psi/fda/ui/cdump/Bundle.properties" key="CdumpExecutionTopComponent.jLabel2.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-        </Property>
-      </Properties>
-    </Component>
-    <Component class="javax.swing.JButton" name="jButton1">
-      <Properties>
-        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="ch/psi/fda/ui/cdump/Bundle.properties" key="CdumpExecutionTopComponent.jButton1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-        </Property>
-      </Properties>
-      <Events>
-        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton1ActionPerformed"/>
-      </Events>
-    </Component>
-  </SubComponents>
-</Form>
--- a/fda.ui.cdump/src/main/java/ch/psi/fda/ui/cdump/CdumpExecutionTopComponent.java
+++ b/fda.ui.cdump/src/main/java/ch/psi/fda/ui/cdump/CdumpExecutionTopComponent.java
@@ -1,291 +0,0 @@
-/*
- *  Copyright (C) 2011 Paul Scherrer Institute
- * 
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package ch.psi.fda.ui.cdump;
-
-import ch.psi.cdump.CdumpConfiguration;
-import ch.psi.cdump.CdumpService;
-import ch.psi.cdump.RunConfiguration;
-import ch.psi.fda.ui.preferences.api.Preferences;
-import java.io.File;
-import java.util.Date;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.openide.util.NbBundle;
-import org.openide.windows.TopComponent;
-import org.openide.windows.WindowManager;
-import org.netbeans.api.settings.ConvertAsProperties;
-import org.openide.DialogDisplayer;
-import org.openide.NotifyDescriptor;
-import org.openide.util.Lookup;
-import org.openide.windows.IOProvider;
-import org.openide.windows.InputOutput;
-
-/**
- * Top component which displays something.
- */
-@ConvertAsProperties(dtd = "-//ch.psi.fda.ui.cdump//CdumpExecution//EN",
-autostore = false)
-public final class CdumpExecutionTopComponent extends TopComponent {
-
-    private static CdumpExecutionTopComponent instance;
-    /** path to the icon used by the component and its open action */
-//    static final String ICON_PATH = "SET/PATH/TO/ICON/HERE";
-    private static final String PREFERRED_ID = "CdumpExecutionTopComponent";
-
-    private CdumpService service;
-
-    public CdumpExecutionTopComponent() {
-        initComponents();
-
-        // Set default to 10 kHz
-        jComboBox1.setSelectedItem("10kHz");
-
-        setName(NbBundle.getMessage(CdumpExecutionTopComponent.class, "CTL_CdumpExecutionTopComponent"));
-        setToolTipText(NbBundle.getMessage(CdumpExecutionTopComponent.class, "HINT_CdumpExecutionTopComponent"));
-//        setIcon(ImageUtilities.loadImage(ICON_PATH, true));
-
-    }
-
-    /** This method is called from within the constructor to
-     * initialize the form.
-     * WARNING: Do NOT modify this code. The content of this method is
-     * always regenerated by the Form Editor.
-     */
-    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
-    private void initComponents() {
-
-        jComboBox1 = new javax.swing.JComboBox();
-        jLabel1 = new javax.swing.JLabel();
-        jTextField1 = new javax.swing.JTextField();
-        jLabel2 = new javax.swing.JLabel();
-        jButton1 = new javax.swing.JButton();
-
-        jComboBox1.setModel(new javax.swing.DefaultComboBoxModel(RunConfiguration.rates));
-
-        org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(CdumpExecutionTopComponent.class, "CdumpExecutionTopComponent.jLabel1.text")); // NOI18N
-
-        jTextField1.setText(org.openide.util.NbBundle.getMessage(CdumpExecutionTopComponent.class, "CdumpExecutionTopComponent.jTextField1.text")); // NOI18N
-
-        org.openide.awt.Mnemonics.setLocalizedText(jLabel2, org.openide.util.NbBundle.getMessage(CdumpExecutionTopComponent.class, "CdumpExecutionTopComponent.jLabel2.text")); // NOI18N
-
-        org.openide.awt.Mnemonics.setLocalizedText(jButton1, org.openide.util.NbBundle.getMessage(CdumpExecutionTopComponent.class, "CdumpExecutionTopComponent.jButton1.text")); // NOI18N
-        jButton1.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                jButton1ActionPerformed(evt);
-            }
-        });
-
-        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
-        this.setLayout(layout);
-        layout.setHorizontalGroup(
-            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(layout.createSequentialGroup()
-                .addContainerGap()
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addGroup(layout.createSequentialGroup()
-                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addComponent(jLabel1)
-                            .addComponent(jLabel2))
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
-                            .addComponent(jComboBox1, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                            .addComponent(jTextField1, javax.swing.GroupLayout.DEFAULT_SIZE, 173, Short.MAX_VALUE)))
-                    .addComponent(jButton1))
-                .addContainerGap(108, Short.MAX_VALUE))
-        );
-        layout.setVerticalGroup(
-            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(layout.createSequentialGroup()
-                .addContainerGap()
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(jLabel1)
-                    .addComponent(jComboBox1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(jLabel2)
-                    .addComponent(jTextField1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(jButton1)
-                .addContainerGap(187, Short.MAX_VALUE))
-        );
-    }// </editor-fold>//GEN-END:initComponents
-
-    private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
-        if(jButton1.getText().equals("Start")){
-            try{
-            // Start acquisition
-                startAcquisition();
-                jButton1.setText("Stop");
-            }
-            catch(Exception e){
-                NotifyDescriptor d = new NotifyDescriptor.Message("Unable to start data acquisition:\n" + e.getMessage(), NotifyDescriptor.ERROR_MESSAGE);
-                DialogDisplayer.getDefault().notifyLater(d);
-
-                // Print exception to output window of the application
-                InputOutput io = IOProvider.getDefault().getIO("Error", false);
-                // Set output console visible
-                io.select();
-                io.getOut().println("Cannot start continuous detector");
-                e.printStackTrace(io.getErr());
-            }
-        }
-        else {
-            try{
-            // Stop acquisition
-            jButton1.setText("Start");
-            stopAcquisition();
-            }
-            catch(Exception e){
-                NotifyDescriptor d = new NotifyDescriptor.Message("Unable to stop data acquisition:\n" + e.getMessage(), NotifyDescriptor.ERROR_MESSAGE);
-                DialogDisplayer.getDefault().notifyLater(d);
-
-                // Print exception to output window of the application
-                InputOutput io = IOProvider.getDefault().getIO("Error", false);
-                // Set output console visible
-                io.select();
-                io.getOut().println("Cannot stop continuous detector");
-                e.printStackTrace(io.getErr());
-            }
-        }
-    }//GEN-LAST:event_jButton1ActionPerformed
-
-    // Variables declaration - do not modify//GEN-BEGIN:variables
-    private javax.swing.JButton jButton1;
-    private javax.swing.JComboBox jComboBox1;
-    private javax.swing.JLabel jLabel1;
-    private javax.swing.JLabel jLabel2;
-    private javax.swing.JTextField jTextField1;
-    // End of variables declaration//GEN-END:variables
-    /**
-     * Gets default instance. Do not use directly: reserved for *.settings files only,
-     * i.e. deserialization routines; otherwise you could get a non-deserialized instance.
-     * To obtain the singleton instance, use {@link #findInstance}.
-     */
-    public static synchronized CdumpExecutionTopComponent getDefault() {
-        if (instance == null) {
-            instance = new CdumpExecutionTopComponent();
-        }
-        return instance;
-    }
-
-    /**
-     * Obtain the CdumpExecutionTopComponent instance. Never call {@link #getDefault} directly!
-     */
-    public static synchronized CdumpExecutionTopComponent findInstance() {
-        TopComponent win = WindowManager.getDefault().findTopComponent(PREFERRED_ID);
-        if (win == null) {
-            Logger.getLogger(CdumpExecutionTopComponent.class.getName()).warning(
-                    "Cannot find " + PREFERRED_ID + " component. It will not be located properly in the window system.");
-            return getDefault();
-        }
-        if (win instanceof CdumpExecutionTopComponent) {
-            return (CdumpExecutionTopComponent) win;
-        }
-        Logger.getLogger(CdumpExecutionTopComponent.class.getName()).warning(
-                "There seem to be multiple components with the '" + PREFERRED_ID
-                + "' ID. That is a potential source of errors and unexpected behavior.");
-        return getDefault();
-    }
-
-    @Override
-    public int getPersistenceType() {
-        return TopComponent.PERSISTENCE_ALWAYS;
-    }
-
-    @Override
-    public void componentOpened() {
-        // TODO add custom code on component opening
-    }
-
-    @Override
-    public void componentClosed() {
-        // TODO add custom code on component closing
-    }
-
-    void writeProperties(java.util.Properties p) {
-        // better to version settings since initial version as advocated at
-        // http://wiki.apidesign.org/wiki/PropertyFiles
-        p.setProperty("version", "1.0");
-        // TODO store your settings
-    }
-
-    Object readProperties(java.util.Properties p) {
-        if (instance == null) {
-            instance = this;
-        }
-        instance.readPropertiesImpl(p);
-        return instance;
-    }
-
-    private void readPropertiesImpl(java.util.Properties p) {
-        String version = p.getProperty("version");
-        // TODO read your settings according to their version
-    }
-
-    @Override
-    protected String preferredID() {
-        return PREFERRED_ID;
-    }
-
-    /**
-     * Start CDUMP logic
-     */
-    public void startAcquisition() {
-        Preferences p = Lookup.getDefault().lookup(Preferences.class);
-        System.setProperty("ch.psi.cdump.home", p.getHome().getAbsolutePath());
-
-        Logger.getLogger(CdumpExecutionTopComponent.class.getName()).log(Level.INFO, "Start acquisition");
-
-        RunConfiguration c = new RunConfiguration();
-        c.setSamplingRate((String) jComboBox1.getSelectedItem());
-
-        // Calculate data file location/name
-        String fname = jTextField1.getText();
-        CdumpConfiguration cc = CdumpConfiguration.getInstance();
-        String d = cc.getDataDirectory() + "/" + cc.replaceMacros(cc.getFilePrefix(), new Date(), fname) + fname + ".txt";
-        File f = new File(d);
-        f.getParentFile().mkdirs(); // Create data base directory
-        // Set file to save data
-        c.setDatafile(f);
-
-        // Create execution service
-        service = new CdumpService();
-
-        // Take data
-	service.startAcquisition(c);
-    }
-
-    /**
-     * Stop CDUMP logic
-     */
-    public void stopAcquisition() {
-
-        if(service != null){
-            Logger.getLogger(CdumpExecutionTopComponent.class.getName()).log(Level.INFO, "Stop acquisition");
-            service.stopAcquisition();
-        }
-
-//        // Destroy jca context to let the program abort
-//        try {
-//            ChannelBeanFactory.getFactory().getChannelFactory().getContext().destroy();
-//        } catch (IllegalStateException e) {
-//            throw new RuntimeException(e);
-//        } catch (CAException e) {
-//            throw new RuntimeException(e);
-//        }
-    }
-}
--- a/fda.ui.cdump/src/main/nbm/manifest.mf
+++ b/fda.ui.cdump/src/main/nbm/manifest.mf
@@ -1,4 +0,0 @@
-Manifest-Version: 1.0
-OpenIDE-Module-Localizing-Bundle: ch/psi/fda/ui/cdump/Bundle.properties
-OpenIDE-Module-Layer: ch/psi/fda/ui/cdump/layer.xml
-OpenIDE-Module-Requires: org.openide.windows.WindowManager
--- a/fda.ui.cdump/src/main/nbm/module.xml
+++ b/fda.ui.cdump/src/main/nbm/module.xml
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<nbm>
-    <!--
-    <moduleType>autoload</moduleType>
-    <codeNameBase>ch.psi.fda.ui.cdump/1</codeNameBase>
-    <licenseName>Apache License, Version 2.0</licenseName>
-    <licenseFile>license.txt</licenseFile>
-    -->
-</nbm>
--- a/fda.ui.cdump/src/main/resources/ch/psi/fda/ui/cdump/layer.xml
+++ b/fda.ui.cdump/src/main/resources/ch/psi/fda/ui/cdump/layer.xml
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.0//EN" "http://www.netbeans.org/dtds/filesystem-1_0.dtd">
-<filesystem>
-    <folder name="Actions">
-        <folder name="Window">
-            <file name="ch-psi-fda-ui-cdump-CdumpExecutionAction.instance">
-                <attr name="component" methodvalue="ch.psi.fda.ui.cdump.CdumpExecutionTopComponent.findInstance"/>
-                <attr name="displayName" bundlevalue="ch.psi.fda.ui.cdump.Bundle#CTL_CdumpExecutionAction"/>
-                <attr name="instanceCreate" methodvalue="org.openide.windows.TopComponent.openAction"/>
-            </file>
-        </folder>
-    </folder>
-    <folder name="Menu">
-        <folder name="Window">
-            <file name="CdumpExecutionAction.shadow">
-                <attr name="originalFile" stringvalue="Actions/Window/ch-psi-fda-ui-cdump-CdumpExecutionAction.instance"/>
-            </file>
-        </folder>
-    </folder>
-    <folder name="Windows2">
-        <folder name="Components">
-            <file name="CdumpExecutionTopComponent.settings" url="CdumpExecutionTopComponentSettings.xml"/>
-        </folder>
-        <folder name="Modes">
-            <folder name="editor">
-                <file name="CdumpExecutionTopComponent.wstcref" url="CdumpExecutionTopComponentWstcref.xml"/>
-            </folder>
-        </folder>
-    </folder>
-</filesystem>
--- a/fda.ui.ce/src/main/java/ch/psi/fda/ui/ce/panels/model/Bundle.properties
+++ b/fda.ui.ce/src/main/java/ch/psi/fda/ui/ce/panels/model/Bundle.properties
@@ -1,262 +0,0 @@
-ShellActionPanel.jTextField1.text=Command
-ChannelActionPanel.jLabel2.text=Value:
-ChannelActionPanel.jLabel2.toolTipText=
-ChannelActionPanel.jLabel3.text=Operation:
-ChannelActionPanel.Operation.text=
-ChannelActionPanel.jLabel4.text=Type:
-ChannelActionPanel.jLabel5.text=Timeout [s]:
-ChannelActionPanel.jLabel6.text=Delay [s]:
-ChannelActionPanel.jButton1.text=
-ChannelActionPanel.Type.toolTipText=Type (Optional)
-ChannelActionPanel.Type.text=
-ChannelActionPanel.Timeout.toolTipText=Timeout in seconds (Optional)
-ChannelActionPanel.Timeout.text=
-ChannelActionPanel.Delay.toolTipText=Delay (in seconds) to wait after the action was executed (Optional)
-ChannelActionPanel.Delay.text=
-ShellActionPanel.jButton1.text=jButton1
-ShellActionPanel.jTextField1.toolTipText=Shell command
-ChannelAction2Panel.Timeout.text=
-RegionPanel.jLabel1.text=Start
-RegionPanel.jLabel2.text=End:
-RegionPanel.jLabel3.text=oen
-ChannelActionPanel.jTextFieldValue.toolTipText=Channel value
-ChannelActionPanel.jTextFieldValue.text=
-RegionPanel.jLabel1.text_1=Start:
-RegionPanel.jLabel2.text_1=End:
-RegionPanel.jLabel3.text_1=Step Size:
-DiscreteStepPositionerPanel.jLabel2.text=Readback:
-DiscreteStepPositionerPanel.jLabel3.text=Settling Time:
-DiscreteStepPositionerPanel.jButton1.text=
-DiscreteStepPositionerPanel.jLabel4.text=Done:
-DiscreteStepPositionerPanel.jLabel5.text=Done Value:
-DiscreteStepPositionerPanel.Settling\ Time.text=
-DiscreteStepPositionerPanel.Settling\ Time.toolTipText=Positioner settling time
-DiscreteStepPositionerPanel.Done.toolTipText=Channel indicating done of movement
-DiscreteStepPositionerPanel.Done.text=
-DiscreteStepPositionerPanel.Done\ Value.toolTipText=Value of done channel that indicated done (Integer)
-DiscreteStepPositionerPanel.Done\ Value.text=
-DiscreteStepPositionerPanel.Readback.toolTipText=Readback channel of the positioner
-DiscreteStepPositionerPanel.Readback.text=
-DiscreteStepPositionerPanel.Name.toolTipText=Name of positioner
-DiscreteStepPositionerPanel.Name.text=Channel Name
-RegionPanel.jButton1.text=
-ChannelActionPanel.jFormattedTextFieldChannel.text=Channel Name
-ChannelActionPanel.jFormattedTextFieldChannel.toolTipText=Channel name
-DiscreteStepPositionerPanel.jLabel6.text=Done Delay:
-DiscreteStepPositionerPanel.Done\ Delay.toolTipText=Delay before done channel is checked
-DiscreteStepPositionerPanel.Done\ Delay.text=
-RegionPanel.Step\ Size.toolTipText=Step size
-RegionPanel.Step\ Size.text=
-RegionPanel.Start.toolTipText=Start
-RegionPanel.Start.text=
-RegionPanel.End.toolTipText=End
-RegionPanel.End.text=
-LinearPositionerPanel.jLabel1.text=Start:
-LinearPositionerPanel.jLabel2.text=End:
-LinearPositionerPanel.jLabel3.text=Step Size:
-LinearPositionerPanel.Start.text=
-LinearPositionerPanel.End.text=
-LinearPositionerPanel.StepSize.text=
-ArrayPositionerPanel.jLabel2.text=Positions:
-ArrayPositionerPanel.Positions.toolTipText=Positions [space separated]
-ArrayPositionerPanel.Positions.text=
-ScalarDetectorPanel.jButton1.toolTipText=Add optional field(s)
-ScalarDetectorPanel.jButton1.text=
-ScalarDetectorPanel.jTextFieldName.text=Channel Name
-ArrayDetectorPanel.jLabel2.text=Array Size:
-ArrayDetectorPanel.jButton1.text=
-ArrayDetectorPanel.jTextFieldName.text=Channel Name
-ArrayDetectorPanel.jFormattedTextFieldArraySize.text=
-TimestampDetectorPanel.jLabel1.text=[ms]
-SimpleScalarDetectorPanel.jTextFieldName.text=Channel Name
-ScalerChannelPanel.jLabel1.text=Scaler Number:
-ScalerChannelPanel.jFormattedTextFieldNumber.text=
-ScalerChannelPanel.jFormattedTextFieldNumber.toolTipText=Number of the scaler
-PseudoPositionerPanel.jLabel1.text=Count:
-PseudoPositionerPanel.jFormattedTextFieldCount.toolTipText=Number of pseudo steps
-PseudoPositionerPanel.jFormattedTextFieldCount.text=
-ContinuousPositionerPanel.jLabel2.text=Readback:
-ContinuousPositionerPanel.jLabel3.text=Start:
-ContinuousPositionerPanel.jLabel4.text=End:
-ContinuousPositionerPanel.jLabel5.text=Step Size:
-ContinuousPositionerPanel.jLabel6.text=Integration Time:
-ContinuousPositionerPanel.jLabel7.text=Additional Backlash:
-ContinuousPositionerPanel.Name.toolTipText=Channel Name
-ContinuousPositionerPanel.Name.text=Channel Name
-ContinuousPositionerPanel.Readback.text=
-ContinuousPositionerPanel.jTextFieldReadback.toolTipText=Readback
-ContinuousPositionerPanel.Start.text=
-ContinuousPositionerPanel.End.text=
-ContinuousPositionerPanel.jFormattedTextFieldEnd.toolTipText=End
-ContinuousPositionerPanel.Step\ Size.toolTipText=Step Size
-ContinuousPositionerPanel.Step\ Size.text=
-ContinuousPositionerPanel.Integration\ Time.text=
-ContinuousPositionerPanel.jFormattedTextFieldIntegrationTime.toolTipText=Integration Time
-ContinuousPositionerPanel.Additional\ backlash.toolTipText=Additional backlash
-ContinuousPositionerPanel.Additional\ backlash.text=
-ContinuousPositionerPanel.jButton1.text=
-ContinuousPositionerPanel.jButton1.toolTipText=Add optional item
-ScanPanel.jButton1.text=
-ScanPanel.jButton1.toolTipText=Add optional items
-ScanPanel.collapsibleListContainerDimension.toolTipText=Dimensions
-ConfigurationPanel.Number\ of\ Execution.text=
-ConfigurationPanel.jLabel1.text=Number of Execution:
-GuardConditionPanel.jLabel2.text=Value:
-GuardConditionPanel.jLabel3.text=Type:
-GuardConditionPanel.Channel.toolTipText=Guard channel
-GuardConditionPanel.Channel.text=Channel Name
-GuardConditionPanel.Value.toolTipText=Value
-GuardConditionPanel.Value.text=
-GuardConditionPanel.jButton1.text=
-ConfigurationPanel.jLabel2.text=Data Format:
-ScriptActionPanel.jTextArea1.text=
-DiscreteStepDimensionPanel.jButton1.text=
-ScriptActionPanel.jTextArea1.toolTipText=Jython Script
-SimpleScalarDetectorPanel.jTextFieldName.toolTipText=Channel Name
-ScalarDetectorPanel.jTextFieldName.toolTipText=Channel Name
-ChannelActionPanel.jFormattedTextFieldDelay.toolTipText=Delay in seconds
-ChannelActionPanel.jComboBoxType.toolTipText=Type of channel
-ChannelActionPanel.jComboBoxOperation.toolTipText=Operation to perform
-ArrayDetectorPanel.jTextFieldName.toolTipText=Channel Name
-ArrayDetectorPanel.jFormattedTextFieldArraySize.toolTipText=Array Size
-ConfigurationPanel.jFormattedTextFieldNumber.toolTipText=Number of executions
-ContinuousPositionerPanel.jFormattedTextFieldStart.toolTipText=Start
-LinearPositionerPanel.discreteStepPositionerPanel1.toolTipText=
-LinearPositionerPanel.jFormattedTextFieldStart.toolTipText=Start
-LinearPositionerPanel.jFormattedTextFieldEnd.toolTipText=End
-LinearPositionerPanel.jFormattedTextFieldStepSize.toolTipText=Step Size
-TimestampDetectorPanel.jLabel1.toolTipText=Timestamp in ms
-ConfigurationPanel.jLabel3.text=File Name:
-ConfigurationPanel.jTextFieldFileName.text=
-DiscreteStepDimensionPanel.ZigZag.text=ZigZag
-ContinuousDimensionPanel.jButton1.text=
-ContinuousDimensionPanel.jButton1.toolTipText=Add optional items
-LinePlotPanel.jLabel1.text=Title:
-LinePlotPanel.jLabel2.text=X:
-LinePlotPanel.jLabel3.text=Y:
-LinePlotPanel.jButton1.text=
-LinePlotPanel.Title.text=
-LinePlotPanel.jTextFieldTitle.toolTipText=Title of the plot
-LinePlotPanel.jComboBoxX.toolTipText=x-Axis
-LinePlotPanel.jComboBoxY.toolTipText=y-Axis
-MatrixPlotPanel.jTextFieldTitle.toolTipText=Title of the plot
-MatrixPlotPanel.jComboBoxY.toolTipText=y-Axis
-MatrixPlotPanel.jButton1.text=
-MatrixPlotPanel.jComboBoxX.toolTipText=x-Axis
-MatrixPlotPanel.jLabel3.text=Y:
-MatrixPlotPanel.jLabel2.text=X:
-MatrixPlotPanel.jLabel1.text=Title:
-MatrixPlotPanel.jLabel4.text=Z:
-MatrixPlotPanel.jComboBoxZ.toolTipText=Plot Value
-ConfigurationPanel.jButton1.text=
-ChannelParameterMappingPanel.jLabel1.text=Type:
-ChannelParameterMappingPanel.Type.toolTipText=Id to map this variable
-ChannelParameterMappingPanel.jButton1.text=
-IDParameterMappingPanel.jTextField2.text=Variable
-IDParameterMappingPanel.jLabel1.text=Id:
-IDParameterMappingPanel.jButton1.text=
-IDParameterMappingPanel.jLabel1.text_1=Id:
-IDParameterMappingPanel.jButton1.text_1=
-ScriptManipulationPanel.jButton1.text=
-ScriptManipulationPanel.jTextFieldId.text=Id
-ScriptManipulationPanel.jLabel1.text=Id:
-DiscreteStepPositionerPanel.jLabel1.text=Id:
-DiscreteStepPositionerPanel.jTextFieldId.text=Id
-ContinuousPositionerPanel.jLabel1.text=Id:
-ContinuousPositionerPanel.jTextFieldId.text=Id
-ArrayDetectorPanel.jLabel1.text=Id:
-ArrayDetectorPanel.jTextFieldId.text=Id
-PseudoPositionerPanel.jLabel2.text=Id:
-PseudoPositionerPanel.jTextFieldId.text=Id
-ScalarDetectorPanel.jLabel1.text=Id:
-ScalarDetectorPanel.jTextFieldId.text=Id
-ScalerChannelPanel.jLabel2.text=Id:
-ScalerChannelPanel.jTextFieldId.text=Id
-SimpleScalarDetectorPanel.jLabel1.text=Id:
-SimpleScalarDetectorPanel.jTextFieldId.text=Id
-TimestampDetectorPanel.jLabel2.text=Id:
-TimestampDetectorPanel.jTextFieldId.text=Id
-ConfigurationPanel.jCheckBoxFailOnSensorError.text=Fail on Sensor Error
-ScriptActionPanel.jButton1.text=
-ScriptActionPanel.jButton1.toolTipText=Add optional items
-ConfigurationPanel.jButton2.text=
-PseudoPositionerPanel.Settling\ Time.text=
-PseudoPositionerPanel.jLabel3.text=Settling Time:
-PseudoPositionerPanel.jButton1.text=
-PseudoPositionerPanel.jLabel4.text=Done:
-PseudoPositionerPanel.Done.text=
-PseudoPositionerPanel.jLabel5.text=Done Value:
-PseudoPositionerPanel.Done\ Value.text=
-PseudoPositionerPanel.jLabel6.text=Done Delay:
-PseudoPositionerPanel.Done\ Delay.text=
-DiscreteStepDimensionPanel.Data\ Group.text=Data Group
-ContinuousDimensionPanel.Data\ Group.text=Data Group
-ScalarDetectorPanel.Type.toolTipText=Data type
-ScalarDetectorPanel.jLabel2.text=Type:
-RecipientPanel.jButton1.text=Test
-RecipientPanel.jButton1.toolTipText=Send test notification
-ChannelParameterMappingPanel.jTextFieldVariable.text=Variable
-ChannelParameterMappingPanel.jTextFieldName.text=Channel Name
-DiscreteStepDimensionPanel.jCheckBoxZigZag.toolTipText=ZigZag Dimension
-IDParameterMappingPanel.jTextFieldVariable.text_1=Variable
-RecipientPanel.jTextFieldSms.toolTipText=email address or SMS number
-RecipientPanel.jTextFieldSms.text=SMS, E-Mail
-ContinuousDimensionPanel.ZigZag.toolTipText=ZigZag
-ContinuousDimensionPanel.ZigZag.text=ZigZag
-RecipientPanel.Error.text=Error
-RecipientPanel.Success.text=Success
-RecipientPanel.jButton2.text=
-RegionPanel.jLabel4.text=Function:
-FunctionPositionerPanel.discreteStepPositionerPanel1.toolTipText=
-FunctionPositionerPanel.jFormattedTextFieldStepSize.toolTipText=Step Size
-FunctionPositionerPanel.jLabel3.text=Step Size:
-FunctionPositionerPanel.jFormattedTextFieldStart.toolTipText=Start
-FunctionPositionerPanel.jLabel1.text=Start:
-FunctionPositionerPanel.jFormattedTextFieldEnd.toolTipText=End
-FunctionPositionerPanel.jLabel2.text=End:
-SimpleScalarDetectorPanel.jButton1.text=
-SimpleScalarDetectorPanel.SCR.text=SCR
-LinePlotArrayPanel.jButton1.text=
-LinePlotArrayPanel.jLabel3.text=Y:
-LinePlotArrayPanel.jComboBoxY.toolTipText=y-Axis
-LinePlotArrayPanel.jLabel1.text=Title:
-LinePlotArrayPanel.jTextFieldTitle.toolTipText=Title of the plot
-MatrixPlotArrayPanel.jComboBoxZ.toolTipText=Array value to plot
-MatrixPlotArrayPanel.jLabel4.text=Z:
-MatrixPlotArrayPanel.jLabel1.text=Title:
-MatrixPlotArrayPanel.jButton1.text=
-MatrixPlotArrayPanel.jTextFieldTitle.toolTipText=Title of the plot
-MatrixPlotArrayPanel.jLabel3.text=Y:
-MatrixPlotArrayPanel.jComboBoxY.toolTipText=y-Axis
-MatrixPlotArrayPanel.jLabel2.text=Size:
-LinePlotArrayPanel.jLabel2.text=Max Series:
-LinePlotArrayPanel.jLabel2.toolTipText=Maximum number of series in plot
-LinePlotArrayPanel.Max\ Series.toolTipText=Maximum number of series in plot
-LinePlotArrayPanel.Max\ Series.text=
-LinePlotPanel.jButton2.text=
-LinePlotArrayPanel.jLabel4.text=Offset:
-LinePlotArrayPanel.jLabel5.text=Size:
-LinePlotArrayPanel.Offset.text=
-LinePlotArrayPanel.Size.text=
-MatrixPlotArrayPanel.jLabel5.text=Offset:
-MatrixPlotArrayPanel.Offset.text=
-MatrixPlotArrayPanel.Size.toolTipText=Size of array specified as Z
-MatrixPlotArrayPanel.Size.text=
-LinePlotArrayPanel.jButton2.text=
-GlobalVariablePanel.jLabel1.text=Name:
-GlobalVariablePanel.jLabel2.text=Value:
-GlobalVariablePanel.jTextFieldName.text=
-GlobalVariablePanel.jTextFieldValue.text=
-FunctionPanel.jButton1.text=
-GlobalVariableParameterMappingPanel.jLabel1.text_1=Variable:
-GlobalVariableParameterMappingPanel.jButton1.text_1=
-GlobalVariableParameterMappingPanel.jTextFieldVariable.text_1=Variable
-ConfigurationPanel.Description.text=
-GlobalVariablePanel.jButton1.text=
-GlobalVariablePanel.jTextFieldDescription.text=Description
-ScriptManipulationPanel.Returns\ Array.text=Array
-LinearPositionerPanel.Asynchronous.toolTipText=Asynchronous move
-LinearPositionerPanel.Asynchronous.text=Asynchronous
-DiscreteStepPositionerPanel.Asynchronous.text=Asynchronous:
-DiscreteStepPositionerPanel.jLabel7.text=Type:
-PseudoPositionerPanel.jLabel7.text=Type:
--- a/fda.ui.ce/src/main/java/ch/psi/fda/ui/ce/panels/model/ShellActionPanel.form
+++ b/fda.ui.ce/src/main/java/ch/psi/fda/ui/ce/panels/model/ShellActionPanel.form
@@ -1,43 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" ?>
-
-<Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
-  <AuxValues>
-    <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
-    <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
-    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
-    <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
-    <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
-    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
-    <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
-    <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
-    <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
-  </AuxValues>
-
-  <Layout>
-    <DimensionLayout dim="0">
-      <Group type="103" groupAlignment="0" attributes="0">
-          <Component id="jTextField1" alignment="1" pref="400" max="32767" attributes="0"/>
-      </Group>
-    </DimensionLayout>
-    <DimensionLayout dim="1">
-      <Group type="103" groupAlignment="0" attributes="0">
-          <Component id="jTextField1" min="-2" max="-2" attributes="0"/>
-      </Group>
-    </DimensionLayout>
-  </Layout>
-  <SubComponents>
-    <Component class="javax.swing.JTextField" name="jTextField1">
-      <Properties>
-        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="ch/psi/fda/ui/ce/panels/model/Bundle.properties" key="ShellActionPanel.jTextField1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-        </Property>
-        <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="ch/psi/fda/ui/ce/panels/model/Bundle.properties" key="ShellActionPanel.jTextField1.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-        </Property>
-        <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-          <Dimension value="[200, 28]"/>
-        </Property>
-      </Properties>
-    </Component>
-  </SubComponents>
-</Form>
--- a/fda.ui.ce/src/main/nbm/manifest.mf
+++ b/fda.ui.ce/src/main/nbm/manifest.mf
@@ -1,5 +0,0 @@
-Manifest-Version: 1.0
-OpenIDE-Module-Localizing-Bundle: ch/psi/fda/ui/ce/Bundle.properties
-OpenIDE-Module-Layer: ch/psi/fda/ui/ce/layer.xml
-OpenIDE-Module-Requires: org.openide.windows.WindowManager
-OpenIDE-Module: ch.psi.fda.ui.ce
--- a/fda.ui.ce/src/main/nbm/module.xml
+++ b/fda.ui.ce/src/main/nbm/module.xml
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<nbm>
-    <!--
-    <moduleType>autoload</moduleType>
-    <codeNameBase>ch.psi.fda.ui.ce/1</codeNameBase>
-    <licenseName>Apache License, Version 2.0</licenseName>
-    <licenseFile>license.txt</licenseFile>
-    -->
-</nbm>
--- a/fda.ui.ce/src/main/resources/ch/psi/fda/ui/ce/layer.xml
+++ b/fda.ui.ce/src/main/resources/ch/psi/fda/ui/ce/layer.xml
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.0//EN" "http://www.netbeans.org/dtds/filesystem-1_0.dtd">
-<filesystem>
-    <folder name="Actions">
-        <folder name="File">
-            <file name="ch-psi-fda-ui-ce-ExecuteAction.instance">
-                <attr name="delegate" methodvalue="org.openide.awt.Actions.inject"/>
-                <attr name="displayName" bundlevalue="ch.psi.fda.ui.ce.Bundle#CTL_ExecuteAction"/>
-                <attr name="iconBase" stringvalue="ch/psi/fda/ui/ce/runProject24.png"/>
-                <attr name="injectable" stringvalue="ch.psi.fda.ui.ce.ExecuteAction"/>
-                <attr name="instanceCreate" methodvalue="org.openide.awt.Actions.context"/>
-                <attr name="noIconInMenu" boolvalue="false"/>
-                <attr name="selectionType" stringvalue="EXACTLY_ONE"/>
-                <attr name="type" stringvalue="ch.psi.fda.ui.ce.ExecuteCapability"/>
-            </file>
-            <file name="ch-psi-fda-ui-ce-NewAction.instance">
-                <attr name="delegate" newvalue="ch.psi.fda.ui.ce.NewAction"/>
-                <attr name="displayName" bundlevalue="ch.psi.fda.ui.ce.Bundle#CTL_NewAction"/>
-                <attr name="instanceCreate" methodvalue="org.openide.awt.Actions.alwaysEnabled"/>
-                <attr name="noIconInMenu" boolvalue="false"/>
-            </file>
-        </folder>
-        <folder name="View">
-            <file name="ch-psi-fda-ui-ce-ViewConfigurationAction.instance">
-                <attr name="delegate" methodvalue="org.openide.awt.Actions.inject"/>
-                <attr name="displayName" bundlevalue="ch.psi.fda.ui.ce.Bundle#CTL_ViewConfigurationAction"/>
-                <attr name="injectable" stringvalue="ch.psi.fda.ui.ce.ViewConfigurationAction"/>
-                <attr name="instanceCreate" methodvalue="org.openide.awt.Actions.context"/>
-                <attr name="noIconInMenu" boolvalue="false"/>
-                <attr name="selectionType" stringvalue="EXACTLY_ONE"/>
-                <attr name="type" stringvalue="org.openide.loaders.DataObject"/>
-            </file>
-        </folder>
-
-        <!--Overwrite display name of default Open action-->
-        <!--<folder name="System">
-            <file name="org-openide-actions-OpenAction.instance">
-                <attr name="displayName" stringvalue="Edit"/>
-            </file>
-        </folder>-->
-
-        <folder name="Window">
-            <!--<file name="ch-psi-fda-ui-ce-VisualEditorAction.instance">
-                <attr name="component" methodvalue="ch.psi.fda.ui.ce.VisualEditorTopComponent.findInstance"/>
-                <attr name="displayName" bundlevalue="ch.psi.fda.ui.ce.Bundle#CTL_VisualEditorAction"/>
-                <attr name="instanceCreate" methodvalue="org.openide.windows.TopComponent.openAction"/>
-            </file>-->
-        </folder>
-    </folder>
-    <folder name="Loaders">
-        <folder name="text">
-            <folder name="x10+xml">
-                <folder name="Actions">
-                    <file name="ch-psi-fda-ui-ce-ViewConfigurationAction-separatorAfter.instance">
-                        <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
-                        <attr name="position" intvalue="50"/>
-                    </file>
-                    <file name="ch-psi-fda-ui-ce-ViewConfigurationAction.shadow">
-                        <attr name="originalFile" stringvalue="Actions/View/ch-psi-fda-ui-ce-ViewConfigurationAction.instance"/>
-                        <attr name="position" intvalue="0"/>
-                    </file>
-                </folder>
-            </folder>
-        </folder>
-    </folder>
-    <folder name="Menu">
-        <folder name="File">
-            <file name="ch-psi-fda-ui-ce-NewAction.shadow">
-                <attr name="originalFile" stringvalue="Actions/File/ch-psi-fda-ui-ce-NewAction.instance"/>
-                <attr name="position" intvalue="1300"/>
-            </file>
-        </folder>
-        <folder name="Window">
-            <file name="VisualEditorAction.shadow">
-                <attr name="originalFile" stringvalue="Actions/Window/ch-psi-fda-ui-ce-VisualEditorAction.instance"/>
-            </file>
-        </folder>
-    </folder>
-    <folder name="Toolbars">
-        <folder name="File">
-            <file name="org-openide-actions-SaveAction.shadow">
-                <attr name="originalFile" stringvalue="Actions/System/org-openide-actions-SaveAction.instance"/>
-                <attr name="position" intvalue="444"/>
-            </file>
-            <file name="org-openide-actions-SaveAllAction.shadow_hidden"/>
-        </folder>
-        <folder name="Run"> <!-- Run is a name I choose -->
-            <file name="ch-psi-fda-ui-ce-ExecuteAction.shadow">
-                <attr name="originalFile" stringvalue="Actions/File/ch-psi-fda-ui-ce-ExecuteAction.instance"/>
-                <attr name="position" intvalue="544"/>
-            </file>
-        </folder>
-    </folder>
-    <folder name="Shortcuts">
-        <file name="D-S.shadow">
-            <attr name="originalFile" stringvalue="Actions/System/org-openide-actions-SaveAction.instance"/>
-        </file>
-    </folder>
-    <folder name="Windows2">
-        <folder name="Components">
-            <file name="VisualEditorTopComponent.settings" url="VisualEditorTopComponentSettings.xml"/>
-        </folder>
-        <folder name="Modes">
-            <folder name="editor">
-                <file name="VisualEditorTopComponent.wstcref" url="VisualEditorTopComponentWstcref.xml"/>
-            </folder>
-        </folder>
-    </folder>
-</filesystem>
--- a/fda.ui.cm/pom.xml
+++ b/fda.ui.cm/pom.xml
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <artifactId>fda.ui</artifactId>
-        <groupId>ch.psi</groupId>
-        <version>1.1.30</version>
-    </parent>
-
-    <artifactId>fda.ui.cm</artifactId>
-    <packaging>nbm</packaging>
-
-    <name>fda.ui.cm NetBeans Module</name>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <repositories>
-        <!--
-        Repository hosting NetBeans modules, especially APIs.
-        Versions are based on IDE releases, e.g.: RELEASE691
-        To create your own repository, use: nbm:populate-repository
-        -->
-        <repository>
-            <id>netbeans</id>
-            <name>NetBeans</name>
-            <url>http://bits.netbeans.org/maven2/</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-netbeans-api-annotations-common</artifactId>
-            <version>${netbeans.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-openide-filesystems</artifactId>
-            <version>${netbeans.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-openide-loaders</artifactId>
-            <version>${netbeans.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-openide-util</artifactId>
-            <version>${netbeans.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-openide-util-lookup</artifactId>
-            <version>${netbeans.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-openide-explorer</artifactId>
-            <version>${netbeans.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-openide-nodes</artifactId>
-            <version>${netbeans.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-openide-text</artifactId>
-            <version>${netbeans.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-openide-windows</artifactId>
-            <version>${netbeans.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>ch.psi</groupId>
-            <artifactId>fda.ui.preferences</artifactId>
-            <version>${project.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>ch.psi</groupId>
-            <artifactId>fda.ui.ee</artifactId>
-            <version>${project.version}</version>
-            <type>jar</type>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>nbm-maven-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <publicPackages>
-                        <publicPackage>ch.psi.fda.ui.cm</publicPackage>
-                        <publicPackage>ch.psi.fda.ui.cm.fs</publicPackage>
-                    </publicPackages>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <!-- NetBeans 6.9+ requires JDK 6 -->
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.3.1</version>
-                <configuration>
-                    <!-- to have the jar plugin pickup the nbm generated manifest -->
-                    <useDefaultManifestFile>true</useDefaultManifestFile>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
--- a/fda.ui.cm/src/main/nbm/manifest.mf
+++ b/fda.ui.cm/src/main/nbm/manifest.mf
@@ -1,5 +0,0 @@
-Manifest-Version: 1.0
-OpenIDE-Module-Localizing-Bundle: ch/psi/fda/ui/cm/Bundle.properties
-OpenIDE-Module-Layer: ch/psi/fda/ui/cm/layer.xml
-OpenIDE-Module: ch.psi.fda.ui.cm
-OpenIDE-Module-Requires: org.openide.windows.WindowManager
--- a/fda.ui.cm/src/main/nbm/module.xml
+++ b/fda.ui.cm/src/main/nbm/module.xml
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<nbm>
-    <!--
-    <moduleType>autoload</moduleType>
-    <codeNameBase>ch.psi.fda.ui.cm/1</codeNameBase>
-    <licenseName>Apache License, Version 2.0</licenseName>
-    <licenseFile>license.txt</licenseFile>
-    -->
-</nbm>
--- a/fda.ui.cm/src/test/resources/.gitignore
+++ b/fda.ui.cm/src/test/resources/.gitignore
--- a/fda.ui.ee/pom.xml
+++ b/fda.ui.ee/pom.xml
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <artifactId>fda.ui</artifactId>
-        <groupId>ch.psi</groupId>
-        <version>1.1.30</version>
-    </parent>
-    
-    <artifactId>fda.ui.ee</artifactId>
-    <packaging>nbm</packaging>
-
-    <name>fda.ui.ee NetBeans Module</name>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <repositories>
-        <!--
-        Repository hosting NetBeans modules, especially APIs.
-        Versions are based on IDE releases, e.g.: RELEASE691
-        To create your own repository, use: nbm:populate-repository
-        -->
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-openide-util</artifactId>
-            <version>${netbeans.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-netbeans-api-annotations-common</artifactId>
-            <version>${netbeans.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-openide-util-lookup</artifactId>
-            <version>${netbeans.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-netbeans-api-progress</artifactId>
-            <version>${netbeans.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-openide-dialogs</artifactId>
-            <version>${netbeans.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-openide-io</artifactId>
-            <version>${netbeans.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-openide-modules</artifactId>
-            <version>${netbeans.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-openide-windows</artifactId>
-            <version>${netbeans.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-netbeans-modules-settings</artifactId>
-            <version>${netbeans.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>ch.psi</groupId>
-            <artifactId>fda.ui.preferences</artifactId>
-            <version>${project.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>ch.psi</groupId>
-            <artifactId>fda</artifactId>
-            <version>1.1.30</version>
-            <type>jar</type>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>nbm-maven-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <publicPackages>
-                        <publicPackage>ch.psi.fda.model</publicPackage>
-                        <publicPackage>ch.psi.fda.model.v1</publicPackage>
-                        <publicPackage>ch.psi.fda.ui.ee.api</publicPackage>
-                    </publicPackages>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <!-- to have the jar plugin pickup the nbm generated manifest -->
-                    <useDefaultManifestFile>true</useDefaultManifestFile>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
--- a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ee/SimpleConversionService.java
+++ b/fda.ui.ee/src/main/java/ch/psi/fda/ui/ee/SimpleConversionService.java
@@ -1,99 +0,0 @@
-/*
- *  Copyright (C) 2011 Paul Scherrer Institute
- * 
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package ch.psi.fda.ui.ee;
-
-import ch.psi.fda.deserializer.DataDeserializer;
-import ch.psi.fda.deserializer.DataDeserializerMDA;
-import ch.psi.fda.deserializer.DataDeserializerTXT;
-import ch.psi.fda.serializer.DataSerializer;
-import ch.psi.fda.serializer.DataSerializerMAT;
-import ch.psi.fda.serializer.DataSerializerMAT2D;
-import ch.psi.fda.serializer.DataSerializerMAT2DZigZag;
-import ch.psi.fda.serializer.DataSerializerMDA;
-import ch.psi.fda.serializer.DataSerializerTXT;
-import ch.psi.fda.serializer.DataSerializerTXT2D;
-import ch.psi.fda.serializer.DataSerializerTXTSplit;
-import ch.psi.fda.ui.ee.api.ConversionService;
-import java.io.File;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.openide.DialogDisplayer;
-import org.openide.NotifyDescriptor;
-import org.openide.util.lookup.ServiceProvider;
-import org.openide.windows.IOProvider;
-import org.openide.windows.InputOutput;
-
-/**
- *
- * @author ebner
- */
-@ServiceProvider(service = ConversionService.class)
-public class SimpleConversionService implements ConversionService {
-
-    @Override
-    public void convert(File input, File output, Reader reader, Writer writer) {
-
-        try {
-            Logger.getLogger(SimpleConversionService.class.getName()).log(Level.INFO, "Convert file {0} from {1} to {2}", new Object[]{input.getAbsolutePath(), reader, writer});
-
-            // Create deserializer
-            final DataDeserializer deserializer;
-            if (reader.equals(Reader.TXT)) {
-                deserializer = new DataDeserializerTXT(input);
-            } else if (reader.equals(Reader.MDA)) {
-                deserializer = new DataDeserializerMDA(input);
-            } else {
-                throw new IllegalArgumentException("Reader of type " + reader + " not supported.");
-            }
-
-            final DataSerializer serializer;
-            if (writer.equals(Writer.MAT)) {
-                serializer = new DataSerializerMAT(deserializer.getQueue(), output);
-            } else if (writer.equals(Writer.MAT_2D)) {
-                serializer = new DataSerializerMAT2D(deserializer.getQueue(), output);
-            } else if (writer.equals(Writer.TXT)) {
-                serializer = new DataSerializerTXT(deserializer.getQueue(), output, false);
-            } else if (writer.equals(Writer.TXT_2D)) {
-                serializer = new DataSerializerTXT2D(deserializer.getQueue(), output);
-            } else if (writer.equals(Writer.TXT_SPLIT)) {
-                serializer = new DataSerializerTXTSplit(deserializer.getQueue(), output);
-            } else if (writer.equals(Writer.MDA)) {
-                serializer = new DataSerializerMDA(deserializer.getQueue(), output);
-            } else if (writer.equals(Writer.MAT_2D_Z)) {
-                serializer = new DataSerializerMAT2DZigZag(deserializer.getQueue(), output);
-            } else {
-                throw new IllegalArgumentException("Writer of type " + writer + " not supported.");
-            }
-
-            // Convert file
-            deserializer.run();
-            serializer.run();
-
-        } catch (Exception e) {
-            // Inform the user without waiting for its response
-            NotifyDescriptor d = new NotifyDescriptor.Message("An error occured while converting '" + input.getName() + "':\n" + e.getMessage(), NotifyDescriptor.ERROR_MESSAGE);
-            DialogDisplayer.getDefault().notifyLater(d);
-
-            // Print exception to output window of the application
-            InputOutput io = IOProvider.getDefault().getIO("Error", false);
-            // Set output console visible
-            io.select();
-            io.getOut().println("Conversion of '" + input.getName() + "' failed");
-            e.printStackTrace(io.getErr());
-        }
-    }
-}
--- a/fda.ui.ee/src/main/nbm/module.xml
+++ b/fda.ui.ee/src/main/nbm/module.xml
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<nbm>
-    <!--
-    <moduleType>autoload</moduleType>
-    <codeNameBase>ch.psi.fda.ui/1</codeNameBase>
-    <licenseName>Apache License, Version 2.0</licenseName>
-    <licenseFile>license.txt</licenseFile>
-    -->
-</nbm>
--- a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ee/Bundle.properties
+++ b/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ee/Bundle.properties
@@ -1,10 +0,0 @@
-# Localized module labels. Defaults taken from POM (<name>, <description>, <groupId>) if unset.
-#OpenIDE-Module-Name=
-#OpenIDE-Module-Short-Description=
-#OpenIDE-Module-Long-Description=
-#OpenIDE-Module-Display-Category=
-CTL_AbortAllAction=Abort All
-CTL_ExportAsPNGAction=Export as PNGs
-CTL_PlotVisualizerAction=Visualization
-CTL_PlotVisualizerTopComponent=Visualization
-HINT_PlotVisualizerTopComponent=This is a Visualization window
--- a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ee/layer.xml
+++ b/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ee/layer.xml
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.0//EN" "http://www.netbeans.org/dtds/filesystem-1_0.dtd">
-<filesystem>
-<folder name="Actions">
-        <folder name="File">
-            <file name="ch-psi-fda-ui-ee-AbortAllAction.instance">
-                <attr name="delegate" newvalue="ch.psi.fda.ui.ee.AbortAllAction"/>
-                <attr name="displayName" bundlevalue="ch.psi.fda.ui.ee.Bundle#CTL_AbortAllAction"/>
-                <attr name="iconBase" stringvalue="ch/psi/fda/ui/ee/stop.png"/>
-                <attr name="instanceCreate" methodvalue="org.openide.awt.Actions.alwaysEnabled"/>
-                <attr name="noIconInMenu" boolvalue="false"/>
-            </file>
-        </folder>
-        <folder name="Tools">
-            <file name="ch-psi-fda-ui-ee-ExportAsPNGAction.instance">
-                <attr name="delegate" methodvalue="org.openide.awt.Actions.inject"/>
-                <attr name="displayName" bundlevalue="ch.psi.fda.ui.ee.Bundle#CTL_ExportAsPNGAction"/>
-                <attr name="injectable" stringvalue="ch.psi.fda.ui.ee.ExportAsPNGAction"/>
-                <attr name="instanceCreate" methodvalue="org.openide.awt.Actions.context"/>
-                <attr name="noIconInMenu" boolvalue="false"/>
-                <attr name="selectionType" stringvalue="EXACTLY_ONE"/>
-                <attr name="type" stringvalue="ch.psi.fda.ui.ee.ExportCapability"/>
-            </file>
-        </folder>
-        <folder name="Window">
-            <file name="ch-psi-fda-ui-ee-PlotVisualizerAction.instance">
-                <attr name="component" methodvalue="ch.psi.fda.ui.ee.PlotVisualizerTopComponent.findInstance"/>
-                <attr name="displayName" bundlevalue="ch.psi.fda.ui.ee.Bundle#CTL_PlotVisualizerAction"/>
-                <attr name="instanceCreate" methodvalue="org.openide.windows.TopComponent.openAction"/>
-            </file>
-        </folder>
-    </folder>
-    <folder name="Menu">
-        <folder name="Tools">
-            <file name="ch-psi-fda-ui-ee-ExportAsPNGAction.shadow">
-                <attr name="originalFile" stringvalue="Actions/Tools/ch-psi-fda-ui-ee-ExportAsPNGAction.instance"/>
-                <attr name="position" intvalue="10"/>
-            </file>
-        </folder>
-        <folder name="Window">
-            <file name="PlotVisualizerAction.shadow">
-                <attr name="originalFile" stringvalue="Actions/Window/ch-psi-fda-ui-ee-PlotVisualizerAction.instance"/>
-            </file>
-        </folder>
-    </folder>
-    <folder name="Toolbars">
-        <folder name="Run">
-            <file name="ch-psi-fda-ui-ee-AbortAllAction.shadow">
-                <attr name="originalFile" stringvalue="Actions/File/ch-psi-fda-ui-ee-AbortAllAction.instance"/>
-                <attr name="position" intvalue="644"/>
-            </file>
-        </folder>
-    </folder>
-    <folder name="Windows2">
-        <folder name="Components">
-            <file name="PlotVisualizerTopComponent.settings" url="PlotVisualizerTopComponentSettings.xml"/>
-        </folder>
-        <folder name="Modes">
-            <folder name="editor">
-                <file name="PlotVisualizerTopComponent.wstcref" url="PlotVisualizerTopComponentWstcref.xml"/>
-            </folder>
-        </folder>
-    </folder>
-</filesystem>
--- a/fda.ui.ee/src/test/java/.gitignore
+++ b/fda.ui.ee/src/test/java/.gitignore
--- a/fda.ui.ee/src/test/resources/.gitignore
+++ b/fda.ui.ee/src/test/resources/.gitignore
--- a/fda.ui.module/pom.xml
+++ b/fda.ui.module/pom.xml
@@ -1,151 +1,167 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <artifactId>fda.ui</artifactId>
-        <groupId>ch.psi</groupId>
-        <version>1.1.30</version>
-    </parent>
-
-    <artifactId>fda.ui.ce</artifactId>
-    <packaging>nbm</packaging>
-
-    <name>fda.ui.ce NetBeans Module</name>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <repositories>
-        <!--
-        Repository hosting NetBeans modules, especially APIs.
-        Versions are based on IDE releases, e.g.: RELEASE691
-        To create your own repository, use: nbm:populate-repository
-        -->
-        <repository>
-            <id>netbeans</id>
-            <name>NetBeans</name>
-            <url>http://bits.netbeans.org/maven2/</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-netbeans-api-annotations-common</artifactId>
-            <version>${netbeans.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-openide-filesystems</artifactId>
-            <version>${netbeans.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-openide-loaders</artifactId>
-            <version>${netbeans.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-netbeans-modules-settings</artifactId>
-            <version>${netbeans.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-openide-io</artifactId>
-            <version>${netbeans.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-openide-util</artifactId>
-            <version>${netbeans.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-openide-util-lookup</artifactId>
-            <version>${netbeans.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-openide-dialogs</artifactId>
-            <version>${netbeans.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-openide-nodes</artifactId>
-            <version>${netbeans.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.netbeans.api</groupId>
-            <artifactId>org-openide-windows</artifactId>
-            <version>${netbeans.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>ch.psi</groupId>
-            <artifactId>fda.ui.preferences</artifactId>
-            <version>${project.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>ch.psi</groupId>
-            <artifactId>fda.ui.ee</artifactId>
-            <version>${project.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>ch.psi</groupId>
-            <artifactId>fda.ui.cm</artifactId>
-            <version>${project.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-            <type>jar</type>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>nbm-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-
-            <plugin>
-                <!-- NetBeans 6.9+ requires JDK 6 -->
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.3.1</version>
-                <configuration>
-                    <!-- to have the jar plugin pickup the nbm generated manifest -->
-                    <useDefaultManifestFile>true</useDefaultManifestFile>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>fda.ui</artifactId>
+        <groupId>ch.psi</groupId>
+        <version>3.5.0_zmq</version>
+    </parent>
+    
+    <artifactId>fda.ui.module</artifactId>
+    <packaging>nbm</packaging>
+
+    <name>ch.psi.fda.ui.module</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <repositories>
+        <!--
+        Repository hosting NetBeans modules, especially APIs.
+        Versions are based on IDE releases, e.g.: RELEASE691
+        To create your own repository, use: nbm:populate-repository
+        -->
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.netbeans.api</groupId>
+            <artifactId>org-netbeans-modules-options-api</artifactId>
+            <version>${netbeans.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.netbeans.api</groupId>
+            <artifactId>org-openide-filesystems</artifactId>
+            <version>${netbeans.version}</version>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.netbeans.api</groupId>
+            <artifactId>org-openide-explorer</artifactId>
+            <version>${netbeans.version}</version>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.netbeans.api</groupId>
+            <artifactId>org-openide-nodes</artifactId>
+            <version>${netbeans.version}</version>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.netbeans.api</groupId>
+            <artifactId>org-openide-loaders</artifactId>
+            <version>${netbeans.version}</version>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.netbeans.api</groupId>
+            <artifactId>org-openide-util</artifactId>
+            <version>${netbeans.version}</version>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.netbeans.api</groupId>
+            <artifactId>org-netbeans-api-annotations-common</artifactId>
+            <version>${netbeans.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.netbeans.api</groupId>
+            <artifactId>org-openide-util-lookup</artifactId>
+            <version>${netbeans.version}</version>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.netbeans.api</groupId>
+            <artifactId>org-netbeans-api-progress</artifactId>
+            <version>${netbeans.version}</version>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.netbeans.api</groupId>
+            <artifactId>org-openide-dialogs</artifactId>
+            <version>${netbeans.version}</version>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.netbeans.api</groupId>
+            <artifactId>org-openide-io</artifactId>
+            <version>${netbeans.version}</version>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.netbeans.api</groupId>
+            <artifactId>org-openide-modules</artifactId>
+            <version>${netbeans.version}</version>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.netbeans.api</groupId>
+            <artifactId>org-openide-windows</artifactId>
+            <version>${netbeans.version}</version>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.netbeans.api</groupId>
+            <artifactId>org-netbeans-modules-settings</artifactId>
+            <version>${netbeans.version}</version>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.netbeans.api</groupId>
+            <artifactId>org-openide-awt</artifactId>
+            <version>${netbeans.version}</version>
+            <type>jar</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>ch.psi</groupId>
+            <artifactId>fda</artifactId>
+            <version>2.5.1_zmq</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.2</version>
+            <scope>test</scope>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>plot</artifactId>
+            <version>2.1-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>nbm-maven-plugin</artifactId>
+                <version>3.8.1</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <publicPackages>
+                        <publicPackage>ch.psi.fda.model</publicPackage>
+                        <publicPackage>ch.psi.fda.model.v1</publicPackage>
+                        <publicPackage>ch.psi.fda.ui.ee.api</publicPackage>
+                        <publicPackage>org.xml.sax</publicPackage>
+                        <publicPackage>ch.psi.fda.ui.cm</publicPackage>
+                        <publicPackage>ch.psi.fda.ui.cm.fs</publicPackage>
+                        <publicPackage>ch.psi.fda.ui.preferences.api</publicPackage>
+                    </publicPackages>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <!-- to have the jar plugin pickup the nbm generated manifest -->
+                    <useDefaultManifestFile>true</useDefaultManifestFile>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/cdump/CdumpExecutionTopComponent.form
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/cdump/CdumpExecutionTopComponent.form
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
+  <AuxValues>
+    <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
+    <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
+    <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
+    <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
+    <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
+    <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
+  </AuxValues>
+
+  <Layout>
+    <DimensionLayout dim="0">
+      <Group type="103" groupAlignment="0" attributes="0">
+          <Group type="102" attributes="0">
+              <EmptySpace max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="0" attributes="0">
+                  <Group type="102" attributes="0">
+                      <Group type="103" groupAlignment="0" attributes="0">
+                          <Component id="jLabel1" alignment="0" min="-2" max="-2" attributes="0"/>
+                          <Component id="jLabel2" alignment="0" min="-2" max="-2" attributes="0"/>
+                      </Group>
+                      <EmptySpace max="-2" attributes="0"/>
+                      <Group type="103" groupAlignment="0" max="-2" attributes="0">
+                          <Component id="jComboBox1" max="32767" attributes="1"/>
+                          <Component id="jTextField1" alignment="0" pref="173" max="32767" attributes="1"/>
+                      </Group>
+                  </Group>
+                  <Component id="jButton1" alignment="0" min="-2" max="-2" attributes="0"/>
+              </Group>
+              <EmptySpace max="32767" attributes="0"/>
+          </Group>
+          <Component id="jPanel1" alignment="1" max="32767" attributes="0"/>
+      </Group>
+    </DimensionLayout>
+    <DimensionLayout dim="1">
+      <Group type="103" groupAlignment="0" attributes="0">
+          <Group type="102" alignment="0" attributes="0">
+              <EmptySpace max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="3" attributes="0">
+                  <Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
+                  <Component id="jComboBox1" alignment="3" min="-2" max="-2" attributes="0"/>
+              </Group>
+              <EmptySpace max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="3" attributes="0">
+                  <Component id="jLabel2" alignment="3" min="-2" max="-2" attributes="0"/>
+                  <Component id="jTextField1" alignment="3" min="-2" max="-2" attributes="0"/>
+              </Group>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="jButton1" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="jPanel1" max="32767" attributes="0"/>
+          </Group>
+      </Group>
+    </DimensionLayout>
+  </Layout>
+  <SubComponents>
+    <Component class="javax.swing.JComboBox" name="jComboBox1">
+      <Properties>
+        <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+          <Connection code="new javax.swing.DefaultComboBoxModel(Cdump.SAMPLING_RATES)" type="code"/>
+        </Property>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JLabel" name="jLabel1">
+      <Properties>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="ch/psi/fda/ui/cdump/Bundle.properties" key="CdumpExecutionTopComponent.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JTextField" name="jTextField1">
+      <Properties>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="ch/psi/fda/ui/cdump/Bundle.properties" key="CdumpExecutionTopComponent.jTextField1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JLabel" name="jLabel2">
+      <Properties>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="ch/psi/fda/ui/cdump/Bundle.properties" key="CdumpExecutionTopComponent.jLabel2.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JButton" name="jButton1">
+      <Properties>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="ch/psi/fda/ui/cdump/Bundle.properties" key="CdumpExecutionTopComponent.jButton1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+      </Properties>
+      <Events>
+        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton1ActionPerformed"/>
+      </Events>
+    </Component>
+    <Container class="javax.swing.JPanel" name="jPanel1">
+
+      <Layout>
+        <DimensionLayout dim="0">
+          <Group type="103" groupAlignment="0" attributes="0">
+              <Group type="102" attributes="0">
+                  <EmptySpace max="-2" attributes="0"/>
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <Component id="jLabel3" alignment="0" min="-2" max="-2" attributes="0"/>
+                      <Group type="102" attributes="0">
+                          <Group type="103" groupAlignment="0" attributes="0">
+                              <Group type="102" alignment="0" attributes="0">
+                                  <Component id="jLabel4" min="-2" max="-2" attributes="0"/>
+                                  <EmptySpace type="separate" max="-2" attributes="0"/>
+                                  <Component id="jTextField2" min="-2" pref="176" max="-2" attributes="0"/>
+                              </Group>
+                              <Component id="jButton2" alignment="0" min="-2" max="-2" attributes="0"/>
+                          </Group>
+                          <EmptySpace type="separate" max="-2" attributes="0"/>
+                          <Group type="103" groupAlignment="0" attributes="0">
+                              <Group type="102" attributes="0">
+                                  <EmptySpace min="21" pref="21" max="-2" attributes="0"/>
+                                  <Group type="103" groupAlignment="1" attributes="0">
+                                      <Component id="jLabel5" alignment="0" min="-2" max="-2" attributes="0"/>
+                                      <Component id="jLabel6" alignment="0" min="-2" max="-2" attributes="0"/>
+                                  </Group>
+                                  <EmptySpace max="-2" attributes="0"/>
+                                  <Group type="103" groupAlignment="0" max="-2" attributes="0">
+                                      <Component id="comboNumberPoints" max="32767" attributes="0"/>
+                                      <Component id="comboSubsampling" min="-2" max="-2" attributes="0"/>
+                                  </Group>
+                              </Group>
+                              <Component id="checkPlot" min="-2" max="-2" attributes="0"/>
+                          </Group>
+                      </Group>
+                  </Group>
+                  <EmptySpace max="32767" attributes="0"/>
+              </Group>
+          </Group>
+        </DimensionLayout>
+        <DimensionLayout dim="1">
+          <Group type="103" groupAlignment="0" attributes="0">
+              <Group type="102" alignment="0" attributes="0">
+                  <EmptySpace max="-2" attributes="0"/>
+                  <Component id="jLabel3" min="-2" pref="14" max="-2" attributes="0"/>
+                  <EmptySpace max="-2" attributes="0"/>
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <Group type="102" attributes="0">
+                          <Group type="103" groupAlignment="3" attributes="0">
+                              <Component id="jLabel4" alignment="3" min="-2" max="-2" attributes="0"/>
+                              <Component id="jTextField2" alignment="3" min="-2" max="-2" attributes="0"/>
+                          </Group>
+                          <EmptySpace type="separate" max="-2" attributes="0"/>
+                          <Component id="jButton2" min="-2" max="-2" attributes="0"/>
+                      </Group>
+                      <Group type="102" attributes="0">
+                          <Component id="checkPlot" min="-2" max="-2" attributes="0"/>
+                          <EmptySpace max="-2" attributes="0"/>
+                          <Group type="103" groupAlignment="3" attributes="0">
+                              <Component id="jLabel6" alignment="3" min="-2" max="-2" attributes="0"/>
+                              <Component id="comboNumberPoints" alignment="3" min="-2" max="-2" attributes="0"/>
+                          </Group>
+                          <EmptySpace max="-2" attributes="0"/>
+                          <Group type="103" groupAlignment="3" attributes="0">
+                              <Component id="jLabel5" alignment="3" min="-2" max="-2" attributes="0"/>
+                              <Component id="comboSubsampling" alignment="3" min="-2" max="-2" attributes="0"/>
+                          </Group>
+                      </Group>
+                  </Group>
+                  <EmptySpace pref="68" max="32767" attributes="0"/>
+              </Group>
+          </Group>
+        </DimensionLayout>
+      </Layout>
+      <SubComponents>
+        <Component class="javax.swing.JLabel" name="jLabel3">
+          <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="ch/psi/fda/ui/cdump/Bundle.properties" key="CdumpExecutionTopComponent.jLabel3.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+            </Property>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JLabel" name="jLabel4">
+          <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="ch/psi/fda/ui/cdump/Bundle.properties" key="CdumpExecutionTopComponent.jLabel4.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+            </Property>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JTextField" name="jTextField2">
+          <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="ch/psi/fda/ui/cdump/Bundle.properties" key="CdumpExecutionTopComponent.jTextField2.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+            </Property>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JButton" name="jButton2">
+          <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="ch/psi/fda/ui/cdump/Bundle.properties" key="CdumpExecutionTopComponent.jButton2.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+            </Property>
+          </Properties>
+          <Events>
+            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton2ActionPerformed"/>
+          </Events>
+        </Component>
+        <Component class="javax.swing.JLabel" name="jLabel5">
+          <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="ch/psi/fda/ui/cdump/Bundle.properties" key="CdumpExecutionTopComponent.jLabel5.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+            </Property>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JLabel" name="jLabel6">
+          <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="ch/psi/fda/ui/cdump/Bundle.properties" key="CdumpExecutionTopComponent.jLabel6.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+            </Property>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JComboBox" name="comboNumberPoints">
+          <Properties>
+            <Property name="editable" type="boolean" value="true"/>
+            <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
+              <StringArray count="7">
+                <StringItem index="0" value="100"/>
+                <StringItem index="1" value="200"/>
+                <StringItem index="2" value="500"/>
+                <StringItem index="3" value="1000"/>
+                <StringItem index="4" value="2000"/>
+                <StringItem index="5" value="5000"/>
+                <StringItem index="6" value="10000"/>
+              </StringArray>
+            </Property>
+            <Property name="selectedIndex" type="int" value="3"/>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JComboBox" name="comboSubsampling">
+          <Properties>
+            <Property name="editable" type="boolean" value="true"/>
+            <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
+              <StringArray count="5">
+                <StringItem index="0" value="1"/>
+                <StringItem index="1" value="10"/>
+                <StringItem index="2" value="100"/>
+                <StringItem index="3" value="1000"/>
+                <StringItem index="4" value="10000"/>
+              </StringArray>
+            </Property>
+            <Property name="selectedIndex" type="int" value="2"/>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JCheckBox" name="checkPlot">
+          <Properties>
+            <Property name="selected" type="boolean" value="true"/>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="ch/psi/fda/ui/cdump/Bundle.properties" key="CdumpExecutionTopComponent.checkPlot.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+            </Property>
+          </Properties>
+          <Events>
+            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="checkPlotActionPerformed"/>
+          </Events>
+        </Component>
+      </SubComponents>
+    </Container>
+  </SubComponents>
+</Form>
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/cdump/CdumpExecutionTopComponent.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/cdump/CdumpExecutionTopComponent.java
@@ -0,0 +1,554 @@
+/*
+ *  Copyright (C) 2011 Paul Scherrer Institute
+ * 
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ * 
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package ch.psi.fda.ui.cdump;
+
+import ch.psi.fda.aq.AcquisitionConfiguration;
+import ch.psi.fda.cdump.Cdump;
+import ch.psi.fda.cdump.CdumpConfiguration;
+import ch.psi.fda.fdaq.Fdaq;
+import ch.psi.fda.fdaq.FdaqConfiguration;
+import ch.psi.fda.model.v1.Visualization;
+import ch.psi.fda.serializer.SerializerTXT;
+import ch.psi.fda.ui.ee.PlotVisualizerTopComponent;
+import ch.psi.fda.ui.preferences.api.Preferences;
+import ch.psi.fda.ui.visualizer.Visualizer;
+import ch.psi.fda.vdescriptor.LinePlot;
+import ch.psi.fda.vdescriptor.VDescriptor;
+import ch.psi.fda.vdescriptor.XYSeries;
+import ch.psi.jcae.ChannelService;
+import ch.psi.jcae.impl.DefaultChannelService;
+import com.google.common.eventbus.AsyncEventBus;
+import com.google.common.eventbus.EventBus;
+import java.io.File;
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.Executors;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.netbeans.api.settings.ConvertAsProperties;
+import org.openide.DialogDisplayer;
+import org.openide.NotifyDescriptor;
+import org.openide.util.Lookup;
+import org.openide.util.NbBundle;
+import org.openide.windows.IOProvider;
+import org.openide.windows.InputOutput;
+import org.openide.windows.TopComponent;
+import org.openide.windows.WindowManager;
+
+/**
+ * Top component which displays something.
+ */
+@ConvertAsProperties(dtd = "-//ch.psi.fda.ui.cdump//CdumpExecution//EN",
+autostore = false)
+public final class CdumpExecutionTopComponent extends TopComponent {
+
+    private static CdumpExecutionTopComponent instance;
+    private static final String PREFERRED_ID = "CdumpExecutionTopComponent";
+
+    final ChannelService cservice = new DefaultChannelService();
+    private Cdump service;
+    private Fdaq fdaqService;
+
+    public CdumpExecutionTopComponent() {
+        initComponents();
+
+        // Set default to 10 kHz
+        jComboBox1.setSelectedItem("10kHz");
+
+        setName(NbBundle.getMessage(CdumpExecutionTopComponent.class, "CTL_CdumpExecutionTopComponent"));
+        setToolTipText(NbBundle.getMessage(CdumpExecutionTopComponent.class, "HINT_CdumpExecutionTopComponent"));
+//        setIcon(ImageUtilities.loadImage(ICON_PATH, true));
+
+    }
+
+    /** This method is called from within the constructor to
+     * initialize the form.
+     * WARNING: Do NOT modify this code. The content of this method is
+     * always regenerated by the Form Editor.
+     */
+    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
+    private void initComponents() {
+
+        jComboBox1 = new javax.swing.JComboBox();
+        jLabel1 = new javax.swing.JLabel();
+        jTextField1 = new javax.swing.JTextField();
+        jLabel2 = new javax.swing.JLabel();
+        jButton1 = new javax.swing.JButton();
+        jPanel1 = new javax.swing.JPanel();
+        jLabel3 = new javax.swing.JLabel();
+        jLabel4 = new javax.swing.JLabel();
+        jTextField2 = new javax.swing.JTextField();
+        jButton2 = new javax.swing.JButton();
+        jLabel5 = new javax.swing.JLabel();
+        jLabel6 = new javax.swing.JLabel();
+        comboNumberPoints = new javax.swing.JComboBox();
+        comboSubsampling = new javax.swing.JComboBox();
+        checkPlot = new javax.swing.JCheckBox();
+
+        jComboBox1.setModel(new javax.swing.DefaultComboBoxModel(Cdump.SAMPLING_RATES));
+
+        org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(CdumpExecutionTopComponent.class, "CdumpExecutionTopComponent.jLabel1.text")); // NOI18N
+
+        jTextField1.setText(org.openide.util.NbBundle.getMessage(CdumpExecutionTopComponent.class, "CdumpExecutionTopComponent.jTextField1.text")); // NOI18N
+
+        org.openide.awt.Mnemonics.setLocalizedText(jLabel2, org.openide.util.NbBundle.getMessage(CdumpExecutionTopComponent.class, "CdumpExecutionTopComponent.jLabel2.text")); // NOI18N
+
+        org.openide.awt.Mnemonics.setLocalizedText(jButton1, org.openide.util.NbBundle.getMessage(CdumpExecutionTopComponent.class, "CdumpExecutionTopComponent.jButton1.text")); // NOI18N
+        jButton1.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                jButton1ActionPerformed(evt);
+            }
+        });
+
+        org.openide.awt.Mnemonics.setLocalizedText(jLabel3, org.openide.util.NbBundle.getMessage(CdumpExecutionTopComponent.class, "CdumpExecutionTopComponent.jLabel3.text")); // NOI18N
+
+        org.openide.awt.Mnemonics.setLocalizedText(jLabel4, org.openide.util.NbBundle.getMessage(CdumpExecutionTopComponent.class, "CdumpExecutionTopComponent.jLabel4.text")); // NOI18N
+
+        jTextField2.setText(org.openide.util.NbBundle.getMessage(CdumpExecutionTopComponent.class, "CdumpExecutionTopComponent.jTextField2.text")); // NOI18N
+
+        org.openide.awt.Mnemonics.setLocalizedText(jButton2, org.openide.util.NbBundle.getMessage(CdumpExecutionTopComponent.class, "CdumpExecutionTopComponent.jButton2.text")); // NOI18N
+        jButton2.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                jButton2ActionPerformed(evt);
+            }
+        });
+
+        org.openide.awt.Mnemonics.setLocalizedText(jLabel5, org.openide.util.NbBundle.getMessage(CdumpExecutionTopComponent.class, "CdumpExecutionTopComponent.jLabel5.text")); // NOI18N
+
+        org.openide.awt.Mnemonics.setLocalizedText(jLabel6, org.openide.util.NbBundle.getMessage(CdumpExecutionTopComponent.class, "CdumpExecutionTopComponent.jLabel6.text")); // NOI18N
+
+        comboNumberPoints.setEditable(true);
+        comboNumberPoints.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "100", "200", "500", "1000", "2000", "5000", "10000" }));
+        comboNumberPoints.setSelectedIndex(3);
+
+        comboSubsampling.setEditable(true);
+        comboSubsampling.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "1", "10", "100", "1000", "10000" }));
+        comboSubsampling.setSelectedIndex(2);
+
+        checkPlot.setSelected(true);
+        org.openide.awt.Mnemonics.setLocalizedText(checkPlot, org.openide.util.NbBundle.getMessage(CdumpExecutionTopComponent.class, "CdumpExecutionTopComponent.checkPlot.text")); // NOI18N
+        checkPlot.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                checkPlotActionPerformed(evt);
+            }
+        });
+
+        javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
+        jPanel1.setLayout(jPanel1Layout);
+        jPanel1Layout.setHorizontalGroup(
+            jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(jPanel1Layout.createSequentialGroup()
+                .addContainerGap()
+                .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(jLabel3)
+                    .addGroup(jPanel1Layout.createSequentialGroup()
+                        .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                            .addGroup(jPanel1Layout.createSequentialGroup()
+                                .addComponent(jLabel4)
+                                .addGap(18, 18, 18)
+                                .addComponent(jTextField2, javax.swing.GroupLayout.PREFERRED_SIZE, 176, javax.swing.GroupLayout.PREFERRED_SIZE))
+                            .addComponent(jButton2))
+                        .addGap(18, 18, 18)
+                        .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                            .addGroup(jPanel1Layout.createSequentialGroup()
+                                .addGap(21, 21, 21)
+                                .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+                                    .addComponent(jLabel5, javax.swing.GroupLayout.Alignment.LEADING)
+                                    .addComponent(jLabel6, javax.swing.GroupLayout.Alignment.LEADING))
+                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                                .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+                                    .addComponent(comboNumberPoints, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                                    .addComponent(comboSubsampling, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
+                            .addComponent(checkPlot))))
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+        );
+        jPanel1Layout.setVerticalGroup(
+            jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(jPanel1Layout.createSequentialGroup()
+                .addContainerGap()
+                .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 14, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addGroup(jPanel1Layout.createSequentialGroup()
+                        .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                            .addComponent(jLabel4)
+                            .addComponent(jTextField2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                        .addGap(18, 18, 18)
+                        .addComponent(jButton2))
+                    .addGroup(jPanel1Layout.createSequentialGroup()
+                        .addComponent(checkPlot)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                            .addComponent(jLabel6)
+                            .addComponent(comboNumberPoints, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                            .addComponent(jLabel5)
+                            .addComponent(comboSubsampling, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))))
+                .addContainerGap(68, Short.MAX_VALUE))
+        );
+
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
+        this.setLayout(layout);
+        layout.setHorizontalGroup(
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                .addContainerGap()
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addGroup(layout.createSequentialGroup()
+                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                            .addComponent(jLabel1)
+                            .addComponent(jLabel2))
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+                            .addComponent(jComboBox1, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                            .addComponent(jTextField1, javax.swing.GroupLayout.DEFAULT_SIZE, 173, Short.MAX_VALUE)))
+                    .addComponent(jButton1))
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+            .addComponent(jPanel1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+        );
+        layout.setVerticalGroup(
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                .addContainerGap()
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(jLabel1)
+                    .addComponent(jComboBox1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(jLabel2)
+                    .addComponent(jTextField1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(jButton1)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+        );
+    }// </editor-fold>//GEN-END:initComponents
+
+    private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
+        if(jButton1.getText().equals("Start")){
+            try{
+            // Start acquisition
+                startAcquisition();
+                jButton1.setText("Stop");
+            }
+            catch(Exception e){
+                NotifyDescriptor d = new NotifyDescriptor.Message("Unable to start data acquisition:\n" + e.getMessage(), NotifyDescriptor.ERROR_MESSAGE);
+                DialogDisplayer.getDefault().notifyLater(d);
+
+                // Print exception to output window of the application
+                InputOutput io = IOProvider.getDefault().getIO("Error", false);
+                // Set output console visible
+                io.select();
+                io.getOut().println("Cannot start continuous detector");
+                e.printStackTrace(io.getErr());
+            }
+        }
+        else {
+            try{
+            // Stop acquisition
+            jButton1.setText("Start");
+            stopAcquisition();
+            }
+            catch(Exception e){
+                NotifyDescriptor d = new NotifyDescriptor.Message("Unable to stop data acquisition:\n" + e.getMessage(), NotifyDescriptor.ERROR_MESSAGE);
+                DialogDisplayer.getDefault().notifyLater(d);
+
+                // Print exception to output window of the application
+                InputOutput io = IOProvider.getDefault().getIO("Error", false);
+                // Set output console visible
+                io.select();
+                io.getOut().println("Cannot stop continuous detector");
+                e.printStackTrace(io.getErr());
+            }
+        }
+    }//GEN-LAST:event_jButton1ActionPerformed
+
+    private void jButton2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton2ActionPerformed
+        if(jButton2.getText().equals("Start")){
+            try{
+            // Start acquisition
+                startAcquisitionFdaq();
+                jButton2.setText("Stop");
+            }
+            catch(Exception e){
+                NotifyDescriptor d = new NotifyDescriptor.Message("Unable to start data acquisition:\n" + e.getMessage(), NotifyDescriptor.ERROR_MESSAGE);
+                DialogDisplayer.getDefault().notifyLater(d);
+
+                // Print exception to output window of the application
+                InputOutput io = IOProvider.getDefault().getIO("Error", false);
+                // Set output console visible
+                io.select();
+                io.getOut().println("Cannot start fdaq");
+                e.printStackTrace(io.getErr());
+            }
+        }
+        else {
+            try{
+            // Stop acquisition
+            jButton2.setText("Start");
+            stopAcquisitionFdaq();
+            }
+            catch(Exception e){
+                NotifyDescriptor d = new NotifyDescriptor.Message("Unable to stop data acquisition:\n" + e.getMessage(), NotifyDescriptor.ERROR_MESSAGE);
+                DialogDisplayer.getDefault().notifyLater(d);
+
+                // Print exception to output window of the application
+                InputOutput io = IOProvider.getDefault().getIO("Error", false);
+                // Set output console visible
+                io.select();
+                io.getOut().println("Cannot stop fdaq");
+                e.printStackTrace(io.getErr());
+            }
+        }
+    }//GEN-LAST:event_jButton2ActionPerformed
+
+    private void checkPlotActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_checkPlotActionPerformed
+        // TODO add your handling code here:
+        comboNumberPoints.setEnabled(checkPlot.isSelected());
+        comboSubsampling.setEnabled(checkPlot.isSelected());
+    }//GEN-LAST:event_checkPlotActionPerformed
+
+    // Variables declaration - do not modify//GEN-BEGIN:variables
+    private javax.swing.JCheckBox checkPlot;
+    private javax.swing.JComboBox comboNumberPoints;
+    private javax.swing.JComboBox comboSubsampling;
+    private javax.swing.JButton jButton1;
+    private javax.swing.JButton jButton2;
+    private javax.swing.JComboBox jComboBox1;
+    private javax.swing.JLabel jLabel1;
+    private javax.swing.JLabel jLabel2;
+    private javax.swing.JLabel jLabel3;
+    private javax.swing.JLabel jLabel4;
+    private javax.swing.JLabel jLabel5;
+    private javax.swing.JLabel jLabel6;
+    private javax.swing.JPanel jPanel1;
+    private javax.swing.JTextField jTextField1;
+    private javax.swing.JTextField jTextField2;
+    // End of variables declaration//GEN-END:variables
+    /**
+     * Gets default instance. Do not use directly: reserved for *.settings files only,
+     * i.e. deserialization routines; otherwise you could get a non-deserialized instance.
+     * To obtain the singleton instance, use {@link #findInstance}.
+     */
+    public static synchronized CdumpExecutionTopComponent getDefault() {
+        if (instance == null) {
+            instance = new CdumpExecutionTopComponent();
+        }
+        return instance;
+    }
+
+    /**
+     * Obtain the CdumpExecutionTopComponent instance. Never call {@link #getDefault} directly!
+     */
+    public static synchronized CdumpExecutionTopComponent findInstance() {
+        TopComponent win = WindowManager.getDefault().findTopComponent(PREFERRED_ID);
+        if (win == null) {
+            Logger.getLogger(CdumpExecutionTopComponent.class.getName()).warning(
+                    "Cannot find " + PREFERRED_ID + " component. It will not be located properly in the window system.");
+            return getDefault();
+        }
+        if (win instanceof CdumpExecutionTopComponent) {
+            return (CdumpExecutionTopComponent) win;
+        }
+        Logger.getLogger(CdumpExecutionTopComponent.class.getName()).warning(
+                "There seem to be multiple components with the '" + PREFERRED_ID
+                + "' ID. That is a potential source of errors and unexpected behavior.");
+        return getDefault();
+    }
+
+    @Override
+    public int getPersistenceType() {
+        return TopComponent.PERSISTENCE_ALWAYS;
+    }
+
+    @Override
+    public void componentOpened() {
+        // TODO add custom code on component opening
+    }
+
+    @Override
+    public void componentClosed() {
+        // TODO add custom code on component closing
+    }
+
+    void writeProperties(java.util.Properties p) {
+        // better to version settings since initial version as advocated at
+        // http://wiki.apidesign.org/wiki/PropertyFiles
+        p.setProperty("version", "1.0");
+        // TODO store your settings
+    }
+
+    Object readProperties(java.util.Properties p) {
+        if (instance == null) {
+            instance = this;
+        }
+        instance.readPropertiesImpl(p);
+        return instance;
+    }
+
+    private void readPropertiesImpl(java.util.Properties p) {
+        String version = p.getProperty("version");
+        // TODO read your settings according to their version
+    }
+
+    @Override
+    protected String preferredID() {
+        return PREFERRED_ID;
+    }
+
+    /**
+     * Start CDUMP logic
+     */
+    public void startAcquisition() {
+        Preferences p = Lookup.getDefault().lookup(Preferences.class);
+        System.setProperty("ch.psi.fda.cdump.config.file", p.getHome().getAbsolutePath()+"/etc/cdump.properties");
+
+        Logger.getLogger(CdumpExecutionTopComponent.class.getName()).log(Level.INFO, "Start acquisition");
+
+        String fname = jTextField1.getText();
+        AcquisitionConfiguration config = ch.psi.fda.ui.ee.Configuration.getInstance().getConfiguration();
+        String fileName = config.getDataBaseDirectory() + "/" + config.replaceMacros(config.getDataFilePrefix(), new Date(), fname) + fname + ".txt";
+        
+        File f = new File(fileName);
+        f.getParentFile().mkdirs(); // Create data base directory
+		
+	// Create execution service
+	EventBus eventbus = new AsyncEventBus(Executors.newSingleThreadExecutor());
+	service = new Cdump(cservice, eventbus, new CdumpConfiguration());
+		
+	SerializerTXT serializer = new SerializerTXT(f);
+	serializer.setShowDimensionHeader(false);
+		
+	eventbus.register(serializer);
+        
+        String samplingRate = (String) jComboBox1.getSelectedItem();
+        service.acquire(samplingRate);
+    }
+
+    /**
+     * Stop CDUMP logic
+     */
+    public void stopAcquisition() {
+
+        if(service != null){
+            Logger.getLogger(CdumpExecutionTopComponent.class.getName()).log(Level.INFO, "Stop acquisition");
+            service.stop();
+        }
+    }
+    
+    public void startAcquisitionFdaq() {
+        final boolean showPlot = checkPlot.isSelected();
+        final int itemCount = Integer.valueOf(comboNumberPoints.getSelectedItem().toString());
+        final int subsamplingFactor = Integer.valueOf(comboSubsampling.getSelectedItem().toString());        
+        
+        final PlotVisualizerTopComponent tc = PlotVisualizerTopComponent.findInstance();        
+        new Thread(new Runnable() {
+
+            @Override
+            public void run() {
+                try{
+                    acquireFdaq(tc, showPlot, itemCount, subsamplingFactor);
+                }
+                catch (Exception ex){
+                    Logger.getLogger(CdumpExecutionTopComponent.class.getName()).log(Level.WARNING,null,ex);
+                }
+            }
+        }).start();	
+        if (showPlot){
+            tc.requestVisible();
+        }
+    }
+    
+    
+    public void acquireFdaq(PlotVisualizerTopComponent tc, boolean showPlot, int itemCount, int subsamplingFactor) {
+        Preferences p = Lookup.getDefault().lookup(Preferences.class);
+        // TODO currently only the hardcoded configurations are supported
+        // The ch.psi.fda.fdaq.config.file configuration file is not set base on FDA_HOME ...
+
+        FdaqConfiguration configuration = new FdaqConfiguration();
+		
+	EventBus bus = new AsyncEventBus(Executors.newSingleThreadExecutor());
+	fdaqService = new Fdaq(bus, configuration);                
+        
+        String fname = jTextField2.getText();
+        AcquisitionConfiguration config = ch.psi.fda.ui.ee.Configuration.getInstance().getConfiguration();
+        String fileName = config.getDataBaseDirectory() + "/" + config.replaceMacros(config.getDataFilePrefix(), new Date(), fname) + fname + ".txt";
+        
+        File f = new File(fileName);
+        f.getParentFile().mkdirs(); // Create data base directory
+        
+        SerializerTXT serializer = new SerializerTXT(f, false);
+	serializer.setShowDimensionHeader(false);
+	bus.register(serializer);
+		
+	// This stop ensures that the data server is in a good shape (i.e. gets restarted)
+	// We need to wait a certain amount of time to have the server restarted.
+	fdaqService.stop();
+	try {
+		Thread.sleep(1000); // TODO check whether this sleep is really necessary
+	} catch (InterruptedException e) {
+		e.printStackTrace();
+	}
+        
+        Logger.getLogger(CdumpExecutionTopComponent.class.getName()).log(Level.INFO, "Start fdaq acquisition");
+
+        if (showPlot) {
+            VDescriptor vd = new VDescriptor();				
+                //LinePlot lineplot = new LinePlot();
+            for (String plot: new String[]{"ain1","ain2","ain3","ain4","enc1"}){
+                LinePlot lineplot = new LinePlot(plot);
+                XYSeries series = new XYSeries("counter", plot);
+                series.setMaxItemCount(itemCount);
+                lineplot.getData().add(series);            
+                vd.getPlots().add(lineplot);
+            }            
+            //vd.getPlots().add(lineplot);
+            String linePlotImpl=Lookup.getDefault().lookup(Preferences.class).getLinePlotImpl();        
+            Visualizer visualizer = new Visualizer(vd,linePlotImpl);            
+            visualizer.setSubsampling(subsamplingFactor);
+            bus.register(visualizer);
+            tc.updatePanel(visualizer.getPlotPanels());        
+        }
+
+       fdaqService.acquire();
+                
+
+
+//        // Calculate data file location/name
+//        String fname = jTextField2.getText();
+//        FdaqConfiguration cc = FdaqConfiguration.getInstance();
+//        String d = cc.getDataDirectory() + "/" + cc.replaceMacros(cc.getFilePrefix(), new Date(), fname) + fname + ".txt";
+//        File f = new File(d);
+//        f.getParentFile().mkdirs(); // Create data base directory
+//
+//        // Create execution service
+//        fdaqService = new FdaqService();
+//
+//        // Take data
+//	fdaqService.startAcquisition(f);
+    }
+
+    public void stopAcquisitionFdaq() {
+
+        if(fdaqService != null){
+            Logger.getLogger(CdumpExecutionTopComponent.class.getName()).log(Level.INFO, "Stop fdaq acquisition");
+            fdaqService.stop();
+        }
+    }
+    
+}
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/ExecuteAction.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/ExecuteAction.java
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/ExecuteCapability.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/ExecuteCapability.java
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/LoadingErrorPanel.form
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/LoadingErrorPanel.form
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/LoadingErrorPanel.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/LoadingErrorPanel.java
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/NewAction.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/NewAction.java
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/ViewConfigurationAction.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/ViewConfigurationAction.java
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/VisualEditorTopComponent.form
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/VisualEditorTopComponent.form
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/VisualEditorTopComponent.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/VisualEditorTopComponent.java
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/CollapsibleContainer.form
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/CollapsibleContainer.form
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/CollapsibleContainer.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/CollapsibleContainer.java
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/CollapsibleListContainer.form
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/CollapsibleListContainer.form
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/CollapsibleListContainer.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/CollapsibleListContainer.java
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/ComponentMetadata.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/ComponentMetadata.java
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/DocumentAdapter.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/DocumentAdapter.java
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/EditableComponent.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/EditableComponent.java
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/FieldUtilities.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/FieldUtilities.java
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/IdInputVerifier.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/IdInputVerifier.java
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/ListContainer.form
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/ListContainer.form
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/ListContainer.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/ListContainer.java
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/ListContainerDropTargetListener.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/ListContainerDropTargetListener.java
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/ListItem.form
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/ListItem.form
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/ListItem.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/ListItem.java
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/ListItemProvider.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/ListItemProvider.java
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/ListItemTransferHandler.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/ListItemTransferHandler.java
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/ListUtil.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/ListUtil.java
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/ObjectProvider.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/ObjectProvider.java
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/PanelSupport.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/PanelSupport.java
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/WrapLayout.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/WrapLayout.java
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ActionListItemProvider.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ActionListItemProvider.java
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ArrayDetectorPanel.form
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ArrayDetectorPanel.form
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ArrayDetectorPanel.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ArrayDetectorPanel.java
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ArrayPositionerPanel.form
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ArrayPositionerPanel.form
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ArrayPositionerPanel.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ArrayPositionerPanel.java
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ChannelActionPanel.form
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ChannelActionPanel.form
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>

 <Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
  <Properties>
@@ -25,12 +25,12 @@
  <Layout>
    <DimensionLayout dim="0">
      <Group type="103" groupAlignment="0" attributes="0">
-          <Component id="jPanel1" alignment="0" pref="629" max="32767" attributes="0"/>
+          <Component id="jPanel1" alignment="0" pref="665" max="32767" attributes="0"/>
      </Group>
    </DimensionLayout>
    <DimensionLayout dim="1">
      <Group type="103" groupAlignment="0" attributes="0">
-          <Component id="jPanel1" alignment="0" max="32767" attributes="0"/>
+          <Component id="jPanel1" alignment="0" pref="32" max="32767" attributes="0"/>
      </Group>
    </DimensionLayout>
  </Layout>
@@ -105,10 +105,13 @@
        <Component class="javax.swing.JComboBox" name="jComboBoxOperation">
          <Properties>
            <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
-              <StringArray count="3">
+              <StringArray count="6">
                <StringItem index="0" value="put"/>
                <StringItem index="1" value="putq"/>
                <StringItem index="2" value="wait"/>
+                <StringItem index="3" value="waitAND"/>
+                <StringItem index="4" value="waitOR"/>
+                <StringItem index="5" value="waitREGEX"/>
              </StringArray>
            </Property>
            <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ChannelActionPanel.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ChannelActionPanel.java
@@ -205,7 +205,7 @@ public class ChannelActionPanel extends javax.swing.JPanel implements ObjectProv
        jFormattedTextFieldChannel.setPreferredSize(new java.awt.Dimension(180, 28));
        jPanel1.add(jFormattedTextFieldChannel);

-        jLabel2.setFont(new java.awt.Font("Lucida Grande", 1, 13));
+        jLabel2.setFont(new java.awt.Font("Lucida Grande", 1, 13)); // NOI18N
        jLabel2.setLabelFor(jTextFieldValue);
        jLabel2.setText(org.openide.util.NbBundle.getMessage(ChannelActionPanel.class, "ChannelActionPanel.jLabel2.text")); // NOI18N
        jLabel2.setToolTipText(org.openide.util.NbBundle.getMessage(ChannelActionPanel.class, "ChannelActionPanel.jLabel2.toolTipText")); // NOI18N
@@ -216,17 +216,17 @@ public class ChannelActionPanel extends javax.swing.JPanel implements ObjectProv
        jTextFieldValue.setPreferredSize(new java.awt.Dimension(60, 28));
        jPanel1.add(jTextFieldValue);

-        jLabel3.setFont(new java.awt.Font("Lucida Grande", 1, 13));
+        jLabel3.setFont(new java.awt.Font("Lucida Grande", 1, 13)); // NOI18N
        jLabel3.setLabelFor(jComboBoxOperation);
        jLabel3.setText(org.openide.util.NbBundle.getMessage(ChannelActionPanel.class, "ChannelActionPanel.jLabel3.text")); // NOI18N
        jPanel1.add(jLabel3);

-        jComboBoxOperation.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "put", "putq", "wait" }));
+        jComboBoxOperation.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "put", "putq", "wait", "waitAND", "waitOR", "waitREGEX" }));
        jComboBoxOperation.setToolTipText(org.openide.util.NbBundle.getMessage(ChannelActionPanel.class, "ChannelActionPanel.jComboBoxOperation.toolTipText")); // NOI18N
        jComboBoxOperation.setName("Operation"); // NOI18N
        jPanel1.add(jComboBoxOperation);

-        jLabel4.setFont(new java.awt.Font("Lucida Grande", 1, 13));
+        jLabel4.setFont(new java.awt.Font("Lucida Grande", 1, 13)); // NOI18N
        jLabel4.setLabelFor(jComboBoxType);
        jLabel4.setText(org.openide.util.NbBundle.getMessage(ChannelActionPanel.class, "ChannelActionPanel.jLabel4.text")); // NOI18N
        jPanel1.add(jLabel4);
@@ -236,7 +236,7 @@ public class ChannelActionPanel extends javax.swing.JPanel implements ObjectProv
        jComboBoxType.setName("Type"); // NOI18N
        jPanel1.add(jComboBoxType);

-        jLabel5.setFont(new java.awt.Font("Lucida Grande", 1, 13));
+        jLabel5.setFont(new java.awt.Font("Lucida Grande", 1, 13)); // NOI18N
        jLabel5.setLabelFor(jFormattedTextFieldTimeout);
        jLabel5.setText(org.openide.util.NbBundle.getMessage(ChannelActionPanel.class, "ChannelActionPanel.jLabel5.text")); // NOI18N
        jPanel1.add(jLabel5);
@@ -247,7 +247,7 @@ public class ChannelActionPanel extends javax.swing.JPanel implements ObjectProv
        jFormattedTextFieldTimeout.setPreferredSize(new java.awt.Dimension(60, 28));
        jPanel1.add(jFormattedTextFieldTimeout);

-        jLabel6.setFont(new java.awt.Font("Lucida Grande", 1, 13));
+        jLabel6.setFont(new java.awt.Font("Lucida Grande", 1, 13)); // NOI18N
        jLabel6.setLabelFor(jFormattedTextFieldDelay);
        jLabel6.setText(org.openide.util.NbBundle.getMessage(ChannelActionPanel.class, "ChannelActionPanel.jLabel6.text")); // NOI18N
        jPanel1.add(jLabel6);
@@ -268,11 +268,11 @@ public class ChannelActionPanel extends javax.swing.JPanel implements ObjectProv
        this.setLayout(layout);
        layout.setHorizontalGroup(
            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, 629, Short.MAX_VALUE)
+            .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, 665, Short.MAX_VALUE)
        );
        layout.setVerticalGroup(
            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+            .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, 32, Short.MAX_VALUE)
        );
    }// </editor-fold>//GEN-END:initComponents

--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ChannelParameterMappingListItemProvider.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ChannelParameterMappingListItemProvider.java
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ChannelParameterMappingPanel.form
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ChannelParameterMappingPanel.form
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ChannelParameterMappingPanel.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ChannelParameterMappingPanel.java
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ConfigurationPanel.form
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ConfigurationPanel.form
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ConfigurationPanel.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ConfigurationPanel.java
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ContinuousDetectorListItemProvider.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ContinuousDetectorListItemProvider.java
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ContinuousDimensionListItemProvider.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ContinuousDimensionListItemProvider.java
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ContinuousDimensionPanel.form
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ContinuousDimensionPanel.form
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ContinuousDimensionPanel.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ContinuousDimensionPanel.java
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ContinuousPositionerPanel.form
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ContinuousPositionerPanel.form
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ContinuousPositionerPanel.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ContinuousPositionerPanel.java
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DefaultSettings.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DefaultSettings.java
@@ -27,7 +27,7 @@ public class DefaultSettings {
    
    private final static DefaultSettings instance = new DefaultSettings();

-    private boolean collapsed = true;
+    private boolean collapsed = false;


    private DefaultSettings(){
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DescriptionListItemProvider.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DescriptionListItemProvider.java
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DescriptionPanel.form
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DescriptionPanel.form
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DescriptionPanel.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DescriptionPanel.java
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DetectorOfDetectorsPanel.form
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DetectorOfDetectorsPanel.form
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DetectorOfDetectorsPanel.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DetectorOfDetectorsPanel.java
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepDetectorListItemProvider.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepDetectorListItemProvider.java
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepDimensionListItemProvider.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepDimensionListItemProvider.java
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepDimensionPanel.form
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepDimensionPanel.form
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepDimensionPanel.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepDimensionPanel.java
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepPositionerListItemProvider.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepPositionerListItemProvider.java
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepPositionerPanel.form
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepPositionerPanel.form
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepPositionerPanel.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepPositionerPanel.java
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepScalarDetectorListItemProvider.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepScalarDetectorListItemProvider.java
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/FunctionListItemProvider.java
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/FunctionListItemProvider.java
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
ebner	0e25758fcc	updated version	2015-08-13 14:37:35 +02:00
ebner	c656d8b557	upgraded to zmq version of xscan	2015-08-13 08:23:16 +02:00
ebner	d43dc9ff9d	packaged new version	2015-05-11 13:46:12 +02:00
ebner	4e2959d44d	Fixed memory leak reported in CTRLHA-133	2015-05-05 10:56:41 +02:00
ebner	4ec9742f70	Fixed 2 memory/thread leaks	2015-05-05 10:50:05 +02:00
Simon Gregor Ebner	e1a55b8bf6	new version	2014-10-10 13:54:48 +02:00
Alexandre Gobbo	5a1fcd0e4c	Added title font property to plots.	2014-09-09 09:27:27 +02:00
Alexandre Gobbo	63e6ee8a44	Added title font property to plots.	2014-09-09 09:18:50 +02:00
Alexandre Gobbo	2c953786d1	Fixed bug in chained manipulations	2014-09-04 09:16:49 +02:00
Alexandre Gobbo	19f0db668a	Added visualization to Fdaq	2014-08-29 16:46:18 +02:00
Alexandre Gobbo	a264ca3f64	Added visualization to Fdaq	2014-08-29 16:28:31 +02:00
Alexandre Gobbo	ab6aaecc97	Added visualization to Fdaq	2014-08-29 16:18:10 +02:00
Alexandre Gobbo	61e3b4806c	Several bug fixes and small improvements	2014-08-28 14:25:42 +02:00
Alexandre Gobbo	2246c4b4dd	Fixed bugs on MatrixPlotArray 7 LinePlotArray	2014-08-22 09:25:44 +02:00
Alexandre Gobbo	37fb752682	Fixed bugs on MatrixPlotArray 7 LinePlotArray	2014-08-22 09:25:37 +02:00
Alexandre Gobbo	4e363ea179	Fixed bugs on MatrixPlotArray 7 LinePlotArray	2014-08-22 09:25:28 +02:00
Alexandre Gobbo	1a8bf86cc5	Merge origin/master	2014-08-19 14:24:28 +02:00
Simon Gregor Ebner	f1c0581072	updated backing fda ...	2014-08-19 13:21:39 +02:00
Alexandre Gobbo	40dd308127	Bug plotting -Infinity	2014-08-18 16:09:14 +02:00
Alexandre Gobbo	028529a8c9	Added configuration for plot hardware acceleration and heavyweight popup menus	2014-08-13 13:41:19 +02:00
Alexandre Gobbo	8936173116	Adapting to plot v2: Abstraction of graphs & new implementations: JZY3D, JavaFX, JFreeChart	2014-08-12 16:42:25 +02:00
Simon Gregor Ebner	ffb6a8b872	Updated version	2014-08-07 14:34:23 +02:00
Simon Gregor Ebner	10a80e1ad6	Fixed startup scripts for console	2014-08-07 12:59:25 +02:00
Simon Gregor Ebner	2d61a7bdf0	Updated gitignore files	2014-08-06 10:11:44 +02:00
Simon Gregor Ebner	c12e540025	Added some more folders to gitignore file	2014-08-06 10:09:06 +02:00
Simon Gregor Ebner	db3b9bc53f	Upgraded to Netbeans platform 8	2014-08-06 10:08:19 +02:00
Simon Gregor Ebner	9a00e312ec	Updated version to 3.0.0	2014-07-29 11:53:14 +02:00
Simon Gregor Ebner	d11c873fa4	Fixed problems that top components did not come up at startup	2014-07-29 11:46:11 +02:00
Simon Gregor Ebner	c254c30f8b	upgraded to latest FDA version number ...	2014-07-28 16:30:26 +02:00
Simon Gregor Ebner	eb726a7ac1	cleanup pom	2014-07-28 11:06:26 +02:00
Simon Gregor Ebner	c40dec7a25	Upgraded used fdaq library	2014-07-28 10:41:46 +02:00
Simon Gregor Ebner	005cc205ae	fix readme	2014-07-25 14:46:33 +02:00
Simon Gregor Ebner	a1594a7e2a	Updated readme and cleanup pom files	2014-07-25 14:43:29 +02:00
Simon Gregor Ebner	c345841e8a	Cleanup POM	2014-07-25 14:14:50 +02:00
Simon Gregor Ebner	11cb7572ae	Restructured project	2014-07-25 14:08:35 +02:00
Simon Gregor Ebner	91f44a93ba	Removed duplicate dependency	2014-07-25 13:24:44 +02:00
Simon Gregor Ebner	957cf02f30	removed branding folder	2014-07-25 13:14:34 +02:00
Simon Gregor Ebner	cfbe50b212	Merged maven modules into one	2014-07-25 13:11:45 +02:00
Simon Gregor Ebner	9ce2b1582b	Fixed file path for cdump and fdaq scans	2014-07-25 11:04:03 +02:00
Simon Gregor Ebner	b9325dd025	Merged cdump code into ee module	2014-07-25 10:58:48 +02:00
Simon Gregor Ebner	2ab5d9edce	Got things finally back working reliably. Note: You have to use Netbeans 7.x and you have to run it with Java 7 This is extremely unsatisfying!	2014-07-25 10:31:45 +02:00
Simon Gregor Ebner	6bc71ff0e9	Updated maven configuration to have the build run again on Java 8 Also Upgraded to Netbeans Platform 8	2014-07-24 11:52:42 +02:00
Simon Ebner	17b5e98177	updates	2014-01-22 13:11:35 +01:00
Simon Ebner	a4ffeee271	Upgraded to new FDA version ...	2014-01-20 13:58:05 +01:00
Simon Ebner	6149f95eed	Changes for 2.x fda version FDA-95 Fixed command line start scripts for new Java entry points	2013-12-17 09:41:54 +01:00
Simon Ebner	c3ccfb3312	new version 1.1.40	2013-09-25 09:32:13 +02:00
Simon Ebner	58c908d5ad	do not collapse function of functional positioner	2013-09-23 11:33:59 +02:00
Simon Ebner	3026aa7510	Changed version to 1.1.39 and disabled auto collapse (see Request/Issue FDA-74)	2013-09-23 10:38:15 +02:00
Simon Ebner	a9d801bcca	FDA-70 Added support for waitREGEX condition ...	2013-05-21 16:03:35 +02:00
Simon Ebner	fb2b07b133	Added new channel operations bitwise AND and OR	2013-05-21 14:21:00 +02:00
Simon Ebner	b12968b6ce	Added hack for fdaq readout	2013-04-16 11:51:41 +02:00
Simon Ebner	56fbb7b349	Updated version to 1.0.36	2013-03-11 13:47:31 +01:00
ebner	de03e88c8a	Changed Shell Action Panel to support exit value check and exit value. NOTE: the newer versions of netbeans have a strange behavior the Bundles.properties gets generated inside the src/main/java folder but they need to be manually copied to the src/main/resources folder once the form is saved. Otherwise things will crash...	2012-06-27 15:18:33 +02:00
ebner	ee28c20847	Updated to new version 35	2012-06-27 14:40:52 +02:00
ebner	5b14b8bf52	Updated the version to 1.1.34	2012-06-25 15:17:37 +02:00
ebner	d6098fce12	added .project file of Eclipse	2012-05-31 10:11:15 +02:00
ebner	6bcc45d69a	Updated version	2012-05-31 10:09:00 +02:00