Merged cdump code into ee module

This commit is contained in:
2014-07-25 10:58:48 +02:00
parent 2ab5d9edce
commit b9325dd025
14 changed files with 35 additions and 178 deletions

View File

@@ -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>

View File

@@ -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>

View File

@@ -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

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>