From b9325dd02503aab46181ab7fbdbfb59fadb345eb Mon Sep 17 00:00:00 2001
From: Simon Gregor Ebner <simon.ebner@psi.ch>
Date: Fri, 25 Jul 2014 10:58:48 +0200
Subject: [PATCH] Merged cdump code into ee module

---
 application/pom.xml                           |   4 +-
 fda.ui.cdump/pom.xml                          | 132 ------------------
 fda.ui.cdump/src/main/nbm/manifest.mf         |   4 -
 fda.ui.cdump/src/main/nbm/module.xml          |   9 --
 .../resources/ch/psi/fda/ui/cdump/layer.xml   |  30 ----
 fda.ui.ee/pom.xml                             |  22 +++
 .../ui/cdump/CdumpExecutionTopComponent.form  |   0
 .../ui/cdump/CdumpExecutionTopComponent.java  |   0
 .../ch/psi/fda/ui/cdump/Bundle.properties     |   0
 .../CdumpExecutionTopComponentSettings.xml    |   0
 .../ee}/CdumpExecutionTopComponentWstcref.xml |   0
 .../main/resources/ch/psi/fda/ui/ee/layer.xml |  10 ++
 .../ch/psi/fda/ui/fdaq/Bundle.properties      |   0
 pom.xml                                       |   2 +-
 14 files changed, 35 insertions(+), 178 deletions(-)
 delete mode 100644 fda.ui.cdump/pom.xml
 delete mode 100644 fda.ui.cdump/src/main/nbm/manifest.mf
 delete mode 100644 fda.ui.cdump/src/main/nbm/module.xml
 delete mode 100644 fda.ui.cdump/src/main/resources/ch/psi/fda/ui/cdump/layer.xml
 rename {fda.ui.cdump => fda.ui.ee}/src/main/java/ch/psi/fda/ui/cdump/CdumpExecutionTopComponent.form (100%)
 rename {fda.ui.cdump => fda.ui.ee}/src/main/java/ch/psi/fda/ui/cdump/CdumpExecutionTopComponent.java (100%)
 rename {fda.ui.cdump => fda.ui.ee}/src/main/resources/ch/psi/fda/ui/cdump/Bundle.properties (100%)
 rename {fda.ui.cdump/src/main/resources/ch/psi/fda/ui/cdump => fda.ui.ee/src/main/resources/ch/psi/fda/ui/ee}/CdumpExecutionTopComponentSettings.xml (100%)
 rename {fda.ui.cdump/src/main/resources/ch/psi/fda/ui/cdump => fda.ui.ee/src/main/resources/ch/psi/fda/ui/ee}/CdumpExecutionTopComponentWstcref.xml (100%)
 rename {fda.ui.cdump => fda.ui.ee}/src/main/resources/ch/psi/fda/ui/fdaq/Bundle.properties (100%)

diff --git a/application/pom.xml b/application/pom.xml
index 98f5a06..5ad0ffc 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -67,11 +67,11 @@
             <artifactId>fda.ui.preferences</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
+<!--        <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>fda.ui.cdump</artifactId>
             <version>${project.version}</version>
-        </dependency>
+        </dependency>-->
     </dependencies>
 
     <build>
diff --git a/fda.ui.cdump/pom.xml b/fda.ui.cdump/pom.xml
deleted file mode 100644
index 199e95d..0000000
--- a/fda.ui.cdump/pom.xml
+++ /dev/null
@@ -1,132 +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>2.0.1</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>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>ch.psi</groupId>
-            <artifactId>ch.psi.fda.cdump</artifactId>
-            <version>2.3.0</version>
-        </dependency>
-        <dependency>
-            <groupId>ch.psi</groupId>
-            <artifactId>ch.psi.fdaq</artifactId>
-            <version>0.0.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>
-            </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>
diff --git a/fda.ui.cdump/src/main/nbm/manifest.mf b/fda.ui.cdump/src/main/nbm/manifest.mf
deleted file mode 100644
index b126358..0000000
--- a/fda.ui.cdump/src/main/nbm/manifest.mf
+++ /dev/null
@@ -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
diff --git a/fda.ui.cdump/src/main/nbm/module.xml b/fda.ui.cdump/src/main/nbm/module.xml
deleted file mode 100644
index a34f8a8..0000000
--- a/fda.ui.cdump/src/main/nbm/module.xml
+++ /dev/null
@@ -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>
diff --git 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
deleted file mode 100644
index fa54f5b..0000000
--- a/fda.ui.cdump/src/main/resources/ch/psi/fda/ui/cdump/layer.xml
+++ /dev/null
@@ -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>
diff --git a/fda.ui.ee/pom.xml b/fda.ui.ee/pom.xml
index f36ef3c..c84ca5f 100644
--- a/fda.ui.ee/pom.xml
+++ b/fda.ui.ee/pom.xml
@@ -78,6 +78,18 @@
             <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.ui.preferences</artifactId>
@@ -90,6 +102,16 @@
             <version>2.0.4</version>
             <type>jar</type>
         </dependency>
+        <dependency>
+            <groupId>ch.psi</groupId>
+            <artifactId>ch.psi.fda.cdump</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.psi</groupId>
+            <artifactId>ch.psi.fdaq</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/fda.ui.cdump/src/main/java/ch/psi/fda/ui/cdump/CdumpExecutionTopComponent.form b/fda.ui.ee/src/main/java/ch/psi/fda/ui/cdump/CdumpExecutionTopComponent.form
similarity index 100%
rename from fda.ui.cdump/src/main/java/ch/psi/fda/ui/cdump/CdumpExecutionTopComponent.form
rename to fda.ui.ee/src/main/java/ch/psi/fda/ui/cdump/CdumpExecutionTopComponent.form
diff --git a/fda.ui.cdump/src/main/java/ch/psi/fda/ui/cdump/CdumpExecutionTopComponent.java b/fda.ui.ee/src/main/java/ch/psi/fda/ui/cdump/CdumpExecutionTopComponent.java
similarity index 100%
rename from fda.ui.cdump/src/main/java/ch/psi/fda/ui/cdump/CdumpExecutionTopComponent.java
rename to fda.ui.ee/src/main/java/ch/psi/fda/ui/cdump/CdumpExecutionTopComponent.java
diff --git a/fda.ui.cdump/src/main/resources/ch/psi/fda/ui/cdump/Bundle.properties b/fda.ui.ee/src/main/resources/ch/psi/fda/ui/cdump/Bundle.properties
similarity index 100%
rename from fda.ui.cdump/src/main/resources/ch/psi/fda/ui/cdump/Bundle.properties
rename to fda.ui.ee/src/main/resources/ch/psi/fda/ui/cdump/Bundle.properties
diff --git a/fda.ui.cdump/src/main/resources/ch/psi/fda/ui/cdump/CdumpExecutionTopComponentSettings.xml b/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ee/CdumpExecutionTopComponentSettings.xml
similarity index 100%
rename from fda.ui.cdump/src/main/resources/ch/psi/fda/ui/cdump/CdumpExecutionTopComponentSettings.xml
rename to fda.ui.ee/src/main/resources/ch/psi/fda/ui/ee/CdumpExecutionTopComponentSettings.xml
diff --git a/fda.ui.cdump/src/main/resources/ch/psi/fda/ui/cdump/CdumpExecutionTopComponentWstcref.xml b/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ee/CdumpExecutionTopComponentWstcref.xml
similarity index 100%
rename from fda.ui.cdump/src/main/resources/ch/psi/fda/ui/cdump/CdumpExecutionTopComponentWstcref.xml
rename to fda.ui.ee/src/main/resources/ch/psi/fda/ui/ee/CdumpExecutionTopComponentWstcref.xml
diff --git 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
index 6554848..c56e36b 100644
--- 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
@@ -28,6 +28,11 @@
                 <attr name="displayName" bundlevalue="ch.psi.fda.ui.ee.Bundle#CTL_PlotVisualizerAction"/>
                 <attr name="instanceCreate" methodvalue="org.openide.windows.TopComponent.openAction"/>
             </file>
+            <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">
@@ -41,6 +46,9 @@
             <file name="PlotVisualizerAction.shadow">
                 <attr name="originalFile" stringvalue="Actions/Window/ch-psi-fda-ui-ee-PlotVisualizerAction.instance"/>
             </file>
+            <file name="CdumpExecutionAction.shadow">
+                <attr name="originalFile" stringvalue="Actions/Window/ch-psi-fda-ui-cdump-CdumpExecutionAction.instance"/>
+            </file>
         </folder>
     </folder>
     <folder name="Toolbars">
@@ -54,10 +62,12 @@
     <folder name="Windows2">
         <folder name="Components">
             <file name="PlotVisualizerTopComponent.settings" url="PlotVisualizerTopComponentSettings.xml"/>
+            <file name="CdumpExecutionTopComponent.settings" url="CdumpExecutionTopComponentSettings.xml"/>
         </folder>
         <folder name="Modes">
             <folder name="editor">
                 <file name="PlotVisualizerTopComponent.wstcref" url="PlotVisualizerTopComponentWstcref.xml"/>
+                <file name="CdumpExecutionTopComponent.wstcref" url="CdumpExecutionTopComponentWstcref.xml"/>
             </folder>
         </folder>
     </folder>
diff --git a/fda.ui.cdump/src/main/resources/ch/psi/fda/ui/fdaq/Bundle.properties b/fda.ui.ee/src/main/resources/ch/psi/fda/ui/fdaq/Bundle.properties
similarity index 100%
rename from fda.ui.cdump/src/main/resources/ch/psi/fda/ui/fdaq/Bundle.properties
rename to fda.ui.ee/src/main/resources/ch/psi/fda/ui/fdaq/Bundle.properties
diff --git a/pom.xml b/pom.xml
index c467e24..6f7a740 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,7 +85,7 @@
         <module>fda.ui.preferences</module>
         <module>fda.ui.ce</module>
         <module>fda.ui.cm</module>
-        <module>fda.ui.cdump</module>
+<!--        <module>fda.ui.cdump</module>-->
     </modules>
 
     <properties>