Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[6662] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2011-11-11 08:10:55
|
Revision: 6662
http://fudaa.svn.sourceforge.net/fudaa/?rev=6662&view=rev
Author: deniger
Date: 2011-11-11 08:10:48 +0000 (Fri, 11 Nov 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/pom.xml
trunk/soft/fudaa-crue/ui-application/pom.xml
trunk/soft/fudaa-crue/ui-branding/pom.xml
trunk/soft/fudaa-crue/ui-branding/src/main/nbm/module.xml
trunk/soft/fudaa-crue/ui-modelling/pom.xml
trunk/soft/fudaa-crue/ui-otfa/pom.xml
trunk/soft/fudaa-crue/ui-post/pom.xml
trunk/soft/fudaa-crue/ui-study/pom.xml
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/ScenariosTopComponent.java
Property Changed:
----------------
trunk/soft/fudaa-crue/ui-branding/src/main/
trunk/soft/fudaa-crue/ui-branding/src/main/resources/
Modified: trunk/soft/fudaa-crue/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/pom.xml 2011-11-11 07:57:12 UTC (rev 6661)
+++ trunk/soft/fudaa-crue/pom.xml 2011-11-11 08:10:48 UTC (rev 6662)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.fudaa.pom</groupId>
<artifactId>soft-pom</artifactId>
- <version>0.8</version>
+ <version>0.9</version>
</parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
@@ -34,12 +34,12 @@
<modules>
<module>crue-server</module>
<!-- <module>crue-ui</module>-->
- <module>ui-application</module>
<module>ui-branding</module>
<module>ui-study</module>
<module>ui-modelling</module>
<module>ui-post</module>
<module>ui-otfa</module>
+ <module>ui-application</module>
</modules>
<dependencyManagement>
<dependencies>
@@ -67,11 +67,6 @@
</dependency>
<dependency>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <artifactId>ui-application</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>ui-branding</artifactId>
<version>${project.version}</version>
<type>nbm</type>
@@ -132,29 +127,7 @@
<cluster>${brandingToken}</cluster>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <configuration>
- <classpathContainers>
- <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</classpathContainer>
- </classpathContainers>
- <additionalConfig>
- <file>
- <name>.settings/org.eclipse.core.resources.prefs</name>
- <location>../src/config/eclipse/org.eclipse.core.resources.prefs</location>
- </file>
- </additionalConfig>
- </configuration>
- </plugin>
+
</plugins>
</build>
</project>
\ No newline at end of file
Modified: trunk/soft/fudaa-crue/ui-application/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-application/pom.xml 2011-11-11 07:57:12 UTC (rev 6661)
+++ trunk/soft/fudaa-crue/ui-application/pom.xml 2011-11-11 08:10:48 UTC (rev 6662)
@@ -51,14 +51,7 @@
<artifactId>ui-otfa</artifactId>
<type>nbm</type>
</dependency>
- <dependency>
- <artifactId>jcl-over-slf4j</artifactId>
- <groupId>org.slf4j</groupId>
- </dependency>
- <dependency>
- <artifactId>logback-classic</artifactId>
- <groupId>ch.qos.logback</groupId>
- </dependency>
+
</dependencies>
<build>
@@ -83,41 +76,6 @@
</plugin>
-->
</plugins>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.apache.maven.plugins
- </groupId>
- <artifactId>
- maven-antrun-plugin
- </artifactId>
- <versionRange>
- [1.3,)
- </versionRange>
- <goals>
- <goal>run</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
<profiles>
Modified: trunk/soft/fudaa-crue/ui-branding/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/pom.xml 2011-11-11 07:57:12 UTC (rev 6661)
+++ trunk/soft/fudaa-crue/ui-branding/pom.xml 2011-11-11 08:10:48 UTC (rev 6662)
@@ -1,128 +1,83 @@
<?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>org.fudaa.soft.fudaa-crue</groupId>
- <artifactId>fudaa-crue</artifactId>
- <version>0.38-SNAPSHOT</version>
- </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.fudaa.soft.fudaa-crue</groupId>
+ <artifactId>fudaa-crue</artifactId>
+ <version>0.38-SNAPSHOT</version>
+ </parent>
- <artifactId>ui-branding</artifactId>
- <packaging>nbm</packaging>
+ <artifactId>ui-branding</artifactId>
+ <packaging>nbm</packaging>
+ <name>Crue UI Branding</name>
- <name>Crue UI Branding</name>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.fudaa.soft.fudaa-crue</groupId>
+ <artifactId>crue-server</artifactId>
+ </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-modules</artifactId>
+ <version>${netbeans.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-openide-util</artifactId>
+ <version>${netbeans.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-openide-awt</artifactId>
+ <version>${netbeans.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-openide-nodes</artifactId>
+ <version>${netbeans.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-openide-windows</artifactId>
+ <version>${netbeans.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-openide-util-lookup</artifactId>
+ <version>${netbeans.version}</version>
+ </dependency>
+
+ </dependencies>
- <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-modules</artifactId>
- <version>${netbeans.version}</version>
- </dependency>
- <dependency>
- <groupId>org.netbeans.api</groupId>
- <artifactId>org-openide-util</artifactId>
- <version>${netbeans.version}</version>
- </dependency>
- <dependency>
- <groupId>org.netbeans.api</groupId>
- <artifactId>org-openide-awt</artifactId>
- <version>${netbeans.version}</version>
- </dependency>
- <dependency>
- <groupId>org.netbeans.api</groupId>
- <artifactId>org-openide-nodes</artifactId>
- <version>${netbeans.version}</version>
- </dependency>
- <dependency>
- <groupId>org.netbeans.api</groupId>
- <artifactId>org-openide-windows</artifactId>
- <version>${netbeans.version}</version>
- </dependency>
- <dependency>
- <groupId>org.netbeans.api</groupId>
- <artifactId>org-openide-util-lookup</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>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>nbm-maven-plugin</artifactId>
+ <configuration>
+ <publicPackages>
+ <publicPackage>org.*</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>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.apache.maven.plugins
- </groupId>
- <artifactId>
- maven-antrun-plugin
- </artifactId>
- <versionRange>
- [1.3,)
- </versionRange>
- <goals>
- <goal>run</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.codehaus.mojo
- </groupId>
- <artifactId>
- nbm-maven-plugin
- </artifactId>
- <versionRange>
- [3.5,)
- </versionRange>
- <goals>
- <goal>manifest</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
+ <useDefaultManifestFile>true</useDefaultManifestFile>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Property changes on: trunk/soft/fudaa-crue/ui-branding/src/main
___________________________________________________________________
Added: svn:ignore
+ .directory
Modified: trunk/soft/fudaa-crue/ui-branding/src/main/nbm/module.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/nbm/module.xml 2011-11-11 07:57:12 UTC (rev 6661)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/nbm/module.xml 2011-11-11 08:10:48 UTC (rev 6662)
@@ -3,7 +3,8 @@
<!--
<moduleType>autoload</moduleType>
<codeNameBase>org.fudaa.fudaa.test.testui/1</codeNameBase>
- <licenseName>Apache License, Version 2.0</licenseName>
+ -->
+ <licenseName>GPL 2</licenseName>
<licenseFile>license.txt</licenseFile>
- -->
+
</nbm>
Property changes on: trunk/soft/fudaa-crue/ui-branding/src/main/resources
___________________________________________________________________
Added: svn:ignore
+ .directory
Modified: trunk/soft/fudaa-crue/ui-modelling/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/pom.xml 2011-11-11 07:57:12 UTC (rev 6661)
+++ trunk/soft/fudaa-crue/ui-modelling/pom.xml 2011-11-11 08:10:48 UTC (rev 6662)
@@ -15,7 +15,18 @@
</properties>
<dependencies>
+<!--ui-branding est egalement utilise comme "librairy wrapper"-->
<dependency>
+ <groupId>org.fudaa.soft.fudaa-crue</groupId>
+ <artifactId>crue-server</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.soft.fudaa-crue</groupId>
+ <artifactId>ui-branding</artifactId>
+ <type>nbm</type>
+ </dependency>
+ <dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-netbeans-api-annotations-common</artifactId>
<version>${netbeans.version}</version>
Modified: trunk/soft/fudaa-crue/ui-otfa/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/pom.xml 2011-11-11 07:57:12 UTC (rev 6661)
+++ trunk/soft/fudaa-crue/ui-otfa/pom.xml 2011-11-11 08:10:48 UTC (rev 6662)
@@ -1,79 +1,90 @@
<?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>fudaa-crue</artifactId>
- <groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.38-SNAPSHOT</version>
- </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>fudaa-crue</artifactId>
+ <groupId>org.fudaa.soft.fudaa-crue</groupId>
+ <version>0.38-SNAPSHOT</version>
+ </parent>
- <artifactId>ui-otfa</artifactId>
- <packaging>nbm</packaging>
- <name>Crue UI OTFA</name>
+ <artifactId>ui-otfa</artifactId>
+ <packaging>nbm</packaging>
+ <name>Crue UI OTFA</name>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
+ <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>
- <dependency>
- <groupId>org.netbeans.api</groupId>
- <artifactId>org-openide-util</artifactId>
- <version>${netbeans.version}</version>
- </dependency>
- <dependency>
- <groupId>org.netbeans.api</groupId>
- <artifactId>org-openide-awt</artifactId>
- <version>${netbeans.version}</version>
- </dependency>
- <dependency>
- <groupId>org.netbeans.api</groupId>
- <artifactId>org-openide-nodes</artifactId>
- <version>${netbeans.version}</version>
- </dependency>
- <dependency>
- <groupId>org.netbeans.api</groupId>
- <artifactId>org-openide-loaders</artifactId>
- <version>${netbeans.version}</version>
- </dependency>
- <dependency>
- <groupId>org.netbeans.api</groupId>
- <artifactId>org-openide-dialogs</artifactId>
- <version>${netbeans.version}</version>
- </dependency>
- <dependency>
- <groupId>org.netbeans.api</groupId>
- <artifactId>org-openide-windows</artifactId>
- <version>${netbeans.version}</version>
- </dependency>
- <dependency>
- <groupId>org.netbeans.api</groupId>
- <artifactId>org-openide-explorer</artifactId>
- <version>${netbeans.version}</version>
- </dependency>
- </dependencies>
+ <dependencies>
+ <!--ui-branding est egalement utilise comme "librairy wrapper"-->
+ <dependency>
+ <groupId>org.fudaa.soft.fudaa-crue</groupId>
+ <artifactId>crue-server</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.soft.fudaa-crue</groupId>
+ <artifactId>ui-branding</artifactId>
+ <type>nbm</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</artifactId>
+ <version>${netbeans.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-openide-awt</artifactId>
+ <version>${netbeans.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-openide-nodes</artifactId>
+ <version>${netbeans.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-openide-loaders</artifactId>
+ <version>${netbeans.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-openide-dialogs</artifactId>
+ <version>${netbeans.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-openide-windows</artifactId>
+ <version>${netbeans.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-openide-explorer</artifactId>
+ <version>${netbeans.version}</version>
+ </dependency>
+ </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>nbm-maven-plugin</artifactId>
- <extensions>true</extensions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>nbm-maven-plugin</artifactId>
+ <extensions>true</extensions>
+ </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>
+ <useDefaultManifestFile>true</useDefaultManifestFile>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: trunk/soft/fudaa-crue/ui-post/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-post/pom.xml 2011-11-11 07:57:12 UTC (rev 6661)
+++ trunk/soft/fudaa-crue/ui-post/pom.xml 2011-11-11 08:10:48 UTC (rev 6662)
@@ -15,11 +15,18 @@
</properties>
<dependencies>
+ <!--ui-branding est egalement utilise comme "librairy wrapper"-->
<dependency>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>crue-server</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.fudaa.soft.fudaa-crue</groupId>
+ <artifactId>ui-branding</artifactId>
+ <type>nbm</type>
+ </dependency>
+ <dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-netbeans-api-annotations-common</artifactId>
<version>${netbeans.version}</version>
Modified: trunk/soft/fudaa-crue/ui-study/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-study/pom.xml 2011-11-11 07:57:12 UTC (rev 6661)
+++ trunk/soft/fudaa-crue/ui-study/pom.xml 2011-11-11 08:10:48 UTC (rev 6662)
@@ -15,11 +15,19 @@
</properties>
<dependencies>
+ <!--ui-branding est egalement utilise comme "librairy wrapper"-->
<dependency>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>crue-server</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.fudaa.soft.fudaa-crue</groupId>
+ <artifactId>ui-branding</artifactId>
+ <type>nbm</type>
+ </dependency>
+
+ <dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-netbeans-api-annotations-common</artifactId>
<version>${netbeans.version}</version>
@@ -32,7 +40,7 @@
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-util</artifactId>
- <version>RELEASE70</version>
+ <version>${netbeans.version}</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
@@ -47,7 +55,7 @@
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-nodes</artifactId>
- <version>RELEASE70</version>
+ <version>${netbeans.version}</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
@@ -57,10 +65,15 @@
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-awt</artifactId>
- <version>RELEASE70</version>
+ <version>${netbeans.version}</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
+ <artifactId>org-openide-modules</artifactId>
+ <version>${netbeans.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.api</groupId>
<artifactId>org-netbeans-modules-settings</artifactId>
<version>${netbeans.version}</version>
</dependency>
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/ScenariosTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/ScenariosTopComponent.java 2011-11-11 07:57:12 UTC (rev 6661)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/ScenariosTopComponent.java 2011-11-11 08:10:48 UTC (rev 6662)
@@ -5,6 +5,7 @@
package org.fudaa.fudaa.crue.study;
import java.util.Arrays;
+import java.util.Collection;
import java.util.logging.Logger;
import javax.swing.ActionMap;
import org.fudaa.dodico.crue.config.CrueConfigMetierLoaderDefault;
@@ -22,8 +23,10 @@
import org.openide.explorer.ExplorerManager;
import org.openide.explorer.ExplorerUtils;
import org.openide.nodes.Children;
-import org.openide.util.Utilities;
-import org.openide.util.lookup.Lookups;
+import org.openide.util.LookupEvent;
+import org.openide.util.LookupListener;
+import org.openide.util.lookup.AbstractLookup;
+import org.openide.util.lookup.InstanceContent;
import org.openide.windows.WindowManager;
/**
@@ -39,62 +42,76 @@
@ActionReference(path = "Menu/Window" /*, position = 333 */)
@TopComponent.OpenActionRegistration(displayName = "#CTL_ScenariosAction",
preferredID = "ScenariosTopComponent")
-public final class ScenariosTopComponent extends TopComponent implements ExplorerManager.Provider {
+public final class ScenariosTopComponent extends TopComponent implements ExplorerManager.Provider {
- private final static String PREFERRED_ID = "ScenariosTopComponent";
- private ExplorerManager em = new ExplorerManager();
+ private final static String PREFERRED_ID = "ScenariosTopComponent";
+ private ExplorerManager em = new ExplorerManager();
+ Lookup.Result<String> strings;
+ InstanceContent content = new InstanceContent();
+ Lookup dynamicLookup = new AbstractLookup(content);
+ public ScenariosTopComponent() {
+ initComponents();
+ setName(NbBundle.getMessage(ScenariosTopComponent.class, "CTL_ScenariosTopComponent"));
+ setToolTipText(NbBundle.getMessage(ScenariosTopComponent.class, "HINT_ScenariosTopComponent"));
+ putClientProperty(TopComponent.PROP_CLOSING_DISABLED, Boolean.TRUE);
+ putClientProperty(TopComponent.PROP_DRAGGING_DISABLED, Boolean.TRUE);
+ putClientProperty(TopComponent.PROP_MAXIMIZATION_DISABLED, Boolean.TRUE);
+ putClientProperty(TopComponent.PROP_UNDOCKING_DISABLED, Boolean.TRUE);
+ ActionMap map = this.getActionMap();
+ map.put("delete", ExplorerUtils.actionDelete(em, true)); //NOI18N
+ associateLookup(ExplorerUtils.createLookup(em, map));
+ buildProject();
+ content.add("Hello");
+ strings = dynamicLookup.lookupResult(String.class);
+ strings.addLookupListener(new LookupListener() {
- public ScenariosTopComponent() {
- initComponents();
- setName(NbBundle.getMessage(ScenariosTopComponent.class, "CTL_ScenariosTopComponent"));
- setToolTipText(NbBundle.getMessage(ScenariosTopComponent.class, "HINT_ScenariosTopComponent"));
- putClientProperty(TopComponent.PROP_CLOSING_DISABLED, Boolean.TRUE);
- putClientProperty(TopComponent.PROP_DRAGGING_DISABLED, Boolean.TRUE);
- putClientProperty(TopComponent.PROP_MAXIMIZATION_DISABLED, Boolean.TRUE);
- putClientProperty(TopComponent.PROP_UNDOCKING_DISABLED, Boolean.TRUE);
- ActionMap map = this.getActionMap();
- map.put("delete", ExplorerUtils.actionDelete(em, true)); //NOI18N
- associateLookup(ExplorerUtils.createLookup(em, map));
- buildProject();
+ @Override
+ public void resultChanged(LookupEvent e) {
+ System.err.println("Yes " + e);
+ }
+ });
- }
+ }
- public void buildProject() {
- EMHScenario sc1=new EMHScenario(CrueConfigMetierLoaderDefault.DEFAULT,new CrueOptions());
- sc1.setNom("Scenario 1");
- EMHScenario sc2=new EMHScenario(CrueConfigMetierLoaderDefault.DEFAULT,new CrueOptions());
- sc2.setNom("Scenario 2");
- EMHProjet projet=new EMHProjet();
- em.setRootContext(new ManagerEMHEtudeNode(Children.create(new ScenarioChildFactory(Arrays.asList(sc1,sc2)), true),projet));
+ public void buildProject() {
+ EMHScenario sc1 = new EMHScenario(CrueConfigMetierLoaderDefault.DEFAULT, new CrueOptions());
+ sc1.setNom("Scenario 1");
+ EMHScenario sc2 = new EMHScenario(CrueConfigMetierLoaderDefault.DEFAULT, new CrueOptions());
+ sc2.setNom("Scenario 2");
+ EMHProjet projet = new EMHProjet();
+ content.add("Hello");
+ content.add("Hello 2");
+
+ em.setRootContext(new ManagerEMHEtudeNode(Children.create(new ScenarioChildFactory(Arrays.asList(sc1, sc2)), true), projet));
+ }
+
+ @Override
+ public ExplorerManager getExplorerManager() {
+ return em;
+ }
+
+ /**
+ * Obtain the EditorTopComponent instance. Never call {@link #getDefault} directly!
+ */
+ public static synchronized ScenariosTopComponent findInstance() {
+ TopComponent win = WindowManager.getDefault().findTopComponent(PREFERRED_ID);
+ if (win == null) {
+ Logger.getLogger(ScenariosTopComponent.class.getName()).warning(
+ "Cannot find " + PREFERRED_ID + " component. It will not be located properly in the window system.");
+ return null;
}
-
- @Override
- public ExplorerManager getExplorerManager() {
- return em;
+ if (win instanceof ScenariosTopComponent) {
+ return (ScenariosTopComponent) win;
}
+ return null;
+ }
- /**
- * Obtain the EditorTopComponent instance. Never call {@link #getDefault} directly!
- */
- public static synchronized ScenariosTopComponent findInstance() {
- TopComponent win = WindowManager.getDefault().findTopComponent(PREFERRED_ID);
- if (win == null) {
- Logger.getLogger(ScenariosTopComponent.class.getName()).warning(
- "Cannot find " + PREFERRED_ID + " component. It will not be located properly in the window system.");
- return null;
- }
- if (win instanceof ScenariosTopComponent) {
- return (ScenariosTopComponent) win;
- }
- return null;
- }
-
- /** 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.
- */
+ /** 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() {
@@ -121,25 +138,25 @@
private javax.swing.JScrollPane jScrollPane2;
// End of variables declaration//GEN-END:variables
- @Override
- public void componentOpened() {
- // TODO add custom code on component opening
- }
+ @Override
+ public void componentOpened() {
+ // TODO add custom code on component opening
+ }
- @Override
- public void componentClosed() {
- // TODO add custom code on component closing
- }
+ @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
- }
+ 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
+ }
- void readProperties(java.util.Properties p) {
- String version = p.getProperty("version");
- // TODO read your settings according to their version
- }
+ void readProperties(java.util.Properties p) {
+ String version = p.getProperty("version");
+ // TODO read your settings according to their version
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
