Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[6714] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2011-11-25 22:01:25
|
Revision: 6714
http://fudaa.svn.sourceforge.net/fudaa/?rev=6714&view=rev
Author: deniger
Date: 2011-11-25 22:01:17 +0000 (Fri, 25 Nov 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-ui/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioLoaderUI.java
trunk/soft/fudaa-crue/pom.xml
trunk/soft/fudaa-crue/ui-application/pom.xml
trunk/soft/fudaa-crue/ui-branding/src/main/nbm/manifest.mf
trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/layer.xml
trunk/soft/fudaa-crue/ui-modelling/pom.xml
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/perspective/ActiveModelisation.java
trunk/soft/fudaa-crue/ui-options/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/actions/LoadStudy.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ManagerEMHScenarioNode.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/perspective/ActiveStudy.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/property/ManagerEMHScenarioPropertyFactory.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/EMHProjetService.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/FileChangeListenerEtudeDir.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/OpenEtuAction.java
trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/actions/Bundle.properties
Added Paths:
-----------
trunk/soft/fudaa-crue/ui-emh/
trunk/soft/fudaa-crue/ui-emh/pom.xml
trunk/soft/fudaa-crue/ui-emh/src/
trunk/soft/fudaa-crue/ui-emh/src/main/
trunk/soft/fudaa-crue/ui-emh/src/main/java/
trunk/soft/fudaa-crue/ui-emh/src/main/java/org/
trunk/soft/fudaa-crue/ui-emh/src/main/java/org/fudaa/
trunk/soft/fudaa-crue/ui-emh/src/main/java/org/fudaa/fudaa/
trunk/soft/fudaa-crue/ui-emh/src/main/java/org/fudaa/fudaa/crue/
trunk/soft/fudaa-crue/ui-emh/src/main/java/org/fudaa/fudaa/crue/emh/
trunk/soft/fudaa-crue/ui-emh/src/main/nbm/
trunk/soft/fudaa-crue/ui-emh/src/main/nbm/manifest.mf
trunk/soft/fudaa-crue/ui-emh/src/main/nbm/module.xml
trunk/soft/fudaa-crue/ui-emh/src/main/resources/
trunk/soft/fudaa-crue/ui-emh/src/main/resources/org/
trunk/soft/fudaa-crue/ui-emh/src/main/resources/org/fudaa/
trunk/soft/fudaa-crue/ui-emh/src/main/resources/org/fudaa/fudaa/
trunk/soft/fudaa-crue/ui-emh/src/main/resources/org/fudaa/fudaa/crue/
trunk/soft/fudaa-crue/ui-emh/src/main/resources/org/fudaa/fudaa/crue/emh/
trunk/soft/fudaa-crue/ui-emh/src/main/resources/org/fudaa/fudaa/crue/emh/Bundle.properties
trunk/soft/fudaa-crue/ui-emh/src/main/resources/org/fudaa/fudaa/crue/emh/layer.xml
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/services/
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/services/ModellingScenarioServiceImpl.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/services/PerspectiveServiceModelling.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/OpenScenario.java
Removed Paths:
-------------
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/perspective/PerspectiveServiceModelling.java
Modified: trunk/soft/fudaa-crue/crue-ui/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioLoaderUI.java
===================================================================
--- trunk/soft/fudaa-crue/crue-ui/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioLoaderUI.java 2011-11-25 22:00:04 UTC (rev 6713)
+++ trunk/soft/fudaa-crue/crue-ui/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioLoaderUI.java 2011-11-25 22:01:17 UTC (rev 6714)
@@ -47,7 +47,7 @@
* @return true si ok
*/
public boolean loadScenarioInManager(final UiContext uiContext, final EMHRun run) {
- final ScenarioLoader loader = new ScenarioLoader(scenario, projet, projet.getPropDefinition());
+ final ScenarioLoader loader = new ScenarioLoader(scenario, projet, projet.getCoeurConfig());
final CtuluLogGroup errorMng = loader.loadInManager(run);
final boolean ok = !errorMng.containsFatalError();
CommonGuiLib.showDialog(errorMng, uiContext, FCrueResource.getS("ihm.res.chargt.scenario"));
@@ -61,7 +61,7 @@
* @return the scenario if valid
*/
public EMHScenario loadAScenario(final UiContext uiContext, final EMHRun run) {
- final ScenarioLoader loader = new ScenarioLoader(scenario, projet, projet.getPropDefinition());
+ final ScenarioLoader loader = new ScenarioLoader(scenario, projet, projet.getCoeurConfig());
final ScenarioLoaderResult loadResultat = loader.load(run);
if (loadResultat == null) { return null; }
if (loadResultat.errorManager != null) {
Modified: trunk/soft/fudaa-crue/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/pom.xml 2011-11-25 22:00:04 UTC (rev 6713)
+++ trunk/soft/fudaa-crue/pom.xml 2011-11-25 22:01:17 UTC (rev 6714)
@@ -25,7 +25,7 @@
<modules>
<module>crue-server</module>
<!-- <module>crue-ui</module>-->
- <module>ui-wrapper</module>
+ <module>ui-common</module>
<module>ui-branding</module>
<module>ui-study</module>
<module>ui-modelling</module>
@@ -33,6 +33,7 @@
<module>ui-otfa</module>
<module>ui-application</module>
<module>ui-options</module>
+ <module>ui-emh</module>
</modules>
<dependencyManagement>
<dependencies>
@@ -60,7 +61,7 @@
</dependency>
<dependency>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <artifactId>ui-wrapper</artifactId>
+ <artifactId>ui-common</artifactId>
<version>${project.version}</version>
<type>nbm</type>
</dependency>
@@ -72,6 +73,12 @@
</dependency>
<dependency>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
+ <artifactId>ui-emh</artifactId>
+ <version>${project.version}</version>
+ <type>nbm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>ui-branding</artifactId>
<version>${project.version}</version>
<type>nbm</type>
Modified: trunk/soft/fudaa-crue/ui-application/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-application/pom.xml 2011-11-25 22:00:04 UTC (rev 6713)
+++ trunk/soft/fudaa-crue/ui-application/pom.xml 2011-11-25 22:01:17 UTC (rev 6714)
@@ -28,7 +28,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>ui-wrapper</artifactId>
+ <artifactId>ui-common</artifactId>
<type>nbm</type>
</dependency>
<dependency>
@@ -38,6 +38,11 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>ui-emh</artifactId>
+ <type>nbm</type>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>ui-study</artifactId>
<type>nbm</type>
</dependency>
Modified: trunk/soft/fudaa-crue/ui-branding/src/main/nbm/manifest.mf
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/nbm/manifest.mf 2011-11-25 22:00:04 UTC (rev 6713)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/nbm/manifest.mf 2011-11-25 22:01:17 UTC (rev 6714)
@@ -1,4 +1,3 @@
Manifest-Version: 1.0
-OpenIDE-Module-Install: org/fudaa/fudaa/crue/branding/Installer.class
OpenIDE-Module-Localizing-Bundle: org/fudaa/fudaa/crue/branding/Bundle.properties
OpenIDE-Module-Layer: org/fudaa/fudaa/crue/branding/layer.xml
Modified: trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/layer.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/layer.xml 2011-11-25 22:00:04 UTC (rev 6713)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/layer.xml 2011-11-25 22:01:17 UTC (rev 6714)
@@ -27,7 +27,7 @@
<folder name="Help_hidden"/>
<file name="Refactoring_hidden"/>
<file name="RunProject_hidden"/>
- <file name="View_hidden"/>
+ <file name="View_hidden"/>
<folder name="Window">
<file name="CloneDocumentAction.shadow_hidden"/>
<file name="CloseAllButThisAction.shadow_hidden"/>
@@ -53,5 +53,6 @@
<file name="rightTopMode.wsmode" url="/modes/rightTopMode.wsmode"/>
<file name="rightBottomMode.wsmode" url="/modes/rightBottomMode.wsmode"/>
</folder>
+ <file name="properties.settings" url="propertiesSettings_1.xml"/>
</folder>
</filesystem>
Property changes on: trunk/soft/fudaa-crue/ui-emh
___________________________________________________________________
Added: svn:ignore
+ target
Added: trunk/soft/fudaa-crue/ui-emh/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-emh/pom.xml (rev 0)
+++ trunk/soft/fudaa-crue/ui-emh/pom.xml 2011-11-25 22:01:17 UTC (rev 6714)
@@ -0,0 +1,66 @@
+<?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>
+ <artifactId>ui-emh</artifactId>
+ <packaging>nbm</packaging>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <dependencies>
+ <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-common</artifactId>
+ <type>nbm</type>
+ </dependency>
+ <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>
+ <version>3.5</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>
+ <name>Crue UI EMH</name>
+</project>
Added: trunk/soft/fudaa-crue/ui-emh/src/main/nbm/manifest.mf
===================================================================
--- trunk/soft/fudaa-crue/ui-emh/src/main/nbm/manifest.mf (rev 0)
+++ trunk/soft/fudaa-crue/ui-emh/src/main/nbm/manifest.mf 2011-11-25 22:01:17 UTC (rev 6714)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+OpenIDE-Module-Localizing-Bundle: org/fudaa/fudaa/crue/emh/Bundle.properties
+OpenIDE-Module-Layer: org/fudaa/fudaa/crue/emh/layer.xml
Added: trunk/soft/fudaa-crue/ui-emh/src/main/nbm/module.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-emh/src/main/nbm/module.xml (rev 0)
+++ trunk/soft/fudaa-crue/ui-emh/src/main/nbm/module.xml 2011-11-25 22:01:17 UTC (rev 6714)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nbm>
+ <!--
+ <moduleType>autoload</moduleType>
+ <codeNameBase>org.fudaa.fudaa.crue.emh/1</codeNameBase>
+ <licenseName>Apache License, Version 2.0</licenseName>
+ <licenseFile>license.txt</licenseFile>
+ -->
+</nbm>
Added: trunk/soft/fudaa-crue/ui-emh/src/main/resources/org/fudaa/fudaa/crue/emh/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-emh/src/main/resources/org/fudaa/fudaa/crue/emh/Bundle.properties (rev 0)
+++ trunk/soft/fudaa-crue/ui-emh/src/main/resources/org/fudaa/fudaa/crue/emh/Bundle.properties 2011-11-25 22:01:17 UTC (rev 6714)
@@ -0,0 +1,5 @@
+# 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=
Added: trunk/soft/fudaa-crue/ui-emh/src/main/resources/org/fudaa/fudaa/crue/emh/layer.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-emh/src/main/resources/org/fudaa/fudaa/crue/emh/layer.xml (rev 0)
+++ trunk/soft/fudaa-crue/ui-emh/src/main/resources/org/fudaa/fudaa/crue/emh/layer.xml 2011-11-25 22:01:17 UTC (rev 6714)
@@ -0,0 +1,5 @@
+<?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>
+
+</filesystem>
Modified: trunk/soft/fudaa-crue/ui-modelling/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/pom.xml 2011-11-25 22:00:04 UTC (rev 6713)
+++ trunk/soft/fudaa-crue/ui-modelling/pom.xml 2011-11-25 22:01:17 UTC (rev 6714)
@@ -23,7 +23,7 @@
</dependency>
<dependency>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <artifactId>ui-wrapper</artifactId>
+ <artifactId>ui-common</artifactId>
<type>nbm</type>
</dependency>
<dependency>
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/perspective/ActiveModelisation.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/perspective/ActiveModelisation.java 2011-11-25 22:00:04 UTC (rev 6713)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/perspective/ActiveModelisation.java 2011-11-25 22:01:17 UTC (rev 6714)
@@ -4,7 +4,9 @@
*/
package org.fudaa.fudaa.crue.modelling.perspective;
-import org.fudaa.fudaa.crue.common.ActivePerspectiveAbstract;
+import org.fudaa.fudaa.crue.common.Perspective;
+import org.fudaa.fudaa.crue.modelling.services.PerspectiveServiceModelling;
+import org.fudaa.fudaa.crue.common.action.ActivePerspectiveAbstract;
import org.openide.awt.ActionID;
import org.openide.awt.ActionReference;
import org.openide.awt.ActionRegistration;
@@ -15,7 +17,7 @@
public final class ActiveModelisation extends ActivePerspectiveAbstract {
public ActiveModelisation() {
- super("CTL_ActiveModelisation", PerspectiveServiceModelling.class.getName());
+ super("CTL_ActiveModelisation", PerspectiveServiceModelling.class.getName(), Perspective.MODELLING);
setBooleanState(false);
}
}
Deleted: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/perspective/PerspectiveServiceModelling.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/perspective/PerspectiveServiceModelling.java 2011-11-25 22:00:04 UTC (rev 6713)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/perspective/PerspectiveServiceModelling.java 2011-11-25 22:01:17 UTC (rev 6714)
@@ -1,37 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.fudaa.fudaa.crue.modelling.perspective;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-import org.fudaa.fudaa.crue.common.services.PerspectiveService;
-import org.openide.util.lookup.ServiceProvider;
-
-/**
- *
- * @author genesis
- */
-@ServiceProvider(service = PerspectiveService.class)
-public class PerspectiveServiceModelling implements PerspectiveService {
-
- private final Set<String> components = Collections.unmodifiableSet(new HashSet<String>(Arrays.asList("ModellingEMHTopComponent", "ModellingVisualTopComponent", "ModellingProfilesTopComponent")));
-
- @Override
- public boolean activate() {
- return true;
- }
-
- @Override
- public boolean deactivate() {
- return true;
- }
-
- @Override
- public Set<String> getTopComponents() {
- return components;
- }
-}
Added: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/services/ModellingScenarioServiceImpl.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/services/ModellingScenarioServiceImpl.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/services/ModellingScenarioServiceImpl.java 2011-11-25 22:01:17 UTC (rev 6714)
@@ -0,0 +1,41 @@
+package org.fudaa.fudaa.crue.modelling.services;
+
+import org.fudaa.dodico.crue.metier.emh.EMHScenario;
+import org.fudaa.dodico.crue.metier.etude.EMHProjet;
+import org.fudaa.dodico.crue.metier.etude.ManagerEMHScenario;
+import org.fudaa.dodico.crue.projet.ScenarioLoader;
+import org.fudaa.dodico.crue.projet.ScenarioLoader.ScenarioLoaderResult;
+import org.fudaa.fudaa.crue.common.log.CtuluLogDisplayDialog;
+import org.fudaa.fudaa.crue.common.services.ModellingScenarioService;
+import org.fudaa.fudaa.crue.common.services.SelectedPerspectiveService;
+import org.openide.util.Lookup;
+import org.openide.util.lookup.ServiceProvider;
+
+/**
+ *
+ * @author deniger ( genesis)
+ */
+@ServiceProvider(service = ModellingScenarioService.class)
+public class ModellingScenarioServiceImpl implements ModellingScenarioService {
+
+ SelectedPerspectiveService service = Lookup.getDefault().lookup(SelectedPerspectiveService.class);
+
+ ManagerEMHScenario managerScenario;
+ EMHScenario scenario;
+
+ @Override
+ public boolean isScenarioLoaded() {
+ return managerScenario != null;
+ }
+
+ @Override
+ public boolean loadScenario(EMHProjet projet, ManagerEMHScenario scenario) {
+ ScenarioLoader loader=new ScenarioLoader(scenario, projet, projet.getCoeurConfig());
+ ScenarioLoaderResult load = loader.load(null);
+ CtuluLogDisplayDialog dialog=new CtuluLogDisplayDialog(scenario.getNom());
+ dialog.setLogGroup(load.errorManager);
+ dialog.setVisible(true);
+ service.activePerspective(null);
+ return true;
+ }
+}
Copied: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/services/PerspectiveServiceModelling.java (from rev 6712, trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/perspective/PerspectiveServiceModelling.java)
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/services/PerspectiveServiceModelling.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/services/PerspectiveServiceModelling.java 2011-11-25 22:01:17 UTC (rev 6714)
@@ -0,0 +1,37 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.fudaa.fudaa.crue.modelling.services;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+import org.fudaa.fudaa.crue.common.services.PerspectiveService;
+import org.openide.util.lookup.ServiceProvider;
+
+/**
+ *
+ * @author genesis
+ */
+@ServiceProvider(service = PerspectiveService.class)
+public class PerspectiveServiceModelling implements PerspectiveService {
+
+ private final Set<String> components = Collections.unmodifiableSet(new HashSet<String>(Arrays.asList("ModellingEMHTopComponent", "ModellingVisualTopComponent", "ModellingProfilesTopComponent")));
+
+ @Override
+ public boolean activate() {
+ return true;
+ }
+
+ @Override
+ public boolean deactivate() {
+ return true;
+ }
+
+ @Override
+ public Set<String> getTopComponents() {
+ return components;
+ }
+}
Modified: trunk/soft/fudaa-crue/ui-options/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-options/pom.xml 2011-11-25 22:00:04 UTC (rev 6713)
+++ trunk/soft/fudaa-crue/ui-options/pom.xml 2011-11-25 22:01:17 UTC (rev 6714)
@@ -20,14 +20,7 @@
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>
@@ -38,7 +31,7 @@
</dependency>
<dependency>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <artifactId>ui-wrapper</artifactId>
+ <artifactId>ui-common</artifactId>
<type>nbm</type>
</dependency>
Modified: trunk/soft/fudaa-crue/ui-otfa/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/pom.xml 2011-11-25 22:00:04 UTC (rev 6713)
+++ trunk/soft/fudaa-crue/ui-otfa/pom.xml 2011-11-25 22:01:17 UTC (rev 6714)
@@ -17,7 +17,6 @@
<dependencies>
- <!--ui-branding est egalement utilise comme "librairy wrapper"-->
<dependency>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>crue-server</artifactId>
@@ -25,7 +24,7 @@
</dependency>
<dependency>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <artifactId>ui-wrapper</artifactId>
+ <artifactId>ui-common</artifactId>
<type>nbm</type>
</dependency>
<dependency>
@@ -165,12 +164,4 @@
</plugins>
</pluginManagement>
</build>
- <repositories>
- <repository>
- <url>http://download.java.net/maven/2/</url>
- <id>beans-binding</id>
- <layout>default</layout>
- <name>Repository for library Library[beans-binding]</name>
- </repository>
- </repositories>
</project>
Modified: trunk/soft/fudaa-crue/ui-post/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-post/pom.xml 2011-11-25 22:00:04 UTC (rev 6713)
+++ trunk/soft/fudaa-crue/ui-post/pom.xml 2011-11-25 22:01:17 UTC (rev 6714)
@@ -23,7 +23,7 @@
</dependency>
<dependency>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <artifactId>ui-wrapper</artifactId>
+ <artifactId>ui-common</artifactId>
<type>nbm</type>
</dependency>
<dependency>
Modified: trunk/soft/fudaa-crue/ui-study/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-study/pom.xml 2011-11-25 22:00:04 UTC (rev 6713)
+++ trunk/soft/fudaa-crue/ui-study/pom.xml 2011-11-25 22:01:17 UTC (rev 6714)
@@ -22,7 +22,7 @@
</dependency>
<dependency>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <artifactId>ui-wrapper</artifactId>
+ <artifactId>ui-common</artifactId>
<type>nbm</type>
</dependency>
<dependency>
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/LoadStudy.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/LoadStudy.java 2011-11-25 22:00:04 UTC (rev 6713)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/LoadStudy.java 2011-11-25 22:01:17 UTC (rev 6714)
@@ -23,6 +23,7 @@
EMHProjetService service = Lookup.getDefault().lookup(EMHProjetService.class);
+ @Override
public void actionPerformed(ActionEvent e) {
service.load();
}
Copied: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/OpenScenario.java (from rev 6712, trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/CloseStudy.java)
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/OpenScenario.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/OpenScenario.java 2011-11-25 22:01:17 UTC (rev 6714)
@@ -0,0 +1,48 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.fudaa.fudaa.crue.study.actions;
+
+import org.fudaa.dodico.crue.metier.etude.ManagerEMHScenario;
+import org.fudaa.fudaa.crue.common.services.ModellingScenarioService;
+import org.fudaa.fudaa.crue.study.services.EMHProjetService;
+import org.openide.nodes.Node;
+import org.openide.util.HelpCtx;
+import org.openide.util.Lookup;
+import org.openide.util.NbBundle;
+import org.openide.util.actions.NodeAction;
+
+public final class OpenScenario extends NodeAction {
+
+ ModellingScenarioService scenarioService = Lookup.getDefault().lookup(ModellingScenarioService.class);
+ EMHProjetService projetService = Lookup.getDefault().lookup(EMHProjetService.class);
+
+ @Override
+ public HelpCtx getHelpCtx() {
+ return HelpCtx.DEFAULT_HELP;
+ }
+
+ protected ManagerEMHScenario getScenario(Node[] activatedNodes) {
+ if (activatedNodes != null && activatedNodes.length == 1) {
+ return activatedNodes[0].getLookup().lookup(ManagerEMHScenario.class);
+ }
+ return null;
+ }
+
+ @Override
+ protected boolean enable(Node[] activatedNodes) {
+ return projetService.getSelectedProject() != null && getScenario(activatedNodes) != null;
+ }
+
+ @Override
+ protected void performAction(Node[] activatedNodes) {
+ ManagerEMHScenario scenario = getScenario(activatedNodes);
+ scenarioService.loadScenario(projetService.getSelectedProject(), scenario);
+ }
+
+ @Override
+ public String getName() {
+ return NbBundle.getMessage(OpenFichierCrueNode.class, "OpenScenarioAction");
+ }
+}
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ManagerEMHScenarioNode.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ManagerEMHScenarioNode.java 2011-11-25 22:00:04 UTC (rev 6713)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ManagerEMHScenarioNode.java 2011-11-25 22:01:17 UTC (rev 6714)
@@ -8,6 +8,7 @@
import javax.swing.Action;
import org.fudaa.dodico.crue.metier.etude.ManagerEMHScenario;
import org.fudaa.fudaa.crue.common.property.AbstractNodeFirable;
+import org.fudaa.fudaa.crue.study.actions.OpenScenario;
import org.fudaa.fudaa.crue.study.property.ManagerEMHScenarioPropertyFactory;
import org.openide.actions.DeleteAction;
import org.openide.actions.PropertiesAction;
@@ -30,11 +31,14 @@
@Override
public Action[] getActions(boolean context) {
- Action[] result = new Action[]{SystemAction.get(DeleteAction.class), SystemAction.get(PropertiesAction.class)};
+ Action[] result = new Action[]{
+ SystemAction.get(OpenScenario.class),
+ SystemAction.get(DeleteAction.class),
+ SystemAction.get(PropertiesAction.class)
+ };
return result;
}
-
@Override
protected Sheet createSheet() {
return new ManagerEMHScenarioPropertyFactory().createSheet(this);
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/perspective/ActiveStudy.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/perspective/ActiveStudy.java 2011-11-25 22:00:04 UTC (rev 6713)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/perspective/ActiveStudy.java 2011-11-25 22:01:17 UTC (rev 6714)
@@ -4,7 +4,8 @@
*/
package org.fudaa.fudaa.crue.study.perspective;
-import org.fudaa.fudaa.crue.common.ActivePerspectiveAbstract;
+import org.fudaa.fudaa.crue.common.Perspective;
+import org.fudaa.fudaa.crue.common.action.ActivePerspectiveAbstract;
import org.openide.awt.ActionRegistration;
import org.openide.awt.ActionID;
import org.openide.awt.ActionReference;
@@ -16,6 +17,6 @@
public final class ActiveStudy extends ActivePerspectiveAbstract {
public ActiveStudy() {
- super("CTL_ActiveStudy", PerspectiveServiceStudy.class.getName());
+ super("CTL_ActiveStudy", PerspectiveServiceStudy.class.getName(),Perspective.STUDY);
}
}
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/property/ManagerEMHScenarioPropertyFactory.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/property/ManagerEMHScenarioPropertyFactory.java 2011-11-25 22:00:04 UTC (rev 6713)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/property/ManagerEMHScenarioPropertyFactory.java 2011-11-25 22:01:17 UTC (rev 6714)
@@ -33,11 +33,11 @@
//type
PropertySupport.Reflection typeProp = new PropertySupport.Reflection(infosVersions, String.class, "getType", null);
configureNoCustomEditor(typeProp);
- setNameAndDisplayName(typeProp, TYPE_NAME, getClass());
+ setNameAndDisplayName(typeProp, TYPE_NAME);
//commentaire
Property commentaireProp = new PropertySupportReflection(node, infosVersions, String.class, "getCommentaire", "setCommentaire");
- setNameAndDisplayName(commentaireProp, COMMENTAIRE_NAME, getClass());
+ setNameAndDisplayName(commentaireProp, COMMENTAIRE_NAME);
commentaireProp.setPreferred(true);
configureNoEditAsText(commentaireProp);
//auteur derniere modif
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/EMHProjetService.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/EMHProjetService.java 2011-11-25 22:00:04 UTC (rev 6713)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/EMHProjetService.java 2011-11-25 22:01:17 UTC (rev 6714)
@@ -5,28 +5,18 @@
import java.io.IOException;
import org.fudaa.dodico.crue.metier.etude.EMHProjectInfos;
-import com.memoire.bu.BuFileFilter;
import java.io.File;
-import javax.swing.Icon;
-import javax.swing.filechooser.FileFilter;
-import org.fudaa.dodico.crue.io.Crue10FileFormatFactory;
-import org.fudaa.dodico.crue.io.common.CrueFileType;
import org.fudaa.dodico.crue.metier.etude.EMHProjet;
-import org.fudaa.dodico.crue.projet.coeur.TestCoeurConfig;
+import org.fudaa.fudaa.crue.common.CommonBundle;
import org.fudaa.fudaa.crue.common.property.listener.ListenerManager;
import org.fudaa.fudaa.crue.study.node.NodesManager;
-import org.netbeans.api.progress.ProgressUtils;
-import org.openide.filesystems.FileChooserBuilder;
-import org.openide.filesystems.FileChooserBuilder.BadgeProvider;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.Exceptions;
-import org.openide.util.ImageUtilities;
import org.openide.util.Lookup;
import org.openide.util.lookup.AbstractLookup;
import org.openide.util.lookup.InstanceContent;
import org.openide.util.lookup.ServiceProvider;
-import static org.fudaa.fudaa.crue.study.services.Bundle.*;
/**
* @author genesis
@@ -63,11 +53,15 @@
public void load() {
new OpenEtuAction().open(this);
}
+
+ private File etuFile;
- void activeProject(EMHProjet project) {
+ void activeProject(EMHProjet project,File etuFile) {
+ this.etuFile=etuFile;
nodesManager.setProject(project);
dynamicContent.add(project);
registerListener(project);
+ CommonBundle.modifyFrameTitle(etuFile.getAbsolutePath());
}
private void unactiveProject(EMHProjet currentProject) {
@@ -75,6 +69,7 @@
dynamicContent.remove(currentProject);
listeners.clean();
etuFolder = null;
+ CommonBundle.resetFrameTitle();
}
public EMHProjet getSelectedProject() {
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/FileChangeListenerEtudeDir.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/FileChangeListenerEtudeDir.java 2011-11-25 22:00:04 UTC (rev 6713)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/FileChangeListenerEtudeDir.java 2011-11-25 22:01:17 UTC (rev 6714)
@@ -4,7 +4,6 @@
*/
package org.fudaa.fudaa.crue.study.services;
-import org.fudaa.fudaa.crue.common.property.listener.ListenerManager;
import org.fudaa.fudaa.crue.common.property.listener.UnregisterableListener;
import org.openide.filesystems.FileAttributeEvent;
import org.openide.filesystems.FileChangeListener;
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/OpenEtuAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/OpenEtuAction.java 2011-11-25 22:00:04 UTC (rev 6713)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/OpenEtuAction.java 2011-11-25 22:01:17 UTC (rev 6714)
@@ -50,7 +50,7 @@
OpenFileProcess runner = new OpenFileProcess((toOpen));
EMHProjet project = ProgressUtils.showProgressDialogAndRun(runner, OpenEtuFileAction(toOpen.getName()), false);
if (project != null) {
- service.activeProject(project);
+ service.activeProject(project,toOpen);
}
}
}
Modified: trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/actions/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/actions/Bundle.properties 2011-11-25 22:00:04 UTC (rev 6713)
+++ trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/actions/Bundle.properties 2011-11-25 22:01:17 UTC (rev 6714)
@@ -2,3 +2,4 @@
CTL_CloseStudy=Fermer l'\u00e9tude courante
CTL_SaveScenario=Enregister EMHScenario
OpenFichierAction=Ouvrir le fichier
+OpenScenarioAction=Charger le sc\u00e9nario
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|