Menu
▾
▴
fudaa-svn-commit
|
From: <de...@us...> - 2011-11-11 22:18:06
|
Revision: 6664
http://fudaa.svn.sourceforge.net/fudaa/?rev=6664&view=rev
Author: deniger
Date: 2011-11-11 22:17:59 +0000 (Fri, 11 Nov 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/Crue10FileFormatFactory.java
trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
trunk/soft/fudaa-crue/ui-study/pom.xml
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/FileListTopComponent.java
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/node/ManagerEMHEtudeNode.java
trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/Bundle.properties
trunk/soft/fudaa-crue/ui-wrapper/pom.xml
Added Paths:
-----------
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/
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/LoadStudy.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ManagerScenarioChildFactory.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/Bundle.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/OpenFileProgress.java
trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/actions/
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/etude.gif
trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/services/
trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/services/Bundle.properties
Removed Paths:
-------------
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/LoadStudy.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ScenarioChildFactory.java
trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/Bundle_fr.properties
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/Crue10FileFormatFactory.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/Crue10FileFormatFactory.java 2011-11-11 09:45:50 UTC (rev 6663)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/Crue10FileFormatFactory.java 2011-11-11 22:17:59 UTC (rev 6664)
@@ -33,6 +33,7 @@
return version;
}
+
private final Map<CrueFileType, CrueFileFormatBuilder> fnts = new HashMap<CrueFileType, CrueFileFormatBuilder>();
private static final Crue10FileFormatFactory INSTANCE = new Crue10FileFormatFactory();
Modified: trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/Bundle.properties 2011-11-11 09:45:50 UTC (rev 6663)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/Bundle.properties 2011-11-11 22:17:59 UTC (rev 6664)
@@ -5,4 +5,5 @@
SplashProgressBarBounds=0,237,400,20
SplashProgressBarColor=0xFF
SplashRunningTextBounds=6,224,380,10
-SplashRunningTextFontSize=19
+SplashRunningTextColor=0xFF
+SplashRunningTextFontSize=12
Modified: trunk/soft/fudaa-crue/ui-study/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-study/pom.xml 2011-11-11 09:45:50 UTC (rev 6663)
+++ trunk/soft/fudaa-crue/ui-study/pom.xml 2011-11-11 22:17:59 UTC (rev 6664)
@@ -43,6 +43,11 @@
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
+ <artifactId>org-netbeans-api-progress</artifactId>
+ <version>${netbeans.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.api</groupId>
<artifactId>org-openide-util-lookup</artifactId>
<version>${netbeans.version}</version>
</dependency>
@@ -54,7 +59,7 @@
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-nodes</artifactId>
- <version>${netbeans.version}</version>
+ <version>RELEASE70</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
@@ -64,7 +69,7 @@
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-awt</artifactId>
- <version>${netbeans.version}</version>
+ <version>RELEASE70</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
@@ -76,7 +81,11 @@
<artifactId>org-netbeans-modules-settings</artifactId>
<version>${netbeans.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-openide-filesystems</artifactId>
+ <version>RELEASE70</version>
+ </dependency>
</dependencies>
<build>
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/FileListTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/FileListTopComponent.java 2011-11-11 09:45:50 UTC (rev 6663)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/FileListTopComponent.java 2011-11-11 22:17:59 UTC (rev 6664)
@@ -77,30 +77,7 @@
@Override
public void componentOpened() {
- Lookup.Result<EMHScenario> strings = Lookup.getDefault().lookupResult(EMHScenario.class);
- strings.allItems();
- strings.addLookupListener(new LookupListener() {
-
- @Override
- public void resultChanged(LookupEvent e) {
- System.err.println("scenario changed "+e);
- }
- });
-
- Result<EMHScenario> lookupResult1 = ScenariosTopComponent.findInstance().getLookup().lookupResult(EMHScenario.class);
- lookupResult1.addLookupListener(new LookupListener() {
-
- @Override
- public void resultChanged(LookupEvent le) {
- System.err.println("event " + le);
-
- EMHScenario lookupItem = Lookup.getDefault().lookup(EMHScenario.class);
- System.err.println(lookupItem);
- }
- });
-
-
// TODO add custom code on component opening
}
Deleted: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/LoadStudy.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/LoadStudy.java 2011-11-11 09:45:50 UTC (rev 6663)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/LoadStudy.java 2011-11-11 22:17:59 UTC (rev 6664)
@@ -1,29 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.fudaa.fudaa.crue.study;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import org.openide.awt.ActionRegistration;
-import org.openide.awt.ActionReference;
-import org.openide.awt.ActionReferences;
-import org.openide.awt.ActionID;
-import org.openide.loaders.DataFolder;
-import org.openide.util.lookup.Lookups;
-import org.openide.windows.TopComponentGroup;
-import org.openide.windows.WindowManager;
-
-@ActionID(category = "View",
-id = "org.fudaa.fudaa.crue.study.LoadStudy")
-@ActionRegistration(displayName = "#CTL_LoadStudy")
-@ActionReferences({
- @ActionReference(path = "Menu/Study", position = 3333, separatorBefore = 3283, separatorAfter = 3383)
-})
-public final class LoadStudy implements ActionListener {
-
- public void actionPerformed(ActionEvent e) {
- ScenariosTopComponent.findInstance().buildProject();
- }
-}
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 09:45:50 UTC (rev 6663)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/ScenariosTopComponent.java 2011-11-11 22:17:59 UTC (rev 6664)
@@ -4,17 +4,13 @@
*/
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;
-import org.fudaa.dodico.crue.config.CrueOptions;
-import org.fudaa.dodico.crue.metier.emh.EMHScenario;
import org.fudaa.dodico.crue.metier.etude.EMHProjet;
import org.fudaa.fudaa.crue.study.node.ManagerEMHEtudeNode;
-import org.fudaa.fudaa.crue.study.node.ScenarioChildFactory;
+import org.fudaa.fudaa.crue.study.services.EMHProjetService;
import org.openide.util.Lookup;
+import org.openide.util.LookupEvent;
import org.openide.util.NbBundle;
import org.openide.windows.TopComponent;
import org.netbeans.api.settings.ConvertAsProperties;
@@ -22,11 +18,8 @@
import org.openide.awt.ActionReference;
import org.openide.explorer.ExplorerManager;
import org.openide.explorer.ExplorerUtils;
-import org.openide.nodes.Children;
-import org.openide.util.LookupEvent;
+import org.openide.nodes.Node;
import org.openide.util.LookupListener;
-import org.openide.util.lookup.AbstractLookup;
-import org.openide.util.lookup.InstanceContent;
import org.openide.windows.WindowManager;
/**
@@ -42,13 +35,12 @@
@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, LookupListener {
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);
+ EMHProjetService service = Lookup.getDefault().lookup(EMHProjetService.class);
+ private final Lookup.Result<EMHProjet> resultat;
public ScenariosTopComponent() {
initComponents();
@@ -61,29 +53,24 @@
ActionMap map = this.getActionMap();
map.put("delete", ExplorerUtils.actionDelete(em, true)); //NOI18N
associateLookup(ExplorerUtils.createLookup(em, map));
+ resultat = service.getLookup().lookupResult(EMHProjet.class);
+ resultat.addLookupListener(this);
buildProject();
- content.add("Hello");
- strings = dynamicLookup.lookupResult(String.class);
- strings.addLookupListener(new LookupListener() {
+ }
- @Override
- public void resultChanged(LookupEvent e) {
- System.err.println("Yes " + e);
- }
- });
-
+ @Override
+ public void resultChanged(LookupEvent ev) {
+ buildProject();
}
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));
+ EMHProjet selectedProject = service.getSelectedProject();
+ if (selectedProject == null) {
+ em.setRootContext(Node.EMPTY);
+ } else {
+
+ em.setRootContext(new ManagerEMHEtudeNode(selectedProject));
+ }
}
@Override
Copied: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/CloseStudy.java (from rev 6659, trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/LoadStudy.java)
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/CloseStudy.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/CloseStudy.java 2011-11-11 22:17:59 UTC (rev 6664)
@@ -0,0 +1,54 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.fudaa.fudaa.crue.study.actions;
+
+import java.awt.event.ActionEvent;
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import org.fudaa.dodico.crue.metier.etude.EMHProjet;
+import org.fudaa.fudaa.crue.study.services.EMHProjetService;
+import org.openide.awt.ActionRegistration;
+import org.openide.awt.ActionReference;
+import org.openide.awt.ActionReferences;
+import org.openide.awt.ActionID;
+import org.openide.util.ContextAwareAction;
+import org.openide.util.Lookup;
+import org.openide.util.Lookup.Result;
+import org.openide.util.LookupEvent;
+import org.openide.util.LookupListener;
+import org.openide.util.NbBundle;
+
+@ActionID(category = "View",
+id = "org.fudaa.fudaa.crue.study.actions.CloseStudy")
+@ActionRegistration(displayName = "#CTL_CloseStudy")
+@ActionReferences({
+ @ActionReference(path = "Menu/Study", position = 2)
+})
+public final class CloseStudy extends AbstractAction implements LookupListener, ContextAwareAction {
+
+ EMHProjetService service = Lookup.getDefault().lookup(EMHProjetService.class);
+ private final Result<EMHProjet> resultat;
+
+ public CloseStudy() {
+ setEnabled(false);
+ putValue(Action.NAME, NbBundle.getMessage(CloseStudy.class, "CTL_CloseStudy"));
+ resultat = service.getLookup().lookupResult(EMHProjet.class);
+ resultat.addLookupListener(this);
+ }
+
+ @Override
+ public Action createContextAwareInstance(Lookup actionContext) {
+ return new CloseStudy();
+ }
+
+ @Override
+ public void resultChanged(LookupEvent ev) {
+ setEnabled(service.isProjectOpened());
+ }
+
+ public void actionPerformed(ActionEvent e) {
+ service.close();
+ }
+}
Copied: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/LoadStudy.java (from rev 6659, trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/LoadStudy.java)
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/LoadStudy.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/LoadStudy.java 2011-11-11 22:17:59 UTC (rev 6664)
@@ -0,0 +1,29 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.fudaa.fudaa.crue.study.actions;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import org.fudaa.fudaa.crue.study.services.EMHProjetService;
+import org.openide.awt.ActionRegistration;
+import org.openide.awt.ActionReference;
+import org.openide.awt.ActionReferences;
+import org.openide.awt.ActionID;
+import org.openide.util.Lookup;
+
+@ActionID(category = "View",
+id = "org.fudaa.fudaa.crue.study.actions.LoadStudy")
+@ActionRegistration(displayName = "#CTL_LoadStudy")
+@ActionReferences({
+ @ActionReference(path = "Menu/Study", position = 1)
+})
+public final class LoadStudy implements ActionListener {
+
+ EMHProjetService service = Lookup.getDefault().lookup(EMHProjetService.class);
+
+ public void actionPerformed(ActionEvent e) {
+ service.load();
+ }
+}
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ManagerEMHEtudeNode.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ManagerEMHEtudeNode.java 2011-11-11 09:45:50 UTC (rev 6663)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ManagerEMHEtudeNode.java 2011-11-11 22:17:59 UTC (rev 6664)
@@ -7,23 +7,19 @@
import org.fudaa.dodico.crue.metier.etude.EMHProjet;
import org.openide.nodes.AbstractNode;
import org.openide.nodes.Children;
-import org.openide.util.Lookup;
import org.openide.util.lookup.Lookups;
/**
*
* @author deniger
*/
-public class ManagerEMHEtudeNode extends AbstractNode{
-
-
+public class ManagerEMHEtudeNode extends AbstractNode {
+
+ private final EMHProjet projet;
- public ManagerEMHEtudeNode(Children children,EMHProjet projet) {
- super(children,Lookups.singleton(projet));
- setDisplayName("Etude "+System.currentTimeMillis());
- }
-
-
-
-
+ public ManagerEMHEtudeNode(EMHProjet projet) {
+ super(Children.create(new ManagerScenarioChildFactory(projet.getListeScenarios()),false), Lookups.singleton(projet));
+ this.projet=projet;
+ setDisplayName("Etude " + System.currentTimeMillis());
+ }
}
Copied: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ManagerScenarioChildFactory.java (from rev 6659, trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ScenarioChildFactory.java)
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ManagerScenarioChildFactory.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ManagerScenarioChildFactory.java 2011-11-11 22:17:59 UTC (rev 6664)
@@ -0,0 +1,59 @@
+package org.fudaa.fudaa.crue.study.node;
+
+import java.io.IOException;
+import java.util.List;
+import javax.swing.Action;
+import org.fudaa.dodico.crue.metier.emh.EMHScenario;
+import org.fudaa.dodico.crue.metier.etude.ManagerEMHScenario;
+import org.openide.actions.DeleteAction;
+import org.openide.actions.PropertiesAction;
+import org.openide.nodes.AbstractNode;
+import org.openide.nodes.ChildFactory;
+import org.openide.nodes.Children;
+import org.openide.nodes.Node;
+import org.openide.util.actions.SystemAction;
+import org.openide.util.lookup.Lookups;
+
+public class ManagerScenarioChildFactory extends ChildFactory<ManagerEMHScenario> {
+
+ private List<ManagerEMHScenario> resultList;
+
+ public ManagerScenarioChildFactory(List<ManagerEMHScenario> resultList) {
+ this.resultList = resultList;
+ }
+
+ @Override
+ protected boolean createKeys(List<ManagerEMHScenario> list) {
+ for (ManagerEMHScenario customer : resultList) {
+ list.add(customer);
+ }
+ return true;
+ }
+
+ @Override
+ protected Node createNodeForKey(ManagerEMHScenario c) {
+ Node node = new AbstractNode(Children.LEAF, Lookups.singleton(c)) {
+
+ @Override
+ public Action[] getActions(boolean context) {
+ Action[] result = new Action[]{
+ SystemAction.get(DeleteAction.class),
+ SystemAction.get(PropertiesAction.class)
+ };
+ return result;
+ }
+
+ @Override
+ public boolean canDestroy() {
+ return true;
+ }
+
+ @Override
+ public void destroy() throws IOException {
+ super.destroy();
+ }
+ };
+ node.setDisplayName(c.getNom());
+ return node;
+ }
+}
Deleted: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ScenarioChildFactory.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ScenarioChildFactory.java 2011-11-11 09:45:50 UTC (rev 6663)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ScenarioChildFactory.java 2011-11-11 22:17:59 UTC (rev 6664)
@@ -1,63 +0,0 @@
-package org.fudaa.fudaa.crue.study.node;
-
-
-
-import java.io.IOException;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.swing.Action;
-import org.fudaa.dodico.crue.metier.emh.EMHScenario;
-import org.openide.actions.DeleteAction;
-import org.openide.actions.PropertiesAction;
-import org.openide.nodes.AbstractNode;
-import org.openide.nodes.ChildFactory;
-import org.openide.nodes.Children;
-import org.openide.nodes.Node;
-import org.openide.util.actions.SystemAction;
-import org.openide.util.lookup.Lookups;
-
-public class ScenarioChildFactory extends ChildFactory<EMHScenario> {
-
- private List<EMHScenario> resultList;
-
- public ScenarioChildFactory(List<EMHScenario> resultList) {
- this.resultList = resultList;
- }
-
- @Override
- protected boolean createKeys(List<EMHScenario> list) {
- for (EMHScenario customer : resultList) {
- list.add(customer);
- }
- return true;
- }
-
- @Override
- protected Node createNodeForKey(EMHScenario c) {
- Node node = new AbstractNode(Children.LEAF, Lookups.singleton(c)) {
-
- @Override
- public Action[] getActions(boolean context) {
- Action[] result = new Action[]{
- SystemAction.get(DeleteAction.class),
- SystemAction.get(PropertiesAction.class)
- };
- return result;
- }
-
- @Override
- public boolean canDestroy() {
- return true;
- }
-
- @Override
- public void destroy() throws IOException {
- super.destroy();
- }
- };
- node.setDisplayName(c.getNom());
- node.setShortDescription(c.getType());
- return node;
- }
-}
Added: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/Bundle.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/Bundle.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/Bundle.java 2011-11-11 22:17:59 UTC (rev 6664)
@@ -0,0 +1,33 @@
+package org.fudaa.fudaa.crue.study.services;
+
+class Bundle {
+ /**
+ * @return <i>Choisir fichier Etude (*.etu.xml)</i>
+ * @see EMHProjetService
+ */
+ static String ChooseEtu() {
+ return org.openide.util.NbBundle.getMessage(Bundle.class, "ChooseEtu");
+ }
+ /**
+ * @return <i>Fichier Etu</i>
+ * @see EMHProjetService
+ */
+ static String EtuFile() {
+ return org.openide.util.NbBundle.getMessage(Bundle.class, "EtuFile");
+ }
+ /**
+ * @return <i>Ouvrir l'étude</i>
+ * @see EMHProjetService
+ */
+ static String OpenEtu() {
+ return org.openide.util.NbBundle.getMessage(Bundle.class, "OpenEtu");
+ }
+ /**
+ * @return <i>Ouverture de l''étude </i>{@code arg0}
+ * @see EMHProjetService
+ */
+ static String OpenEtuFileAction(Object arg0) {
+ return org.openide.util.NbBundle.getMessage(Bundle.class, "OpenEtuFileAction", arg0);
+ }
+ private void Bundle() {}
+}
Added: 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 (rev 0)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/EMHProjetService.java 2011-11-11 22:17:59 UTC (rev 6664)
@@ -0,0 +1,123 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.fudaa.fudaa.crue.study.services;
+
+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.netbeans.api.progress.ProgressUtils;
+import org.openide.filesystems.FileChooserBuilder;
+import org.openide.filesystems.FileChooserBuilder.BadgeProvider;
+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
+ */
+@ServiceProvider(service = EMHProjetService.class)
+public class EMHProjetService implements Lookup.Provider {
+
+ private InstanceContent dynamicContent = new InstanceContent();
+ private Lookup projectLookup = new AbstractLookup(dynamicContent);
+
+ @Override
+ public Lookup getLookup() {
+ return projectLookup;
+ }
+
+ public void close() {
+ EMHProjet currentProject = getSelectedProject();
+ if (currentProject != null) {
+ dynamicContent.remove(currentProject);
+ }
+ }
+
+ public void load() {
+ EMHProjet currentProject = getSelectedProject();
+ if (currentProject != null) {
+ System.err.println("We must close it");
+ dynamicContent.remove(currentProject);
+ }
+ File home = new File(System.getProperty("user.home"), "DATA");
+ final FileChooserBuilder builder = new FileChooserBuilder(getClass()).setTitle(ChooseEtu()).
+ setDefaultWorkingDirectory(home).setApproveText(OpenEtu());
+ builder.setFilesOnly(true);
+ final BuFileFilter fileFilter = Crue10FileFormatFactory.getLastVersion(CrueFileType.ETU).createFileFilter();
+ final FileFilter composed = new FileFilter() {
+
+ @Override
+ public boolean accept(File f) {
+ return f != null && !f.isHidden() && fileFilter.accept(f);
+ }
+
+ @Override
+ public String getDescription() {
+ return EtuFile();
+ }
+ };
+ builder.setFileFilter(composed);
+ final EtuFileIconProvider badgeProvider = new EtuFileIconProvider(composed);
+
+ builder.setBadgeProvider(badgeProvider);
+
+ File toOpen = builder.showOpenDialog();
+ if (toOpen != null) {
+ OpenFileProgress runner = new OpenFileProgress((toOpen));
+ EMHProjet showProgressDialogAndRun = ProgressUtils.showProgressDialogAndRun(runner, OpenEtuFileAction(toOpen.getName()), false);
+ if (showProgressDialogAndRun != null) {
+ dynamicContent.add(showProgressDialogAndRun);
+ }
+ }
+ }
+
+ public EMHProjet getSelectedProject() {
+ return projectLookup.lookup(EMHProjet.class);
+ }
+
+ public boolean isProjectOpened() {
+ return getSelectedProject() != null;
+ }
+
+ private static class EtuFileIconProvider implements BadgeProvider {
+
+ private final FileFilter composed;
+ private final Icon icon = ImageUtilities.image2Icon(ImageUtilities.loadImage("org/fudaa/fudaa/crue/study/etude.gif"));
+
+ public EtuFileIconProvider(FileFilter composed) {
+ this.composed = composed;
+ }
+
+ @Override
+ public Icon getBadge(File file) {
+ if (isAccepted(file)) {
+ return icon;
+ }
+ return null;
+ }
+
+ public boolean isAccepted(File file) {
+ return file.isFile() && composed.accept(file);
+ }
+
+ @Override
+ public int getXOffset() {
+ return 0;
+ }
+
+ @Override
+ public int getYOffset() {
+ return 0;
+ }
+ }
+}
Added: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/OpenFileProgress.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/OpenFileProgress.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/OpenFileProgress.java 2011-11-11 22:17:59 UTC (rev 6664)
@@ -0,0 +1,38 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.fudaa.fudaa.crue.study.services;
+
+import java.io.File;
+import org.fudaa.dodico.crue.common.CrueOperationSimpleResult;
+import org.fudaa.dodico.crue.io.Crue10FileFormatFactory;
+import org.fudaa.dodico.crue.io.Crue10FileFormatFactory.VersionResult;
+import org.fudaa.dodico.crue.metier.etude.EMHProjet;
+import org.fudaa.dodico.crue.projet.EMHProjetController;
+import org.netbeans.api.progress.ProgressHandle;
+import org.netbeans.api.progress.ProgressRunnable;
+
+/**
+ *
+ * @author genesis
+ */
+public class OpenFileProgress implements ProgressRunnable<EMHProjet> {
+ private final File etuFile;
+
+ public OpenFileProgress(File etuFile) {
+ this.etuFile = etuFile;
+ }
+
+ @Override
+ public EMHProjet run(ProgressHandle handle) {
+ handle.switchToIndeterminate();
+
+ VersionResult findVersion = Crue10FileFormatFactory.findVersion(etuFile);
+ CrueOperationSimpleResult<EMHProjet> readProjet = EMHProjetController.readProjet(etuFile, findVersion.getVersion());
+ readProjet.getLogGroup().getLastLog().printResume();
+ handle.finish();
+ return readProjet.getResult();
+ }
+
+}
Modified: trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/Bundle.properties 2011-11-11 09:45:50 UTC (rev 6663)
+++ trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/Bundle.properties 2011-11-11 22:17:59 UTC (rev 6664)
@@ -1,13 +1,9 @@
-CTL_TestAction=Test
-CTL_TestTopComponent=Test Window
-HINT_TestTopComponent=This is a Test window
# Localized mo...
[truncated message content] |
|
From: <de...@us...> - 2011-11-15 15:13:31
|
Revision: 6670
http://fudaa.svn.sourceforge.net/fudaa/?rev=6670&view=rev
Author: deniger
Date: 2011-11-15 15:13:19 +0000 (Tue, 15 Nov 2011)
Log Message:
-----------
Modified Paths:
--------------
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/property/PropertyCrueUtils.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/property/PropertyManagerEMHScenarioFactory.java
Added Paths:
-----------
trunk/soft/fudaa-crue/ui-study/src/test/java/InplaceEditorString.java
trunk/soft/fudaa-crue/ui-study/src/test/java/PropertyEditorString.java
trunk/soft/fudaa-crue/ui-study/src/test/java/PropertyEditorStringEditable.java
trunk/soft/fudaa-crue/ui-wrapper/src/main/java/org/fudaa/fudaa/crue/common/property/
trunk/soft/fudaa-crue/ui-wrapper/src/main/java/org/fudaa/fudaa/crue/common/property/AbstractNodeFirable.java
trunk/soft/fudaa-crue/ui-wrapper/src/main/java/org/fudaa/fudaa/crue/common/property/PropertySupportReflection.java
Removed Paths:
-------------
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/property/InplaceEditorString.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/property/PropertyEditorString.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/property/PropertyEditorStringEditable.java
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-15 11:45:06 UTC (rev 6669)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ManagerEMHScenarioNode.java 2011-11-15 15:13:19 UTC (rev 6670)
@@ -5,19 +5,14 @@
package org.fudaa.fudaa.crue.study.node;
import java.io.IOException;
-import java.util.Date;
import javax.swing.Action;
-import org.fudaa.dodico.crue.metier.etude.EMHInfosVersion;
import org.fudaa.dodico.crue.metier.etude.ManagerEMHScenario;
+import org.fudaa.fudaa.crue.common.property.AbstractNodeFirable;
import org.fudaa.fudaa.crue.study.property.PropertyManagerEMHScenarioFactory;
-import org.joda.time.LocalDateTime;
import org.openide.actions.DeleteAction;
import org.openide.actions.PropertiesAction;
-import org.openide.nodes.AbstractNode;
import org.openide.nodes.Children;
-import org.openide.nodes.PropertySupport;
import org.openide.nodes.Sheet;
-import org.openide.util.Exceptions;
import org.openide.util.actions.SystemAction;
import org.openide.util.lookup.Lookups;
@@ -25,7 +20,7 @@
*
* @author genesis
*/
-public class ManagerEMHScenarioNode extends AbstractNode {
+public class ManagerEMHScenarioNode extends AbstractNodeFirable {
public ManagerEMHScenarioNode(Children children, ManagerEMHScenario scenario) {
super(children, Lookups.singleton(scenario));
@@ -39,9 +34,10 @@
return result;
}
+
@Override
protected Sheet createSheet() {
- return new PropertyManagerEMHScenarioFactory().createSheet(getLookup().lookup(ManagerEMHScenario.class));
+ return new PropertyManagerEMHScenarioFactory().createSheet(this);
}
@Override
Deleted: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/property/InplaceEditorString.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/property/InplaceEditorString.java 2011-11-15 11:45:06 UTC (rev 6669)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/property/InplaceEditorString.java 2011-11-15 15:13:19 UTC (rev 6670)
@@ -1,115 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.fudaa.fudaa.crue.study.property;
-
-import java.awt.Component;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.beans.PropertyEditor;
-import javax.swing.JComponent;
-import javax.swing.JLabel;
-import javax.swing.KeyStroke;
-import org.apache.commons.lang.ObjectUtils;
-import org.openide.explorer.propertysheet.InplaceEditor;
-import org.openide.explorer.propertysheet.PropertyEnv;
-import org.openide.explorer.propertysheet.PropertyModel;
-
-/**
- *
- * @author deniger
- */
-public class InplaceEditorString implements InplaceEditor, PropertyChangeListener {
-
- private PropertyEditor editor = null;
- PropertyEnv env = null;
- private JLabel label = new JLabel();
-
- @Override
- public void connect(PropertyEditor propertyEditor, PropertyEnv env) {
- editor = propertyEditor;
- this.env = env;
- env.addPropertyChangeListener(this);
- editor.addPropertyChangeListener(this);
- reset();
- }
-
- @Override
- public JComponent getComponent() {
- return label;
- }
-
- @Override
- public void clear() {
- editor.removePropertyChangeListener(this);
- this.env.removePropertyChangeListener(this);
- //avoid memory leaks:
- editor = null;
- model = null;
- }
-
- @Override
- public Object getValue() {
- return label.getText();
- }
-
- @Override
- public void setValue(Object object) {
- label.setText(ObjectUtils.toString(object));
- }
-
- @Override
- public boolean supportsTextEntry() {
- return true;
- }
-
- @Override
- public void reset() {
- String d = (String) editor.getValue();
- label.setText(ObjectUtils.toString(d));
- }
-
- @Override
- public KeyStroke[] getKeyStrokes() {
- return new KeyStroke[0];
- }
-
- @Override
- public PropertyEditor getPropertyEditor() {
- return editor;
- }
-
- @Override
- public PropertyModel getPropertyModel() {
- return model;
- }
- private PropertyModel model;
-
- @Override
- public void setPropertyModel(PropertyModel propertyModel) {
- this.model = propertyModel;
- }
-
- @Override
- public boolean isKnownComponent(Component component) {
- return component == label || label.isAncestorOf(component);
- }
-
- @Override
- public void addActionListener(ActionListener actionListener) {
- System.err.println("add");
- //do nothing - not needed for this component
- }
-
- public void removeActionListener(ActionListener actionListener) {
- System.err.println("remove");
- }
-
- @Override
- public void propertyChange(PropertyChangeEvent evt) {
- System.err.println(evt);
- }
-}
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/property/PropertyCrueUtils.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/property/PropertyCrueUtils.java 2011-11-15 11:45:06 UTC (rev 6669)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/property/PropertyCrueUtils.java 2011-11-15 15:13:19 UTC (rev 6670)
@@ -4,6 +4,7 @@
*/
package org.fudaa.fudaa.crue.study.property;
+import java.beans.FeatureDescriptor;
import org.openide.explorer.view.OutlineView;
import org.openide.nodes.Node;
import org.openide.util.NbBundle;
@@ -25,4 +26,11 @@
public static void addProperty(OutlineView view, String property) {
view.addPropertyColumn(property, NbBundle.getMessage(PropertyCrueUtils.class, property));
}
+
+ public static void configureNoCustomEditor(FeatureDescriptor typeProp) {
+ typeProp.setValue("suppressCustomEditor", Boolean.TRUE);
+ }
+ public static void configureNoEditAsText(FeatureDescriptor typeProp) {
+ typeProp.setValue("canEditAsText", Boolean.FALSE);
+ }
}
Deleted: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/property/PropertyEditorString.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/property/PropertyEditorString.java 2011-11-15 11:45:06 UTC (rev 6669)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/property/PropertyEditorString.java 2011-11-15 15:13:19 UTC (rev 6670)
@@ -1,44 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.fudaa.fudaa.crue.study.property;
-
-import java.beans.PropertyEditor;
-import java.beans.PropertyEditorManager;
-import java.beans.PropertyEditorSupport;
-import org.apache.commons.lang.ObjectUtils;
-import org.openide.explorer.propertysheet.ExPropertyEditor;
-import org.openide.explorer.propertysheet.InplaceEditor;
-import org.openide.explorer.propertysheet.PropertyEnv;
-
-/**
- *
- * @author genesis
- */
-public class PropertyEditorString extends PropertyEditorSupport implements ExPropertyEditor, InplaceEditor.Factory {
-
- InplaceEditorString editor;
- PropertyEditor findEditor;
-
- public PropertyEditorString() {
- findEditor = PropertyEditorManager.findEditor(String.class);
- System.err.println("findEditor " + findEditor.getClass());
- }
-
- @Override
- public String getAsText() {
- return ObjectUtils.toString(getValue());
- }
-
- public void attachEnv(PropertyEnv env) {
- env.registerInplaceEditorFactory(this);
- }
-
- public InplaceEditor getInplaceEditor() {
- if (editor == null) {
- editor = new InplaceEditorString();
- }
- return editor;
- }
-}
Deleted: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/property/PropertyEditorStringEditable.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/property/PropertyEditorStringEditable.java 2011-11-15 11:45:06 UTC (rev 6669)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/property/PropertyEditorStringEditable.java 2011-11-15 15:13:19 UTC (rev 6670)
@@ -1,42 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.fudaa.fudaa.crue.study.property;
-
-import java.awt.Component;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import javax.swing.JTextArea;
-
-/**
- *
- * @author deniger
- */
-public class PropertyEditorStringEditable extends PropertyEditorString {
-
- PropertyEditorStringEditable(){
-
- }
-
- @Override
- public Component getCustomEditor() {
- JTextArea res = new JTextArea();
- res.setRows(10);
- res.setText(getAsText());
- addPropertyChangeListener(new PropertyChangeListener() {
-
- @Override
- public void propertyChange(PropertyChangeEvent evt) {
- System.err.println("La");
- }
- });
-
- return res;
- }
-
- @Override
- public boolean supportsCustomEditor() {
- return true;
- }
-}
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/property/PropertyManagerEMHScenarioFactory.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/property/PropertyManagerEMHScenarioFactory.java 2011-11-15 11:45:06 UTC (rev 6669)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/property/PropertyManagerEMHScenarioFactory.java 2011-11-15 15:13:19 UTC (rev 6670)
@@ -6,7 +6,10 @@
import org.fudaa.dodico.crue.metier.etude.EMHInfosVersion;
import org.fudaa.dodico.crue.metier.etude.ManagerEMHScenario;
+import org.fudaa.fudaa.crue.common.property.PropertySupportReflection;
+import org.fudaa.fudaa.crue.study.node.ManagerEMHScenarioNode;
import org.joda.time.LocalDateTime;
+import org.openide.nodes.Node.Property;
import org.openide.nodes.PropertySupport;
import org.openide.nodes.Sheet;
import org.openide.util.Exceptions;
@@ -20,24 +23,31 @@
public static final String AUTEURMODIFICATION = "AuteurModification";
public static final String DATEMODIFICATION = "DateModification";
- public Sheet createSheet(ManagerEMHScenario scenario) {
+ public Sheet createSheet(final ManagerEMHScenarioNode node) {
+ ManagerEMHScenario scenario = node.getLookup().lookup(ManagerEMHScenario.class);
Sheet sheet = Sheet.createDefault();
Sheet.Set set = Sheet.createPropertiesSet();
try {
final EMHInfosVersion infosVersions = scenario.getInfosVersions();
+ //type
PropertySupport.Reflection typeProp = new PropertySupport.Reflection(infosVersions, String.class, "getType", null);
- typeProp.setPropertyEditorClass(PropertyEditorString.class);
+ configureNoCustomEditor(typeProp);
setNameAndDisplayName(typeProp, TYPE_NAME);
- PropertySupport.Reflection commentaireProp = new PropertySupport.Reflection(infosVersions, String.class, "getCommentaire", "setCommentaire");
+
+ //commentaire
+ Property commentaireProp = new PropertySupportReflection(node, infosVersions, String.class, "getCommentaire", "setCommentaire");
setNameAndDisplayName(commentaireProp, COMMENTAIRE_NAME);
- commentaireProp.setPropertyEditorClass(PropertyEditorStringEditable.class);
- PropertySupport.Reflection auteurModifProp = new PropertySupport.Reflection(infosVersions, String.class, "getAuteurDerniereModif", null);
+ commentaireProp.setPreferred(true);
+ configureNoEditAsText(commentaireProp);
+ //auteur derniere modif
+ Property auteurModifProp = new PropertySupport.Reflection(infosVersions, String.class, "getAuteurDerniereModif", null);
setNameAndDisplayName(auteurModifProp, AUTEURMODIFICATION);
- auteurModifProp.setPropertyEditorClass(PropertyEditorString.class);
+ configureNoCustomEditor(typeProp);
+ //date dernier modif.
PropertySupport.Reflection dateModifProp = new PropertySupport.Reflection(infosVersions, LocalDateTime.class, "getDateDerniereModif", null);
dateModifProp.setPropertyEditorClass(PropertyEditorLocalDateTime.class);
-
setNameAndDisplayName(dateModifProp, DATEMODIFICATION);
+ configureNoCustomEditor(typeProp);
set.put(typeProp);
set.put(commentaireProp);
set.put(auteurModifProp);
Copied: trunk/soft/fudaa-crue/ui-study/src/test/java/InplaceEditorString.java (from rev 6669, trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/property/InplaceEditorString.java)
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/test/java/InplaceEditorString.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-study/src/test/java/InplaceEditorString.java 2011-11-15 15:13:19 UTC (rev 6670)
@@ -0,0 +1,98 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+
+import java.awt.Component;
+import java.awt.event.ActionListener;
+import java.beans.PropertyEditor;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.KeyStroke;
+import org.apache.commons.lang.ObjectUtils;
+import org.openide.explorer.propertysheet.InplaceEditor;
+import org.openide.explorer.propertysheet.PropertyEnv;
+import org.openide.explorer.propertysheet.PropertyModel;
+
+/**
+ *
+ * @author deniger
+ */
+public class InplaceEditorString extends JLabel implements InplaceEditor {
+
+ private PropertyEditor editor = null;
+
+ @Override
+ public void connect(PropertyEditor propertyEditor, PropertyEnv env) {
+ editor = propertyEditor;
+ reset();
+ }
+
+ @Override
+ public JComponent getComponent() {
+ return this;
+ }
+
+ @Override
+ public void clear() {
+ //avoid memory leaks:
+ editor = null;
+ model = null;
+ }
+
+ @Override
+ public Object getValue() {
+ return getText();
+ }
+
+ @Override
+ public void setValue(Object object) {
+ setText(ObjectUtils.toString(object));
+ }
+
+ @Override
+ public boolean supportsTextEntry() {
+ return true;
+ }
+
+ @Override
+ public void reset() {
+ String d = (String) editor.getValue();
+ setText(ObjectUtils.toString(d));
+ }
+
+ @Override
+ public KeyStroke[] getKeyStrokes() {
+ return new KeyStroke[0];
+ }
+
+ @Override
+ public PropertyEditor getPropertyEditor() {
+ return editor;
+ }
+
+ @Override
+ public PropertyModel getPropertyModel() {
+ return model;
+ }
+ private PropertyModel model;
+
+ @Override
+ public void setPropertyModel(PropertyModel propertyModel) {
+ this.model = propertyModel;
+ }
+
+ @Override
+ public boolean isKnownComponent(Component component) {
+ return component == this || this.isAncestorOf(component);
+ }
+
+ @Override
+ public void addActionListener(ActionListener actionListener) {
+ //do nothing - not needed for this component
+ }
+
+ public void removeActionListener(ActionListener actionListener) {
+ }
+}
Copied: trunk/soft/fudaa-crue/ui-study/src/test/java/PropertyEditorString.java (from rev 6669, trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/property/PropertyEditorString.java)
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/test/java/PropertyEditorString.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-study/src/test/java/PropertyEditorString.java 2011-11-15 15:13:19 UTC (rev 6670)
@@ -0,0 +1,42 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+
+import java.beans.PropertyEditor;
+import java.beans.PropertyEditorManager;
+import java.beans.PropertyEditorSupport;
+import org.apache.commons.lang.ObjectUtils;
+import org.openide.explorer.propertysheet.ExPropertyEditor;
+import org.openide.explorer.propertysheet.InplaceEditor;
+import org.openide.explorer.propertysheet.PropertyEnv;
+
+/**
+ *
+ * @author genesis
+ */
+public class PropertyEditorString extends PropertyEditorSupport implements ExPropertyEditor, InplaceEditor.Factory {
+
+ InplaceEditorString editor;
+ PropertyEditor findEditor;
+
+ public PropertyEditorString() {
+ }
+
+ @Override
+ public String getAsText() {
+ return ObjectUtils.toString(getValue());
+ }
+
+ public void attachEnv(PropertyEnv env) {
+ env.registerInplaceEditorFactory(this);
+ }
+
+ public InplaceEditor getInplaceEditor() {
+ if (editor == null) {
+ editor = new InplaceEditorString();
+ }
+ return editor;
+ }
+}
Copied: trunk/soft/fudaa-crue/ui-study/src/test/java/PropertyEditorStringEditable.java (from rev 6669, trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/property/PropertyEditorStringEditable.java)
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/test/java/PropertyEditorStringEditable.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-study/src/test/java/PropertyEditorStringEditable.java 2011-11-15 15:13:19 UTC (rev 6670)
@@ -0,0 +1,105 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Rectangle;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyEditor;
+import java.beans.PropertyEditorManager;
+import java.beans.PropertyEditorSupport;
+import org.openide.explorer.propertysheet.ExPropertyEditor;
+import org.openide.explorer.propertysheet.InplaceEditor;
+import org.openide.explorer.propertysheet.PropertyEnv;
+
+/**
+ *
+ * @author deniger
+ */
+public class PropertyEditorStringEditable extends PropertyEditorSupport implements ExPropertyEditor, InplaceEditor.Factory {
+
+ PropertyEditor stringEditor;
+
+ public PropertyEditorStringEditable() {
+ stringEditor = PropertyEditorManager.findEditor(String.class);
+ }
+
+ @Override
+ public void attachEnv(PropertyEnv env) {
+ ((ExPropertyEditor) stringEditor).attachEnv(env);
+ env.registerInplaceEditorFactory(this);
+
+ }
+ InplaceEditorString editor;
+
+ @Override
+ public InplaceEditor getInplaceEditor() {
+ if (editor == null) {
+ editor = new InplaceEditorString();
+ }
+ return editor;
+ }
+
+ @Override
+ public void setValue(Object value) {
+ stringEditor.setValue(value);
+ }
+
+ @Override
+ public void setAsText(String text) throws IllegalArgumentException {
+ stringEditor.setAsText(text);
+ }
+
+ @Override
+ public void removePropertyChangeListener(PropertyChangeListener listener) {
+ stringEditor.removePropertyChangeListener(listener);
+ }
+
+ @Override
+ public void paintValue(Graphics gfx, Rectangle box) {
+ stringEditor.paintValue(gfx, box);
+ }
+
+ @Override
+ public boolean isPaintable() {
+ return stringEditor.isPaintable();
+ }
+
+ @Override
+ public Object getValue() {
+ return stringEditor.getValue();
+ }
+
+ @Override
+ public String[] getTags() {
+ return stringEditor.getTags();
+ }
+
+ @Override
+ public String getJavaInitializationString() {
+ return stringEditor.getJavaInitializationString();
+ }
+
+ @Override
+ public String getAsText() {
+ return stringEditor.getAsText();
+ }
+
+ @Override
+ public void addPropertyChangeListener(PropertyChangeListener listener) {
+ stringEditor.addPropertyChangeListener(listener);
+ }
+
+ @Override
+ public Component getCustomEditor() {
+ return stringEditor.getCustomEditor();
+ }
+
+ @Override
+ public boolean supportsCustomEditor() {
+ return stringEditor.supportsCustomEditor();
+ }
+}
Added: trunk/soft/fudaa-crue/ui-wrapper/src/main/java/org/fudaa/fudaa/crue/common/property/AbstractNodeFirable.java
===================================================================
--- trunk/soft/fudaa-crue/ui-wrapper/src/main/java/org/fudaa/fudaa/crue/common/property/AbstractNodeFirable.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-wrapper/src/main/java/org/fudaa/fudaa/crue/common/property/AbstractNodeFirable.java 2011-11-15 15:13:19 UTC (rev 6670)
@@ -0,0 +1,29 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.fudaa.fudaa.crue.common.property;
+
+import org.openide.nodes.AbstractNode;
+import org.openide.nodes.Children;
+import org.openide.util.Lookup;
+
+/**
+ *
+ * @author genesis
+ */
+public abstract class AbstractNodeFirable extends AbstractNode {
+
+ public AbstractNodeFirable(Children children, Lookup lookup) {
+ super(children, lookup);
+ }
+
+ public AbstractNodeFirable(Children children) {
+ super(children);
+ }
+
+ protected void fireObjectChange(String property, Object oldValue, Object newValue) {
+ super.firePropertyChange(property, oldValue, newValue);
+
+ }
+}
Added: trunk/soft/fudaa-crue/ui-wrapper/src/main/java/org/fudaa/fudaa/crue/common/property/PropertySupportReflection.java
===================================================================
--- trunk/soft/fudaa-crue/ui-wrapper/src/main/java/org/fudaa/fudaa/crue/common/property/PropertySupportReflection.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-wrapper/src/main/java/org/fudaa/fudaa/crue/common/property/PropertySupportReflection.java 2011-11-15 15:13:19 UTC (rev 6670)
@@ -0,0 +1,61 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.fudaa.fudaa.crue.common.property;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import org.apache.commons.lang.ObjectUtils;
+import org.openide.nodes.PropertySupport;
+
+/**
+ *
+ * Une propriété qui envoie des evts via AbstractNodeFirable
+ * @author genesis
+ */
+public class PropertySupportReflection extends PropertySupport.Reflection {
+
+ private final AbstractNodeFirable node;
+
+ /**
+ *
+ * @param node le node contenant l'objet. Enverra les evts.
+ * @param instance
+ * @param valueType
+ * @param property
+ * @throws NoSuchMethodException
+ */
+ public PropertySupportReflection(AbstractNodeFirable node, Object instance, Class valueType, String property) throws NoSuchMethodException {
+ super(instance, valueType, property);
+ this.node = node;
+ }
+
+ public PropertySupportReflection(AbstractNodeFirable node, Object instance, Class valueType, String getter, String setter) throws NoSuchMethodException {
+ super(instance, valueType, getter, setter);
+ this.node = node;
+ }
+
+ public PropertySupportReflection(AbstractNodeFirable node, Object instance, Class valueType, Method getter, Method setter) {
+ super(instance, valueType, getter, setter);
+ this.node = node;
+ }
+
+ /**
+ * Envoie un evt s'il la propriété est modifiée.
+ *
+ * @param val
+ * @throws IllegalAccessException
+ * @throws IllegalArgumentException
+ * @throws InvocationTargetException
+ */
+ @Override
+ public void setValue(Object val) throws IllegalAccessException, IllegalArgumentException, InvocationTargetException {
+ Object old = getValue();
+ if (!ObjectUtils.equals(val, old)) {
+ super.setValue(val);
+ node.fireObjectChange(getName(), old, val);
+ }
+
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2011-11-16 23:07:49
|
Revision: 6674
http://fudaa.svn.sourceforge.net/fudaa/?rev=6674&view=rev
Author: deniger
Date: 2011-11-16 23:07:42 +0000 (Wed, 16 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/src/main/nbm-branding/modules/org-netbeans-core-ui.jar/org/netbeans/core/ui/resources/Bundle_fr.properties
trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-openide-actions.jar/org/openide/actions/Bundle_fr.properties
trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/layer.xml
trunk/soft/fudaa-crue/ui-study/pom.xml
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/FileListTopComponent.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/FichierCrueNode.java
trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/actions/Bundle.properties
trunk/soft/fudaa-crue/ui-wrapper/pom.xml
Added Paths:
-----------
trunk/soft/fudaa-crue/ui-options/
trunk/soft/fudaa-crue/ui-options/pom.xml
trunk/soft/fudaa-crue/ui-options/src/
trunk/soft/fudaa-crue/ui-options/src/main/
trunk/soft/fudaa-crue/ui-options/src/main/java/
trunk/soft/fudaa-crue/ui-options/src/main/java/org/
trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/
trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/
trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/
trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/
trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/Crue9OptionsPanelController.java
trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/Crue9Panel.form
trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/Crue9Panel.java
trunk/soft/fudaa-crue/ui-options/src/main/nbm/
trunk/soft/fudaa-crue/ui-options/src/main/nbm/manifest.mf
trunk/soft/fudaa-crue/ui-options/src/main/nbm/module.xml
trunk/soft/fudaa-crue/ui-options/src/main/resources/
trunk/soft/fudaa-crue/ui-options/src/main/resources/org/
trunk/soft/fudaa-crue/ui-options/src/main/resources/org/fudaa/
trunk/soft/fudaa-crue/ui-options/src/main/resources/org/fudaa/fudaa/
trunk/soft/fudaa-crue/ui-options/src/main/resources/org/fudaa/fudaa/crue/
trunk/soft/fudaa-crue/ui-options/src/main/resources/org/fudaa/fudaa/crue/options/
trunk/soft/fudaa-crue/ui-options/src/main/resources/org/fudaa/fudaa/crue/options/Bundle.properties
trunk/soft/fudaa-crue/ui-options/src/main/resources/org/fudaa/fudaa/crue/options/frame.gif
trunk/soft/fudaa-crue/ui-options/src/main/resources/org/fudaa/fudaa/crue/options/layer.xml
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/OpenFichierCrueNode.java
Modified: trunk/soft/fudaa-crue/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/pom.xml 2011-11-15 22:56:47 UTC (rev 6673)
+++ trunk/soft/fudaa-crue/pom.xml 2011-11-16 23:07:42 UTC (rev 6674)
@@ -41,6 +41,7 @@
<module>ui-post</module>
<module>ui-otfa</module>
<module>ui-application</module>
+ <module>ui-options</module>
</modules>
<dependencyManagement>
<dependencies>
@@ -74,6 +75,12 @@
</dependency>
<dependency>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
+ <artifactId>ui-options</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-15 22:56:47 UTC (rev 6673)
+++ trunk/soft/fudaa-crue/ui-application/pom.xml 2011-11-16 23:07:42 UTC (rev 6674)
@@ -56,7 +56,11 @@
<artifactId>ui-otfa</artifactId>
<type>nbm</type>
</dependency>
-
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>ui-options</artifactId>
+ <type>nbm</type>
+ </dependency>
</dependencies>
<build>
Modified: trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-core-ui.jar/org/netbeans/core/ui/resources/Bundle_fr.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-core-ui.jar/org/netbeans/core/ui/resources/Bundle_fr.properties 2011-11-15 22:56:47 UTC (rev 6673)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-core-ui.jar/org/netbeans/core/ui/resources/Bundle_fr.properties 2011-11-16 23:07:42 UTC (rev 6674)
@@ -1 +1,3 @@
Menu/Edit=&Edition
+Actions/Tools=Outils
+Menu/Tools=&Outils
Modified: trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties 2011-11-15 22:56:47 UTC (rev 6673)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties 2011-11-16 23:07:42 UTC (rev 6674)
@@ -1,3 +1,2 @@
-
CTL_MainWindow_Title=Fudaa-Crue {0}
CTL_MainWindow_Title_No_Project=Fudaa-Crue {0}
Modified: trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-openide-actions.jar/org/openide/actions/Bundle_fr.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-openide-actions.jar/org/openide/actions/Bundle_fr.properties 2011-11-15 22:56:47 UTC (rev 6673)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-openide-actions.jar/org/openide/actions/Bundle_fr.properties 2011-11-16 23:07:42 UTC (rev 6674)
@@ -6,3 +6,4 @@
RedoSimple=&Refaire
Rename=Renommer...
UndoSimple=&D\u00e9faire
+CTL_Tools=Outils
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-15 22:56:47 UTC (rev 6673)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/layer.xml 2011-11-16 23:07:42 UTC (rev 6674)
@@ -27,8 +27,7 @@
<folder name="Help_hidden"/>
<file name="Refactoring_hidden"/>
<file name="RunProject_hidden"/>
- <file name="View_hidden"/>
- <file name="Tools_hidden"/>
+ <file name="View_hidden"/>
<folder name="Window">
<file name="CloneDocumentAction.shadow_hidden"/>
<file name="CloseAllButThisAction.shadow_hidden"/>
@@ -49,9 +48,6 @@
<file name="Memory_hidden"/>
</folder>
<folder name="Windows2">
- <folder name="Components">
- <file name="properties.settings_hidden"/>
- </folder>
<folder name="Modes">
<file name="properties.wsmode" url="/modes/propertiesWsmode.xml"/>
<file name="rightTopMode.wsmode" url="/modes/rightTopMode.wsmode"/>
Property changes on: trunk/soft/fudaa-crue/ui-options
___________________________________________________________________
Added: svn:ignore
+ target
Added: trunk/soft/fudaa-crue/ui-options/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-options/pom.xml (rev 0)
+++ trunk/soft/fudaa-crue/ui-options/pom.xml 2011-11-16 23:07:42 UTC (rev 6674)
@@ -0,0 +1,129 @@
+<?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-options</artifactId>
+ <name>Crue UI Options</name>
+ <packaging>nbm</packaging>
+
+ <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.fudaa.soft.fudaa-crue</groupId>
+ <artifactId>ui-wrapper</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-windows</artifactId>
+ <version>${netbeans.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-netbeans-swing-outline</artifactId>
+ <version>${netbeans.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-openide-util</artifactId>
+ <version>RELEASE70</version>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-netbeans-api-progress</artifactId>
+ <version>${netbeans.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-openide-util-lookup</artifactId>
+ <version>RELEASE70</version>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-openide-explorer</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-actions</artifactId>
+ <version>${netbeans.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-openide-awt</artifactId>
+ <version>RELEASE70</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>
+ <dependency>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-openide-filesystems</artifactId>
+ <version>${netbeans.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-netbeans-modules-options-api</artifactId>
+ <version>RELEASE70</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>
+ <!-- to have the jar plugin pickup the nbm generated manifest -->
+ <useDefaultManifestFile>true</useDefaultManifestFile>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added: trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/Crue9OptionsPanelController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/Crue9OptionsPanelController.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/Crue9OptionsPanelController.java 2011-11-16 23:07:42 UTC (rev 6674)
@@ -0,0 +1,76 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.fudaa.fudaa.crue.options;
+
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
+import javax.swing.JComponent;
+import org.netbeans.spi.options.OptionsPanelController;
+import org.openide.util.HelpCtx;
+import org.openide.util.Lookup;
+
+@OptionsPanelController.TopLevelRegistration(categoryName = "#OptionsCategory_Name_Crue9",
+iconBase = "org/fudaa/fudaa/crue/options/frame.gif",
+keywords = "#OptionsCategory_Keywords_Crue9",
+keywordsCategory = "Crue9")
+public final class Crue9OptionsPanelController extends OptionsPanelController {
+
+ private Crue9Panel panel;
+ private final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
+ private boolean changed;
+
+ public void update() {
+ getPanel().load();
+ changed = false;
+ }
+
+ public void applyChanges() {
+ getPanel().store();
+ changed = false;
+ }
+
+ public void cancel() {
+ // need not do anything special, if no changes have been persisted yet
+ }
+
+ public boolean isValid() {
+ return getPanel().valid();
+ }
+
+ public boolean isChanged() {
+ return changed;
+ }
+
+ public HelpCtx getHelpCtx() {
+ return null; // new HelpCtx("...ID") if you have a help set
+ }
+
+ public JComponent getComponent(Lookup masterLookup) {
+ return getPanel();
+ }
+
+ public void addPropertyChangeListener(PropertyChangeListener l) {
+ pcs.addPropertyChangeListener(l);
+ }
+
+ public void removePropertyChangeListener(PropertyChangeListener l) {
+ pcs.removePropertyChangeListener(l);
+ }
+
+ private Crue9Panel getPanel() {
+ if (panel == null) {
+ panel = new Crue9Panel(this);
+ }
+ return panel;
+ }
+
+ void changed() {
+ if (!changed) {
+ changed = true;
+ pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, false, true);
+ }
+ pcs.firePropertyChange(OptionsPanelController.PROP_VALID, null, null);
+ }
+}
Added: trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/Crue9Panel.form
===================================================================
--- trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/Crue9Panel.form (rev 0)
+++ trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/Crue9Panel.form 2011-11-16 23:07:42 UTC (rev 6674)
@@ -0,0 +1,70 @@
+<?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" alignment="0" attributes="0">
+ <EmptySpace max="-2" attributes="0"/>
+ <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
+ <EmptySpace type="unrelated" max="-2" attributes="0"/>
+ <Component id="jTextField1" min="-2" max="-2" attributes="0"/>
+ <EmptySpace max="-2" attributes="0"/>
+ <Component id="jButton1" min="-2" max="-2" attributes="0"/>
+ <EmptySpace pref="172" 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 min="-2" pref="24" max="-2" attributes="0"/>
+ <Group type="103" groupAlignment="3" attributes="0">
+ <Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
+ <Component id="jTextField1" alignment="3" min="-2" max="-2" attributes="0"/>
+ <Component id="jButton1" alignment="3" min="-2" pref="25" max="-2" attributes="0"/>
+ </Group>
+ <EmptySpace pref="19" max="32767" attributes="0"/>
+ </Group>
+ </Group>
+ </DimensionLayout>
+ </Layout>
+ <SubComponents>
+ <Component class="javax.swing.JLabel" name="jLabel1">
+ <Properties>
+ <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/fudaa/fudaa/crue/options/Bundle.properties" key="Crue9Panel.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
+ </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="org/fudaa/fudaa/crue/options/Bundle.properties" key="Crue9Panel.jTextField1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
+ </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="org/fudaa/fudaa/crue/options/Bundle.properties" key="Crue9Panel.jButton1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
+ </Property>
+ </Properties>
+ <Events>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton1ActionPerformed"/>
+ </Events>
+ </Component>
+ </SubComponents>
+</Form>
Added: trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/Crue9Panel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/Crue9Panel.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/Crue9Panel.java 2011-11-16 23:07:42 UTC (rev 6674)
@@ -0,0 +1,98 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.fudaa.fudaa.crue.options;
+
+final class Crue9Panel extends javax.swing.JPanel {
+
+ private final Crue9OptionsPanelController controller;
+
+ Crue9Panel(Crue9OptionsPanelController controller) {
+ this.controller = controller;
+ initComponents();
+ // TODO listen to changes in form fields and call controller.changed()
+ }
+
+ /** 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() {
+
+ jLabel1 = new javax.swing.JLabel();
+ jTextField1 = new javax.swing.JTextField();
+ jButton1 = new javax.swing.JButton();
+
+ org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(Crue9Panel.class, "Crue9Panel.jLabel1.text")); // NOI18N
+
+ jTextField1.setText(org.openide.util.NbBundle.getMessage(Crue9Panel.class, "Crue9Panel.jTextField1.text")); // NOI18N
+
+ org.openide.awt.Mnemonics.setLocalizedText(jButton1, org.openide.util.NbBundle.getMessage(Crue9Panel.class, "Crue9Panel.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()
+ .addComponent(jLabel1)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ .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(172, Short.MAX_VALUE))
+ );
+ layout.setVerticalGroup(
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addGap(24, 24, 24)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(jLabel1)
+ .addComponent(jTextField1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addContainerGap(19, Short.MAX_VALUE))
+ );
+ }// </editor-fold>//GEN-END:initComponents
+
+ private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
+ // TODO add your handling code here:
+ }//GEN-LAST:event_jButton1ActionPerformed
+
+ void load() {
+ // TODO read settings and initialize GUI
+ // Example:
+ // someCheckBox.setSelected(Preferences.userNodeForPackage(Crue9Panel.class).getBoolean("someFlag", false));
+ // or for org.openide.util with API spec. version >= 7.4:
+ // someCheckBox.setSelected(NbPreferences.forModule(Crue9Panel.class).getBoolean("someFlag", false));
+ // or:
+ // someTextField.setText(SomeSystemOption.getDefault().getSomeStringProperty());
+ }
+
+ void store() {
+ // TODO store modified settings
+ // Example:
+ // Preferences.userNodeForPackage(Crue9Panel.class).putBoolean("someFlag", someCheckBox.isSelected());
+ // or for org.openide.util with API spec. version >= 7.4:
+ // NbPreferences.forModule(Crue9Panel.class).putBoolean("someFlag", someCheckBox.isSelected());
+ // or:
+ // SomeSystemOption.getDefault().setSomeStringProperty(someTextField.getText());
+ }
+
+ boolean valid() {
+ // TODO check whether form is consistent and complete
+ return true;
+ }
+ // Variables declaration - do not modify//GEN-BEGIN:variables
+ private javax.swing.JButton jButton1;
+ private javax.swing.JLabel jLabel1;
+ private javax.swing.JTextField jTextField1;
+ // End of variables declaration//GEN-END:variables
+}
Added: trunk/soft/fudaa-crue/ui-options/src/main/nbm/manifest.mf
===================================================================
--- trunk/soft/fudaa-crue/ui-options/src/main/nbm/manifest.mf (rev 0)
+++ trunk/soft/fudaa-crue/ui-options/src/main/nbm/manifest.mf 2011-11-16 23:07:42 UTC (rev 6674)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+OpenIDE-Module-Localizing-Bundle: org/fudaa/fudaa/crue/options/Bundle.properties
+OpenIDE-Module-Layer: org/fudaa/fudaa/crue/options/layer.xml
Added: trunk/soft/fudaa-crue/ui-options/src/main/nbm/module.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-options/src/main/nbm/module.xml (rev 0)
+++ trunk/soft/fudaa-crue/ui-options/src/main/nbm/module.xml 2011-11-16 23:07:42 UTC (rev 6674)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nbm>
+ <!--
+ <moduleType>autoload</moduleType>
+ <codeNameBase>org.fudaa.fudaa.crue.options/1</codeNameBase>
+ <licenseName>Apache License, Version 2.0</licenseName>
+ <licenseFile>license.txt</licenseFile>
+ -->
+</nbm>
Added: trunk/soft/fudaa-crue/ui-options/src/main/resources/org/fudaa/fudaa/crue/options/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-options/src/main/resources/org/fudaa/fudaa/crue/options/Bundle.properties (rev 0)
+++ trunk/soft/fudaa-crue/ui-options/src/main/resources/org/fudaa/fudaa/crue/options/Bundle.properties 2011-11-16 23:07:42 UTC (rev 6674)
@@ -0,0 +1,7 @@
+AdvancedOption_DisplayName_Test=Test
+AdvancedOption_Keywords_Test=Test
+OptionsCategory_Keywords_Crue9=crue9
+OptionsCategory_Name_Crue9=Crue9
+Crue9Panel.jLabel1.text=exeCrue9
+Crue9Panel.jTextField1.text=jTextField1
+Crue9Panel.jButton1.text=jButton1
Added: trunk/soft/fudaa-crue/ui-options/src/main/resources/org/fudaa/fudaa/crue/options/frame.gif
===================================================================
(Binary files differ)
Property changes on: trunk/soft/fudaa-crue/ui-options/src/main/resources/org/fudaa/fudaa/crue/options/frame.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/soft/fudaa-crue/ui-options/src/main/resources/org/fudaa/fudaa/crue/options/layer.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-options/src/main/resources/org/fudaa/fudaa/crue/options/layer.xml (rev 0)
+++ trunk/soft/fudaa-crue/ui-options/src/main/resources/org/fudaa/fudaa/crue/options/layer.xml 2011-11-16 23:07:42 UTC (rev 6674)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
+<filesystem>
+ <folder name="Menu">
+ <folder name="Tools">
+ <file name="Separator1.instance_hidden"/>
+ <file name="Separator2.instance_hidden"/>
+ <file name="org-netbeans-modules-autoupdate-ui-actions-PluginManagerAction.shadow_hidden"/>
+ <file name="org-netbeans-modules-favorites-templates-TemplatesAction.shadow_hidden"/>
+ <file name="org-netbeans-modules-options-OptionsWindowAction-separatorBefore.instance_hidden"/>
+ <file name="org-openide-actions-ToolsAction.shadow_hidden"/>
+ </folder>
+ </folder>
+ <folder name="OptionsDialog">
+ <file name="Advanced.instance_hidden"/>
+ <file name="General.instance_hidden"/>
+ <file name="Keymaps.instance_hidden"/>
+ </folder>
+</filesystem>
Modified: trunk/soft/fudaa-crue/ui-study/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-study/pom.xml 2011-11-15 22:56:47 UTC (rev 6673)
+++ trunk/soft/fudaa-crue/ui-study/pom.xml 2011-11-16 23:07:42 UTC (rev 6674)
@@ -64,7 +64,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>
@@ -74,7 +74,7 @@
<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>
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/FileListTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/FileListTopComponent.java 2011-11-15 22:56:47 UTC (rev 6673)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/FileListTopComponent.java 2011-11-16 23:07:42 UTC (rev 6674)
@@ -4,12 +4,15 @@
*/
package org.fudaa.fudaa.crue.study;
+import java.awt.FlowLayout;
import java.beans.PropertyVetoException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import javax.swing.JButton;
import org.fudaa.dodico.crue.metier.etude.FichierCrue;
import org.fudaa.dodico.crue.metier.etude.ManagerEMHContainerBase;
+import org.fudaa.fudaa.crue.study.actions.OpenFichierCrueNode;
import org.fudaa.fudaa.crue.study.node.ListingFichierCrue;
import org.fudaa.fudaa.crue.study.node.NodesManager;
import org.openide.nodes.Node;
@@ -39,41 +42,45 @@
@TopComponent.OpenActionRegis...
[truncated message content] |
|
From: <de...@us...> - 2011-11-25 22:00:11
|
Revision: 6713
http://fudaa.svn.sourceforge.net/fudaa/?rev=6713&view=rev
Author: deniger
Date: 2011-11-25 22:00:04 +0000 (Fri, 25 Nov 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-common/pom.xml
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/CommonBundle.java
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/Perspective.java
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/property/PropertyCrueUtils.java
trunk/soft/fudaa-crue/ui-common/src/main/nbm/manifest.mf
trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/Bundle.properties
Added Paths:
-----------
trunk/soft/fudaa-crue/ui-common/
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/Installer.java
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/action/
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/action/ActivePerspectiveAbstract.java
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/action/ResetWindowsAction.java
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/ModellingScenarioService.java
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/SelectedPerspectiveService.java
trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/action/
trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/action/Bundle.properties
Removed Paths:
-------------
trunk/soft/fudaa-crue/ui-branding/src/main/java/org/fudaa/fudaa/crue/branding/
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/ActivePerspectiveAbstract.java
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/ResetWindowsAction.java
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/SelectedPerspectiveService.java
trunk/soft/fudaa-crue/ui-wrapper/
Modified: trunk/soft/fudaa-crue/ui-common/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-wrapper/pom.xml 2011-11-25 15:28:39 UTC (rev 6712)
+++ trunk/soft/fudaa-crue/ui-common/pom.xml 2011-11-25 22:00:04 UTC (rev 6713)
@@ -7,7 +7,7 @@
<version>0.38-SNAPSHOT</version>
</parent>
- <artifactId>ui-wrapper</artifactId>
+ <artifactId>ui-common</artifactId>
<packaging>nbm</packaging>
<name>Crue UI Common</name>
@@ -24,15 +24,20 @@
<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>
<artifactId>org-netbeans-modules-settings</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-openide-explorer</artifactId>
<version>${netbeans.version}</version>
</dependency>
@@ -49,7 +54,7 @@
<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>
@@ -59,12 +64,12 @@
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-windows</artifactId>
- <version>RELEASE70</version>
+ <version>${netbeans.version}</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-util-lookup</artifactId>
- <version>RELEASE70</version>
+ <version>${netbeans.version}</version>
</dependency>
</dependencies>
@@ -77,6 +82,7 @@
<configuration>
<publicPackages>
<publicPackage>org.*</publicPackage>
+ <publicPackage>org.fudaa.dodico.crue.*</publicPackage>
<publicPackage>com.memoire.*</publicPackage>
</publicPackages>
</configuration>
Deleted: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/ActivePerspectiveAbstract.java
===================================================================
--- trunk/soft/fudaa-crue/ui-wrapper/src/main/java/org/fudaa/fudaa/crue/common/ActivePerspectiveAbstract.java 2011-11-25 15:28:39 UTC (rev 6712)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/ActivePerspectiveAbstract.java 2011-11-25 22:00:04 UTC (rev 6713)
@@ -1,61 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.fudaa.fudaa.crue.common;
-
-import java.awt.event.ActionEvent;
-
-import org.fudaa.fudaa.crue.common.services.SelectedPerspectiveService;
-import org.openide.util.HelpCtx;
-import org.openide.util.Lookup;
-import org.openide.util.LookupEvent;
-import org.openide.util.LookupListener;
-import org.openide.util.NbBundle;
-import org.openide.util.actions.BooleanStateAction;
-
-public abstract class ActivePerspectiveAbstract extends BooleanStateAction implements LookupListener {
-
- private Lookup.Result result = null;
- SelectedPerspectiveService service = Lookup.getDefault().lookup(SelectedPerspectiveService.class);
- private final String perspectiveId;
-
- public ActivePerspectiveAbstract(String textCode, String perspectiveId) {
- putValue(NAME, NbBundle.getMessage(getClass(), textCode));
- putValue(SHORT_DESCRIPTION, getValue(NAME));
- this.perspectiveId = perspectiveId;
- setBooleanState(false);
- result = service.getLookup().lookupResult(String.class);
- result.allItems();
- result.addLookupListener(this);
-
- }
-
- @Override
- public void resultChanged(LookupEvent lookupEvent) {
- boolean isSelectedPerspective = result.allInstances().contains(getName());
- setBooleanState(isSelectedPerspective);
- if (isSelectedPerspective) {
- setEnabled(false);
- } else {
- setEnabled(true);
- }
- }
-
- @Override
- public String getName() {
- return (String) getValue(NAME);
- }
-
- @Override
- public HelpCtx getHelpCtx() {
- return new HelpCtx(getClass());
- }
-
- @Override
- public void actionPerformed(ActionEvent ev) {
- if (service.activePerspective(perspectiveId)) {
- super.actionPerformed(ev);
- }
- }
-}
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/CommonBundle.java
===================================================================
--- trunk/soft/fudaa-crue/ui-wrapper/src/main/java/org/fudaa/fudaa/crue/common/CommonBundle.java 2011-11-25 15:28:39 UTC (rev 6712)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/CommonBundle.java 2011-11-25 22:00:04 UTC (rev 6713)
@@ -4,14 +4,30 @@
*/
package org.fudaa.fudaa.crue.common;
+import java.text.MessageFormat;
+import org.openide.util.NbBundle;
+import org.openide.windows.WindowManager;
+
/**
*
* @author genesis
*/
public class CommonBundle {
-
- private CommonBundle(){
-
+
+ public static String getDefaultFrameTitle() {
+ return MessageFormat.format(
+ NbBundle.getBundle("org.netbeans.core.startup.Bundle").getString("currentVersion"),
+ new Object[]{System.getProperty("netbeans.buildnumber")});
}
-
+
+ public static void resetFrameTitle() {
+ WindowManager.getDefault().getMainWindow().setTitle(getDefaultFrameTitle());
+ }
+
+ public static void modifyFrameTitle(String title) {
+ WindowManager.getDefault().getMainWindow().setTitle(title + " | " + getDefaultFrameTitle());
+ }
+
+ private CommonBundle() {
+ }
}
Copied: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/Installer.java (from rev 6712, trunk/soft/fudaa-crue/ui-branding/src/main/java/org/fudaa/fudaa/crue/branding/Installer.java)
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/Installer.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/Installer.java 2011-11-25 22:00:04 UTC (rev 6713)
@@ -0,0 +1,51 @@
+package org.fudaa.fudaa.crue.common;
+
+import org.openide.modules.ModuleInfo;
+import org.openide.modules.ModuleInstall;
+import org.openide.util.Lookup;
+import org.openide.util.Lookup.Item;
+import org.openide.util.actions.BooleanStateAction;
+import org.openide.util.lookup.Lookups;
+import org.openide.windows.WindowManager;
+
+public class Installer extends ModuleInstall implements Runnable {
+
+ @Override
+ protected void initialize() {
+ WindowManager.getDefault().invokeWhenUIReady(this);
+ }
+
+ @Override
+ public void validate() throws IllegalStateException {
+ super.validate();
+ }
+
+ @Override
+ public void restored() {
+
+ Lookup.Template<ModuleInfo> template = new Lookup.Template<ModuleInfo>(ModuleInfo.class, "Module[org.fudaa.soft.fudaa.crue.ui.branding", null);
+ Item<ModuleInfo> modules = Lookup.getDefault().lookupItem(template);
+ if (modules != null) {
+ ModuleInfo instance = modules.getInstance();
+ if (instance != null) {
+ System.setProperty("netbeans.buildnumber", instance.getImplementationVersion());
+ }
+ }
+ WindowManager.getDefault().invokeWhenUIReady(this);
+ }
+
+ @Override
+ public void run() {
+ final String folder = "Actions/File/";
+ final String actionId = folder + "org-fudaa-fudaa-crue-study-perspective-ActiveStudy";
+ Lookup.Template<BooleanStateAction> template = new Lookup.Template<BooleanStateAction>(BooleanStateAction.class, actionId, null);
+ Item<BooleanStateAction> lookupAll = Lookups.forPath(folder).lookupItem(template);
+ if (lookupAll == null) {
+ //TODO faire du log avec slf4j.
+ System.err.println(actionId + " must be set to set to the default action to activate");
+ } else {
+ lookupAll.getInstance().actionPerformed(null);
+ }
+
+ }
+}
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/Perspective.java
===================================================================
--- trunk/soft/fudaa-crue/ui-wrapper/src/main/java/org/fudaa/fudaa/crue/common/Perspective.java 2011-11-25 15:28:39 UTC (rev 6712)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/Perspective.java 2011-11-25 22:00:04 UTC (rev 6713)
@@ -1,24 +1,13 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
package org.fudaa.fudaa.crue.common;
/**
*
- * @author genesis
+ * @author deniger ( genesis)
*/
-public class Perspective {
-
- private final String actionName;
+public enum Perspective {
- public Perspective(String actionName) {
- this.actionName = actionName;
- }
-
- public String getActionName() {
- return actionName;
- }
-
-
+ STUDY,
+ MODELLING,
+ POST,
+ TEST;
}
Deleted: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/ResetWindowsAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-wrapper/src/main/java/org/fudaa/fudaa/crue/common/ResetWindowsAction.java 2011-11-25 15:28:39 UTC (rev 6712)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/ResetWindowsAction.java 2011-11-25 22:00:04 UTC (rev 6713)
@@ -1,57 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.fudaa.fudaa.crue.common;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.Set;
-import javax.swing.SwingUtilities;
-import org.fudaa.fudaa.crue.common.services.SelectedPerspectiveService;
-import org.openide.awt.ActionRegistration;
-import org.openide.awt.ActionReference;
-import org.openide.awt.ActionReferences;
-import org.openide.awt.ActionID;
-import org.openide.util.Lookup;
-import org.openide.util.Lookup.Item;
-import org.openide.util.lookup.Lookups;
-import org.openide.windows.TopComponent;
-import org.openide.windows.WindowManager;
-
-@ActionID(category = "Window",
-id = "org.fudaa.fudaa.crue.common.ResetWindowsAction")
-@ActionRegistration(displayName = "#CTL_ResetWindowsAction")
-@ActionReferences({
- @ActionReference(path = "Menu/Window", position = 3333)
-})
-public final class ResetWindowsAction implements ActionListener {
-
- SelectedPerspectiveService service = Lookup.getDefault().lookup(SelectedPerspectiveService.class);
-
- @Override
- public void actionPerformed(ActionEvent e) {
- final String folder = "Actions/Window/";
- final String actionId = folder + "org-netbeans-core-windows-actions-ResetWindowsAction";
- Lookup.Template<ActionListener> template = new Lookup.Template<ActionListener>(ActionListener.class, actionId, null);
- Item<ActionListener> lookupAll = Lookups.forPath(folder).lookupItem(template);
- if (lookupAll == null) {
- //TODO faire du log avec slf4j.
- System.err.println(actionId + " must be set to set to the default action to activate");
- } else {
- Set<TopComponent> opened = WindowManager.getDefault().getRegistry().getOpened();
- for (TopComponent topComponent : opened) {
- topComponent.close();
- }
- lookupAll.getInstance().actionPerformed(null);
- SwingUtilities.invokeLater(new Runnable() {
-
- @Override
- public void run() {
- service.rebuildCurrentPerspective();
- }
- });
-
- }
- }
-}
Copied: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/action/ActivePerspectiveAbstract.java (from rev 6712, trunk/soft/fudaa-crue/ui-wrapper/src/main/java/org/fudaa/fudaa/crue/common/ActivePerspectiveAbstract.java)
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/action/ActivePerspectiveAbstract.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/action/ActivePerspectiveAbstract.java 2011-11-25 22:00:04 UTC (rev 6713)
@@ -0,0 +1,63 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.fudaa.fudaa.crue.common.action;
+
+import java.awt.event.ActionEvent;
+
+import org.fudaa.fudaa.crue.common.Perspective;
+import org.fudaa.fudaa.crue.common.services.SelectedPerspectiveService;
+import org.openide.util.HelpCtx;
+import org.openide.util.Lookup;
+import org.openide.util.LookupEvent;
+import org.openide.util.LookupListener;
+import org.openide.util.NbBundle;
+import org.openide.util.actions.BooleanStateAction;
+
+public abstract class ActivePerspectiveAbstract extends BooleanStateAction implements LookupListener {
+
+ private Lookup.Result result = null;
+ SelectedPerspectiveService service = Lookup.getDefault().lookup(SelectedPerspectiveService.class);
+ private final Perspective perspectiveId;
+
+ public ActivePerspectiveAbstract(String textCode, String perspectiveId, Perspective perspective) {
+ putValue(NAME, NbBundle.getMessage(getClass(), textCode));
+ putValue(SHORT_DESCRIPTION, getValue(NAME));
+ this.perspectiveId = perspective;
+ setBooleanState(false);
+ result = service.getLookup().lookupResult(String.class);
+ result.allItems();
+ result.addLookupListener(this);
+ service.register(perspective, perspectiveId);
+
+ }
+
+ @Override
+ public void resultChanged(LookupEvent lookupEvent) {
+ boolean isSelectedPerspective = result.allInstances().contains(getName());
+ setBooleanState(isSelectedPerspective);
+ if (isSelectedPerspective) {
+ setEnabled(false);
+ } else {
+ setEnabled(true);
+ }
+ }
+
+ @Override
+ public String getName() {
+ return (String) getValue(NAME);
+ }
+
+ @Override
+ public HelpCtx getHelpCtx() {
+ return new HelpCtx(getClass());
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent ev) {
+ if (service.activePerspective(perspectiveId)) {
+ super.actionPerformed(ev);
+ }
+ }
+}
Copied: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/action/ResetWindowsAction.java (from rev 6712, trunk/soft/fudaa-crue/ui-wrapper/src/main/java/org/fudaa/fudaa/crue/common/ResetWindowsAction.java)
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/action/ResetWindowsAction.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/action/ResetWindowsAction.java 2011-11-25 22:00:04 UTC (rev 6713)
@@ -0,0 +1,57 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.fudaa.fudaa.crue.common.action;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Set;
+import javax.swing.SwingUtilities;
+import org.fudaa.fudaa.crue.common.services.SelectedPerspectiveService;
+import org.openide.awt.ActionRegistration;
+import org.openide.awt.ActionReference;
+import org.openide.awt.ActionReferences;
+import org.openide.awt.ActionID;
+import org.openide.util.Lookup;
+import org.openide.util.Lookup.Item;
+import org.openide.util.lookup.Lookups;
+import org.openide.windows.TopComponent;
+import org.openide.windows.WindowManager;
+
+@ActionID(category = "Window",
+id = "org.fudaa.fudaa.crue.common.ResetWindowsAction")
+@ActionRegistration(displayName = "#CTL_ResetWindowsAction")
+@ActionReferences({
+ @ActionReference(path = "Menu/Window", position = 3333)
+})
+public final class ResetWindowsAction implements ActionListener {
+
+ SelectedPerspectiveService service = Lookup.getDefault().lookup(SelectedPerspectiveService.class);
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ final String folder = "Actions/Window/";
+ final String actionId = folder + "org-netbeans-core-windows-actions-ResetWindowsAction";
+ Lookup.Template<ActionListener> template = new Lookup.Template<ActionListener>(ActionListener.class, actionId, null);
+ Item<ActionListener> lookupAll = Lookups.forPath(folder).lookupItem(template);
+ if (lookupAll == null) {
+ //TODO faire du log avec slf4j.
+ System.err.println(actionId + " must be set to set to the default action to activate");
+ } else {
+ Set<TopComponent> opened = WindowManager.getDefault().getRegistry().getOpened();
+ for (TopComponent topComponent : opened) {
+ topComponent.close();
+ }
+ lookupAll.getInstance().actionPerformed(null);
+ SwingUtilities.invokeLater(new Runnable() {
+
+ @Override
+ public void run() {
+ service.rebuildCurrentPerspective();
+ }
+ });
+
+ }
+ }
+}
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/property/PropertyCrueUtils.java
===================================================================
--- trunk/soft/fudaa-crue/ui-wrapper/src/main/java/org/fudaa/fudaa/crue/common/property/PropertyCrueUtils.java 2011-11-25 15:28:39 UTC (rev 6712)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/property/PropertyCrueUtils.java 2011-11-25 22:00:04 UTC (rev 6713)
@@ -19,26 +19,32 @@
public static final String TYPE_NAME = "Type";
public static final String COMMENTAIRE_NAME = "Commentaire";
- protected static void setNameAndDisplayName(Node.Property property, String name,String displayName) {
+ protected static void setNameAndDisplayName(Node.Property property, String name, String displayName) {
property.setName(name);
property.setDisplayName(displayName);
}
- protected static void setNameAndDisplayName(Node.Property property, String name,Class bundleClass) {
+
+ protected static void setNameAndDisplayName(Node.Property property, String name) {
+ setNameAndDisplayName(property, name, CommonBundle.class);
+ }
+
+ protected static void setNameAndDisplayName(Node.Property property, String name, Class bundleClass) {
property.setName(name);
property.setDisplayName(NbBundle.getMessage(bundleClass, name));
}
-
+
public static void addProperty(OutlineView view, String property) {
view.addPropertyColumn(property, NbBundle.getMessage(CommonBundle.class, property));
}
- public static void addProperty(OutlineView view, String property,Class bundleClass) {
+ public static void addProperty(OutlineView view, String property, Class bundleClass) {
view.addPropertyColumn(property, NbBundle.getMessage(bundleClass, property));
}
public static void configureNoCustomEditor(FeatureDescriptor typeProp) {
typeProp.setValue("suppressCustomEditor", Boolean.TRUE);
}
+
public static void configureNoEditAsText(FeatureDescriptor typeProp) {
typeProp.setValue("canEditAsText", Boolean.FALSE);
}
Copied: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/ModellingScenarioService.java (from rev 6712, trunk/soft/fudaa-crue/ui-wrapper/src/main/java/org/fudaa/fudaa/crue/common/services/PerspectiveService.java)
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/ModellingScenarioService.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/ModellingScenarioService.java 2011-11-25 22:00:04 UTC (rev 6713)
@@ -0,0 +1,21 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.fudaa.fudaa.crue.common.services;
+
+import org.fudaa.dodico.crue.metier.etude.EMHProjet;
+import org.fudaa.dodico.crue.metier.etude.ManagerEMHScenario;
+
+/**
+ *
+ * @author genesis
+ */
+public interface ModellingScenarioService {
+
+
+ boolean isScenarioLoaded();
+
+ boolean loadScenario(EMHProjet projet,ManagerEMHScenario scenario);
+
+}
Deleted: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/SelectedPerspectiveService.java
===================================================================
--- trunk/soft/fudaa-crue/ui-wrapper/src/main/java/org/fudaa/fudaa/crue/common/services/SelectedPerspectiveService.java 2011-11-25 15:28:39 UTC (rev 6712)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/SelectedPerspectiveService.java 2011-11-25 22:00:04 UTC (rev 6713)
@@ -1,86 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.fudaa.fudaa.crue.common.services;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-import org.apache.commons.lang.StringUtils;
-import org.openide.util.Lookup;
-import org.openide.util.Lookup.Item;
-import org.openide.util.lookup.AbstractLookup;
-import org.openide.util.lookup.InstanceContent;
-import org.openide.util.lookup.ServiceProvider;
-import org.openide.windows.TopComponent;
-import org.openide.windows.WindowManager;
-
-/**
- *
- * @author genesis
- */
-@ServiceProvider(service = SelectedPerspectiveService.class)
-public class SelectedPerspectiveService implements Lookup.Provider {
-
- InstanceContent content = new InstanceContent();
- Lookup dynamicLookup = new AbstractLookup(content);
- PerspectiveService currentPerspective;
-
- @Override
- public Lookup getLookup() {
- return dynamicLookup;
- }
-
- private void activeTopComponents(Collection<String> topComponents) {
- Set<TopComponent> opened = WindowManager.getDefault().getRegistry().getOpened();
- Set<String> alreadyOpen = new HashSet<String>();
- for (TopComponent openTopComponent : opened) {
- String id = WindowManager.getDefault().findTopComponentID(openTopComponent);
- if (openTopComponent.isOpened() && topComponents.contains(id)) {
- alreadyOpen.add(id);
- openTopComponent.requestVisible();
- } else {
- openTopComponent.close();
- }
- }
- for (String id : topComponents) {
- if (!alreadyOpen.contains(id)) {
- TopComponent findTopComponent = WindowManager.getDefault().findTopComponent(id);
- if (findTopComponent != null) {
- findTopComponent.open();
- findTopComponent.requestVisible();
- }
- else{
- System.err.println("AIEE");
- }
- }
- }
- }
-
- public boolean activePerspective(String persective) {
- final String selectedPersective = dynamicLookup.lookup(String.class);
- if (StringUtils.equals(selectedPersective, persective)) {
- return false;
- }
- if (currentPerspective != null && !currentPerspective.deactivate()) {
- return false;
- }
- Lookup.Template<PerspectiveService> template = new Lookup.Template<PerspectiveService>(PerspectiveService.class, persective, null);
- final Lookup.Item<PerspectiveService> selected = Lookup.getDefault().lookupItem(template);
- currentPerspective = selected == null ? null : selected.getInstance();
- rebuildCurrentPerspective();
- if (selectedPersective != null) {
- content.remove(selectedPersective);
- }
- content.add(persective);
- return true;
- }
-
- public void rebuildCurrentPerspective() {
- activeTopComponents(currentPerspective == null
- ? Collections.EMPTY_SET
- : currentPerspective.getTopComponents());
- }
-}
Copied: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/SelectedPerspectiveService.java (from rev 6712, trunk/soft/fudaa-crue/ui-wrapper/src/main/java/org/fudaa/fudaa/crue/common/services/SelectedPerspectiveService.java)
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/SelectedPerspectiveService.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/SelectedPerspectiveService.java 2011-11-25 22:00:04 UTC (rev 6713)
@@ -0,0 +1,96 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.fudaa.fudaa.crue.common.services;
+
+import org.fudaa.fudaa.crue.common.Perspective;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import org.apache.commons.lang.StringUtils;
+import org.fudaa.fudaa.crue.common.services.PerspectiveService;
+import org.openide.util.Lookup;
+import org.openide.util.lookup.AbstractLookup;
+import org.openide.util.lookup.InstanceContent;
+import org.openide.util.lookup.ServiceProvider;
+import org.openide.windows.TopComponent;
+import org.openide.windows.WindowManager;
+
+/**
+ *
+ * @author genesis
+ */
+@ServiceProvider(service = SelectedPerspectiveService.class)
+public class SelectedPerspectiveService implements Lookup.Provider {
+
+ private InstanceContent content = new InstanceContent();
+ private Lookup dynamicLookup = new AbstractLookup(content);
+ private PerspectiveService currentPerspective;
+ private Map<Perspective, String> perspectiveNames = new HashMap<Perspective, String>();
+
+ @Override
+ public Lookup getLookup() {
+ return dynamicLookup;
+ }
+
+ private void activeTopComponents(Collection<String> topComponents) {
+ Set<TopComponent> opened = WindowManager.getDefault().getRegistry().getOpened();
+ Set<String> alreadyOpen = new HashSet<String>();
+ for (TopComponent openTopComponent : opened) {
+ String id = WindowManager.getDefault().findTopComponentID(openTopComponent);
+ if (openTopComponent.isOpened() && topComponents.contains(id)) {
+ alreadyOpen.add(id);
+ openTopComponent.requestVisible();
+ } else {
+ openTopComponent.close();
+ }
+ }
+ for (String id : topComponents) {
+ if (!alreadyOpen.contains(id)) {
+ TopComponent findTopComponent = WindowManager.getDefault().findTopComponent(id);
+ if (findTopComponent != null) {
+ findTopComponent.open();
+ findTopComponent.requestVisible();
+ }
+ }
+ }
+ }
+
+ public void register(Perspective perspective, String id) {
+ if (perspectiveNames.containsKey(perspective)) {
+ throw new IllegalAccessError("perspective is already set " + perspective);
+ }
+ perspectiveNames.put(perspective, id);
+
+ }
+
+ public boolean activePerspective(Perspective persectiveEnum) {
+ String perspective = perspectiveNames.get(persectiveEnum);
+ final String selectedPersective = dynamicLookup.lookup(String.class);
+ if (StringUtils.equals(selectedPersective, perspective)) {
+ return false;
+ }
+ if (currentPerspective != null && !currentPerspective.deactivate()) {
+ return false;
+ }
+ Lookup.Template<PerspectiveService> template = new Lookup.Template<PerspectiveService>(PerspectiveService.class, perspective, null);
+ final Lookup.Item<PerspectiveService> selected = Lookup.getDefault().lookupItem(template);
+ currentPerspective = selected == null ? null : selected.getInstance();
+ rebuildCurrentPerspective();
+ if (selectedPersective != null) {
+ content.remove(selectedPersective);
+ }
+ content.add(perspective);
+ return true;
+ }
+
+ public void rebuildCurrentPerspective() {
+ activeTopComponents(currentPerspective == null
+ ? Collections.EMPTY_SET
+ : currentPerspective.getTopComponents());
+ }
+}
Modified: trunk/soft/fudaa-crue/ui-common/src/main/nbm/manifest.mf
===================================================================
--- trunk/soft/fudaa-crue/ui-wrapper/src/main/nbm/manifest.mf 2011-11-25 15:28:39 UTC (rev 6712)
+++ trunk/sof...
[truncated message content] |
|
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);
configureNoCusto...
[truncated message content] |
|
From: <de...@us...> - 2011-12-01 08:46:54
|
Revision: 6740
http://fudaa.svn.sourceforge.net/fudaa/?rev=6740&view=rev
Author: deniger
Date: 2011-12-01 08:46:47 +0000 (Thu, 01 Dec 2011)
Log Message:
-----------
maj
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagneLineResult.java
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagneResult.java
trunk/soft/fudaa-crue/ui-comparison/src/main/java/org/fudaa/fudaa/crue/comparison/ScenarioComparaisonController.java
trunk/soft/fudaa-crue/ui-comparison/src/main/java/org/fudaa/fudaa/crue/comparison/ScenarioComparaisonLauncher.java
trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/OtfaCampagneTopComponent.java
trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/action/LaunchAction.java
trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/action/NewFileAction.java
trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/action/OpenFileAction.java
trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/node/OtfaCampagneLineNode.java
trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/node/OtfaCampagneLinesChildren.java
trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/node/OtfaCampagneLinesNode.java
trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/process/OpenOtfaCampagneProcess.java
trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/process/SaveOtfaCampagneProcess.java
Added Paths:
-----------
trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/process/OtfaCampagneContainer.java
trunk/soft/fudaa-crue/ui-otfa/src/main/resources/org/fudaa/fudaa/crue/otfa/process/
trunk/soft/fudaa-crue/ui-otfa/src/main/resources/org/fudaa/fudaa/crue/otfa/process/Bundle.properties
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagneLineResult.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagneLineResult.java 2011-12-01 08:11:58 UTC (rev 6739)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagneLineResult.java 2011-12-01 08:46:47 UTC (rev 6740)
@@ -10,7 +10,7 @@
* @author deniger
*
*/
-public class OtfaCampagneLineResult {
+ public class OtfaCampagneLineResult {
private List<ExecuteComparaisonResult> comparisonResult;
private CtuluLogGroup logs;//contains all logs from read, run,...
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagneResult.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagneResult.java 2011-12-01 08:11:58 UTC (rev 6739)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagneResult.java 2011-12-01 08:46:47 UTC (rev 6740)
@@ -1,6 +1,5 @@
package org.fudaa.dodico.crue.projet.otfa;
-import java.util.ArrayList;
import java.util.List;
import org.fudaa.ctulu.CtuluLogGroup;
Modified: trunk/soft/fudaa-crue/ui-comparison/src/main/java/org/fudaa/fudaa/crue/comparison/ScenarioComparaisonController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-comparison/src/main/java/org/fudaa/fudaa/crue/comparison/ScenarioComparaisonController.java 2011-12-01 08:11:58 UTC (rev 6739)
+++ trunk/soft/fudaa-crue/ui-comparison/src/main/java/org/fudaa/fudaa/crue/comparison/ScenarioComparaisonController.java 2011-12-01 08:46:47 UTC (rev 6740)
@@ -28,7 +28,6 @@
import org.fudaa.dodico.crue.comparaison.ExecuteComparaison.ExecuteComparaisonResult;
import org.fudaa.dodico.crue.comparaison.tester.ResultatTest;
import org.fudaa.fudaa.crue.common.helper.JXTreeTableExtended;
-import org.fudaa.fudaa.crue.common.helper.UiContext;
import org.fudaa.fudaa.crue.common.UserPreferencesSaver;
import org.jdesktop.swingx.JXTreeTable;
import org.jdesktop.swingx.treetable.DefaultMutableTreeTableNode;
Modified: trunk/soft/fudaa-crue/ui-comparison/src/main/java/org/fudaa/fudaa/crue/comparison/ScenarioComparaisonLauncher.java
===================================================================
--- trunk/soft/fudaa-crue/ui-comparison/src/main/java/org/fudaa/fudaa/crue/comparison/ScenarioComparaisonLauncher.java 2011-12-01 08:11:58 UTC (rev 6739)
+++ trunk/soft/fudaa-crue/ui-comparison/src/main/java/org/fudaa/fudaa/crue/comparison/ScenarioComparaisonLauncher.java 2011-12-01 08:46:47 UTC (rev 6740)
@@ -29,9 +29,7 @@
import org.fudaa.dodico.crue.metier.etude.EMHRun;
import org.fudaa.dodico.crue.metier.etude.ManagerEMHScenario;
import org.fudaa.fudaa.crue.common.helper.DialogHelper;
-import org.fudaa.fudaa.crue.common.helper.UiContext;
import org.fudaa.fudaa.crue.loader.LoaderService;
-import org.fudaa.fudaa.crue.loader.ScenarioLoaderServiceAbstract;
import org.jdesktop.swingx.JXTree;
import org.openide.util.Lookup;
import org.openide.windows.WindowManager;
Modified: trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/OtfaCampagneTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/OtfaCampagneTopComponent.java 2011-12-01 08:11:58 UTC (rev 6739)
+++ trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/OtfaCampagneTopComponent.java 2011-12-01 08:46:47 UTC (rev 6740)
@@ -25,6 +25,7 @@
import org.fudaa.fudaa.crue.otfa.action.SaveFileAction;
import org.fudaa.fudaa.crue.otfa.action.UpLineAction;
import org.fudaa.fudaa.crue.otfa.node.OtfaCampagneLinesNode;
+import org.fudaa.fudaa.crue.otfa.process.OtfaCampagneContainer;
import org.netbeans.api.settings.ConvertAsProperties;
import org.openide.awt.ActionID;
import org.openide.explorer.ExplorerUtils;
@@ -46,6 +47,7 @@
public class OtfaCampagneTopComponent extends TopComponent implements ExplorerManager.Provider {
private final ExplorerManager mgr = new ExplorerManager();
+ private OtfaCampagneContainer campagneContainer;
private OtfaCampagne campaign;
/** Creates new form OtfaCampagneTopComponent */
@@ -102,11 +104,12 @@
ExplorerUtils.activateActions(mgr, false);
}
- public void setCampagne(OtfaCampagne campagne) {
- this.campaign = campagne;
+ public void setCampagne(OtfaCampagneContainer campagne) {
+ campagneContainer = campagne;
+ this.campaign = campagne.getOtfaCampagne();
this.updateCampagneInformations();
- mgr.setRootContext(new OtfaCampagneLinesNode(campagne.getLines()));
+ mgr.setRootContext(new OtfaCampagneLinesNode(campagneContainer));
this.outlineView.getOutline().setRootVisible(false);
}
Modified: trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/action/LaunchAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/action/LaunchAction.java 2011-12-01 08:11:58 UTC (rev 6739)
+++ trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/action/LaunchAction.java 2011-12-01 08:46:47 UTC (rev 6740)
@@ -5,10 +5,11 @@
package org.fudaa.fudaa.crue.otfa.action;
import java.awt.event.ActionEvent;
+import java.util.List;
import javax.swing.AbstractAction;
import javax.swing.Action;
+import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneLineResult;
import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneResult;
-import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneResultLogsPart;
import org.fudaa.dodico.crue.projet.otfa.OtfaExecutor;
import org.fudaa.fudaa.crue.common.log.LogsDisplayer;
import org.fudaa.fudaa.crue.options.services.ConfigurationManagerService;
@@ -38,8 +39,7 @@
if (result.getResults() != null) {
// final OtfaCampagneResultComparaisonsPart comparaisonsPart = result.getComparaisonsPart();
- final OtfaCampagneResultLogsPart logsPart = result.getLogsPart();
-
+ final List<OtfaCampagneLineResult> logsPart = result.getResults();
//TODO mettre ces objets dans l'arbre.
}
}
Modified: trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/action/NewFileAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/action/NewFileAction.java 2011-12-01 08:11:58 UTC (rev 6739)
+++ trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/action/NewFileAction.java 2011-12-01 08:46:47 UTC (rev 6740)
@@ -11,6 +11,7 @@
import org.fudaa.dodico.crue.projet.otfa.OtfaCampagne;
import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneLine;
import org.fudaa.fudaa.crue.otfa.OtfaCampagneTopComponent;
+import org.fudaa.fudaa.crue.otfa.process.OtfaCampagneContainer;
/**
*
@@ -30,7 +31,7 @@
this.editor.setCampagne(createBlankCampagne());
}
- private static OtfaCampagne createBlankCampagne() {
+ private static OtfaCampagneContainer createBlankCampagne() {
final OtfaCampagne campagne = new OtfaCampagne();
final OtfaCampagne.OtfaRunOptions ref = new OtfaCampagne.OtfaRunOptions();
@@ -56,6 +57,6 @@
campagne.setComparaisonOptions(options);
campagne.setLines(new ArrayList<OtfaCampagneLine>());
- return campagne;
+ return new OtfaCampagneContainer(campagne);
}
}
Modified: trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/action/OpenFileAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/action/OpenFileAction.java 2011-12-01 08:11:58 UTC (rev 6739)
+++ trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/action/OpenFileAction.java 2011-12-01 08:46:47 UTC (rev 6740)
@@ -12,6 +12,7 @@
import org.fudaa.fudaa.crue.otfa.OtfaCampagneTopComponent;
import org.fudaa.fudaa.crue.otfa.filter.OtfaFileFilter;
import org.fudaa.fudaa.crue.otfa.process.OpenOtfaCampagneProcess;
+import org.fudaa.fudaa.crue.otfa.process.OtfaCampagneContainer;
import org.netbeans.api.progress.ProgressUtils;
import org.openide.filesystems.FileChooserBuilder;
@@ -43,7 +44,7 @@
if (toOpen != null) {
OpenOtfaCampagneProcess process = new OpenOtfaCampagneProcess(toOpen);
- OtfaCampagne campagne = ProgressUtils.showProgressDialogAndRun(process, "Chargement de la campagne OTFA", false);
+ OtfaCampagneContainer campagne = ProgressUtils.showProgressDialogAndRun(process, "Chargement de la campagne OTFA", false);
if (campagne != null) {
this.editor.setCampagne(campagne);
Modified: trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/node/OtfaCampagneLineNode.java
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/node/OtfaCampagneLineNode.java 2011-12-01 08:11:58 UTC (rev 6739)
+++ trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/node/OtfaCampagneLineNode.java 2011-12-01 08:46:47 UTC (rev 6740)
@@ -8,6 +8,7 @@
import java.io.File;
import javax.swing.Action;
import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneLine;
+import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneLineResult;
import org.fudaa.fudaa.crue.otfa.action.AddLineAction;
import org.fudaa.fudaa.crue.otfa.action.DownLineAction;
import org.fudaa.fudaa.crue.otfa.action.RemoveLineAction;
@@ -26,11 +27,21 @@
* @author Christophe CANEL (Genesis)
*/
public class OtfaCampagneLineNode extends AbstractNode {
+
+
public OtfaCampagneLineNode(OtfaCampagneLine line) {
super(Children.LEAF, Lookups.singleton(line));
displayCorrectName();
}
+
+ public OtfaCampagneLineNode(OtfaCampagneLine line,OtfaCampagneLineResult lineResult) {
+ super(Children.LEAF, Lookups.fixed(line,lineResult));
+ displayCorrectName();
+ }
+
+
+
public void displayCorrectName() {
setDisplayName(NbBundle.getMessage(OtfaCampagneLineNode.class, "OtfaLigne",getLine().getIndice()));
Modified: trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/node/OtfaCampagneLinesChildren.java
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/node/OtfaCampagneLinesChildren.java 2011-12-01 08:11:58 UTC (rev 6739)
+++ trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/node/OtfaCampagneLinesChildren.java 2011-12-01 08:46:47 UTC (rev 6740)
@@ -4,14 +4,14 @@
*/
package org.fudaa.fudaa.crue.otfa.node;
-import java.beans.IntrospectionException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneLine;
+import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneLineResult;
+import org.fudaa.fudaa.crue.otfa.process.OtfaCampagneContainer;
import org.openide.nodes.Index.ArrayChildren;
import org.openide.nodes.Node;
-import org.openide.util.Exceptions;
/**
*
@@ -19,22 +19,29 @@
*/
public class OtfaCampagneLinesChildren extends ArrayChildren {
- private List<OtfaCampagneLine> lines;
+ private OtfaCampagneContainer container;
- public OtfaCampagneLinesChildren(List<OtfaCampagneLine> lines) {
- this.lines = lines;
- }
+ public OtfaCampagneLinesChildren(OtfaCampagneContainer container) {
+ this.container = container;
+ }
- @Override
- protected List<Node> initCollection() {
- final int nbLines = this.lines.size();
+ @Override
+ protected List<Node> initCollection() {
+ final List<OtfaCampagneLine> lines = this.container.getOtfaCampagne().getLines();
+ final int nbLines = lines.size();
- Node[] nodes = new Node[nbLines];
+ Node[] nodes = new Node[nbLines];
- for (int i = 0; i < nbLines; i++) {
- nodes[i] = new OtfaCampagneLineNode(this.lines.get(i));
- }
+ for (int i = 0; i < nbLines; i++) {
+ final OtfaCampagneLine line = lines.get(i);
+ OtfaCampagneLineResult resultFor = container.getResultFor(line);
+ if (resultFor != null) {
+ nodes[i] = new OtfaCampagneLineNode(line, resultFor);
+ } else {
+ nodes[i] = new OtfaCampagneLineNode(line);
+ }
+ }
- return new ArrayList<Node>(Arrays.asList(nodes));
- }
+ return new ArrayList<Node>(Arrays.asList(nodes));
+ }
}
Modified: trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/node/OtfaCampagneLinesNode.java
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/node/OtfaCampagneLinesNode.java 2011-12-01 08:11:58 UTC (rev 6739)
+++ trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/node/OtfaCampagneLinesNode.java 2011-12-01 08:46:47 UTC (rev 6740)
@@ -11,6 +11,7 @@
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneLine;
+import org.fudaa.fudaa.crue.otfa.process.OtfaCampagneContainer;
import org.openide.nodes.AbstractNode;
import org.openide.nodes.Index.ArrayChildren;
import org.openide.nodes.Node;
@@ -22,58 +23,57 @@
*/
public class OtfaCampagneLinesNode extends AbstractNode implements ChangeListener {
- private static class OtfaCampagneLineComparator implements Comparator<OtfaCampagneLine> {
+ private static class OtfaCampagneLineComparator implements Comparator<OtfaCampagneLine> {
- @Override
- public int compare(OtfaCampagneLine o1, OtfaCampagneLine o2) {
- return ((Integer) o1.getIndice()).compareTo(o2.getIndice());
- }
+ @Override
+ public int compare(OtfaCampagneLine o1, OtfaCampagneLine o2) {
+ return ((Integer) o1.getIndice()).compareTo(o2.getIndice());
}
+ }
- public OtfaCampagneLinesNode(List<OtfaCampagneLine> lines) {
- super(new OtfaCampagneLinesChildren(lines), Lookups.singleton(lines));
+ public OtfaCampagneLinesNode(OtfaCampagneContainer container) {
+ super(new OtfaCampagneLinesChildren(container), Lookups.singleton(container));
+ ((OtfaCampagneLinesChildren) this.getChildren()).addChangeListener(this);
- ((OtfaCampagneLinesChildren) this.getChildren()).addChangeListener(this);
+ setDisplayName("Lignes");
+ }
- setDisplayName("Lignes");
- }
+ @Override
+ public Action[] getActions(boolean context) {
+ return new Action[]{};
+ }
- @Override
- public Action[] getActions(boolean context) {
- return new Action[]{};
- }
+ @Override
+ public void stateChanged(ChangeEvent e) {
+ final List<OtfaCampagneLine> lines = getLookup().lookup(List.class);
- @Override
- public void stateChanged(ChangeEvent e) {
- final List<OtfaCampagneLine> lines = getLookup().lookup(List.class);
+ Collections.sort(lines, new OtfaCampagneLineComparator());
+ }
- Collections.sort(lines, new OtfaCampagneLineComparator());
- }
+ public void remove(OtfaCampagneLineNode lineNode) {
+ final ArrayChildren children = (ArrayChildren) this.getChildren();
+ final int indice = children.indexOf(lineNode);
- public void remove(OtfaCampagneLineNode lineNode) {
- final ArrayChildren children = (ArrayChildren) this.getChildren();
- final int indice = children.indexOf(lineNode);
+ for (int i = indice + 1; i < children.getNodesCount(); i++) {
+ OtfaCampagneLineNode node = (OtfaCampagneLineNode) children.getNodeAt(i);
- for (int i = indice + 1; i < children.getNodesCount(); i++) {
- OtfaCampagneLineNode node = (OtfaCampagneLineNode) children.getNodeAt(i);
+ final OtfaCampagneLine line = node.getLine();
+ line.setIndice(line.getIndice() - 1);
+ node.displayCorrectName();
+ }
- final OtfaCampagneLine line = node.getLine();
- line.setIndice(line.getIndice() - 1);
- node.displayCorrectName();
- }
+ getLookup().lookup(List.class).remove(lineNode.getLine());
+ children.remove(new Node[]{lineNode});
+ }
- getLookup().lookup(List.class).remove(lineNode.getLine());
- children.remove(new Node[]{lineNode});
- }
+ public void add(OtfaCampagneLineNode lineNode) {
+ final OtfaCampagneLine line = lineNode.getLine();
+ final List<OtfaCampagneLine> lines = this.getLookup().lookup(List.class);
- public void add(OtfaCampagneLineNode lineNode) {
- final OtfaCampagneLine line = lineNode.getLine();
- final List<OtfaCampagneLine> lines = this.getLookup().lookup(List.class);
+ line.setIndice(lines.size() + 1);
+ lineNode.displayCorrectName();
- line.setIndice(lines.size() + 1);
- lineNode.displayCorrectName();
-
- lines.add(line);
- this.getChildren().add(new Node[]{lineNode});
- }
+ lines.add(line);
+ this.getChildren().add(new Node[]{lineNode});
+ }
}
Modified: trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/process/OpenOtfaCampagneProcess.java
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/process/OpenOtfaCampagneProcess.java 2011-12-01 08:11:58 UTC (rev 6739)
+++ trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/process/OpenOtfaCampagneProcess.java 2011-12-01 08:46:47 UTC (rev 6740)
@@ -12,14 +12,16 @@
import org.fudaa.dodico.crue.io.common.CrueIOResu;
import org.fudaa.dodico.crue.io.otfa.CrueOTFAReaderWriter;
import org.fudaa.dodico.crue.projet.otfa.OtfaCampagne;
+import org.fudaa.fudaa.crue.common.log.LogsDisplayer;
import org.netbeans.api.progress.ProgressHandle;
import org.netbeans.api.progress.ProgressRunnable;
+import org.openide.util.NbBundle;
/**
*
* @author Chris
*/
-public class OpenOtfaCampagneProcess implements ProgressRunnable<OtfaCampagne> {
+public class OpenOtfaCampagneProcess implements ProgressRunnable<OtfaCampagneContainer> {
private File otfaFile;
@@ -28,17 +30,28 @@
}
@Override
- public OtfaCampagne run(ProgressHandle handle) {
+ public OtfaCampagneContainer run(ProgressHandle handle) {
handle.switchToIndeterminate();
//TODO A verifier avec Fred pour version, crue data, ...
final CrueOTFAReaderWriter reader = new CrueOTFAReaderWriter("1.2", otfaFile.getParentFile());
final CtuluLog log = new CtuluLog(BusinessMessages.RESOURCE_BUNDLE);
- final CrueIOResu<OtfaCampagne> result = reader.readXML(otfaFile, log, new CrueDataImpl(null,new CrueOptions(false)));
+ final CrueIOResu<OtfaCampagne> result = reader.readXML(otfaFile, log, new CrueDataImpl(null, new CrueOptions(false)));
+ if (log.isNotEmpty()) {
+ LogsDisplayer.displayError(log, NbBundle.getMessage(OpenOtfaCampagneProcess.class, "OpenOtfa.BilanDialog", otfaFile.getName()));
+ }
+ //TODO FRED lire resultat et cr si present.
+ //merger cr et resultat ensemble en testant les index.
+ //File ctfaFile=
+
+
+
+
result.getAnalyse().printResume();
handle.finish();
-
- return result.getMetier();
+ OtfaCampagneContainer container = new OtfaCampagneContainer(result.getMetier());
+
+ return container;
}
}
Added: trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/process/OtfaCampagneContainer.java
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/process/OtfaCampagneContainer.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/process/OtfaCampagneContainer.java 2011-12-01 08:46:47 UTC (rev 6740)
@@ -0,0 +1,28 @@
+package org.fudaa.fudaa.crue.otfa.process;
+
+import org.fudaa.dodico.crue.projet.otfa.OtfaCampagne;
+import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneLine;
+import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneLineResult;
+
+/**
+ *
+ * @author deniger ( genesis)
+ */
+public class OtfaCampagneContainer {
+
+ private final OtfaCampagne otfaCampagne;
+
+ public OtfaCampagne getOtfaCampagne() {
+ return otfaCampagne;
+ }
+
+
+ public OtfaCampagneContainer(OtfaCampagne otfaCampagne) {
+ this.otfaCampagne = otfaCampagne;
+ }
+
+ //TODO
+ public OtfaCampagneLineResult getResultFor(OtfaCampagneLine line){
+ return null;
+ }
+}
Modified: trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/process/SaveOtfaCampagneProcess.java
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/process/SaveOtfaCampagneProcess.java 2011-12-01 08:11:58 UTC (rev 6739)
+++ trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/process/SaveOtfaCampagneProcess.java 2011-12-01 08:46:47 UTC (rev 6740)
@@ -32,6 +32,7 @@
@Override
public Boolean run(ProgressHandle handle) {
+ //TODO il faudra effacer les Cr et résultats.
//TODO Récupérer l'utilisateur.
final String auteur = "User";
final LocalDateTime date = new LocalDateTime();
Copied: trunk/soft/fudaa-crue/ui-otfa/src/main/resources/org/fudaa/fudaa/crue/otfa/process/Bundle.properties (from rev 6738, trunk/soft/fudaa-crue/ui-otfa/src/main/resources/org/fudaa/fudaa/crue/otfa/perspective/Bundle.properties)
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/src/main/resources/org/fudaa/fudaa/crue/otfa/process/Bundle.properties (rev 0)
+++ trunk/soft/fudaa-crue/ui-otfa/src/main/resources/org/fudaa/fudaa/crue/otfa/process/Bundle.properties 2011-12-01 08:46:47 UTC (rev 6740)
@@ -0,0 +1 @@
+OpenOtfa.BilanDialog=Ouverture fichier OTFA {0}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2011-12-01 22:26:53
|
Revision: 6760
http://fudaa.svn.sourceforge.net/fudaa/?rev=6760&view=rev
Author: deniger
Date: 2011-12-01 22:26:46 +0000 (Thu, 01 Dec 2011)
Log Message:
-----------
maj
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-server/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/Installer.java
trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/services/ConfigurationManagerService.java
trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/services/InstallationService.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/LoadedScenarioPresenter.java
Removed Paths:
-------------
trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/old/otfa/OtfaCampagneEditor.form
trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/old/otfa/OtfaCampagneEditor.java
trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/old/otfa/action/
trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/old/otfa/node/
Modified: trunk/soft/fudaa-crue/crue-server/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties 2011-12-01 22:04:38 UTC (rev 6759)
+++ trunk/soft/fudaa-crue/crue-server/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties 2011-12-01 22:26:46 UTC (rev 6760)
@@ -351,6 +351,7 @@
error.validationModele.branchesNonAffectes = Il existe des CatEMHBranches isolées: {0}
prefix.noeuds=CatEMHNoeud
prefix.branches=CatEMHBranche
+load.fichierViergeOptr=Chargement du fichier OPTR par défaut du coeur
res.branche.notFound = Un résultat est défini sur la CatEMHBranche {0} qui n''existe pas dans l''étude.
load.validFcb = Validation des données du fichier FCB
Modified: trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/Installer.java
===================================================================
--- trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/Installer.java 2011-12-01 22:04:38 UTC (rev 6759)
+++ trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/Installer.java 2011-12-01 22:26:46 UTC (rev 6760)
@@ -3,7 +3,6 @@
import org.fudaa.fudaa.crue.options.services.InstallationService;
import org.openide.modules.ModuleInstall;
import org.openide.util.Lookup;
-import org.openide.windows.WindowManager;
/**
*
@@ -15,13 +14,7 @@
@Override
public void restored() {
- WindowManager.getDefault().invokeWhenUIReady(new Runnable() {
- @Override
- public void run() {
- service.load();
- }
- });
-
+ service.load();
}
}
Modified: trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/services/ConfigurationManagerService.java
===================================================================
--- trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/services/ConfigurationManagerService.java 2011-12-01 22:04:38 UTC (rev 6759)
+++ trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/services/ConfigurationManagerService.java 2011-12-01 22:26:46 UTC (rev 6760)
@@ -40,6 +40,7 @@
import org.openide.util.lookup.AbstractLookup;
import org.openide.util.lookup.InstanceContent;
import org.openide.util.lookup.ServiceProvider;
+import org.openide.windows.WindowManager;
/**
*
@@ -61,7 +62,8 @@
@Override
public void resultChanged(LookupEvent ev) {
- if (installationService.getLookup().lookup(File.class) != null) {
+ final File lookupFile = installationService.getLookup().lookup(File.class);
+ if (lookupFile != null) {
reloadAll();
}
}
@@ -192,13 +194,19 @@
if (siteRead == null) {
return;
}
- CtuluLogGroup log = new CtuluLogGroup(null);
+ final CtuluLogGroup log = new CtuluLogGroup(null);
reloadCoeur(siteRead, log);
reloadOptions(siteRead, log);
if (log.containsSomething()) {
- LogsDisplayer.displayError(log, NbBundle.getMessage(ConfigurationManagerService.class, "ValidationConfigSite.BilanDialogTitle"));
+ WindowManager.getDefault().invokeWhenUIReady(new Runnable() {
+
+ @Override
+ public void run() {
+ LogsDisplayer.displayError(log, NbBundle.getMessage(ConfigurationManagerService.class, "ValidationConfigSite.BilanDialogTitle"));
+ }
+ });
}
}
Modified: trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/services/InstallationService.java
===================================================================
--- trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/services/InstallationService.java 2011-12-01 22:04:38 UTC (rev 6759)
+++ trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/services/InstallationService.java 2011-12-01 22:26:46 UTC (rev 6760)
@@ -21,6 +21,7 @@
import org.openide.util.lookup.AbstractLookup;
import org.openide.util.lookup.InstanceContent;
import org.openide.util.lookup.ServiceProvider;
+import org.openide.windows.WindowManager;
/**
*
@@ -67,16 +68,30 @@
}
File fudaaConfFile = getFudaaCrueConf();
if (!CtuluLibFile.exists(fudaaConfFile)) {
- DialogHelper.showError(NbBundle.getMessage(InstallationService.class, "Installation.NoFudaaCrueConfError"));
LOGGER.log(Level.SEVERE, "fudaacrue.conf not found. Must be in the <INSTALL>/etc folder");
+ WindowManager.getDefault().invokeWhenUIReady(new Runnable() {
+
+ @Override
+ public void run() {
+ DialogHelper.showError(NbBundle.getMessage(InstallationService.class, "Installation.NoFudaaCrueConfError"));
+
+ }
+ });
}
- File siteConfig = getSiteConfigFile();
- File coeurDir = new File(getSiteDir(), "coeurs");
+ final File siteConfig = getSiteConfigFile();
+ final File coeurDir = new File(getSiteDir(), "coeurs");
if (!siteConfig.exists()) {
- DialogHelper.showWarn(NbBundle.getMessage(InstallationService.class, "Installation.CreateDefaultSiteAndCoeur.DialogTitle"),
- NbBundle.getMessage(InstallationService.class, "Installation.CreateDefaultSiteAndCoeur.DialogContent", siteConfig.getAbsolutePath(), coeurDir.getAbsoluteFile()));
createDefaultFiles();
+ WindowManager.getDefault().invokeWhenUIReady(new Runnable() {
+
+ @Override
+ public void run() {
+ DialogHelper.showNotifyOperationTermine(NbBundle.getMessage(InstallationService.class, "Installation.CreateDefaultSiteAndCoeur.DialogTitle"),
+ NbBundle.getMessage(InstallationService.class, "Installation.CreateDefaultSiteAndCoeur.DialogContent", siteConfig.getAbsolutePath(), coeurDir.getAbsoluteFile()));
+ }
+ });
}
+
dynamicContent.add(siteConfig);
}
Deleted: trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/old/otfa/OtfaCampagneEditor.form
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/old/otfa/OtfaCampagneEditor.form 2011-12-01 22:04:38 UTC (rev 6759)
+++ trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/old/otfa/OtfaCampagneEditor.form 2011-12-01 22:26:46 UTC (rev 6760)
@@ -1,133 +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"/>
- <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,9,0,0,2,102"/>
- </AuxValues>
-
- <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
- <SubComponents>
- <Container class="javax.swing.JSplitPane" name="jSplitPane1">
- <Properties>
- <Property name="dividerLocation" type="int" value="150"/>
- <Property name="orientation" type="int" value="0"/>
- <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[800, 600]"/>
- </Property>
- </Properties>
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
- <BorderConstraints direction="Center"/>
- </Constraint>
- </Constraints>
-
- <Layout class="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout"/>
- <SubComponents>
- <Component class="org.openide.explorer.propertysheet.PropertySheetView" name="propertySheetView1">
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription">
- <JSplitPaneConstraints position="bottom"/>
- </Constraint>
- </Constraints>
- </Component>
- <Container class="javax.swing.JPanel" name="jPanel1">
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription">
- <JSplitPaneConstraints position="top"/>
- </Constraint>
- </Constraints>
-
- <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
- <SubComponents>
- <Container class="javax.swing.JPanel" name="jPanel2">
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
- <BorderConstraints direction="East"/>
- </Constraint>
- </Constraints>
-
- <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBoxLayout">
- <Property name="axis" type="int" value="1"/>
- </Layout>
- <SubComponents>
- <Component class="javax.swing.JButton" name="upButton">
- <Properties>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/fudaa/fudaa/crue/old/otfa/Bundle.properties" key="OtfaCampagneEditor.upButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
- </Property>
- <Property name="actionCommand" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/fudaa/fudaa/crue/old/otfa/Bundle.properties" key="OtfaCampagneEditor.upButton.actionCommand" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
- </Property>
- <Property name="enabled" type="boolean" value="false"/>
- <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[2147483647, 23]"/>
- </Property>
- </Properties>
- </Component>
- <Component class="javax.swing.JButton" name="downButton">
- <Properties>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/fudaa/fudaa/crue/old/otfa/Bundle.properties" key="OtfaCampagneEditor.downButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
- </Property>
- <Property name="actionCommand" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/fudaa/fudaa/crue/old/otfa/Bundle.properties" key="OtfaCampagneEditor.downButton.actionCommand" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
- </Property>
- <Property name="enabled" type="boolean" value="false"/>
- <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[2147483647, 23]"/>
- </Property>
- </Properties>
- </Component>
- <Container class="javax.swing.JPanel" name="jPanel3">
-
- <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
- </Container>
- <Component class="javax.swing.JButton" name="addButton">
- <Properties>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/fudaa/fudaa/crue/old/otfa/Bundle.properties" key="OtfaCampagneEditor.addButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
- </Property>
- <Property name="enabled" type="boolean" value="false"/>
- <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[2147483647, 23]"/>
- </Property>
- </Properties>
- </Component>
- <Component class="javax.swing.JButton" name="removeButton">
- <Properties>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/fudaa/fudaa/crue/old/otfa/Bundle.properties" key="OtfaCampagneEditor.removeButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
- </Property>
- <Property name="actionCommand" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/fudaa/fudaa/crue/old/otfa/Bundle.properties" key="OtfaCampagneEditor.removeButton.actionCommand" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
- </Property>
- <Property name="enabled" type="boolean" value="false"/>
- <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[2147483647, 23]"/>
- </Property>
- </Properties>
- </Component>
- </SubComponents>
- </Container>
- <Component class="org.openide.explorer.view.BeanTreeView" name="treeView">
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
- <BorderConstraints direction="Center"/>
- </Constraint>
- </Constraints>
- </Component>
- </SubComponents>
- </Container>
- </SubComponents>
- </Container>
- </SubComponents>
-</Form>
Deleted: trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/old/otfa/OtfaCampagneEditor.java
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/old/otfa/OtfaCampagneEditor.java 2011-12-01 22:04:38 UTC (rev 6759)
+++ trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/old/otfa/OtfaCampagneEditor.java 2011-12-01 22:26:46 UTC (rev 6760)
@@ -1,179 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
-/*
- * OtfaCampagneEditor.java
- *
- * Created on 10 nov. 2011, 15:10:04
- */
-package org.fudaa.fudaa.crue.old.otfa;
-
-import org.fudaa.fudaa.crue.otfa.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import org.openide.explorer.ExplorerManager;
-import org.openide.windows.TopComponent;
-import org.fudaa.dodico.crue.projet.otfa.OtfaCampagne;
-import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneLine;
-import org.fudaa.fudaa.crue.old.otfa.action.AddLineAction;
-import org.fudaa.fudaa.crue.old.otfa.action.DownLineAction;
-import org.fudaa.fudaa.crue.old.otfa.action.RemoveLineAction;
-import org.fudaa.fudaa.crue.old.otfa.action.UpLineAction;
-import org.fudaa.fudaa.crue.old.otfa.node.OtfaCampagneLineNode;
-import org.fudaa.fudaa.crue.old.otfa.node.OtfaCampagneLinesNode;
-import org.fudaa.fudaa.crue.old.otfa.node.OtfaCampagneNode;
-import org.openide.explorer.ExplorerUtils;
-import org.openide.nodes.Index.ArrayChildren;
-import org.openide.nodes.Node;
-import org.openide.util.actions.SystemAction;
-
-/**
- *
- * @author Christophe CANEL (Genesis)
- */
-public class OtfaCampagneEditor extends TopComponent implements ExplorerManager.Provider, ActionListener {
- private final ExplorerManager mgr = new ExplorerManager();
-
- /** Creates new form OtfaCampagneEditor */
- public OtfaCampagneEditor() {
- initComponents();
-
- associateLookup(ExplorerUtils.createLookup(mgr, getActionMap()));
-
- this.upButton.setAction(SystemAction.get(UpLineAction.class).createContextAwareInstance(getLookup()));
- this.downButton.setAction(SystemAction.get(DownLineAction.class).createContextAwareInstance(getLookup()));
- this.addButton.setAction(SystemAction.get(AddLineAction.class).createContextAwareInstance(getLookup()));
- this.removeButton.setAction(SystemAction.get(RemoveLineAction.class).createContextAwareInstance(getLookup()));
- }
-
- public void setCampagne(OtfaCampagne campagne)
- {
- mgr.setRootContext(new OtfaCampagneNode(campagne));
-
- this.treeView.expandAll();
- }
-
- public ExplorerManager getExplorerManager() {
- return mgr;
- }
-
- /** 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.
- */
- @SuppressWarnings("unchecked")
- // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
- private void initComponents() {
-
- jSplitPane1 = new javax.swing.JSplitPane();
- propertySheetView1 = new org.openide.explorer.propertysheet.PropertySheetView();
- jPanel1 = new javax.swing.JPanel();
- jPanel2 = new javax.swing.JPanel();
- upButton = new javax.swing.JButton();
- downButton = new javax.swing.JButton();
- jPanel3 = new javax.swing.JPanel();
- addButton = new javax.swing.JButton();
- removeButton = new javax.swing.JButton();
- treeView = new org.openide.explorer.view.BeanTreeView();
-
- setLayout(new java.awt.BorderLayout());
-
- jSplitPane1.setDividerLocation(150);
- jSplitPane1.setOrientation(javax.swing.JSplitPane.VERTICAL_SPLIT);
- jSplitPane1.setPreferredSize(new java.awt.Dimension(800, 600));
- jSplitPane1.setBottomComponent(propertySheetView1);
-
- jPanel1.setLayout(new java.awt.BorderLayout());
-
- jPanel2.setLayout(new javax.swing.BoxLayout(jPanel2, javax.swing.BoxLayout.Y_AXIS));
-
- upButton.setText(org.openide.util.NbBundle.getMessage(OtfaCampagneEditor.class, "OtfaCampagneEditor.upButton.text")); // NOI18N
- upButton.setActionCommand(org.openide.util.NbBundle.getMessage(OtfaCampagneEditor.class, "OtfaCampagneEditor.upButton.actionCommand")); // NOI18N
- upButton.setEnabled(false);
- upButton.setMaximumSize(new java.awt.Dimension(2147483647, 23));
- jPanel2.add(upButton);
-
- downButton.setText(org.openide.util.NbBundle.getMessage(OtfaCampagneEditor.class, "OtfaCampagneEditor.downButton.text")); // NOI18N
- downButton.setActionCommand(org.openide.util.NbBundle.getMessage(OtfaCampagneEditor.class, "OtfaCampagneEditor.downButton.actionCommand")); // NOI18N
- downButton.setEnabled(false);
- downButton.setMaximumSize(new java.awt.Dimension(2147483647, 23));
- jPanel2.add(downButton);
- jPanel2.add(jPanel3);
-
- addButton.setText(org.openide.util.NbBundle.getMessage(OtfaCampagneEditor.class, "OtfaCampagneEditor.addButton.text")); // NOI18N
- addButton.setEnabled(false);
- addButton.setMaximumSize(new java.awt.Dimension(2147483647, 23));
- jPanel2.add(addButton);
-
- removeButton.setText(org.openide.util.NbBundle.getMessage(OtfaCampagneEditor.class, "OtfaCampagneEditor.removeButton.text")); // NOI18N
- removeButton.setActionCommand(org.openide.util.NbBundle.getMessage(OtfaCampagneEditor.class, "OtfaCampagneEditor.removeButton.actionCommand")); // NOI18N
- removeButton.setEnabled(false);
- removeButton.setMaximumSize(new java.awt.Dimension(2147483647, 23));
- jPanel2.add(removeButton);
-
- jPanel1.add(jPanel2, java.awt.BorderLayout.EAST);
- jPanel1.add(treeView, java.awt.BorderLayout.CENTER);
-
- jSplitPane1.setTopComponent(jPanel1);
-
- add(jSplitPane1, java.awt.BorderLayout.CENTER);
- }// </editor-fold>//GEN-END:initComponents
- // Variables declaration - do not modify//GEN-BEGIN:variables
- private javax.swing.JButton addButton;
- private javax.swing.JButton downButton;
- private javax.swing.JPanel jPanel1;
- private javax.swing.JPanel jPanel2;
- private javax.swing.JPanel jPanel3;
- private javax.swing.JSplitPane jSplitPane1;
- private org.openide.explorer.propertysheet.PropertySheetView propertySheetView1;
- private javax.swing.JButton removeButton;
- private org.openide.explorer.view.BeanTreeView treeView;
- private javax.swing.JButton upButton;
- // End of variables declaration//GEN-END:variables
-
- @Override
- public int getPersistenceType() {
- return PERSISTENCE_NEVER;
- }
-
- @Override
- public void actionPerformed(ActionEvent e) {
- Node node = this.mgr.getSelectedNodes()[0];
-
- if (e.getActionCommand().equals("Up"))
- {
- }
- else if (e.getActionCommand().equals("Down"))
- {
- this.moveLineNode((OtfaCampagneLineNode)node, true);
- }
- }
-
- private void moveLineNode(OtfaCampagneLineNode lineNode, boolean moveDown)
- {
- final OtfaCampagneLinesNode lines = (OtfaCampagneLinesNode)lineNode.getParentNode();
- final ArrayChildren children = (ArrayChildren)lines.getChildren();
- final int indice1 = children.indexOf(lineNode);
- final int indice2 = indice1 + (moveDown ? 1 : -1);
-
- this.switchLineNodeIndice(lineNode, (OtfaCampagneLineNode)children.getNodeAt(indice2));
- children.exchange(indice1, indice2);
- }
-
- private void switchLineNodeIndice(OtfaCampagneLineNode lineNode1, OtfaCampagneLineNode lineNode2)
- {
- final OtfaCampagneLine line1 = lineNode1.getLookup().lookup(OtfaCampagneLine.class);
- final OtfaCampagneLine line2 = lineNode2.getLookup().lookup(OtfaCampagneLine.class);
- final int indice1 = line1.getIndice();
- final int indice2 = line2.getIndice();
-
- line1.setIndice(indice2);
- line2.setIndice(indice1);
-
- lineNode1.displayCorrectName();
- lineNode2.displayCorrectName();
- }
-}
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/LoadedScenarioPresenter.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/LoadedScenarioPresenter.java 2011-12-01 22:04:38 UTC (rev 6759)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/LoadedScenarioPresenter.java 2011-12-01 22:26:46 UTC (rev 6760)
@@ -4,6 +4,7 @@
*/
package org.fudaa.fudaa.crue.study.services;
+import com.memoire.bu.BuGridLayout;
import java.awt.Component;
import java.awt.GridLayout;
import java.awt.event.ActionEvent;
@@ -27,7 +28,6 @@
import org.openide.util.NbBundle;
import org.openide.util.actions.Presenter;
-
@ActionID(category = "File",
id = "org.fudaa.fudaa.crue.study.LoadedScenarioPresenter")
@ActionRegistration(displayName = "#LoadedScenarioPresenter")
@@ -55,7 +55,8 @@
txtModelling.setEditable(false);
txtPost = new JTextField();
txtPost.setEditable(false);
- JPanel panel = new JPanel(new GridLayout(2, 2));
+ final BuGridLayout buGridLayout = new BuGridLayout(2, 6, 2, true, false, false, false);
+ JPanel panel = new JPanel(buGridLayout);
jlModelling = new JLabel(NbBundle.getMessage(LoadedScenarioPresenter.class, "GlobalPresenter.ModellingState.Text"));
jlModelling.setIcon(CrueIconsProvider.getIcon(EnumTypeEMH.SCENARIO));
panel.add(jlModelling);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2011-12-02 08:34:24
|
Revision: 6762
http://fudaa.svn.sourceforge.net/fudaa/?rev=6762&view=rev
Author: deniger
Date: 2011-12-02 08:34:13 +0000 (Fri, 02 Dec 2011)
Log Message:
-----------
maj
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java
trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/action/LaunchAction.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/ListTopComponentAbstract.java
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/actions/MigrateProjectAction.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ListingManagerEMHScenario.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ManagerEMHModeleNode.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/node/ManagerEMHSousModeleNode.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/NodesManager.java
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/property/Bundle.properties
Added Paths:
-----------
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/calcul/
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/calcul/CalculCrueRunner.java
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/calcul/CalculCrueRunnerEmpty.java
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/calcul/CalculCrueRunnerManager.java
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/calcul/CalculCrueRunnerManagerEmpty.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/property/ManagerPropertyFactory.java
Removed Paths:
-------------
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/property/ManagerEMHScenarioPropertyFactory.java
Added: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/calcul/CalculCrueRunner.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/calcul/CalculCrueRunner.java (rev 0)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/calcul/CalculCrueRunner.java 2011-12-02 08:34:13 UTC (rev 6762)
@@ -0,0 +1,22 @@
+package org.fudaa.dodico.crue.projet.calcul;
+
+import org.fudaa.dodico.crue.metier.etude.EMHProjet;
+import org.fudaa.dodico.crue.metier.etude.EMHRun;
+import org.fudaa.dodico.crue.metier.etude.ManagerEMHScenario;
+
+/**
+ *A completer
+ *
+ * @author deniger ( genesis)
+ */
+public interface CalculCrueRunner {
+
+ /**
+ * devrait retourner qqchose.
+ * @param projet
+ * @param scenario
+ * @param run
+ */
+ void launchOn(EMHProjet projet,ManagerEMHScenario scenario,EMHRun run);
+
+}
Added: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/calcul/CalculCrueRunnerEmpty.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/calcul/CalculCrueRunnerEmpty.java (rev 0)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/calcul/CalculCrueRunnerEmpty.java 2011-12-02 08:34:13 UTC (rev 6762)
@@ -0,0 +1,19 @@
+package org.fudaa.dodico.crue.projet.calcul;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.fudaa.dodico.crue.metier.etude.EMHProjet;
+import org.fudaa.dodico.crue.metier.etude.EMHRun;
+import org.fudaa.dodico.crue.metier.etude.ManagerEMHScenario;
+
+/**
+ *
+ * @author deniger ( genesis)
+ */
+public class CalculCrueRunnerEmpty implements CalculCrueRunner {
+
+ @Override
+ public void launchOn(EMHProjet projet, ManagerEMHScenario scenario, EMHRun run) {
+ Logger.getLogger(CalculCrueRunnerEmpty.class.getName()).log(Level.SEVERE, "No compute done");
+ }
+}
Added: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/calcul/CalculCrueRunnerManager.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/calcul/CalculCrueRunnerManager.java (rev 0)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/calcul/CalculCrueRunnerManager.java 2011-12-02 08:34:13 UTC (rev 6762)
@@ -0,0 +1,15 @@
+package org.fudaa.dodico.crue.projet.calcul;
+
+import org.fudaa.dodico.crue.projet.coeur.CoeurConfigContrat;
+
+/**
+ *
+ * @author deniger ( genesis)
+ */
+public interface CalculCrueRunnerManager {
+
+ CalculCrueRunner getCrue9Runner();
+
+ CalculCrueRunner getCrue10Runner(CoeurConfigContrat coeur);
+
+}
Added: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/calcul/CalculCrueRunnerManagerEmpty.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/calcul/CalculCrueRunnerManagerEmpty.java (rev 0)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/calcul/CalculCrueRunnerManagerEmpty.java 2011-12-02 08:34:13 UTC (rev 6762)
@@ -0,0 +1,25 @@
+package org.fudaa.dodico.crue.projet.calcul;
+
+import org.fudaa.dodico.crue.projet.coeur.CoeurConfigContrat;
+
+/**
+ *
+ * @author deniger ( genesis)
+ */
+public class CalculCrueRunnerManagerEmpty implements CalculCrueRunnerManager{
+
+ private final CalculCrueRunnerEmpty empty=new CalculCrueRunnerEmpty();
+
+ @Override
+ public CalculCrueRunner getCrue10Runner(CoeurConfigContrat coeur) {
+ return empty;
+ }
+
+ @Override
+ public CalculCrueRunner getCrue9Runner() {
+ return empty;
+ }
+
+
+
+}
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java 2011-12-02 08:33:39 UTC (rev 6761)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java 2011-12-02 08:34:13 UTC (rev 6762)
@@ -18,26 +18,31 @@
import org.fudaa.dodico.crue.metier.etude.ManagerEMHScenario;
import org.fudaa.dodico.crue.projet.EMHProjetController;
import org.fudaa.dodico.crue.projet.EMHScenarioContainer;
+import org.fudaa.dodico.crue.projet.calcul.CalculCrueRunnerManager;
import org.fudaa.dodico.crue.projet.coeur.CoeurConfigContrat;
import org.fudaa.dodico.crue.projet.coeur.CoeurManager;
import org.fudaa.dodico.crue.projet.create.InfosCreation;
import org.joda.time.LocalDateTime;
+
/**
* Execute actions.
*
*/
public class OtfaExecutor {
+
private final CoeurManager coeurManager;
private final ConnexionInformation user;
private final Map<File, CrueOperationResult<EMHProjet>> loadedProjets = new HashMap<File, CrueOperationResult<EMHProjet>>();
+ private final CalculCrueRunnerManager calculRunner;
/**
* @param coeurManager
*/
- public OtfaExecutor(CoeurManager coeurManager, ConnexionInformation user) {
+ public OtfaExecutor(CoeurManager coeurManager, ConnexionInformation user, final CalculCrueRunnerManager calculRunner) {
super();
this.coeurManager = coeurManager;
this.user = user;
+ this.calculRunner = calculRunner;
}
public OtfaCampagneResult launch(OtfaCampagne in) {
@@ -72,7 +77,7 @@
CtuluLogGroup logs = new CtuluLogGroup(BusinessMessages.RESOURCE_BUNDLE);
for (Entry<File, CrueOperationResult<EMHProjet>> entry : this.loadedProjets.entrySet()) {
- EMHProjetController.writeProjet(entry.getKey(), entry.getValue().getResult(), logs,user);
+ EMHProjetController.writeProjet(entry.getKey(), entry.getValue().getResult(), logs, user);
}
return logs;
@@ -90,8 +95,8 @@
OtfaComparaisonExecutor executor = new OtfaComparaisonExecutor();
- //TODO Mettre le bon CrueConfigMetier.
- CrueConfigMetier config = null;// this.coeurManager.getCoeurConfig(line.getReference().getCoeurName()).getCrueConfigMetier();
+ //la config est celle de la référence.
+ CrueConfigMetier config = coeurManager.getCoeurConfig(line.getReference().getCoeurName()).getCrueConfigMetier();
result.setComparisonResult(executor.compare(config, referenceResult.getResult(), cibleResult.getResult()));
@@ -106,27 +111,33 @@
logs.addGroup(projetResult.getLogs());
final EMHProjet projet = projetResult.getResult();
- final EMHProjetController controller = new EMHProjetController(projet,user);
+ final EMHProjetController controller = new EMHProjetController(projet, user);
ManagerEMHScenario managerScenario = projet.getScenario(item.getScenarioNom());
- EMHScenario emhScenario=null;
+ EMHScenario emhScenario = null;
if (convert) {
final InfosCreation infos = new InfosCreation(user);
infos.setCrueVersion(this.coeurManager.getCoeurConfig(item.getCoeurName()).getCrueVertionTypeOTFA());
// Conversion du scénario
final CrueOperationResult<EMHScenarioContainer> conversionResult = controller.convertScenario(item.getScenarioNom(), infos,
- item.getEtuFile());
+ item.getEtuFile());
logs.addGroup(conversionResult.getLogs());
managerScenario = conversionResult.getResult().getManagerEMHScenario();
- emhScenario=conversionResult.getResult().getEmhScenario();
+ emhScenario = conversionResult.getResult().getEmhScenario();
}
// Création du run.
CrueOperationResult<EMHRun> runResult = controller.createRun(managerScenario.getNom(), item.getEtuFile());
logs.addGroup(runResult.getLogs());
+ if (managerScenario.isCrue9()) {
+ calculRunner.getCrue9Runner().launchOn(projet, managerScenario, runResult.getResult());
+ } else {
+ calculRunner.getCrue10Runner(projet.getCoeurConfig()).launchOn(projet, managerScenario, runResult.getResult());
+ }
+
//TODO Lancer le run et récupérer le log associé.
return new CrueOperationResult<EMHScenario>(emhScenario, logs);
Modified: trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/action/LaunchAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/action/LaunchAction.java 2011-12-02 08:33:39 UTC (rev 6761)
+++ trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/action/LaunchAction.java 2011-12-02 08:34:13 UTC (rev 6762)
@@ -8,6 +8,8 @@
import java.util.List;
import javax.swing.AbstractAction;
import javax.swing.Action;
+import org.fudaa.dodico.crue.projet.calcul.CalculCrueRunnerManager;
+import org.fudaa.dodico.crue.projet.calcul.CalculCrueRunnerManagerEmpty;
import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneLineResult;
import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneResult;
import org.fudaa.dodico.crue.projet.otfa.OtfaExecutor;
@@ -27,6 +29,8 @@
private OtfaCampagneTopComponent editor;
ConfigurationManagerService configurationManagerService = Lookup.getDefault().lookup(ConfigurationManagerService.class);
InstallationService installationService = Lookup.getDefault().lookup(InstallationService.class);
+ //TODO a remplacer
+ private CalculCrueRunnerManager calculRunner = new CalculCrueRunnerManagerEmpty();
public LaunchAction(OtfaCampagneTopComponent editor) {
this.editor = editor;
@@ -36,7 +40,7 @@
@Override
public void actionPerformed(ActionEvent e) {
//TODO Récupérer l'utilisateur.
- final OtfaExecutor executor = new OtfaExecutor(configurationManagerService.getCoeurManager(), installationService.getConnexionInformation());
+ final OtfaExecutor executor = new OtfaExecutor(configurationManagerService.getCoeurManager(), installationService.getConnexionInformation(), calculRunner);
final OtfaCampagneResult result = executor.launch(this.editor.getCampagne());
LogsDisplayer.displayError(result.getGlobalValidation(), MessagesOtfa.getMessage("OtfaBilanExecution.DialogTitle"));
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/ListTopComponentAbstract.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/ListTopComponentAbstract.java 2011-12-02 08:33:39 UTC (rev 6761)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/ListTopComponentAbstract.java 2011-12-02 08:34:13 UTC (rev 6762)
@@ -67,6 +67,7 @@
Node[] nodes = (Node[]) found.toArray(new Node[found.size()]);
try {
getExplorerManager().setSelectedNodes(nodes);
+ requestAttention(true);
} catch (PropertyVetoException ex) {
Exceptions.printStackTrace(ex);
}
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-12-02 08:33:39 UTC (rev 6761)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/ScenariosTopComponent.java 2011-12-02 08:34:13 UTC (rev 6762)
@@ -8,7 +8,7 @@
import org.fudaa.dodico.crue.metier.etude.ManagerEMHScenario;
import org.fudaa.fudaa.crue.common.helper.DialogHelper;
import org.fudaa.fudaa.crue.study.node.NodesManager;
-import org.fudaa.fudaa.crue.study.property.ManagerEMHScenarioPropertyFactory;
+import org.fudaa.fudaa.crue.study.property.ManagerPropertyFactory;
import org.fudaa.fudaa.crue.common.property.PropertyCrueUtils;
import org.openide.util.NbBundle;
import org.openide.windows.TopComponent;
@@ -45,9 +45,10 @@
putClientProperty(TopComponent.PROP_MAXIMIZATION_DISABLED, Boolean.TRUE);
putClientProperty(TopComponent.PROP_UNDOCKING_DISABLED, Boolean.TRUE);
PropertyCrueUtils.addProperty(outlineScenarioView, PropertyCrueUtils.TYPE_NAME);
+ PropertyCrueUtils.addProperty(outlineScenarioView, ManagerPropertyFactory.ISACTIVE, ManagerPropertyFactory.class);
PropertyCrueUtils.addProperty(outlineScenarioView, PropertyCrueUtils.COMMENTAIRE_NAME);
- PropertyCrueUtils.addProperty(outlineScenarioView, ManagerEMHScenarioPropertyFactory.DATEMODIFICATION, ManagerEMHScenarioPropertyFactory.class);
- PropertyCrueUtils.addProperty(outlineScenarioView, ManagerEMHScenarioPropertyFactory.AUTEURMODIFICATION, ManagerEMHScenarioPropertyFactory.class);
+ PropertyCrueUtils.addProperty(outlineScenarioView, ManagerPropertyFactory.DATEMODIFICATION, ManagerPropertyFactory.class);
+ PropertyCrueUtils.addProperty(outlineScenarioView, ManagerPropertyFactory.AUTEURMODIFICATION, ManagerPropertyFactory.class);
}
@Override
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/MigrateProjectAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/MigrateProjectAction.java 2011-12-02 08:33:39 UTC (rev 6761)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/MigrateProjectAction.java 2011-12-02 08:34:13 UTC (rev 6762)
@@ -66,12 +66,12 @@
return;
}
if (!file.getName().endsWith(CrueFileType.ETU.getExtension())) {
- file = new File(CtuluLibFile.getSansExtension(file).getAbsolutePath() + "." + CrueFileType.ETU.getExtension());
+ file =new File(file.getParentFile(),CtuluLibFile.getSansExtension(file.getName())+ "." + CrueFileType.ETU.getExtension());
}
MigrateProcessor runner = new MigrateProcessor(selectedProject, destinationCoeurConfig, file);
final CtuluLogGroup exportTo = ProgressUtils.showProgressDialogAndRun(runner, getActionTitle(), false);
if (exportTo.containsSomething()) {
- LogsDisplayer.displayError(exportTo, getActionTitle());
+ LogsDisplayer.displayError(exportTo,NbBundle.getMessage(DirSelectionApprover.class, "MigrateProject.BilanDialog",file.getAbsoluteFile()));
}
if (!exportTo.containsError()) {
crueService.closeAll();
@@ -110,7 +110,7 @@
validator.valid(selection.getParentFile(), log);
}
if (log.containsErrorOrFatalError()) {
- LogsDisplayer.displayError(log, NbBundle.getMessage(DirSelectionApprover.class, "MigrateProjectChooseFolder.BilanDialog"));
+ LogsDisplayer.displayError(log, NbBundle.getMessage(DirSelectionApprover.class, "MigrateProjectChooseFolder.BilanDialog",selection.getAbsoluteFile()));
return false;
}
return true;
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ListingManagerEMHScenario.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ListingManagerEMHScenario.java 2011-12-02 08:33:39 UTC (rev 6761)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ListingManagerEMHScenario.java 2011-12-02 08:34:13 UTC (rev 6762)
@@ -30,7 +30,7 @@
protected Node createNode(String key) {
ManagerEMHScenario scenario = nodeManager.getProjet().getScenario(key);
final ManagerEMHScenarioNode managerEMHScenarioNode = new ManagerEMHScenarioNode(createChildren(scenario), scenario);
- if (nodeManager.getProjet().getScenarioCourant().equals(scenario)) {
+ if (nodeManager.getProjet().getScenarioCourant()!=null && nodeManager.getProjet().getScenarioCourant().equals(scenario)) {
managerEMHScenarioNode.setScenarioCourant(true);
}
return managerEMHScenarioNode;
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ManagerEMHModeleNode.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ManagerEMHModeleNode.java 2011-12-02 08:33:39 UTC (rev 6761)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ManagerEMHModeleNode.java 2011-12-02 08:34:13 UTC (rev 6762)
@@ -9,10 +9,12 @@
import org.fudaa.dodico.crue.metier.emh.EnumTypeEMH;
import org.fudaa.dodico.crue.metier.etude.ManagerEMHModeleBase;
import org.fudaa.fudaa.crue.common.CrueIconsProvider;
+import org.fudaa.fudaa.crue.common.property.AbstractNodeFirable;
+import org.fudaa.fudaa.crue.study.property.ManagerPropertyFactory;
import org.openide.actions.DeleteAction;
import org.openide.actions.PropertiesAction;
-import org.openide.nodes.AbstractNode;
import org.openide.nodes.Children;
+import org.openide.nodes.Sheet;
import org.openide.util.actions.SystemAction;
import org.openide.util.lookup.Lookups;
@@ -20,7 +22,7 @@
*
* @author genesis
*/
-public class ManagerEMHModeleNode extends AbstractNode {
+public class ManagerEMHModeleNode extends AbstractNodeFirable {
public ManagerEMHModeleNode(Children children, ManagerEMHModeleBase modele) {
super(children, Lookups.singleton(modele));
@@ -43,4 +45,11 @@
public void destroy() throws IOException {
super.destroy();
}
+
+ @Override
+ protected Sheet createSheet() {
+ return ManagerPropertyFactory.createSheet(this, getLookup().lookup(ManagerEMHModeleBase.class));
+ }
+
+
}
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-12-02 08:33:39 UTC (rev 6761)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ManagerEMHScenarioNode.java 2011-12-02 08:34:13 UTC (rev 6762)
@@ -13,7 +13,7 @@
import org.fudaa.fudaa.crue.common.property.AbstractNodeFirable;
import org.fudaa.fudaa.crue.study.actions.OpenRunCourantAction;
import org.fudaa.fudaa.crue.study.actions.OpenScenarioAction;
-import org.fudaa.fudaa.crue.study.property.ManagerEMHScenarioPropertyFactory;
+import org.fudaa.fudaa.crue.study.property.ManagerPropertyFactory;
import org.openide.actions.DeleteAction;
import org.openide.actions.PropertiesAction;
import org.openide.nodes.Children;
@@ -79,7 +79,7 @@
@Override
protected Sheet createSheet() {
- return new ManagerEMHScenarioPropertyFactory().createSheet(this);
+ return new ManagerPropertyFactory().createSheet(this);
}
@Override
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ManagerEMHSousModeleNode.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ManagerEMHSousModeleNode.java 2011-12-02 08:33:39 UTC (rev 6761)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ManagerEMHSousModeleNode.java 2011-12-02 08:34:13 UTC (rev 6762)
@@ -9,10 +9,12 @@
import org.fudaa.dodico.crue.metier.emh.EnumTypeEMH;
import org.fudaa.dodico.crue.metier.etude.ManagerEMHSousModele;
import org.fudaa.fudaa.crue.common.CrueIconsProvider;
+import org.fudaa.fudaa.crue.common.property.AbstractNodeFirable;
+import org.fudaa.fudaa.crue.study.property.ManagerPropertyFactory;
import org.openide.actions.DeleteAction;
import org.openide.actions.PropertiesAction;
-import org.openide.nodes.AbstractNode;
import org.openide.nodes.Children;
+import org.openide.nodes.Sheet;
import org.openide.util.actions.SystemAction;
import org.openide.util.lookup.Lookups;
@@ -20,7 +22,7 @@
*
* @author genesis
*/
-public class ManagerEMHSousModeleNode extends AbstractNode {
+public class ManagerEMHSousModeleNode extends AbstractNodeFirable {
public ManagerEMHSousModeleNode(Children children, ManagerEMHSousModele modele) {
super(children, Lookups.singleton(modele));
@@ -43,4 +45,9 @@
public void destroy() throws IOException {
super.destroy();
}
+
+ @Override
+ protected Sheet createSheet() {
+ return ManagerPropertyFactory.createSheet(this, getLookup().lookup(ManagerEMHSousModele.class));
+ }
}
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/NodesManager.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/NodesManager.java 2011-12-02 08:33:39 UTC (rev 6761)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/NodesManager.java 2011-12-02 08:34:13 UTC (rev 6762)
@@ -100,6 +100,10 @@
}
public final void setProject(EMHProjet projet) {
+ if(projet==null){
+ clear();
+ return;
+ }
emhProjet = projet;
nodeFichierCrueList = new AbstractNode(new ListingFichierCrue(getProjet()).build());
nodeFichierCrueList.setName(FICHIERS);//TODO
Deleted: 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-12-02 08:33:39 UTC (rev 6761)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/property/ManagerEMHScenarioPropertyFactory.java 2011-12-02 08:34:13 UTC (rev 6762)
@@ -1,62 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.fudaa.fudaa.crue.study.property;
-
-import org.fudaa.fudaa.crue.common.property.PropertyCrueUtils;
-import org.fudaa.dodico.crue.metier.etude.EMHInfosVersion;
-import org.fudaa.dodico.crue.metier.etude.ManagerEMHScenario;
-import org.fudaa.fudaa.crue.common.property.PropertySupportReflection;
-import org.fudaa.fudaa.crue.study.node.ManagerEMHScenarioNode;
-import org.joda.time.LocalDateTime;
-import org.openide.nodes.Node.Property;
-import org.openide.nodes.PropertySupport;
-import org.openide.nodes.Sheet;
-import org.openide.util.Exceptions;
-
-/**
- *
- * @author genesis
- */
-public class ManagerEMHScenarioPropertyFactory extends PropertyCrueUtils {
-
- public static final String AUTEURMODIFICATION = "AuteurModification";
- public static final String DATEMODIFICATION = "DateModification";
-
- public Sheet createSheet(final ManagerEMHScenarioNode node) {
- ManagerEMHScenario scenario = node.getLookup().lookup(ManagerEMHScenario.class);
- Sheet sheet = Sheet.createDefault();
- Sheet.Set set = Sheet.createPropertiesSet();
- try {
- final EMHInfosVersion infosVersions = scenario.getInfosVersions();
- //type
- PropertySupport.Reflection typeProp = new PropertySupport.Reflection(infosVersions, String.class, "getType", null);
- configureNoCustomEditor(typeProp);
- setNameAndDisplayName(typeProp, TYPE_NAME);
-
- //commentaire
- Property commentaireProp = new PropertySupportReflection(node, infosVersions, String.class, "getCommentaire", "setCommentaire");
- setNameAndDisplayName(commentaireProp, COMMENTAIRE_NAME);
- commentaireProp.setPreferred(true);
- configureNoEditAsText(commentaireProp);
- //auteur derniere modif
- Property auteurModifProp = new PropertySupport.Reflection(infosVersions, String.class, "getAuteurDerniereModif", null);
- setNameAndDisplayName(auteurModifProp, AUTEURMODIFICATION, getClass());
- configureNoCustomEditor(auteurModifProp);
- //date dernier modif.
- PropertySupport.Reflection dateModifProp = new PropertySupport.Reflection(infosVersions, LocalDateTime.class, "getDateDerniereModif", null);
- dateModifProp.setPropertyEditorClass(PropertyEditorLocalDateTime.class);
- setNameAndDisplayName(dateModifProp, DATEMODIFICATION, getClass());
-
- set.put(typeProp);
- set.put(commentaireProp);
- set.put(auteurModifProp);
- set.put(dateModifProp);
- } catch (Exception ex) {
- Exceptions.printStackTrace(ex);
- }
- sheet.put(set);
- return sheet;
- }
-}
Copied: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/property/ManagerPropertyFactory.java (from rev 6757, 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/ManagerPropertyFactory.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/property/ManagerPropertyFactory.java 2011-12-02 08:34:13 UTC (rev 6762)
@@ -0,0 +1,78 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.fudaa.fudaa.crue.study.property;
+
+import org.fudaa.fudaa.crue.common.property.PropertyCrueUtils;
+import org.fudaa.dodico.crue.metier.etude.EMHInfosVersion;
+import org.fudaa.dodico.crue.metier.etude.ManagerEMHContainerBase;
+import org.fudaa.dodico.crue.metier.etude.ManagerEMHScenario;
+import org.fudaa.fudaa.crue.common.property.AbstractNodeFirable;
+import org.fudaa.fudaa.crue.common.property.PropertySupportReflection;
+import org.fudaa.fudaa.crue.study.node.ManagerEMHScenarioNode;
+import org.joda.time.LocalDateTime;
+import org.openide.nodes.Node.Property;
+import org.openide.nodes.PropertySupport;
+import org.openide.nodes.Sheet;
+import org.openide.util.Exceptions;
+
+/**
+ *
+ * @author genesis
+ */
+public class ManagerPropertyFactory extends PropertyCrueUtils {
+
+ public static final String AUTEURMODIFICATION = "AuteurModification";
+ public static final String DATEMODIFICATION = "DateModification";
+ public static final String ISACTIVE = "IsActive.Property";
+
+ public static Sheet createSheet(final ManagerEMHScenarioNode node) {
+ ManagerEMHScenario scenario = node.getLookup().lookup(ManagerEMHScenario.class);
+ return createSheet(node, scenario);
+ }
+
+ public static Sheet createSheet(final AbstractNodeFirable node, ManagerEMHContainerBase scenario) {
+ Sheet sheet = Sheet.createDefault();
+ Sheet.Set set = Sheet.createPropertiesSet();
+ try {
+ final EMHInfosVersion infosVersions = scenario.getInfosVersions();
+ Property isActiveProp = null;
+ if (scenario.isCrue9()) {
+ isActiveProp = new PropertySupport.Reflection(scenario, Boolean.class, "isActive", null);
+ } else {
+ isActiveProp = new PropertySupportReflection(node, scenario, Boolean.class, "isActive", "setActive");
+ configureNoEditAsText(isActiveProp);
+ }
+ setNameAndDisplayName(isActiveProp, ISACTIVE);
+ isActiveProp.setPreferred(true);
+
+ //type
+ PropertySupport.Reflection typeProp = new PropertySupport.Reflection(infosVersions, String.class, "getType", null);
+ configureNoCustomEditor(typeProp);
+ setNameAndDisplayName(typeProp, TYPE_NAME);
+
+ //commentaire
+ Property commentaireProp = new PropertySupportReflection(node, infosVersions, String.class, "getCommentaire", "setCommentaire");
+ setNameAndDisplayName(commentaireProp, COMMENTAIRE_NAME);
+ configureNoEditAsText(commentaireProp);
+ //auteur derniere modif
+ Property auteurModifProp = new PropertySupport.Reflection(infosVersions, String.class, "getAuteurDerniereModif", null);
+ setNameAndDisplayName(auteurModifProp, AUTEURMODIFICATION, ManagerPropertyFactory.class);
+ configureNoCustomEditor(auteurModifProp);
+ //date dernier modif.
+ PropertySupport.Reflection dateModifProp = new PropertySupport.Reflection(infosVersions, LocalDateTime.class, "getDateDerniere...
[truncated message content] |
|
From: <de...@us...> - 2011-12-02 23:21:33
|
Revision: 6775
http://fudaa.svn.sourceforge.net/fudaa/?rev=6775&view=rev
Author: deniger
Date: 2011-12-02 23:21:26 +0000 (Fri, 02 Dec 2011)
Log Message:
-----------
maj
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/ModellingScenarioService.java
trunk/soft/fudaa-crue/ui-loader/src/main/java/org/fudaa/fudaa/crue/loader/ScenarioLoaderServiceAbstract.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingCloseAction.java
trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/node/OptionNode.java
trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/node/OptionNodeChildFactory.java
trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/services/CrueRunLauncherService.java
trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/action/PostCloseAction.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/AbstractStudyAction.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/OpenProjectAction.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/EmhRunNode.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/EMHProjetService.java
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/ModellingScenarioService.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/ModellingScenarioService.java 2011-12-02 21:27:56 UTC (rev 6774)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/ModellingScenarioService.java 2011-12-02 23:21:26 UTC (rev 6775)
@@ -18,7 +18,7 @@
boolean isScenarioLoaded();
- void unloadScenario();
+ boolean unloadScenario();
boolean loadScenario(EMHProjet projet, ManagerEMHScenario scenario);
Modified: trunk/soft/fudaa-crue/ui-loader/src/main/java/org/fudaa/fudaa/crue/loader/ScenarioLoaderServiceAbstract.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loader/src/main/java/org/fudaa/fudaa/crue/loader/ScenarioLoaderServiceAbstract.java 2011-12-02 21:27:56 UTC (rev 6774)
+++ trunk/soft/fudaa-crue/ui-loader/src/main/java/org/fudaa/fudaa/crue/loader/ScenarioLoaderServiceAbstract.java 2011-12-02 23:21:26 UTC (rev 6775)
@@ -60,7 +60,7 @@
return lookup.lookup(EMHProjet.class);
}
- public void unloadScenario() {
+ public boolean unloadScenario() {
final EMHProjet project = getProject();
if (project != null) {
dynamicContent.remove(project);
@@ -77,6 +77,7 @@
if (scenarioLoaded != null) {
dynamicContent.remove(scenarioLoaded);
}
+ return true;
}
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingCloseAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingCloseAction.java 2011-12-02 21:27:56 UTC (rev 6774)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingCloseAction.java 2011-12-02 23:21:26 UTC (rev 6775)
@@ -6,6 +6,8 @@
import java.awt.event.ActionEvent;
import javax.swing.Action;
+import org.fudaa.fudaa.crue.common.Perspective;
+import org.fudaa.fudaa.crue.common.services.SelectedPerspectiveService;
import org.openide.awt.ActionRegistration;
import org.openide.awt.ActionReference;
import org.openide.awt.ActionReferences;
@@ -21,6 +23,8 @@
})
public final class ModellingCloseAction extends AbstractModellingAction {
+ SelectedPerspectiveService selectedPerspectiveService = Lookup.getDefault().lookup(SelectedPerspectiveService.class);
+
public ModellingCloseAction() {
putValue(Action.NAME, NbBundle.getMessage(ModellingCloseAction.class, "CTL_ModellingClose"));
}
@@ -31,7 +35,10 @@
}
public void actionPerformed(ActionEvent e) {
- scenarioService.unloadScenario();
+ if(scenarioService.unloadScenario()){
+ selectedPerspectiveService.activePerspective(Perspective.STUDY);
+ }
+
}
}
Modified: trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/node/OptionNode.java
===================================================================
--- trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/node/OptionNode.java 2011-12-02 21:27:56 UTC (rev 6774)
+++ trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/node/OptionNode.java 2011-12-02 23:21:26 UTC (rev 6775)
@@ -1,9 +1,11 @@
package org.fudaa.fudaa.crue.options.node;
+import java.io.File;
import java.lang.reflect.InvocationTargetException;
import java.util.MissingResourceException;
import javax.swing.Action;
import org.fudaa.dodico.crue.projet.conf.Option;
+import org.fudaa.dodico.crue.projet.conf.OptionsEnum;
import org.fudaa.dodico.crue.projet.conf.UserOption;
import org.fudaa.fudaa.crue.common.property.PropertyCrueUtils;
import org.openide.nodes.AbstractNode;
@@ -50,9 +52,11 @@
public static String getPropValueDescription() throws MissingResourceException {
return NbBundle.getMessage(OptionNode.class, "ProprieteOption.Value.Desc");
}
+ private final OptionsEnum optionEnum;
- public OptionNode(Option option, String defaultValue) {
+ public OptionNode(Option option, String defaultValue, OptionsEnum optionEnum) {
super(Children.LEAF, Lookups.singleton(option));
+ this.optionEnum = optionEnum;
setDisplayName(option.getDisplayName());
setShortDescription(option.getCommentaire());
this.defaultValue = defaultValue;
@@ -66,11 +70,11 @@
public Action[] getActions(boolean context) {
return new Action[]{SystemAction.get(OptionResetAction.class)};
}
-
- public void setOptionValue(String newValue){
- if(getOption().isEditable()){
- String old=getOption().getValeur();
- ((UserOption)getOption()).setValeur(newValue);
+
+ public void setOptionValue(String newValue) {
+ if (getOption().isEditable()) {
+ String old = getOption().getValeur();
+ ((UserOption) getOption()).setValeur(newValue);
firePropertyChange(PROP_VALUE, old, newValue);
}
}
@@ -83,7 +87,11 @@
try {
set.put(new PropertyId(option));
if (option.isEditable()) {
- set.put(new PropertyValueEditable((UserOption) option));
+ if (File.class.equals(optionEnum.getExpectedValue())) {
+ set.put(new PropertyValueFileEditable((UserOption) option));
+ } else {
+ set.put(new PropertyValueEditable((UserOption) option));
+ }
set.put(new PropertyDefault(defaultValue));
} else {
set.put(new PropertyValue(option));
@@ -167,4 +175,31 @@
option.setValeur(val);
}
}
+
+ private static class PropertyValueFileEditable extends PropertySupport.ReadWrite<File> {
+
+ private final UserOption option;
+
+ public PropertyValueFileEditable(final UserOption option) {
+ super(PROP_VALUE, File.class, getPropValueDisplayName(), getPropValueDescription());
+ this.option = option;
+ }
+
+ @Override
+ public File getValue() throws IllegalAccessException, InvocationTargetException {
+ return new File(option.getValeur());
+ }
+
+ @Override
+ public void setValue(File val) throws IllegalAccessException, IllegalArgumentException, InvocationTargetException {
+ if (val == null) {
+ option.setValeur(null);
+ } else if (val.exists()) {
+ option.setValeur(val.getAbsolutePath());
+ } else {
+ option.setValeur(val.getPath());
+ }
+
+ }
+ }
}
Modified: trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/node/OptionNodeChildFactory.java
===================================================================
--- trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/node/OptionNodeChildFactory.java 2011-12-02 21:27:56 UTC (rev 6774)
+++ trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/node/OptionNodeChildFactory.java 2011-12-02 23:21:26 UTC (rev 6775)
@@ -27,6 +27,6 @@
@Override
protected Node createNodeForKey(Option key) {
- return new OptionNode(key, optionsMananger.getSiteValue(key));
+ return new OptionNode(key, optionsMananger.getSiteValue(key),optionsMananger.getOptionEnum(key));
}
}
Modified: trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/services/CrueRunLauncherService.java
===================================================================
--- trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/services/CrueRunLauncherService.java 2011-12-02 21:27:56 UTC (rev 6774)
+++ trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/services/CrueRunLauncherService.java 2011-12-02 23:21:26 UTC (rev 6775)
@@ -1,10 +1,12 @@
package org.fudaa.fudaa.crue.options.services;
import org.apache.commons.lang.StringUtils;
+import org.fudaa.dodico.crue.metier.etude.ManagerEMHScenario;
import org.fudaa.dodico.crue.projet.calcul.CalculCrueRunner;
import org.fudaa.dodico.crue.projet.calcul.CalculCrueRunnerManager;
import org.fudaa.dodico.crue.projet.calcul.CalculCrueRunnerManagerImpl;
import org.fudaa.dodico.crue.projet.calcul.ExecInput;
+import org.fudaa.dodico.crue.projet.calcul.ExecInputDefault;
import org.fudaa.dodico.crue.projet.coeur.CoeurConfigContrat;
import org.fudaa.dodico.crue.projet.conf.Option;
import org.fudaa.dodico.crue.projet.conf.OptionsEnum;
@@ -23,7 +25,7 @@
ConfigurationManagerService configurationManagerService = Lookup.getDefault().lookup(ConfigurationManagerService.class);
CalculCrueRunnerManagerImpl manager = new CalculCrueRunnerManagerImpl();
- private boolean validCrue9() {
+ public boolean validCrue9() {
final Option option = configurationManagerService.getOptionsManager().getOption(OptionsEnum.CRUE9_EXE);
if (option == null || StringUtils.isEmpty(option.getValeur())) {
DialogHelper.showError(NbBundle.getMessage(CrueRunLauncherService.class, "LaunchCrue9.ExecNotDefined.DialogTitle"), NbBundle.getMessage(CrueRunLauncherService.class, "LaunchCrue9.ExecNotDefined.DialogMessage"));
@@ -38,6 +40,24 @@
return manager.getCrue10Runner(coeur);
}
+ public void run(ExecInputDefault execInputDefault) {
+ //TODO faire un thread et logger les résulat.
+ ManagerEMHScenario scenario = execInputDefault.getScenario();
+ if (scenario.isCrue9()) {
+ getCrue9Runner().launchOn(execInputDefault);
+ } else {
+ getCrue10Runner(execInputDefault.getProjet().getCoeurConfig()).launchOn(execInputDefault);
+ }
+ }
+
+ public boolean validConfiguration(ManagerEMHScenario scenario) {
+ if(scenario.isCrue9()){
+ return validCrue9();
+ }
+ //TODO revoir
+ return true;
+ }
+
/**
* Pour afficher un message si non configure.
*/
Modified: trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/action/PostCloseAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/action/PostCloseAction.java 2011-12-02 21:27:56 UTC (rev 6774)
+++ trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/action/PostCloseAction.java 2011-12-02 23:21:26 UTC (rev 6775)
@@ -2,6 +2,8 @@
import java.awt.event.ActionEvent;
import javax.swing.Action;
+import org.fudaa.fudaa.crue.common.Perspective;
+import org.fudaa.fudaa.crue.common.services.SelectedPerspectiveService;
import org.openide.awt.ActionRegistration;
import org.openide.awt.ActionReference;
import org.openide.awt.ActionReferences;
@@ -16,6 +18,7 @@
@ActionReference(path = "Menu/Post", position = 1)
})
public final class PostCloseAction extends AbstractPostAction {
+ SelectedPerspectiveService selectedPerspectiveService = Lookup.getDefault().lookup(SelectedPerspectiveService.class);
public PostCloseAction() {
putValue(Action.NAME, NbBundle.getMessage(PostCloseAction.class, "CTL_PostCloseAction"));
@@ -28,6 +31,7 @@
public void actionPerformed(ActionEvent e) {
postService.unloadRun();
+ selectedPerspectiveService.activePerspective(Perspective.STUDY);
}
}
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/AbstractStudyAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/AbstractStudyAction.java 2011-12-02 21:27:56 UTC (rev 6774)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/AbstractStudyAction.java 2011-12-02 23:21:26 UTC (rev 6775)
@@ -31,6 +31,6 @@
@Override
protected boolean getEnableState() {
- return super.getEnableState() && service != null && service.isProjectOpened();
+ return super.getEnableState()&& service.isProjectOpened();
}
}
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/OpenProjectAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/OpenProjectAction.java 2011-12-02 21:27:56 UTC (rev 6774)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/OpenProjectAction.java 2011-12-02 23:21:26 UTC (rev 6775)
@@ -5,9 +5,11 @@
package org.fudaa.fudaa.crue.study.actions;
import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
+import javax.swing.Action;
import org.fudaa.dodico.crue.metier.etude.EMHProjet;
import org.fudaa.dodico.crue.metier.etude.ManagerEMHScenario;
+import org.fudaa.fudaa.crue.common.Perspective;
+import org.fudaa.fudaa.crue.common.action.AbstractPerspectiveAwareAction;
import org.fudaa.fudaa.crue.common.helper.DialogHelper;
import org.fudaa.fudaa.crue.common.services.ModellingScenarioService;
import org.fudaa.fudaa.crue.options.services.ConfigurationManagerService;
@@ -25,12 +27,18 @@
@ActionReferences({
@ActionReference(path = "Menu/Study", position = 1)
})
-public final class OpenProjectAction implements ActionListener {
-
- private EMHProjetService service = Lookup.getDefault().lookup(EMHProjetService.class);
+public final class OpenProjectAction extends AbstractPerspectiveAwareAction {
+
+ EMHProjetService service = Lookup.getDefault().lookup(EMHProjetService.class);
ModellingScenarioService modellingScenarioService = Lookup.getDefault().lookup(ModellingScenarioService.class);
private ConfigurationManagerService configurationManagerService = Lookup.getDefault().lookup(ConfigurationManagerService.class);
-
+
+ public OpenProjectAction() {
+ super(Perspective.STUDY);
+ putValue(Action.NAME, NbBundle.getMessage(CloseProjectAction.class, "CTL_LoadStudy"));
+ }
+
+
@Override
public void actionPerformed(ActionEvent e) {
if (!configurationManagerService.isConfigValid()) {
@@ -45,10 +53,15 @@
if (accepted) {
modellingScenarioService.loadScenario(selectedProject, scenarioCourant);
}
-
+
}
-
+
}
}
}
+
+ @Override
+ public Action createContextAwareInstance(Lookup actionContext) {
+ return new OpenProjectAction();
+ }
}
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/EmhRunNode.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/EmhRunNode.java 2011-12-02 21:27:56 UTC (rev 6774)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/EmhRunNode.java 2011-12-02 23:21:26 UTC (rev 6775)
@@ -11,11 +11,11 @@
import org.fudaa.fudaa.crue.common.CrueIconsProvider;
import org.fudaa.fudaa.crue.study.actions.OpenRunNodeAction;
import org.openide.filesystems.FileObject;
-import org.openide.loaders.DataFolder;
import org.openide.loaders.DataObject;
import org.openide.loaders.DataObjectNotFoundException;
import org.openide.nodes.AbstractNode;
import org.openide.nodes.Children;
+import org.openide.nodes.FilterNode;
import org.openide.nodes.Node;
import org.openide.util.Exceptions;
import org.openide.util.actions.SystemAction;
@@ -32,13 +32,13 @@
// public static class DataFolderDefault extends DataFolder {
// }
-
private static Children getChildren(FileObject obj) {
try {
- final Node nodeDelegate = DataObject.find(obj).getNodeDelegate();
+ final DataObject find = DataObject.find(obj);
+ final Node nodeDelegate = find.getNodeDelegate();
nodeDelegate.setDisplayName(org.openide.util.NbBundle.getMessage(EmhRunNode.class, "EMHRunNodeFichierList.DisplayName"));
Children.Array children = new Children.Array();
- children.add(new Node[]{nodeDelegate});
+ children.add(new Node[]{new FilterNode(nodeDelegate)});
return children;
} catch (DataObjectNotFoundException ex) {
Exceptions.printStackTrace(ex);
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-12-02 21:27:56 UTC (rev 6774)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/EMHProjetService.java 2011-12-02 23:21:26 UTC (rev 6775)
@@ -4,21 +4,25 @@
package org.fudaa.fudaa.crue.study.services;
import java.io.IOException;
+import org.fudaa.dodico.crue.common.CrueOperationResult;
import org.fudaa.dodico.crue.metier.etude.EMHProjectInfos;
import java.io.File;
import org.fudaa.ctulu.CtuluLogGroup;
import org.fudaa.dodico.crue.common.BusinessMessages;
import org.fudaa.dodico.crue.metier.etude.EMHProjet;
+import org.fudaa.dodico.crue.metier.etude.EMHRun;
import org.fudaa.dodico.crue.metier.etude.ManagerEMHScenario;
import org.fudaa.dodico.crue.projet.EMHProjetController;
+import org.fudaa.dodico.crue.projet.calcul.ExecInput;
+import org.fudaa.dodico.crue.projet.calcul.ExecInputDefault;
import org.fudaa.fudaa.crue.common.CommonMessage;
import org.fudaa.fudaa.crue.common.log.LogsDisplayer;
import org.fudaa.fudaa.crue.common.property.listener.ListenerManager;
import org.fudaa.fudaa.crue.loader.LoaderService;
import org.fudaa.fudaa.crue.loader.ProjectLoadContainer;
+import org.fudaa.fudaa.crue.options.services.CrueRunLauncherService;
import org.fudaa.fudaa.crue.options.services.InstallationService;
import org.fudaa.fudaa.crue.study.node.NodesManager;
-import org.joda.time.LocalDate;
import org.joda.time.LocalDateTime;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;
@@ -46,7 +50,8 @@
ListenerManager listeners = new ListenerManager();
LoaderService loaderService = Lookup.getDefault().lookup(LoaderService.class);
InstallationService installationService = Lookup.getDefault().lookup(InstallationService.class);
- InputOutput io = IOProvider.getDefault().getIO("EMHProjet", true);
+ CrueRunLauncherService crueRunLauncherService = Lookup.getDefault().lookup(CrueRunLauncherService.class);
+ InputOutput io;
DateTimeFormatter formatter;
private InputOutput getIO() {
@@ -61,7 +66,7 @@
if (formatter == null) {
formatter = DateTimeFormat.mediumDateTime();
}
- io.getOut().println(formatter.print(new LocalDateTime()) + ": " + s);
+ getIO().getOut().println(formatter.print(new LocalDateTime()) + ": " + s);
}
protected void closeIO() {
@@ -159,9 +164,14 @@
}
public void launchRun(ManagerEMHScenario scenario) {
+ if(!crueRunLauncherService.validConfiguration(scenario)){
+ return;
+ }
EMHProjetController controller = new EMHProjetController(getSelectedProject(), installationService.getConnexionInformation());
log(org.openide.util.NbBundle.getMessage(EMHProjetService.class, "LogLaunchRunDefaultOption", scenario.getNom()));
- controller.createRun(scenario.getNom(), etuFile);
+ CrueOperationResult<EMHRun> createRun = controller.createRun(scenario.getNom(), etuFile);
+ crueRunLauncherService.run(new ExecInputDefault(getSelectedProject(), scenario, createRun.getResult()));
+
close();
load(etuFile);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2011-12-16 00:23:05
|
Revision: 6846
http://fudaa.svn.sourceforge.net/fudaa/?rev=6846&view=rev
Author: deniger
Date: 2011-12-16 00:22:58 +0000 (Fri, 16 Dec 2011)
Log Message:
-----------
correction tests unitaires
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/etude/EMHProjet.java
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/CommonMessage.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/AbstractManagerNode.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/FichierCrueNode.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ListingManagerEMHSousModele.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/EMHProjetService.java
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/etude/EMHProjet.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/etude/EMHProjet.java 2011-12-15 23:50:15 UTC (rev 6845)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/etude/EMHProjet.java 2011-12-16 00:22:58 UTC (rev 6846)
@@ -84,11 +84,15 @@
}
public File getDirForRun(final ManagerEMHScenario sc, final EMHRun runCourant) {
- File dir = new File(getInfos().getDirectories().get(EMHProjectInfos.RUNS), sc.getNom());
+ File dir = getMainDirOfRuns(sc);
dir = new File(dir, runCourant.getNom());
return dir;
}
+ public File getMainDirOfRuns(final ManagerEMHScenario sc) {
+ return new File(getInfos().getDirectories().get(EMHProjectInfos.RUNS), sc.getNom());
+ }
+
/**
* @return the dir that contains the dc and dh files.
*/
@@ -248,13 +252,7 @@
* @param scenario
*/
public void deleteDirOfRuns(ManagerEMHScenario scenario) {
- final List<EMHRun> listeRuns = scenario.getListeRuns();
- if (CollectionUtils.isNotEmpty(listeRuns)) {
- for (EMHRun run : listeRuns) {
- CtuluLibFile.deleteDir(getDirForRun(scenario, run));
- }
-
- }
+ CtuluLibFile.deleteDir(getMainDirOfRuns(scenario));
}
/**
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/CommonMessage.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/CommonMessage.java 2011-12-15 23:50:15 UTC (rev 6845)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/CommonMessage.java 2011-12-16 00:22:58 UTC (rev 6846)
@@ -22,6 +22,16 @@
}
public static void resetFrameTitle() {
+ if (!EventQueue.isDispatchThread()) {
+ EventQueue.invokeLater(new Runnable() {
+
+ @Override
+ public void run() {
+ resetFrameTitle();
+ }
+ });
+ return;
+ }
WindowManager.getDefault().getMainWindow().setTitle(getDefaultFrameTitle());
}
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/AbstractManagerNode.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/AbstractManagerNode.java 2011-12-15 23:50:15 UTC (rev 6845)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/AbstractManagerNode.java 2011-12-16 00:22:58 UTC (rev 6846)
@@ -1,5 +1,6 @@
package org.fudaa.fudaa.crue.study.node;
+import java.awt.EventQueue;
import java.io.IOException;
import java.util.concurrent.Callable;
import org.apache.commons.collections.CollectionUtils;
@@ -14,6 +15,7 @@
import org.joda.time.LocalDateTime;
import org.openide.nodes.Children;
import org.openide.nodes.Node;
+import org.openide.util.Exceptions;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;
import org.openide.util.lookup.Lookups;
@@ -30,6 +32,7 @@
public AbstractManagerNode(Children children, T manager) {
super(children, Lookups.singleton(manager));
classManager = manager.getClass();
+ setValue("customDelete", Boolean.TRUE);
}
public T getManager() {
@@ -57,13 +60,27 @@
@Override
public void destroy() throws IOException {
+ if (!EventQueue.isDispatchThread()) {
+ EventQueue.invokeLater(new Runnable() {
+
+ @Override
+ public void run() {
+ try {
+ destroy();
+ } catch (IOException ex) {
+ Exceptions.printStackTrace(ex);
+ }
+ }
+ });
+ return;
+ }
if (getManager() instanceof ManagerEMHScenario && CollectionUtils.isNotEmpty(((ManagerEMHScenario) getManager()).getListeRuns())) {
- boolean accepted = DialogHelper.showQuestion(getName(), NbBundle.getMessage(AbstractManagerNode.class, "DeleteAction.ScenarioWithRuns.ConfirmationMessage"));
+ boolean accepted = DialogHelper.showQuestion(getName(), NbBundle.getMessage(AbstractManagerNode.class, "DeleteAction.ScenarioWithRuns.ConfirmationMessage", getName()));
if (!accepted) {
return;
}
} else {
- boolean accepted = DialogHelper.showQuestion(getName(), NbBundle.getMessage(AbstractManagerNode.class, "DeleteAction.ConfirmationMessage"));
+ boolean accepted = DialogHelper.showQuestion(getName(), NbBundle.getMessage(AbstractManagerNode.class, "DeleteAction.ConfirmationMessage", getName()));
if (!accepted) {
return;
}
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/FichierCrueNode.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/FichierCrueNode.java 2011-12-15 23:50:15 UTC (rev 6845)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/FichierCrueNode.java 2011-12-16 00:22:58 UTC (rev 6846)
@@ -4,6 +4,7 @@
*/
package org.fudaa.fudaa.crue.study.node;
+import java.awt.EventQueue;
import java.io.File;
import java.io.IOException;
import java.util.concurrent.Callable;
@@ -20,6 +21,7 @@
import org.openide.nodes.Children;
import org.openide.nodes.Node;
import org.openide.nodes.Sheet;
+import org.openide.util.Exceptions;
import org.openide.util.Lookup;
import org.openide.util.actions.SystemAction;
import org.openide.util.lookup.Lookups;
@@ -36,6 +38,7 @@
super(Children.LEAF, Lookups.singleton(fichier));
setName(fichier.getNom());
updateIcon();
+ setValue("customDelete", Boolean.TRUE);
}
public FichierCrue getFichierCrue() {
@@ -56,8 +59,9 @@
}
public boolean fileExists() {
- FichierCrue lookup = getFichierCrue();
- final boolean exists = lookup.getProjectFile(projetService.getSelectedProject()).exists();
+ FichierCrue fichierCrue = getFichierCrue();
+ final EMHProjet selectedProject = projetService.getSelectedProject();
+ final boolean exists = fichierCrue.getProjectFile(selectedProject).exists();
return exists;
}
@@ -84,6 +88,21 @@
@Override
public void destroy() throws IOException {
+ //les actions sont effectuées dans un thread a part.
+ if (!EventQueue.isDispatchThread()) {
+ EventQueue.invokeLater(new Runnable() {
+
+ @Override
+ public void run() {
+ try {
+ destroy();
+ } catch (IOException ex) {
+ Exceptions.printStackTrace(ex);
+ }
+ }
+ });
+ return;
+ }
Callable<Boolean> deleteCallable = new Callable<Boolean>() {
@Override
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ListingManagerEMHSousModele.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ListingManagerEMHSousModele.java 2011-12-15 23:50:15 UTC (rev 6845)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ListingManagerEMHSousModele.java 2011-12-16 00:22:58 UTC (rev 6846)
@@ -17,10 +17,8 @@
* @author genesis
*/
public class ListingManagerEMHSousModele extends ChildrenKeysAbstract<ManagerEMHSousModele> {
-
+
StudyChangeListenerService studyChangeListenerService = Lookup.getDefault().lookup(StudyChangeListenerService.class);
-
-
private final NodesManager nodeManager;
public ListingManagerEMHSousModele(NodesManager nodeManager) {
@@ -41,7 +39,9 @@
}
public Children createChildren(ManagerEMHSousModele sousModele) {
-
+ if (sousModele.getListeFichiers() == null) {
+ return Children.LEAF;
+ }
AbstractNode fichier = new FichierCrueManagerNode(sousModele.getListeFichiers(), nodeManager);
Children.Array res = new Children.Array();
res.add(new Node[]{fichier});
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-12-15 23:50:15 UTC (rev 6845)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/EMHProjetService.java 2011-12-16 00:22:58 UTC (rev 6846)
@@ -71,8 +71,8 @@
}
/**
- * Utilise pour une modification qui demande un rechargement de etude.
- * @param call
+ * Utilise pour une modification qui demande un rechargement de l'etude. Apres appel a call.call une sauvegarde est effectuée.
+ * @param call action sur EMHProjet.
* @param logString
*/
public void deepModification(Callable<Boolean> call, String logString) {
@@ -80,6 +80,7 @@
try {
Boolean ok = call.call();
if (Boolean.TRUE.equals(ok)) {
+ quickSave();
reload(logString);
}
} catch (Exception ex) {
@@ -158,8 +159,8 @@
void activeProject(EMHProjet project, File etuFile) {
this.etuFile = etuFile;
+ dynamicContent.add(project);
nodesManager.setProject(project, etuFile);
- dynamicContent.add(project);
registerListener(project);
CommonMessage.modifyFrameTitle(etuFile.getAbsolutePath());
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2011-12-29 11:30:44
|
Revision: 6891
http://fudaa.svn.sourceforge.net/fudaa/?rev=6891&view=rev
Author: deniger
Date: 2011-12-29 11:30:36 +0000 (Thu, 29 Dec 2011)
Log Message:
-----------
Corrections traductions
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-core-ui.jar/org/netbeans/core/ui/resources/Bundle_fr.properties
trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-openide-explorer.jar/org/openide/explorer/propertysheet/Bundle_fr.properties
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/DialogHelper.java
trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/helper/Bundle.properties
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/EMHProjetService.java
Added Paths:
-----------
trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/Bundle_fr.properties
trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/services/
trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/services/Bundle_fr.properties
trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-modules-javahelp.jar/
trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-modules-javahelp.jar/org/
trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-modules-javahelp.jar/org/netbeans/
trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-modules-javahelp.jar/org/netbeans/modules/
trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-modules-javahelp.jar/org/netbeans/modules/javahelp/
trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-modules-javahelp.jar/org/netbeans/modules/javahelp/Bundle_fr.properties
trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-modules-progress-ui.jar/
trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-modules-progress-ui.jar/org/
trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-modules-progress-ui.jar/org/netbeans/
trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-modules-progress-ui.jar/org/netbeans/modules/
trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-modules-progress-ui.jar/org/netbeans/modules/progress/
trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-modules-progress-ui.jar/org/netbeans/modules/progress/ui/
trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-modules-progress-ui.jar/org/netbeans/modules/progress/ui/Bundle_fr.properties
trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-openide-dialogs.jar/
trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-openide-dialogs.jar/org/
trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-openide-dialogs.jar/org/openide/
trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-openide-dialogs.jar/org/openide/Bundle_fr.properties
trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-openide-text.jar/
trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-openide-text.jar/org/
trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-openide-text.jar/org/openide/
trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-openide-text.jar/org/openide/text/
trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-openide-text.jar/org/openide/text/Bundle_fr.properties
Copied: trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/Bundle_fr.properties (from rev 6783, trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/Bundle.properties)
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/Bundle_fr.properties (rev 0)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/Bundle_fr.properties 2011-12-29 11:30:36 UTC (rev 6891)
@@ -0,0 +1,9 @@
+currentVersion=Fudaa-Crue {0}
+LBL_splash_window_title=D\u00e9marrage de Fudaa-Crue
+SPLASH_HEIGHT=290
+SPLASH_WIDTH=400
+SplashProgressBarBounds=0,237,400,20
+SplashProgressBarColor=0xFF
+SplashRunningTextBounds=6,224,380,10
+SplashRunningTextColor=0xFF
+SplashRunningTextFontSize=12
Modified: trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-core-ui.jar/org/netbeans/core/ui/resources/Bundle_fr.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-core-ui.jar/org/netbeans/core/ui/resources/Bundle_fr.properties 2011-12-29 11:05:28 UTC (rev 6890)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-core-ui.jar/org/netbeans/core/ui/resources/Bundle_fr.properties 2011-12-29 11:30:36 UTC (rev 6891)
@@ -1,3 +1,6 @@
Menu/Edit=&Edition
Actions/Tools=Outils
Menu/Tools=&Outils
+Actions/Help=Aide
+Menu/Help=&Aide
+
Added: trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/services/Bundle_fr.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/services/Bundle_fr.properties (rev 0)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/services/Bundle_fr.properties 2011-12-29 11:30:36 UTC (rev 6891)
@@ -0,0 +1,17 @@
+ACS_CANCEL_OPTION_DESC=Bouton Annuler
+ACS_CANCEL_OPTION_NAME=Annuler
+ACS_NO_OPTION_DESC=Bouton Non
+ACS_NO_OPTION_NAME=Non
+ACS_YES_OPTION_DESC=Bouton Oui
+ACS_YES_OPTION_NAME=Oui
+ACSD_FileSelectorCancelButton=Annuler
+CANCEL_OPTION_CAPTION=Annuler
+CancelButton=Annuler
+NO_OPTION_CAPTION=Non
+NoButton=Non
+YES_OPTION_CAPTION=Oui
+YesButton=Oui
+ACS_HELP_OPTION_DESC=Bouton Aide
+ACS_HELP_OPTION_NAME=Aide
+HELP_OPTION_CAPTION=&Aide
+
Added: trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-modules-javahelp.jar/org/netbeans/modules/javahelp/Bundle_fr.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-modules-javahelp.jar/org/netbeans/modules/javahelp/Bundle_fr.properties (rev 0)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-modules-javahelp.jar/org/netbeans/modules/javahelp/Bundle_fr.properties 2011-12-29 11:30:36 UTC (rev 6891)
@@ -0,0 +1,2 @@
+LBL_HelpAction=Aide
+QuickSearch/Help=Aide
Added: trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-modules-progress-ui.jar/org/netbeans/modules/progress/ui/Bundle_fr.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-modules-progress-ui.jar/org/netbeans/modules/progress/ui/Bundle_fr.properties (rev 0)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-modules-progress-ui.jar/org/netbeans/modules/progress/ui/Bundle_fr.properties 2011-12-29 11:30:36 UTC (rev 6891)
@@ -0,0 +1,3 @@
+ModalDialog.btnClose.accessibleName=Annuler
+ModalDialog.btnClose.text=Annuler
+RunOffAWT.BTN_Cancel=Annuler
Added: trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-openide-dialogs.jar/org/openide/Bundle_fr.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-openide-dialogs.jar/org/openide/Bundle_fr.properties (rev 0)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-openide-dialogs.jar/org/openide/Bundle_fr.properties 2011-12-29 11:30:36 UTC (rev 6891)
@@ -0,0 +1,5 @@
+CTL_CANCEL=Annuler
+CTL_NO=Non
+CTL_YES=Oui
+CTL_HelpName=Aide
+
Modified: trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-openide-explorer.jar/org/openide/explorer/propertysheet/Bundle_fr.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-openide-explorer.jar/org/openide/explorer/propertysheet/Bundle_fr.properties 2011-12-29 11:05:28 UTC (rev 6890)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-openide-explorer.jar/org/openide/explorer/propertysheet/Bundle_fr.properties 2011-12-29 11:30:36 UTC (rev 6891)
@@ -1,2 +1,8 @@
CTL_No_properties=Pas de propri\u00e9t\u00e9s
CTL_NoProperties=Pas de propri\u00e9t\u00e9s
+cancel=Annuler
+CTL_Cancel=Annuler
+ACS_CTL_Help=Aide
+ACSD_CTL_Help=Fournit de l'aide au sujet de l'objet dont les propri\u00e9t\u00e9s sont affich\u00e9es dans le panneaux des propri\u00e9t\u00e9s
+CTL_Help=Aide
+
Added: trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-openide-text.jar/org/openide/text/Bundle_fr.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-openide-text.jar/org/openide/text/Bundle_fr.properties (rev 0)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-openide-text.jar/org/openide/text/Bundle_fr.properties 2011-12-29 11:30:36 UTC (rev 6891)
@@ -0,0 +1 @@
+CTL_Cancel=Annuler\n
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/DialogHelper.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/DialogHelper.java 2011-12-29 11:05:28 UTC (rev 6890)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/DialogHelper.java 2011-12-29 11:30:36 UTC (rev 6891)
@@ -30,6 +30,7 @@
s.afficheDialogModal(new Runnable() {
+ @Override
public void run() {
UserPreferencesSaver.loadDialogLocationAndDimension(s);
loadTablePreferencesLater(table);
@@ -98,13 +99,18 @@
return DialogDisplayer.getDefault().notify(nd).equals(NotifyDescriptor.YES_OPTION);
}
+ /**
+ * utiliser isCancelOption pour savoir si l'utilisateur a annulé l'action.
+ * @param title
+ * @param message
+ * @param options
+ * @return WARN: si l'utilisateur appuie sur Echappe la réponse est NotifyDescriptor.CLOSED_OPTION
+ */
public static Object showQuestion(String title, Object message, Object[] options) {
NotifyDescriptor nd = new NotifyDescriptor.Confirmation(message, title);
nd.setOptions(options);
return DialogDisplayer.getDefault().notify(nd);
}
-
-
/**
* @return NotifyDescriptor.YES_OPTION, NotifyDescriptor.NO_OPTION or NotifyDescriptor.CANCEL_OPTION
@@ -116,7 +122,7 @@
}
public static boolean isCancelOption(Object in) {
- return NotifyDescriptor.CANCEL_OPTION.equals(in);
+ return NotifyDescriptor.CANCEL_OPTION.equals(in) || NotifyDescriptor.CLOSED_OPTION.equals(in);
}
public static boolean isYesOption(Object in) {
Modified: trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/helper/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/helper/Bundle.properties 2011-12-29 11:05:28 UTC (rev 6890)
+++ trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/helper/Bundle.properties 2011-12-29 11:30:36 UTC (rev 6891)
@@ -1 +1,5 @@
-NotifyOperationSucceed=Op\u00e9ration termin\u00e9e avec succ\u00e8s
\ No newline at end of file
+NotifyOperationSucceed=Op\u00e9ration termin\u00e9e avec succ\u00e8s
+dialog.ok.label=OK
+dialog.cancel,label=Annuler
+dialog.yes.label=Oui
+dialog.no.label=Non
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-12-29 11:05:28 UTC (rev 6890)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/EMHProjetService.java 2011-12-29 11:30:36 UTC (rev 6891)
@@ -192,9 +192,8 @@
}
private void registerListener(EMHProjet project) {
- String dir = project.getInfos().getDirectories().get(EMHProjectInfos.FICHETUDES);
+ File file = project.getInfos().getDir(EMHProjectInfos.FICHETUDES);
try {
- final File file = new File(dir);
if (file.exists()) {
etuFolder = FileUtil.createFolder(file);
listeners.registerAndaddListener(new FileChangeListenerEtudeDir(this));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2011-12-30 00:38:27
|
Revision: 6893
http://fudaa.svn.sourceforge.net/fudaa/?rev=6893&view=rev
Author: deniger
Date: 2011-12-30 00:38:19 +0000 (Fri, 30 Dec 2011)
Log Message:
-----------
CRUE-50 maj traductions
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/conf/OptionsEnum.java
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/conf/OptionsManager.java
trunk/soft/fudaa-crue/crue-server/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/CrueOptionsPanel.java
trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/CrueOptionsPanelController.java
trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/node/OptionNode.java
trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/node/OptionNodeChildFactory.java
trunk/soft/fudaa-crue/ui-options/src/main/resources/FudaaCrue_Site.xml
trunk/soft/fudaa-crue/ui-options/src/main/resources/default-coeurs.zip
trunk/soft/fudaa-crue/ui-options/src/main/resources/org/fudaa/fudaa/crue/options/Bundle.properties
Added Paths:
-----------
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/conf/OptionValidator.java
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/conf/OptionValidatorMinDouble.java
Added: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/conf/OptionValidator.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/conf/OptionValidator.java (rev 0)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/conf/OptionValidator.java 2011-12-30 00:38:19 UTC (rev 6893)
@@ -0,0 +1,20 @@
+package org.fudaa.dodico.crue.projet.conf;
+
+import org.fudaa.ctulu.CtuluLog;
+
+/**
+ *
+ * @author deniger ( genesis)
+ */
+public interface OptionValidator {
+
+ /**
+ *
+ * @param o
+ * @param log peut être null. Si non null, doit recevoir les message d'erreur
+ * @param optionId l'id de l'option
+ * @return
+ */
+ boolean isValid(String o,CtuluLog log,String optionId);
+
+}
Added: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/conf/OptionValidatorMinDouble.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/conf/OptionValidatorMinDouble.java (rev 0)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/conf/OptionValidatorMinDouble.java 2011-12-30 00:38:19 UTC (rev 6893)
@@ -0,0 +1,55 @@
+package org.fudaa.dodico.crue.projet.conf;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.fudaa.ctulu.CtuluLog;
+import org.fudaa.dodico.crue.common.BusinessMessages;
+
+/**
+ *
+ * @author deniger ( genesis)
+ */
+public class OptionValidatorMinDouble implements OptionValidator {
+
+ private final Double minValue;
+
+ public OptionValidatorMinDouble(Double minValue) {
+ this.minValue = minValue;
+ }
+
+ public static String geti18n(String optionId) {
+ return BusinessMessages.getString("option." + optionId + ".name");
+ }
+
+ @Override
+ public boolean isValid(String o, CtuluLog log, String optionName) {
+ boolean valid = true;
+ if (o == null) {
+ if (log != null) {
+ log.setDefaultResourceBundle(BusinessMessages.RESOURCE_BUNDLE);
+ log.addError("option.DoubleValueIsNull.Error", geti18n(optionName));
+ }
+ return false;
+ }
+ Double valueOf = null;
+ try {
+ valueOf = Double.valueOf(o);
+ } catch (NumberFormatException numberFormatException) {
+ Logger.getLogger(OptionValidatorMinDouble.class.getName()).log(Level.INFO, "option not a number", numberFormatException);
+ if (log != null) {
+ log.setDefaultResourceBundle(BusinessMessages.RESOURCE_BUNDLE);
+ log.addError("option.DoubleValueIsNotANumber.Error", geti18n(optionName));
+ }
+ return false;
+ }
+ if (minValue.compareTo(valueOf) > 0) {
+ if (log != null) {
+ log.setDefaultResourceBundle(BusinessMessages.RESOURCE_BUNDLE);
+ log.addError("option.DoubleValueIsLowerThan.Error", geti18n(optionName), minValue);
+ }
+ valid = false;
+ }
+
+ return valid;
+ }
+}
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/conf/OptionsEnum.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/conf/OptionsEnum.java 2011-12-29 15:08:35 UTC (rev 6892)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/conf/OptionsEnum.java 2011-12-30 00:38:19 UTC (rev 6893)
@@ -15,20 +15,31 @@
KEEP_INITIAL_ORDER_BRANCHE("keepInitialOrder.branche", Boolean.class, Boolean.FALSE, true),
KEEP_INITIAL_ORDER_CASIER("keepInitialOrder.casier", Boolean.class, Boolean.FALSE, true),
KEEP_INITIAL_ORDER_SECTION("keepInitialOrder.section", Boolean.class, Boolean.FALSE, true),
+ UI_UPDATE_FREQ("uiUpdateProgressFrequence", Double.class, Double.valueOf(0.2), true, new OptionValidatorMinDouble(Double.valueOf(0.1))),
EDITOR("externalEditor", File.class, null, true),
CRUE9_EXE("crue9Exe", File.class, null, true);
private final String id;
private final Class expectedValue;
private final Object defaultValue;
private final boolean required;
+ private final OptionValidator validator;
OptionsEnum(String id, Class expectValue, Object defaultValue, boolean required) {
+ this(id, expectValue, defaultValue, required, null);
+ }
+
+ OptionsEnum(String id, Class expectValue, Object defaultValue, boolean required, OptionValidator validator) {
this.id = id;
this.required = required;
this.expectedValue = expectValue;
this.defaultValue = defaultValue;
+ this.validator = validator;
}
+ public OptionValidator getValidator() {
+ return validator;
+ }
+
public boolean isRequired() {
return required;
}
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/conf/OptionsManager.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/conf/OptionsManager.java 2011-12-29 15:08:35 UTC (rev 6892)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/conf/OptionsManager.java 2011-12-30 00:38:19 UTC (rev 6893)
@@ -12,8 +12,6 @@
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.Predicate;
import org.apache.commons.collections.functors.CloneTransformer;
@@ -141,28 +139,30 @@
CtuluLog userLog = parentLogs.createLog();
userLog.setDesc("conf.validConfUser");
- Map<OptionsEnum, Option> siteReadOnlyOptionMap = build(siteOptions, false);
+ Map<OptionsEnum, Option> siteReadOnlyOptionMap = build(siteReadOnlyOptions, false);
validUserOptions(user, userLog, siteReadOnlyOptionMap, false);
if (validOnly) {
return;
}
Map<OptionsEnum, Option> userOptions = getUserOptionClean(user);
+ this.userOptionById.clear();
this.userOptionById.putAll(userOptions);
}
- protected void validSiteOptions(CtuluLog siteLog, List<SiteOption> siteOptions, Map<OptionsEnum, ? extends Option> siteOptionMap) {
+ protected void validSiteOptions(CtuluLog siteLog, List<SiteOption> siteOptions, Map<OptionsEnum, ? extends Option> siteOptionMapInReadOnly) {
validIsKnown(siteLog, siteOptions, true);//pour le site, on n'autorise pas d'erreurs.
validNoTwice(siteLog, siteOptions, true);
- validRequiredButEmptyAndNotEditable(siteLog, siteOptionMap);
+ validRequiredButEmptyAndNotEditable(siteLog, siteOptionMapInReadOnly);
}
- protected void validUserOptions(UserConfiguration user, CtuluLog userLog, Map<OptionsEnum, ? extends Option> siteOptionMap, boolean useFatal) {
+ protected void validUserOptions(UserConfiguration user, CtuluLog userLog, Map<OptionsEnum, ? extends Option> siteOptionMapInReadOnly, boolean useFatal) {
Collection<UserOption> userOptions = user.getOptions();
Map<OptionsEnum, ? extends Option> userOptionMap = build(userOptions, false);
validIsKnown(userLog, userOptions, useFatal);
validNoTwice(userLog, userOptions, useFatal);
- validNoSiteOptionOveridden(userLog, siteOptionMap, userOptionMap, useFatal);
+ validValuesOfOption(userLog, userOptionMap, true);
+ validNoSiteOptionOveridden(userLog, siteOptionMapInReadOnly, userOptionMap, useFatal);
}
private Map<OptionsEnum, Option> build(Collection<? extends Option> in, boolean clone) {
@@ -175,8 +175,8 @@
}
return res;
}
- private List<SiteOption> siteOptions;
- private UserConfiguration siteUserOptions;
+ private List<SiteOption> siteReadOnlyOptions;
+ private UserConfiguration siteModifiableByUserOptions;
public CtuluLogGroup reloadUserConfiguration(UserConfiguration user) {
CtuluLogGroup logs = new CtuluLogGroup(BusinessMessages.RESOURCE_BUNDLE);
@@ -193,20 +193,21 @@
}
public CtuluLogGroup init(Configuration siteConfiguration, UserConfiguration user) {
- siteOptions = siteConfiguration.getSite().getOptions();
- siteUserOptions = siteConfiguration.getUser();
+ siteReadOnlyOptions = siteConfiguration.getSite().getOptions();
+ siteModifiableByUserOptions = siteConfiguration.getUser();
CtuluLogGroup logs = new CtuluLogGroup(BusinessMessages.RESOURCE_BUNDLE);
logs.getMainLog().setDesc("conf.validConfGlobal");
logs.getMainLog().setDefaultResourceBundle(BusinessMessages.RESOURCE_BUNDLE);
CtuluLog siteLog = logs.createLog();
siteLog.setDesc("conf.validConfSite");
//on ne clone pas les SiteOptions car ne seront jamais modifiée.
- Map<OptionsEnum, Option> siteReadOnlyOptionMap = build(siteOptions, false);
- Map<OptionsEnum, Option> siteAllOptionMap = build(siteUserOptions.getOptions(), false);
+ Map<OptionsEnum, Option> siteReadOnlyOptionMap = build(siteReadOnlyOptions, false);
+ Map<OptionsEnum, Option> siteAllOptionMap = build(siteModifiableByUserOptions.getOptions(), false);
siteAllOptionMap.putAll(siteReadOnlyOptionMap);
validIsAllSetKnown(siteLog, siteAllOptionMap, true);//toutes les options doivent être définies
- validSiteOptions(siteLog, siteOptions, siteReadOnlyOptionMap);
- validUserOptions(siteUserOptions, siteLog, siteReadOnlyOptionMap, true);
+ validSiteOptions(siteLog, siteReadOnlyOptions, siteReadOnlyOptionMap);
+ validValuesOfOption(siteLog, siteAllOptionMap, false);
+ validUserOptions(siteModifiableByUserOptions, siteLog, siteReadOnlyOptionMap, true);
this.siteOptionById.clear();
this.siteOptionById.putAll(siteAllOptionMap);
this.userOptionById.clear();
@@ -259,6 +260,20 @@
}
+ private void validValuesOfOption(CtuluLog targetLog, Map<OptionsEnum, ? extends Option> optionMap, boolean doNothingIfNull) {
+ for (OptionsEnum optionEnum : enumById.values()) {
+ if (optionEnum.getValidator() != null) {
+ Option option = optionMap.get(optionEnum);
+ if (option == null && doNothingIfNull) {
+ continue;
+ }
+ optionEnum.getValidator().isValid(option == null ? null : option.getValeur(), targetLog, optionEnum.getId());
+ }
+
+ }
+
+ }
+
private void validIsAllSetKnown(CtuluLog targetLog, Map<OptionsEnum, ? extends Option> optionMap, boolean useFatal) {
for (OptionsEnum enumOption : enumById.values()) {
Modified: trunk/soft/fudaa-crue/crue-server/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties 2011-12-29 15:08:35 UTC (rev 6892)
+++ trunk/soft/fudaa-crue/crue-server/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties 2011-12-30 00:38:19 UTC (rev 6893)
@@ -491,10 +491,23 @@
conf.optionRequiredEmptyButNoEditable=L''option {0} est requise par Fudaa-Crue mais la configuration site ne l''a pas d\u00e9finie et n''autorise pas sa modification
conf.optionNotSet=L''option {0} n''est pas d\u00e9finie dans la configuration site. Demander \u00e0 l''installateur de v\u00e9rifier la configuration.
conf.defineTwice=L''options {0} est d\u00e9finie plusieurs fois
+option.DoubleValueIsLowerThan.Error={0}: la valeur est inf\u00e9rieure \u00e0 la valeur limite {1}
+option.DoubleValueIsNull.Error={0}: la valeur \u00e0 valider n''est pas d\u00e9finie
+option.DoubleValueIsNotANumber.Error={0}: la valeur ne repr\u00e9sente pas un nombre valide.
option.externalEditor.name=Editeur externe
option.externalEditor.comment=Chemin vers l'\u00e9diteur de ficher utilis\u00e9 pour ouvrir un fichier (ou commande accessible dans le path)
option.crue9Exe.name=Ex\u00e9cutable Crue 9
option.crue9Exe.comment=Chemin vers l'ex\u00e9cutable Crue 9 (ou commande accessible dans le path)
+option.keepInitialOrder.branche.name=Conserver l'ordre initial des branches
+option.keepInitialOrder.branche.comment=Conserver l'ordre initial des branches, plut\u00f4t que l'ordre alphab\u00e9tique
+option.keepInitialOrder.casier.name=Conserver l'ordre initial des casiers
+option.keepInitialOrder.casier.comment=Conserver l'ordre initial des casiers, plut\u00f4t que l'ordre alphab\u00e9tique
+option.keepInitialOrder.section.name=Conserver l'ordre initial des sections
+option.keepInitialOrder.section.comment=Conserver l'ordre initial des sections, plut\u00f4t que l'ordre alphab\u00e9tique
+option.keepInitialOrder.section.name=Conserver l'ordre initial des sections
+option.keepInitialOrder.section.comment=Conserver l'ordre initial des sections, plut\u00f4t que l'ordre alphab\u00e9tique
+option.uiUpdateProgressFrequence.name=Fr\u00e9quence de rafra\u00eechissement de l'interface
+option.uiUpdateProgressFrequence.comment=Fr\u00e9quence de rafra\u00eechissement en seconde de l'interface pendant le d\u00e9roulement d'un run
validation.name.pattern.error=Le nom respecte pas le format ( uniquement des lettres
CatEMHConteneur.shortName=Conteneur de donn\u00e9es
Modified: trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/CrueOptionsPanel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/CrueOptionsPanel.java 2011-12-29 15:08:35 UTC (rev 6892)
+++ trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/CrueOptionsPanel.java 2011-12-30 00:38:19 UTC (rev 6893)
@@ -4,13 +4,20 @@
*/
package org.fudaa.fudaa.crue.options;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import org.fudaa.ctulu.CtuluLog;
+import org.fudaa.dodico.crue.common.BusinessMessages;
+import org.fudaa.dodico.crue.projet.conf.Option;
+import org.fudaa.dodico.crue.projet.conf.OptionsEnum;
import org.fudaa.dodico.crue.projet.conf.OptionsManager;
import org.fudaa.dodico.crue.projet.conf.UserConfiguration;
import org.fudaa.dodico.crue.projet.conf.UserOption;
import org.fudaa.fudaa.crue.common.helper.DialogHelper;
+import org.fudaa.fudaa.crue.common.log.LogsDisplayer;
import org.fudaa.fudaa.crue.options.node.OptionNode;
import org.fudaa.fudaa.crue.options.node.OptionNodeChildFactory;
import org.fudaa.fudaa.crue.options.services.ConfigurationManagerService;
@@ -29,9 +36,11 @@
ConfigurationManagerService configurationManagerService = Lookup.getDefault().lookup(ConfigurationManagerService.class);
InstallationService installationService = Lookup.getDefault().lookup(InstallationService.class);
Lookup lookup;
+ CrueOptionsPanelController controller;
CrueOptionsPanel(CrueOptionsPanelController controller) {
initComponents();
+ this.controller=controller;
String txt = installationService.getSiteConfigFile().getAbsolutePath();
txtSiteFile.setText(txt);
txtSiteFile.setToolTipText(txt);
@@ -135,10 +144,23 @@
void load() {
OptionNodeChildFactory childFactory = new OptionNodeChildFactory((configurationManagerService.getOptionsManager()));
Node rootNode = new AbstractNode(Children.create(childFactory, false), Lookup.EMPTY);
+ Node[] nodes = rootNode.getChildren().getNodes();
+ for (Node node : nodes) {
+ node.addPropertyChangeListener(new PropertyChangeListener() {
+
+ @Override
+ public void propertyChange(PropertyChangeEvent evt) {
+ controller.changed();
+ }
+ });
+ }
mgr.setRootContext(rootNode);
}
void store() {
+ if (!valid(true)) {
+ return;
+ }
Node[] nodes = mgr.getRootContext().getChildren().getNodes();
List<UserOption> userNode = new ArrayList<UserOption>();
for (Node node : nodes) {
@@ -155,9 +177,24 @@
}
- boolean valid() {
- // TODO check whether form is consistent and complete
- return true;
+ boolean valid(boolean showMessages) {
+ Node[] nodes = mgr.getRootContext().getChildren().getNodes();
+ CtuluLog logs = new CtuluLog(BusinessMessages.RESOURCE_BUNDLE);
+ boolean valid = true;
+ for (Node node : nodes) {
+ OptionNode optionNode = (OptionNode) node;
+ OptionsEnum optionEnum = optionNode.getOptionEnum();
+ final Option option = optionNode.getOption();
+ if (option.isEditable() && optionEnum.getValidator() != null) {
+ if (!optionEnum.getValidator().isValid(option.getValeur(), logs, optionEnum.getId())) {
+ valid = false;
+ }
+ }
+ }
+ if (!logs.isEmpty()) {
+ LogsDisplayer.displayError(logs, NbBundle.getMessage(CrueOptionsPanel.class, "Options.Validation.MessageTitle"));
+ }
+ return valid;
}
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JLabel jLabelSiteFile;
Modified: trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/CrueOptionsPanelController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/CrueOptionsPanelController.java 2011-12-29 15:08:35 UTC (rev 6892)
+++ trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/CrueOptionsPanelController.java 2011-12-30 00:38:19 UTC (rev 6893)
@@ -27,8 +27,10 @@
}
public void applyChanges() {
- getPanel().store();
- changed = false;
+ if (getPanel().valid(true)) {
+ getPanel().store();
+ changed = false;
+ }
}
public void cancel() {
@@ -36,7 +38,7 @@
}
public boolean isValid() {
- return getPanel().valid();
+ return getPanel().valid(false);
}
public boolean isChanged() {
@@ -65,12 +67,16 @@
}
return panel;
}
+
+ Boolean oldValid=Boolean.TRUE;
void changed() {
if (!changed) {
changed = true;
pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, false, true);
}
- pcs.firePropertyChange(OptionsPanelController.PROP_VALID, null, null);
+ Boolean newValid=Boolean.valueOf(getPanel().valid(false));
+ pcs.firePropertyChange(OptionsPanelController.PROP_VALID, Boolean.TRUE, newValid);
+ oldValid=newValid;
}
}
Modified: trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/node/OptionNode.java
===================================================================
--- trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/node/OptionNode.java 2011-12-29 15:08:35 UTC (rev 6892)
+++ trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/node/OptionNode.java 2011-12-30 00:38:19 UTC (rev 6893)
@@ -4,6 +4,7 @@
import java.lang.reflect.InvocationTargetException;
import java.util.MissingResourceException;
import javax.swing.Action;
+import org.apache.commons.lang.ObjectUtils;
import org.fudaa.dodico.crue.projet.conf.Option;
import org.fudaa.dodico.crue.projet.conf.OptionsEnum;
import org.fudaa.dodico.crue.projet.conf.UserOption;
@@ -62,6 +63,10 @@
this.defaultValue = defaultValue;
}
+ public OptionsEnum getOptionEnum() {
+ return optionEnum;
+ }
+
public String getDefaultValue() {
return defaultValue;
}
@@ -87,11 +92,7 @@
try {
set.put(new PropertyId(option));
if (option.isEditable()) {
- if (File.class.equals(optionEnum.getExpectedValue())) {
- set.put(new PropertyValueFileEditable((UserOption) option));
- } else {
- set.put(new PropertyValueEditable((UserOption) option));
- }
+ set.put(create((UserOption) option));
set.put(new PropertyDefault(defaultValue));
} else {
set.put(new PropertyValue(option));
@@ -103,6 +104,18 @@
return sheet;
}
+ private Property<?> create(UserOption option) {
+ final Class expectedType = optionEnum.getExpectedValue();
+ if (File.class.equals(expectedType)) {
+ return new PropertyValueFileEditable(option);
+ } else if (Boolean.class.equals(expectedType)) {
+ return new PropertyValueBooleanEditable(option);
+ } else if (Double.class.equals(expectedType)) {
+ return new PropertyValueDoubleEditable(option);
+ }
+ return new PropertyValueStringEditable((UserOption) option);
+ }
+
public Option getOption() {
return getLookup().lookup(Option.class);
}
@@ -155,11 +168,11 @@
}
}
- private static class PropertyValueEditable extends PropertySupport.ReadWrite<String> {
+ private static class PropertyValueStringEditable extends PropertySupport.ReadWrite<String> {
private final UserOption option;
- public PropertyValueEditable(final UserOption option) {
+ public PropertyValueStringEditable(final UserOption option) {
super(PROP_VALUE, String.class, getPropValueDisplayName(), getPropValueDescription());
this.option = option;
PropertyCrueUtils.configureNoCustomEditor(this);
@@ -176,10 +189,52 @@
}
}
- private static class PropertyValueFileEditable extends PropertySupport.ReadWrite<File> {
+ private class PropertyValueDoubleEditable extends PropertySupport.ReadWrite<Double> {
private final UserOption option;
+ public PropertyValueDoubleEditable(final UserOption option) {
+ super(PROP_VALUE, Double.class, getPropValueDisplayName(), getPropValueDescription());
+ this.option = option;
+ PropertyCrueUtils.configureNoCustomEditor(this);
+ }
+
+ @Override
+ public Double getValue() throws IllegalAccessException, InvocationTargetException {
+ return Double.valueOf(option.getValeur());
+ }
+
+ @Override
+ public void setValue(Double val) throws IllegalAccessException, IllegalArgumentException, InvocationTargetException {
+ setOptionValue(ObjectUtils.toString(val));
+ }
+ }
+
+ private class PropertyValueBooleanEditable extends PropertySupport.ReadWrite<Boolean> {
+
+ private final UserOption option;
+
+ public PropertyValueBooleanEditable(final UserOption option) {
+ super(PROP_VALUE, boolean.class, getPropValueDisplayName(), getPropValueDescription());
+ this.option = option;
+ PropertyCrueUtils.configureNoCustomEditor(this);
+ }
+
+ @Override
+ public Boolean getValue() throws IllegalAccessException, InvocationTargetException {
+ return Boolean.valueOf(option.getValeur());
+ }
+
+ @Override
+ public void setValue(Boolean val) throws IllegalAccessException, IllegalArgumentException, InvocationTargetException {
+ setOptionValue(val == null ? "false" : val.toString());
+ }
+ }
+
+ private class PropertyValueFileEditable extends PropertySupport.ReadWrite<File> {
+
+ private final UserOption option;
+
public PropertyValueFileEditable(final UserOption option) {
super(PROP_VALUE, File.class, getPropValueDisplayName(), getPropValueDescription());
this.option = option;
@@ -193,11 +248,11 @@
@Override
public void setValue(File val) throws IllegalAccessException, IllegalArgumentException, InvocationTargetException {
if (val == null) {
- option.setValeur(null);
+ setOptionValue(null);
} else if (val.exists()) {
- option.setValeur(val.getAbsolutePath());
+ setOptionValue(val.getAbsolutePath());
} else {
- option.setValeur(val.getPath());
+ setOptionValue(val.getPath());
}
}
Modified: trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/node/OptionNodeChildFactory.java
===================================================================
--- trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/node/OptionNodeChildFactory.java 2011-12-29 15:08:35 UTC (rev 6892)
+++ trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/node/OptionNodeChildFactory.java 2011-12-30 00:38:19 UTC (rev 6893)
@@ -1,5 +1,6 @@
package org.fudaa.fudaa.crue.options.node;
+import java.util.Collection;
import java.util.List;
import org.fudaa.dodico.crue.projet.conf.Option;
import org.fudaa.dodico.crue.projet.conf.OptionsManager;
@@ -11,22 +12,29 @@
* @author deniger ( genesis)
*/
public class OptionNodeChildFactory extends ChildFactory<Option> {
-
+
private final OptionsManager optionsMananger;
-
+
public OptionNodeChildFactory(OptionsManager optionsMananger) {
this.optionsMananger = optionsMananger;
}
-
+
@Override
protected boolean createKeys(List<Option> toPopulate) {
+ if (toPopulate == null || optionsMananger == null) {
+ return false;
+ }
+ final Collection<Option> visibleOptionsCloned = optionsMananger.getVisibleOptionsCloned();
+ if (visibleOptionsCloned == null) {
+ return false;
+ }
toPopulate.addAll(
- optionsMananger.getVisibleOptionsCloned());
+ visibleOptionsCloned);
return true;
}
-
+
@Override
protected Node createNodeForKey(Option key) {
- return new OptionNode(key, optionsMananger.getSiteValue(key),optionsMananger.getOptionEnum(key));
+ return new OptionNode(key, optionsMananger.getSiteValue(key), optionsMananger.getOptionEnum(key));
}
}
Modified: trunk/soft/fudaa-crue/ui-options/src/main/resources/FudaaCrue_Site.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-options/src/main/resources/FudaaCrue_Site.xml 2011-12-29 15:08:35 UTC (rev 6892)
+++ trunk/soft/fudaa-crue/ui-options/src/main/resources/FudaaCrue_Site.xml 2011-12-30 00:38:19 UTC (rev 6893)
@@ -26,6 +26,22 @@
</Site>
<User>
<UserOptions>
+ <UserOption Nom="keepInitialOrder.branche">
+ <Commentaire>Conserver l'ordre initial des branches plutôt que l'ordre alphabétique.</Commentaire>
+ <Valeur>false</Valeur>
+ </UserOption>
+ <UserOption Nom="keepInitialOrder.section">
+ <Commentaire>Conserver l'ordre initial des sections plutôt que l'ordre alphabétique.</Commentaire>
+ <Valeur>false</Valeur>
+ </UserOption>
+ <UserOption Nom="keepInitialOrder.casier">
+ <Commentaire>Conserver l'ordre initial des casiers, plutôt que l'ordre alphabétique.</Commentaire>
+ <Valeur>false</Valeur>
+ </UserOption>
+ <UserOption Nom="uiUpdateProgressFrequence">
+ <Commentaire>Fréquence de rafraîchissement en seconde de l'interface pendant le déroulement d'un run</Commentaire>
+ <Valeur>0.2</Valeur>
+ </UserOption>
<UserOption Nom="externalEditor">
<Commentaire>Chemin ou commande vers l'éditeur externe.</Commentaire>
<Valeur>notepad</Valeur>
Modified: trunk/soft/fudaa-crue/ui-options/src/main/resources/default-coeurs.zip
===================================================================
(Binary files differ)
Modified: trunk/soft/fudaa-crue/ui-options/src/main/resources/org/fudaa/fudaa/crue/options/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-options/src/main/resources/org/fudaa/fudaa/crue/options/Bundle.properties 2011-12-29 15:08:35 UTC (rev 6892)
+++ trunk/soft/fudaa-crue/ui-options/src/main/resources/org/fudaa/fudaa/crue/options/Bundle.properties 2011-12-30 00:38:19 UTC (rev 6893)
@@ -10,4 +10,5 @@
ColumnOptions=Option
ColumnCoeur=Coeur
CoeurOptionsPanel.jbReloadCoeurs.text=Recharger les coeurs
-ReloadOption.WarnNotCancellable.DialogMessage=Attention, cette action n'est pas annulable. Toutes vos modifications seront perdues.\n Voulez-vous continuer ?
+ReloadOption.WarnNotCancellable.DialogMessage=Attention, cette action n'est pas annulable.\nLes valeurs des options vont \u00eatre recharg\u00e9es \u00e0 partir des fichiers de configuration Site et Utilisateur.\nToutes vos modifications seront perdues. Voulez-vous continuer ?
+Options.Validation.MessageTitle=Validation des options
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-01-02 22:01:49
|
Revision: 6903
http://fudaa.svn.sourceforge.net/fudaa/?rev=6903&view=rev
Author: deniger
Date: 2012-01-02 22:01:42 +0000 (Mon, 02 Jan 2012)
Log Message:
-----------
CRUE-50 maj traductions
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-server/pom.xml
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-common/pom.xml
trunk/soft/fudaa-crue/ui-comparison/pom.xml
trunk/soft/fudaa-crue/ui-emh/pom.xml
trunk/soft/fudaa-crue/ui-loader/pom.xml
trunk/soft/fudaa-crue/ui-modelling/pom.xml
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingExportCrue10Action.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingLaunchRunQuickAction.java
trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/action/Bundle.properties
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/DeleteFichierCrueNodeAction.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/DeleteManagerNodeAction.java
Modified: trunk/soft/fudaa-crue/crue-server/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-server/pom.xml 2012-01-02 21:05:45 UTC (rev 6902)
+++ trunk/soft/fudaa-crue/crue-server/pom.xml 2012-01-02 22:01:42 UTC (rev 6903)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.49-SNAPSHOT</version>
+ <version>0.50-SNAPSHOT</version>
</parent>
<artifactId>crue-server</artifactId>
<name>Crue server</name>
Modified: trunk/soft/fudaa-crue/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/pom.xml 2012-01-02 21:05:45 UTC (rev 6902)
+++ trunk/soft/fudaa-crue/pom.xml 2012-01-02 22:01:42 UTC (rev 6903)
@@ -8,7 +8,7 @@
</parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.49-SNAPSHOT</version>
+ <version>0.50-SNAPSHOT</version>
<name>Fudaa-Crue</name>
<packaging>pom</packaging>
<properties>
Modified: trunk/soft/fudaa-crue/ui-application/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-application/pom.xml 2012-01-02 21:05:45 UTC (rev 6902)
+++ trunk/soft/fudaa-crue/ui-application/pom.xml 2012-01-02 22:01:42 UTC (rev 6903)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.49-SNAPSHOT</version>
+ <version>0.50-SNAPSHOT</version>
</parent>
<artifactId>application</artifactId>
Modified: trunk/soft/fudaa-crue/ui-branding/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/pom.xml 2012-01-02 21:05:45 UTC (rev 6902)
+++ trunk/soft/fudaa-crue/ui-branding/pom.xml 2012-01-02 22:01:42 UTC (rev 6903)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.49-SNAPSHOT</version>
+ <version>0.50-SNAPSHOT</version>
</parent>
<artifactId>ui-branding</artifactId>
Modified: trunk/soft/fudaa-crue/ui-common/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-common/pom.xml 2012-01-02 21:05:45 UTC (rev 6902)
+++ trunk/soft/fudaa-crue/ui-common/pom.xml 2012-01-02 22:01:42 UTC (rev 6903)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.49-SNAPSHOT</version>
+ <version>0.50-SNAPSHOT</version>
</parent>
<artifactId>ui-common</artifactId>
Modified: trunk/soft/fudaa-crue/ui-comparison/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-comparison/pom.xml 2012-01-02 21:05:45 UTC (rev 6902)
+++ trunk/soft/fudaa-crue/ui-comparison/pom.xml 2012-01-02 22:01:42 UTC (rev 6903)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.49-SNAPSHOT</version>
+ <version>0.50-SNAPSHOT</version>
</parent>
<artifactId>ui-comparison</artifactId>
<packaging>nbm</packaging>
Modified: trunk/soft/fudaa-crue/ui-emh/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-emh/pom.xml 2012-01-02 21:05:45 UTC (rev 6902)
+++ trunk/soft/fudaa-crue/ui-emh/pom.xml 2012-01-02 22:01:42 UTC (rev 6903)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.49-SNAPSHOT</version>
+ <version>0.50-SNAPSHOT</version>
</parent>
<artifactId>ui-emh</artifactId>
<packaging>nbm</packaging>
Modified: trunk/soft/fudaa-crue/ui-loader/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-loader/pom.xml 2012-01-02 21:05:45 UTC (rev 6902)
+++ trunk/soft/fudaa-crue/ui-loader/pom.xml 2012-01-02 22:01:42 UTC (rev 6903)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.49-SNAPSHOT</version>
+ <version>0.50-SNAPSHOT</version>
</parent>
<artifactId>ui-loader</artifactId>
<packaging>nbm</packaging>
Modified: trunk/soft/fudaa-crue/ui-modelling/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/pom.xml 2012-01-02 21:05:45 UTC (rev 6902)
+++ trunk/soft/fudaa-crue/ui-modelling/pom.xml 2012-01-02 22:01:42 UTC (rev 6903)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.49-SNAPSHOT</version>
+ <version>0.50-SNAPSHOT</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-modelling</artifactId>
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingExportCrue10Action.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingExportCrue10Action.java 2012-01-02 21:05:45 UTC (rev 6902)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingExportCrue10Action.java 2012-01-02 22:01:42 UTC (rev 6903)
@@ -28,7 +28,7 @@
id = "org.fudaa.fudaa.crue.modelling.ModellingExportCrue10Action")
@ActionRegistration(displayName = "#CTL_ModellingExportCrue10Action")
@ActionReferences({
- @ActionReference(path = "Menu/Modelling", position = 11)
+ @ActionReference(path = "Menu/Modelling", position = 11,separatorAfter=12)
})
public final class ModellingExportCrue10Action extends AbstractModellingAction {
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingLaunchRunQuickAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingLaunchRunQuickAction.java 2012-01-02 21:05:45 UTC (rev 6902)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingLaunchRunQuickAction.java 2012-01-02 22:01:42 UTC (rev 6903)
@@ -15,10 +15,10 @@
import org.openide.util.NbBundle;
@ActionID(category = "View",
-id = "org.fudaa.fudaa.crue.modelling.ModellingExportCrue10Action")
+id = "org.fudaa.fudaa.crue.modelling.ModellingLaunchRunQuickAction")
@ActionRegistration(displayName = "#CTL_ModellingLaunchRunQuickAction")
@ActionReferences({
- @ActionReference(path = "Menu/Modelling", position = 13, separatorBefore = 12)
+ @ActionReference(path = "Menu/Modelling", position = 13)
})
public final class ModellingLaunchRunQuickAction extends AbstractModellingAction {
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/action/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/action/Bundle.properties 2012-01-02 21:05:45 UTC (rev 6902)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/action/Bundle.properties 2012-01-02 22:01:42 UTC (rev 6903)
@@ -1,13 +1,8 @@
-# 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_ModellingExportCrue10Action=Exporter au format Crue10 le plus r\u00e9cent
CTL_ModellingClose=Fermer le sc\u00e9nario
CTL_ModellingComparison=Comparer le sc\u00e9nario
CTL_ModellingSaveAction=Sauvegarder
CTL_ModellingComparisonOtherEtuAction=Comparer avec une autre \u00e9tude
-CTL_ModellingExportCrue10Action=Exporter au format Crue10 le plus r\u00e9cent
CTL_ModellingExportCrue9Action=Exporter au format Crue9
CTL_ModellingLaunchRunQuickAction=Lancer un run rapide
CTL_ModellingLaunchRunOptionsAction=Lancer un run avec options...
Modified: trunk/soft/fudaa-crue/ui-options/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-options/pom.xml 2012-01-02 21:05:45 UTC (rev 6902)
+++ trunk/soft/fudaa-crue/ui-options/pom.xml 2012-01-02 22:01:42 UTC (rev 6903)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.49-SNAPSHOT</version>
+ <version>0.50-SNAPSHOT</version>
</parent>
<artifactId>ui-options</artifactId>
<name>Crue UI Options</name>
Modified: trunk/soft/fudaa-crue/ui-otfa/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/pom.xml 2012-01-02 21:05:45 UTC (rev 6902)
+++ trunk/soft/fudaa-crue/ui-otfa/pom.xml 2012-01-02 22:01:42 UTC (rev 6903)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.49-SNAPSHOT</version>
+ <version>0.50-SNAPSHOT</version>
</parent>
<artifactId>ui-otfa</artifactId>
Modified: trunk/soft/fudaa-crue/ui-post/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-post/pom.xml 2012-01-02 21:05:45 UTC (rev 6902)
+++ trunk/soft/fudaa-crue/ui-post/pom.xml 2012-01-02 22:01:42 UTC (rev 6903)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.49-SNAPSHOT</version>
+ <version>0.50-SNAPSHOT</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-post</artifactId>
Modified: trunk/soft/fudaa-crue/ui-study/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-study/pom.xml 2012-01-02 21:05:45 UTC (rev 6902)
+++ trunk/soft/fudaa-crue/ui-study/pom.xml 2012-01-02 22:01:42 UTC (rev 6903)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.49-SNAPSHOT</version>
+ <version>0.50-SNAPSHOT</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-study</artifactId>
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/DeleteFichierCrueNodeAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/DeleteFichierCrueNodeAction.java 2012-01-02 21:05:45 UTC (rev 6902)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/DeleteFichierCrueNodeAction.java 2012-01-02 22:01:42 UTC (rev 6903)
@@ -125,7 +125,7 @@
Boolean res = Boolean.FALSE;
for (FichierCrueNode nodeToDelete : nodes) {
boolean removed = projetService.getSelectedProject().removeFile(nodeToDelete.getFichierCrue());
- if (res && deleteFileConfirmed && nodeToDelete.fileExists()) {
+ if (removed && deleteFileConfirmed && nodeToDelete.fileExists()) {
nodeToDelete.getFile().delete();
}
if (removed) {
@@ -136,7 +136,7 @@
}
};
String logEntry = ToStringHelper.transformTo(nodes, new NodeToStringTransformer());
- projetService.deepModification(deleteCallable, org.openide.util.NbBundle.getMessage(ManagerEMHScenarioNode.class, "Log.DeleteAction", logEntry));
+ projetService.deepModification(deleteCallable, org.openide.util.NbBundle.getMessage(DeleteFichierCrueNodeAction.class, "Log.DeleteAction", logEntry));
}
@Override
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/DeleteManagerNodeAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/DeleteManagerNodeAction.java 2012-01-02 21:05:45 UTC (rev 6902)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/DeleteManagerNodeAction.java 2012-01-02 22:01:42 UTC (rev 6903)
@@ -4,7 +4,6 @@
*/
package org.fudaa.fudaa.crue.study.actions;
-import java.util.MissingResourceException;
import org.fudaa.fudaa.crue.common.helper.NodeToStringTransformer;
import java.util.ArrayList;
import java.util.List;
@@ -105,7 +104,7 @@
}
Callable<Boolean> deleteCallable = new DeleteCallable(nodes);
- projetService.deepModification(deleteCallable, NbBundle.getMessage(ManagerEMHScenarioNode.class, "Log.DeleteAction", ToStringHelper.transformTo(nodes, new NodeToStringTransformer())));
+ projetService.deepModification(deleteCallable, NbBundle.getMessage(DeleteManagerNodeAction.class, "Log.DeleteAction", ToStringHelper.transformTo(nodes, new NodeToStringTransformer())));
}
@Override
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-01-19 11:03:48
|
Revision: 6928
http://fudaa.svn.sourceforge.net/fudaa/?rev=6928&view=rev
Author: deniger
Date: 2012-01-19 11:03:35 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
CRUE-88
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/action/AbstractPerspectiveAction.java
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/DialogHelper.java
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/AbstractPerspectiveService.java
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/PerspectiveService.java
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/PerspectiveState.java
trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/action/Bundle.properties
trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/helper/Bundle.properties
trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/layer.xml
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/PerspectiveServiceModelling.java
trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/layer.xml
trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/action/AbstractOtfaAction.java
trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/perspective/ActiveOtfa.java
trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/perspective/PerspectiveServiceOtfa.java
trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/service/OtfaService.java
trunk/soft/fudaa-crue/ui-otfa/src/main/resources/org/fudaa/fudaa/crue/otfa/layer.xml
trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/perspective/ActivePost.java
trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/perspective/PerspectiveServicePost.java
trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/layer.xml
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/PerspectiveServiceStudy.java
trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/layer.xml
Added Paths:
-----------
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/action/EditPerspectiveAction.java
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/UserSaveAnswer.java
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/action/AbstractPerspectiveAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/action/AbstractPerspectiveAction.java 2012-01-19 09:56:27 UTC (rev 6927)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/action/AbstractPerspectiveAction.java 2012-01-19 11:03:35 UTC (rev 6928)
@@ -4,18 +4,9 @@
*/
package org.fudaa.fudaa.crue.common.action;
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.GridLayout;
import java.awt.event.ActionEvent;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import javax.swing.BorderFactory;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
import org.fudaa.fudaa.crue.common.Perspective;
-import org.fudaa.fudaa.crue.common.services.PerspectiveState;
import org.fudaa.fudaa.crue.common.services.SelectedPerspectiveService;
import org.openide.util.HelpCtx;
import org.openide.util.Lookup;
@@ -29,23 +20,14 @@
private Lookup.Result result = null;
SelectedPerspectiveService service = Lookup.getDefault().lookup(SelectedPerspectiveService.class);
private final Perspective perspectiveId;
- private EditableLookupListener editableListener;
- private AbstractActionState editableAction;
- public AbstractPerspectiveAction(String textCode, String perspectiveId, Perspective perspective, boolean editableOption) {
+ public Perspective getPerspectiveId() {
+ return perspectiveId;
+ }
+
+ public AbstractPerspectiveAction(String textCode, String perspectiveId, Perspective perspective) {
putValue(NAME, NbBundle.getMessage(getClass(), textCode));
putValue(SHORT_DESCRIPTION, getValue(NAME));
- if (editableOption) {
- editableAction = new AbstractActionState(NbBundle.getMessage(AbstractPerspectiveAction.class, "PerspectiveEditAction.Name"), null, "PERSPECTIVE_EDIT_MODE") {
-
- @Override
- public void changeAction() {
- updateEditModelToModel();
- }
- };
- editableAction.setEnabled(false);
- }
-
this.perspectiveId = perspective;
setBooleanState(false);
result = service.getLookup().lookupResult(Perspective.class);
@@ -54,38 +36,10 @@
service.register(perspective, perspectiveId);
}
- private class EditableLookupListener implements PropertyChangeListener {
-
- @Override
- public void propertyChange(PropertyChangeEvent evt) {
- updateStateModeFromModel();
- }
- }
-
- private void updateEditModelToModel() {
- service.getPerspectiveService(perspectiveId).setState(editableAction.isSelected() ? PerspectiveState.MODE_EDIT : PerspectiveState.MODE_READ);
- }
-
- private void updateStateModeFromModel() {
- final PerspectiveState state = service.getPerspectiveService(perspectiveId).getState();
- editableAction.setSelected(state.equals(PerspectiveState.MODE_EDIT));
- editableAction.setEnabled(!PerspectiveState.MODE_READ_ONLY.equals(state));
- }
-
@Override
public void setBooleanState(boolean value) {
super.setBooleanState(value);
setEnabled(!value);
- //on active le listener sur la caractère édition
- if (editableAction != null) {
- if (service.isActivated(perspectiveId) && editableListener == null) {
- editableListener = new EditableLookupListener();
- service.getPerspectiveService(perspectiveId).addStateListener(editableListener);
- }
- final PerspectiveState state = service.getPerspectiveService(perspectiveId).getState();
- editableAction.setEnabled(!PerspectiveState.MODE_READ_ONLY.equals(state) && value);
- }
-
}
@Override
@@ -104,19 +58,6 @@
return new HelpCtx(getClass());
}
- @Override
- public Component getToolbarPresenter() {
- JPanel pn = new JPanel();
- pn.setLayout(new GridLayout(2, 1, 0, 0));
- pn.setBorder(BorderFactory.createEmptyBorder(0, 2, 0, 2));
- pn.add(super.getToolbarPresenter());
- if (editableAction != null) {
- pn.add(editableAction.buildCheckBox(), BorderLayout.SOUTH);
- } else {
- pn.add(new JLabel(" "), BorderLayout.SOUTH);
- }
- return pn;
- }
@Override
public void actionPerformed(ActionEvent ev) {
Copied: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/action/EditPerspectiveAction.java (from rev 6926, trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/action/AbstractPerspectiveAction.java)
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/action/EditPerspectiveAction.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/action/EditPerspectiveAction.java 2012-01-19 11:03:35 UTC (rev 6928)
@@ -0,0 +1,160 @@
+package org.fudaa.fudaa.crue.common.action;
+
+import java.awt.event.ActionEvent;
+
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.util.Collection;
+import javax.swing.JCheckBox;
+import javax.swing.KeyStroke;
+import org.fudaa.fudaa.crue.common.Perspective;
+import org.fudaa.fudaa.crue.common.services.PerspectiveService;
+import org.fudaa.fudaa.crue.common.services.PerspectiveState;
+import org.fudaa.fudaa.crue.common.services.SelectedPerspectiveService;
+import org.openide.awt.ActionID;
+import org.openide.awt.ActionReference;
+import org.openide.awt.ActionRegistration;
+import org.openide.awt.Actions;
+import org.openide.util.HelpCtx;
+import org.openide.util.Lookup;
+import org.openide.util.LookupEvent;
+import org.openide.util.LookupListener;
+import org.openide.util.NbBundle;
+import org.openide.util.actions.BooleanStateAction;
+import org.openide.util.lookup.Lookups;
+
+@ActionID(category = "File",
+id = "org.fudaa.fudaa.crue.common.action.EditPerspectiveAction")
+@ActionRegistration(displayName = "#CTL_EditPerspectiveAction")
+@ActionReference(path = "Menu/Window", position = 6)
+public class EditPerspectiveAction extends BooleanStateAction implements LookupListener {
+
+ private Lookup.Result result = null;
+ SelectedPerspectiveService service = Lookup.getDefault().lookup(SelectedPerspectiveService.class);
+ private EditablePropertyListener editableListener;
+ PerspectiveService currentPerspective;
+ private DirtyPropertyListener dirtyListener;
+
+ public EditPerspectiveAction() {
+ putValue(NAME, NbBundle.getMessage(getClass(), "CTL_EditPerspectiveAction"));
+ putValue(SHORT_DESCRIPTION, getValue(NAME));
+ putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_E, InputEvent.CTRL_DOWN_MASK));
+
+ setEnabled(false);
+ setBooleanState(false);
+ result = service.getLookup().lookupResult(Perspective.class);
+ result.allItems();
+ result.addLookupListener(this);
+ resultChanged(null);
+ }
+
+ @Override
+ public java.awt.Component getToolbarPresenter() {
+ final JCheckBox jCheckBox = new JCheckBox(this);
+ final KeyStroke keyStroke = (KeyStroke) getValue(ACCELERATOR_KEY);
+ jCheckBox.setToolTipText(getName() + " " + Actions.findKey(this));
+ jCheckBox.getInputMap(JCheckBox.WHEN_IN_FOCUSED_WINDOW).put(keyStroke, this);
+ jCheckBox.getActionMap().put(this, this);
+ addPropertyChangeListener(new PropertyChangeListener() {
+
+ @Override
+ public void propertyChange(PropertyChangeEvent evt) {
+ if (PROP_BOOLEAN_STATE.equals(evt.getPropertyName())) {
+ jCheckBox.setSelected(getBooleanState());
+
+ }
+ }
+ });
+ return jCheckBox;
+ }
+
+ private class EditablePropertyListener implements PropertyChangeListener {
+
+ @Override
+ public void propertyChange(PropertyChangeEvent evt) {
+ updateHereFromPerspective();
+ updatePerspectiveAction();
+ }
+ }
+
+ private class DirtyPropertyListener implements PropertyChangeListener {
+
+ @Override
+ public void propertyChange(PropertyChangeEvent evt) {
+ updatePerspectiveAction();
+ }
+ }
+
+ private void updatePerspectiveAction() {
+ if (currentPerspective != null) {
+ final String FOLDER = "Actions/File/";
+ boolean dirty = currentPerspective.isDirty();
+ Lookup pathLookup = Lookups.forPath(FOLDER);
+ Collection<? extends AbstractPerspectiveAction> lookupAll = pathLookup.lookupAll(AbstractPerspectiveAction.class);
+ for (AbstractPerspectiveAction abstractPerspectiveAction : lookupAll) {
+ if (abstractPerspectiveAction.getPerspectiveId() != currentPerspective.getPerspective()) {
+ abstractPerspectiveAction.setEnabled(!dirty);
+ }
+ }
+ }
+ }
+
+ private void updateHereFromPerspective() {
+ PerspectiveService currentPerspectiveService = service.getCurrentPerspectiveService();
+ setEnabled(currentPerspectiveService != null && currentPerspectiveService.supportEdition() && currentPerspectiveService.getState() != null && currentPerspectiveService.getState().isModifiable());
+ setBooleanState(currentPerspectiveService != null && PerspectiveState.MODE_EDIT.equals(currentPerspectiveService.getState()));
+ }
+
+ @Override
+ public void resultChanged(LookupEvent lookupEvent) {
+ if (currentPerspective != null) {
+ if (editableListener != null) {
+ currentPerspective.removeStateListener(editableListener);
+ }
+ if (dirtyListener != null) {
+ currentPerspective.removeDirtyListener(dirtyListener);
+ }
+ }
+ updateHereFromPerspective();
+ currentPerspective = service.getCurrentPerspectiveService();
+ if (currentPerspective != null) {
+ if (editableListener == null) {
+ editableListener = new EditablePropertyListener();
+ }
+ if (dirtyListener == null) {
+ dirtyListener = new DirtyPropertyListener();
+ }
+ currentPerspective.addStateListener(editableListener);
+ currentPerspective.addDirtyListener(dirtyListener);
+ }
+ }
+
+ @Override
+ public String getName() {
+ return (String) getValue(NAME);
+ }
+
+ @Override
+ public HelpCtx getHelpCtx() {
+ return new HelpCtx(getClass());
+ }
+
+ @Override
+ public void setBooleanState(boolean value) {
+ if (value == getBooleanState()) {
+ return;
+ }
+ super.setBooleanState(value);
+ if (service.getCurrentPerspectiveService() != null) {
+ service.getCurrentPerspectiveService().setState(getBooleanState() ? PerspectiveState.MODE_EDIT : PerspectiveState.MODE_READ);
+ }
+ updateHereFromPerspective();
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent ev) {
+ setBooleanState(!getBooleanState());
+ }
+}
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/DialogHelper.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/DialogHelper.java 2012-01-19 09:56:27 UTC (rev 6927)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/DialogHelper.java 2012-01-19 11:03:35 UTC (rev 6928)
@@ -126,6 +126,25 @@
return DialogDisplayer.getDefault().notify(nd);
}
+ public static UserSaveAnswer confirmSaveOrNot() {
+ return confirmSaveOrNot(
+ NbBundle.getMessage(DialogHelper.class, "SaveDialog.Title"), NbBundle.getMessage(DialogHelper.class, "SaveDialog.Content"),
+ NbBundle.getMessage(DialogHelper.class, "SaveDialog.SaveAction"),
+ NbBundle.getMessage(DialogHelper.class, "SaveDialog.DontSaveAction"));
+ }
+
+ public static UserSaveAnswer confirmSaveOrNot(String title, Object message, String messageSave, String messageNotSave) {
+ Object[] values = new Object[]{messageSave, messageNotSave, NbBundle.getMessage(DialogHelper.class, "dialog.cancel.label")};
+ Object showQuestion = showQuestion(title, message, values);
+ if (messageSave.equals(showQuestion)) {
+ return UserSaveAnswer.SAVE;
+ }
+ if (messageNotSave.equals(showQuestion)) {
+ return UserSaveAnswer.DONT_SAVE;
+ }
+ return UserSaveAnswer.CANCEL;
+ }
+
/**
* @return NotifyDescriptor.YES_OPTION, NotifyDescriptor.NO_OPTION or NotifyDescriptor.CANCEL_OPTION
*/
Added: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/UserSaveAnswer.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/UserSaveAnswer.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/UserSaveAnswer.java 2012-01-19 11:03:35 UTC (rev 6928)
@@ -0,0 +1,16 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.fudaa.fudaa.crue.common.helper;
+
+/**
+ *
+ * @author deniger ( genesis)
+ */
+public enum UserSaveAnswer {
+
+ CANCEL,
+ DONT_SAVE,
+ SAVE;
+}
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/AbstractPerspectiveService.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/AbstractPerspectiveService.java 2012-01-19 09:56:27 UTC (rev 6927)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/AbstractPerspectiveService.java 2012-01-19 11:03:35 UTC (rev 6928)
@@ -16,7 +16,8 @@
private final Perspective perspective;
private PropertyChangeSupport propertyChangeSupport;
- private PerspectiveState state = PerspectiveState.MODE_READ_ONLY;
+ private PerspectiveState state = PerspectiveState.MODE_READ_ONLY_TEMP;
+ private boolean dirty = false;
public AbstractPerspectiveService(Perspective perspective) {
this.perspective = perspective;
@@ -30,26 +31,63 @@
@Override
public void addStateListener(PropertyChangeListener listener) {
- propertyChangeSupport.addPropertyChangeListener(listener);
+ propertyChangeSupport.addPropertyChangeListener("state", listener);
}
@Override
+ public void removeStateListener(PropertyChangeListener listener) {
+ propertyChangeSupport.removePropertyChangeListener("state", listener);
+ }
+ @Override
+ public void addDirtyListener(PropertyChangeListener listener) {
+ propertyChangeSupport.addPropertyChangeListener("dirty", listener);
+ }
+
+ @Override
+ public void removeDirtyListener(PropertyChangeListener listener) {
+ propertyChangeSupport.removePropertyChangeListener("dirty", listener);
+ }
+
+ @Override
public PerspectiveState getState() {
return state;
}
+ public boolean isDirty() {
+ return dirty;
+ }
+
+ public void setDirty(boolean dirty) {
+ boolean old=this.dirty;
+ this.dirty = dirty;
+ propertyChangeSupport.firePropertyChange("dirty", old, this.dirty);
+ }
+
+
+
+
+ /**
+ * si le mode courant est readOnlyAlways ne fait rien.
+ * @param state
+ */
@Override
public void setState(PerspectiveState state) {
- PerspectiveState old = this.state;
- this.state = state;
- propertyChangeSupport.firePropertyChange("state", old, state);
- editModeChanged();
+ if (PerspectiveState.MODE_READ_ONLY_ALWAYS.equals(this.state)) {
+ return;
+ }
+ if (modeChangedTo(state)) {
+ PerspectiveState old = this.state;
+ this.state = state;
+ propertyChangeSupport.firePropertyChange("state", old, state);
+ }
}
public boolean isInEditMode() {
return PerspectiveState.MODE_EDIT.equals(getState());
}
- protected void editModeChanged() {
- }
+ /**
+ * @return true si le mode a été changé
+ */
+ protected abstract boolean modeChangedTo(PerspectiveState state);
}
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/PerspectiveService.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/PerspectiveService.java 2012-01-19 09:56:27 UTC (rev 6927)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/PerspectiveService.java 2012-01-19 11:03:35 UTC (rev 6928)
@@ -28,7 +28,21 @@
public void addStateListener(PropertyChangeListener listener);
+ public void removeStateListener(PropertyChangeListener listener);
+
+ public void addDirtyListener(PropertyChangeListener listener);
+
+ public void removeDirtyListener(PropertyChangeListener listener);
+
public PerspectiveState getState();
public void setState(PerspectiveState state);
+
+ /**
+ *
+ * @return true si la perspective supporte les modification edition/lecture seul
+ */
+ public boolean supportEdition();
+
+ public boolean isDirty();
}
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/PerspectiveState.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/PerspectiveState.java 2012-01-19 09:56:27 UTC (rev 6927)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/PerspectiveState.java 2012-01-19 11:03:35 UTC (rev 6928)
@@ -9,10 +9,28 @@
* @author deniger ( genesis)
*/
public enum PerspectiveState {
+
+ MODE_READ(true),
+ /**
+ * utilise pour un mode readOnly temporaire
+ * par exemple si un scenario est chargée, la perspective passe en readonly temporaire
+ */
+ MODE_READ_ONLY_TEMP(false),
+ /**
+ * si une étude a été ouvertue en mode readonly. une perspective qui est dans ce mode ne doit jamais changer
+ * de mode.
+ */
+ MODE_READ_ONLY_ALWAYS(false),
+ MODE_EDIT(true);
- MODE_READ,
- MODE_READ_ONLY,
- MODE_EDIT;
-
+ private final boolean modifiable;
+
+ PerspectiveState(boolean isModifiable) {
+ this.modifiable = isModifiable;
+ }
+
+ public boolean isModifiable() {
+ return modifiable;
+ }
}
Modified: trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/action/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/action/Bundle.properties 2012-01-19 09:56:27 UTC (rev 6927)
+++ trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/action/Bundle.properties 2012-01-19 11:03:35 UTC (rev 6928)
@@ -1,2 +1,3 @@
CTL_ResetWindowsAction=R\u00e9initialiser les fen\u00eatres
PerspectiveEditAction.Name=\u00e9dition
+CTL_EditPerspectiveAction=\u00c9dition
Modified: trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/helper/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/helper/Bundle.properties 2012-01-19 09:56:27 UTC (rev 6927)
+++ trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/helper/Bundle.properties 2012-01-19 11:03:35 UTC (rev 6928)
@@ -1,5 +1,10 @@
NotifyOperationSucceed=Op\u00e9ration termin\u00e9e avec succ\u00e8s
dialog.ok.label=OK
dialog.cancel,label=Annuler
+dialog.cancel.label=Annuler
dialog.yes.label=Oui
dialog.no.label=Non
+SaveDialog.Title=Sauvegarde
+SaveDialog.Content=Voulez-vous sauvegarder vos modifications
+SaveDialog.SaveAction=Sauvegarder les modifications
+SaveDialog.DontSaveAction=Ne pas sauvegarder
Modified: trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/layer.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/layer.xml 2012-01-19 09:56:27 UTC (rev 6927)
+++ trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/layer.xml 2012-01-19 11:03:35 UTC (rev 6928)
@@ -2,12 +2,21 @@
<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
<filesystem>
- <folder name="Actions">
- <folder name="Window"/>
+ <folder name="Actions">
+ <folder name="Window"/>
+ </folder>
+ <folder name="Menu">
+ <folder name="Window">
+ <file name="org-netbeans-core-windows-actions-ResetWindowsAction.shadow_hidden"/>
</folder>
- <folder name="Menu">
- <folder name="Window">
- <file name="org-netbeans-core-windows-actions-ResetWindowsAction.shadow_hidden"/>
- </folder>
+ </folder>
+ <folder name="Toolbars">
+ <folder name="Persective">
+
+ <file name="org-fudaa-fudaa-crue-common-action-EditPerspectiveAction.shadow">
+ <attr name="originalFile" stringvalue="Actions/File/org-fudaa-fudaa-crue-common-action-EditPerspectiveAction.instance"/>
+ <attr intvalue="1" name="position"/>
+ </file>
</folder>
+ </folder>
</filesystem>
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 2012-01-19 09:56:27 UTC (rev 6927)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/perspective/ActiveModelisation.java 2012-01-19 11:03:35 UTC (rev 6928)
@@ -16,7 +16,7 @@
public final class ActiveModelisation extends AbstractPerspectiveAction {
public ActiveModelisation() {
- super("CTL_ActiveModelisation", PerspectiveServiceModelling.class.getName(), Perspective.MODELLING,true);
+ super("CTL_ActiveModelisation", PerspectiveServiceModelling.class.getName(), Perspective.MODELLING);
setBooleanState(false);
}
}
Modified: 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 2012-01-19 09:56:27 UTC (rev 6927)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/perspective/PerspectiveServiceModelling.java 2012-01-19 11:03:35 UTC (rev 6928)
@@ -11,6 +11,7 @@
import org.fudaa.fudaa.crue.common.Perspective;
import org.fudaa.fudaa.crue.common.services.AbstractPerspectiveService;
import org.fudaa.fudaa.crue.common.services.PerspectiveService;
+import org.fudaa.fudaa.crue.common.services.PerspectiveState;
import org.openide.util.lookup.ServiceProvider;
/**
@@ -27,6 +28,20 @@
}
@Override
+ public boolean supportEdition() {
+ return true;
+ }
+
+ @Override
+ protected boolean modeChangedTo(PerspectiveState state) {
+ return true;
+ }
+
+
+
+
+
+ @Override
public boolean activate() {
return true;
}
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/layer.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/layer.xml 2012-01-19 09:56:27 UTC (rev 6927)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/layer.xml 2012-01-19 11:03:35 UTC (rev 6928)
@@ -11,7 +11,7 @@
<folder name="Persective">
<file name="org-fudaa-fudaa-crue-modelling-perspective-ActiveModelisation.shadow">
<attr name="originalFile" stringvalue="Actions/File/org-fudaa-fudaa-crue-modelling-perspective-ActiveModelisation.instance"/>
- <attr intvalue="2" name="position"/>
+ <attr intvalue="3" name="position"/>
</file>
</folder>
</folder>
Modified: trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/action/AbstractOtfaAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/action/AbstractOtfaAction.java 2012-01-19 09:56:27 UTC (rev 6927)
+++ trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/action/AbstractOtfaAction.java 2012-01-19 11:03:35 UTC (rev 6928)
@@ -4,16 +4,10 @@
*/
package org.fudaa.fudaa.crue.otfa.action;
-import java.awt.event.ActionEvent;
-import java.io.File;
import javax.swing.AbstractAction;
import javax.swing.Action;
-import org.fudaa.fudaa.crue.otfa.filter.OtfaFileFilter;
import org.fudaa.fudaa.crue.otfa.node.OtfaCampagneNode;
-import org.fudaa.fudaa.crue.otfa.process.SaveOtfaCampagneProcess;
import org.fudaa.fudaa.crue.otfa.service.OtfaService;
-import org.netbeans.api.progress.ProgressUtils;
-import org.openide.filesystems.FileChooserBuilder;
import org.openide.util.Lookup;
import org.openide.util.Lookup.Result;
import org.openide.util.LookupEvent;
Modified: trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/perspective/ActiveOtfa.java
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/perspective/ActiveOtfa.java 2012-01-19 09:56:27 UTC (rev 6927)
+++ trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/perspective/ActiveOtfa.java 2012-01-19 11:03:35 UTC (rev 6928)
@@ -12,7 +12,7 @@
public final class ActiveOtfa extends AbstractPerspectiveAction {
public ActiveOtfa() {
- super("CTL_ActiveOtfa", PerspectiveServiceOtfa.class.getName(), Perspective.TEST,true);
+ super("CTL_ActiveOtfa", PerspectiveServiceOtfa.class.getName(), Perspective.TEST);
setBooleanState(false);
}
}
Modified: trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/perspective/PerspectiveServiceOtfa.java
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/perspective/PerspectiveServiceOtfa.java 2012-01-19 09:56:27 UTC (rev 6927)
+++ trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/perspective/PerspectiveServiceOtfa.java 2012-01-19 11:03:35 UTC (rev 6928)
@@ -9,8 +9,17 @@
import java.util.HashSet;
import java.util.Set;
import org.fudaa.fudaa.crue.common.Perspective;
+import org.fudaa.fudaa.crue.common.helper.DialogHelper;
+import org.fudaa.fudaa.crue.common.helper.UserSaveAnswer;
import org.fudaa.fudaa.crue.common.services.AbstractPerspectiveService;
import org.fudaa.fudaa.crue.common.services.PerspectiveService;
+import org.fudaa.fudaa.crue.common.services.PerspectiveState;
+import org.fudaa.fudaa.crue.otfa.node.OtfaCampagneNode;
+import org.fudaa.fudaa.crue.otfa.service.OtfaService;
+import org.openide.util.Lookup;
+import org.openide.util.Lookup.Result;
+import org.openide.util.LookupEvent;
+import org.openide.util.LookupListener;
import org.openide.util.lookup.ServiceProvider;
/**
@@ -18,27 +27,83 @@
* @author genesis
*/
@ServiceProvider(service = PerspectiveService.class)
-public class PerspectiveServiceOtfa extends AbstractPerspectiveService {
-
+public class PerspectiveServiceOtfa extends AbstractPerspectiveService implements LookupListener {
+
private final Set<String> components = Collections.unmodifiableSet(new HashSet<String>(Arrays.asList("OtfaCampagneTopComponent", "properties")))...
[truncated message content] |
|
From: <de...@us...> - 2012-04-19 05:59:22
|
Revision: 7083
http://fudaa.svn.sourceforge.net/fudaa/?rev=7083&view=rev
Author: deniger
Date: 2012-04-19 05:59:15 +0000 (Thu, 19 Apr 2012)
Log Message:
-----------
rpti ok
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-server/pom.xml
trunk/soft/fudaa-crue/pom.xml
Modified: trunk/soft/fudaa-crue/crue-server/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-server/pom.xml 2012-04-18 21:17:34 UTC (rev 7082)
+++ trunk/soft/fudaa-crue/crue-server/pom.xml 2012-04-19 05:59:15 UTC (rev 7083)
@@ -72,7 +72,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>commons-jxpath</groupId>
Modified: trunk/soft/fudaa-crue/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/pom.xml 2012-04-18 21:17:34 UTC (rev 7082)
+++ trunk/soft/fudaa-crue/pom.xml 2012-04-19 05:59:15 UTC (rev 7083)
@@ -28,7 +28,6 @@
</properties>
<modules>
<module>crue-server</module>
-<!-- <module>crue-ui</module>-->
<module>ui-common</module>
<module>ui-branding</module>
<module>ui-study</module>
@@ -40,9 +39,11 @@
<module>ui-emh</module>
<module>ui-comparison</module>
<module>ui-loader</module>
+ <module>ui-commandline</module>
</modules>
<dependencyManagement>
<dependencies>
+
<dependency>
<groupId>org.fudaa.framework.fudaa</groupId>
<artifactId>fudaa-common</artifactId>
@@ -50,7 +51,14 @@
<type>pom</type>
<scope>import</scope>
</dependency>
+ <!--pour les tests-->
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>common-jxpath</groupId>
<artifactId>common-jxpath</artifactId>
<version>1.3</version>
@@ -127,8 +135,9 @@
</dependency>
<dependency>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <artifactId>crue-ui</artifactId>
+ <artifactId>ui-commandline</artifactId>
<version>${project.version}</version>
+ <type>nbm</type>
</dependency>
<!-- Externes -->
@@ -145,8 +154,23 @@
</dependencies>
</dependencyManagement>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.12</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.12</version>
+ </plugin>
+
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>nbm-maven-plugin</artifactId>
<version>3.5</version>
@@ -156,6 +180,7 @@
<cluster>${brandingToken}</cluster>
</configuration>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@@ -176,4 +201,23 @@
</plugin>
</plugins>
</build>
+ <!--pour éviter de lancer les tests d'intégration-->
+ <profiles>
+ <profile>
+ <id>noIntegrationTests</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludedGroups>org.fudaa.dodico.crue.common.TestIntegration.class</excludedGroups>
+ <parallel>methods</parallel>
+ <threadCount>5</threadCount>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-04-19 09:09:50
|
Revision: 7085
http://fudaa.svn.sourceforge.net/fudaa/?rev=7085&view=rev
Author: deniger
Date: 2012-04-19 09:09:39 +0000 (Thu, 19 Apr 2012)
Log Message:
-----------
ajout module command-line
Added Paths:
-----------
trunk/soft/fudaa-crue/ui-commandline/
trunk/soft/fudaa-crue/ui-commandline/pom.xml
trunk/soft/fudaa-crue/ui-commandline/src/
trunk/soft/fudaa-crue/ui-commandline/src/main/
trunk/soft/fudaa-crue/ui-commandline/src/main/java/
trunk/soft/fudaa-crue/ui-commandline/src/main/java/org/
trunk/soft/fudaa-crue/ui-commandline/src/main/java/org/fudaa/
trunk/soft/fudaa-crue/ui-commandline/src/main/java/org/fudaa/fudaa/
trunk/soft/fudaa-crue/ui-commandline/src/main/java/org/fudaa/fudaa/crue/
trunk/soft/fudaa-crue/ui-commandline/src/main/java/org/fudaa/fudaa/crue/uicommandline/
trunk/soft/fudaa-crue/ui-commandline/src/main/java/org/fudaa/fudaa/crue/uicommandline/ArgumentLineAnalyser.java
trunk/soft/fudaa-crue/ui-commandline/src/main/java/org/fudaa/fudaa/crue/uicommandline/MultiNetbeansInstanceChooser.java
trunk/soft/fudaa-crue/ui-commandline/src/main/java/org/fudaa/fudaa/crue/uicommandline/MultiNetbeansInstanceInstaller.java
trunk/soft/fudaa-crue/ui-commandline/src/main/java/org/fudaa/fudaa/crue/uicommandline/MultiNetbeansInstanceUtils.java
trunk/soft/fudaa-crue/ui-commandline/src/main/java/org/fudaa/fudaa/crue/uicommandline/OpenedNetbeansInstance.java
trunk/soft/fudaa-crue/ui-commandline/src/main/nbm/
trunk/soft/fudaa-crue/ui-commandline/src/main/nbm/manifest.mf
trunk/soft/fudaa-crue/ui-commandline/src/main/nbm/module.xml
trunk/soft/fudaa-crue/ui-commandline/src/main/resources/
trunk/soft/fudaa-crue/ui-commandline/src/main/resources/org/
trunk/soft/fudaa-crue/ui-commandline/src/main/resources/org/fudaa/
trunk/soft/fudaa-crue/ui-commandline/src/main/resources/org/fudaa/fudaa/
trunk/soft/fudaa-crue/ui-commandline/src/main/resources/org/fudaa/fudaa/crue/
trunk/soft/fudaa-crue/ui-commandline/src/main/resources/org/fudaa/fudaa/crue/uicommandline/
trunk/soft/fudaa-crue/ui-commandline/src/main/resources/org/fudaa/fudaa/crue/uicommandline/Bundle.properties
Property changes on: trunk/soft/fudaa-crue/ui-commandline
___________________________________________________________________
Added: svn:ignore
+ target
Added: trunk/soft/fudaa-crue/ui-commandline/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-commandline/pom.xml (rev 0)
+++ trunk/soft/fudaa-crue/ui-commandline/pom.xml 2012-04-19 09:09:39 UTC (rev 7085)
@@ -0,0 +1,86 @@
+
+<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.51-SNAPSHOT</version>
+ </parent>
+ <artifactId>ui-commandline</artifactId>
+ <packaging>nbm</packaging>
+
+ <name>Crue UI CommandLine</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>
+ <dependency>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-netbeans-modules-sendopts</artifactId>
+ <version>${netbeans.version}</version>
+ <type>nbm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-openide-util-lookup</artifactId>
+ <version>${netbeans.version}</version>
+ <type>nbm</type>
+ </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-filesystems</artifactId>
+ <version>${netbeans.version}</version>
+ <type>nbm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-openide-windows</artifactId>
+ <version>${netbeans.version}</version>
+ <type>nbm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-openide-modules</artifactId>
+ <version>${netbeans.version}</version>
+ <type>nbm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-openide-nodes</artifactId>
+ <version>${netbeans.version}</version>
+ <type>nbm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-openide-dialogs</artifactId>
+ <version>${netbeans.version}</version>
+ <type>nbm</type>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <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>
Added: trunk/soft/fudaa-crue/ui-commandline/src/main/java/org/fudaa/fudaa/crue/uicommandline/ArgumentLineAnalyser.java
===================================================================
--- trunk/soft/fudaa-crue/ui-commandline/src/main/java/org/fudaa/fudaa/crue/uicommandline/ArgumentLineAnalyser.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-commandline/src/main/java/org/fudaa/fudaa/crue/uicommandline/ArgumentLineAnalyser.java 2012-04-19 09:09:39 UTC (rev 7085)
@@ -0,0 +1,157 @@
+package org.fudaa.fudaa.crue.uicommandline;
+
+import java.awt.EventQueue;
+import java.io.File;
+import java.io.IOException;
+import java.util.*;
+import org.fudaa.fudaa.crue.uicommandline.MultiNetbeansInstanceChooser.Result;
+import org.netbeans.api.sendopts.CommandException;
+import org.netbeans.spi.sendopts.Env;
+import org.netbeans.spi.sendopts.Option;
+import org.netbeans.spi.sendopts.OptionProcessor;
+import org.openide.util.Exceptions;
+import org.openide.util.lookup.ServiceProvider;
+import org.openide.windows.WindowManager;
+
+/**
+ *
+ * @author deniger ( genesis)
+ */
+@ServiceProvider(service = OptionProcessor.class)
+public class ArgumentLineAnalyser extends OptionProcessor {
+
+ private static final String TO_FRONT_OPTION = "toFront";
+ private static String IS_COPY_OPTION = "isCopy";
+// private Set<File> userDirOpened = new HashSet<File>();
+ private Option openMultiInstances = Option.withoutArgument(Option.NO_SHORT_NAME, "multi-instances");
+ private Option toFront = Option.withoutArgument(Option.NO_SHORT_NAME, TO_FRONT_OPTION);
+ private Option isCopy = Option.withoutArgument(Option.NO_SHORT_NAME, IS_COPY_OPTION);
+
+ private void activateOrCreateNewInstance() {
+ MultiNetbeansInstanceChooser.Result res = MultiNetbeansInstanceChooser.choose(getOpenedInstances(true));
+ if (res.isCreateNew()) {
+ launchNewInstance();
+ } else if (res.isActivateExisting()) {
+ OpenedNetbeansInstance instance = res.getInstance();
+ if (instance.isCurrent()) {
+ moveMainWindowToFront();
+ } else {
+ activateInstance(instance.getUserDir());
+ }
+ }
+ }
+
+ private void firstInstanceLaunched() {
+ //for the main instance we clean subaltern userDir and we test if other instances already launched
+ if (!MultiNetbeansInstanceUtils.isCopiedInstance()) {
+ //first call of the main window
+ //we clean old userDir
+ MultiNetbeansInstanceUtils.cleanUserDirs();
+ //if not null, the main instance has been closed before subalterns.
+ List<OpenedNetbeansInstance> openedInstances = getOpenedInstances(false);
+ //what can we do ?
+ if (!openedInstances.isEmpty()) {
+ Result choose = MultiNetbeansInstanceChooser.choose(openedInstances);
+ if (choose.isActivateExisting()) {
+ //WindowManager.getDefault().getMainWindow().setVisible(false);
+ activateInstance(choose.getInstance().getUserDir());
+ System.exit(0);
+ } else if (choose.isCancel()) {
+ System.exit(0);
+ }
+ }
+ }
+ }
+
+ private void instanceAlreadyLaunched() {
+ EventQueue.invokeLater(new Runnable() {
+
+ @Override
+ public void run() {
+ activateOrCreateNewInstance();
+ }
+ });
+ }
+
+ private void launchNewInstance() {
+ try {
+ File newUserDir = MultiNetbeansInstanceUtils.createNewUserDir();
+ launchAppli(newUserDir, "--" + IS_COPY_OPTION);
+ } catch (IOException ex) {
+ Exceptions.printStackTrace(ex);
+ }
+ }
+
+ private void activateInstance(File userDir) {
+ launchAppli(userDir, "--" + TO_FRONT_OPTION);
+
+ }
+
+ private void launchAppli(File newUserDir, final String option) {
+ File platformDir = new File(System.getProperty("netbeans.home"));
+ File binDir = new File(platformDir.getParentFile(), "bin");
+ File exe = new File(binDir, MultiNetbeansInstanceUtils.isWindows() ? "fudaacrue.exe" : "fudaacrue");
+ ProcessBuilder builder = new ProcessBuilder(exe.getAbsolutePath(), "--userdir", newUserDir.getAbsolutePath(), option);
+ try {
+ builder.start();
+ } catch (IOException ex) {
+ Exceptions.printStackTrace(ex);
+ }
+ }
+
+ public void moveMainWindowToFront() {
+ EventQueue.invokeLater(new Runnable() {
+
+ @Override
+ public void run() {
+ WindowManager.getDefault().getMainWindow().toFront();
+ }
+ });
+ }
+
+ @Override
+ protected Set<Option> getOptions() {
+ HashSet set = new HashSet();
+ set.add(openMultiInstances);
+ set.add(toFront);
+ set.add(isCopy);
+ return set;
+ }
+
+ private List<OpenedNetbeansInstance> getOpenedInstances(boolean includeCurrent) {
+ List<OpenedNetbeansInstance> openedIstance = new ArrayList<OpenedNetbeansInstance>();
+ if (includeCurrent) {
+ OpenedNetbeansInstance thisInstance = new OpenedNetbeansInstance(MultiNetbeansInstanceUtils.getUserDir(), MultiNetbeansInstanceUtils.getMainWindowTitle(), true);
+ openedIstance.add(thisInstance);
+ }
+ List<File> userDirOpened = MultiNetbeansInstanceUtils.listUserDir();
+ for (File userDir : userDirOpened) {
+ File frameName = MultiNetbeansInstanceUtils.getFrameName(userDir);
+ if (frameName.exists()) {
+ String frame = MultiNetbeansInstanceUtils.readFrameName(frameName);
+ if (frame != null) {
+ openedIstance.add(new OpenedNetbeansInstance(userDir, frame, false));
+ }
+ }
+ }
+ Collections.sort(openedIstance);
+ return openedIstance;
+ }
+
+ @Override
+ protected void process(Env env, Map<Option, String[]> maps) throws CommandException {
+ //for copied instances we just move to front.
+ if (MultiNetbeansInstanceUtils.isCopiedInstance() || maps.containsKey(toFront)) {
+ moveMainWindowToFront();
+ return;
+ }
+ if (maps.containsKey(isCopy)) {
+ MultiNetbeansInstanceUtils.storedCopiedInstance();
+ }
+ if (MultiNetbeansInstanceUtils.getFrameName().exists()) {
+ instanceAlreadyLaunched();
+ } else {
+ firstInstanceLaunched();
+ }
+ }
+}
Added: trunk/soft/fudaa-crue/ui-commandline/src/main/java/org/fudaa/fudaa/crue/uicommandline/MultiNetbeansInstanceChooser.java
===================================================================
--- trunk/soft/fudaa-crue/ui-commandline/src/main/java/org/fudaa/fudaa/crue/uicommandline/MultiNetbeansInstanceChooser.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-commandline/src/main/java/org/fudaa/fudaa/crue/uicommandline/MultiNetbeansInstanceChooser.java 2012-04-19 09:09:39 UTC (rev 7085)
@@ -0,0 +1,107 @@
+package org.fudaa.fudaa.crue.uicommandline;
+
+import java.awt.Component;
+import java.util.List;
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import org.openide.DialogDisplayer;
+import org.openide.NotifyDescriptor;
+import org.openide.util.NbBundle;
+
+/**
+ *
+ * @author deniger ( genesis)
+ */
+public class MultiNetbeansInstanceChooser {
+
+ public static class Result {
+
+ private final static int CANCEL = 0;
+ private final static int ACTIVE = 1;
+ private final static int NEW = 2;
+ private final int action;
+ private final OpenedNetbeansInstance instance;
+
+ public OpenedNetbeansInstance getInstance() {
+ return instance;
+ }
+
+ public Result(int action, OpenedNetbeansInstance instance) {
+ this.action = action;
+ this.instance = instance;
+ }
+
+ public static Result createCancel() {
+ return new Result(CANCEL, null);
+ }
+
+ public static Result createNewInstance() {
+ return new Result(NEW, null);
+ }
+
+ public static Result createActivate(OpenedNetbeansInstance instance) {
+ if (instance == null) {
+ return createCancel();
+ }
+ return new Result(ACTIVE, instance);
+ }
+
+ public boolean isCancel() {
+ return CANCEL == action;
+ }
+
+ public boolean isCreateNew() {
+ return NEW == action;
+ }
+
+ public boolean isActivateExisting() {
+ return ACTIVE == action;
+ }
+ }
+
+ private static class InstanceRenderer extends DefaultListCellRenderer {
+
+ @Override
+ public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+ Object newValue = value;
+ if (value != null) {
+ newValue = ((OpenedNetbeansInstance) value).getFrameName();
+ }
+ return super.getListCellRendererComponent(list, newValue, index, isSelected, cellHasFocus);
+ }
+ }
+
+ public static Result choose(List<OpenedNetbeansInstance> in) {
+
+ final JList list = new JList(in.toArray());
+ list.setCellRenderer(new InstanceRenderer());
+ list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+
+
+ String title = NbBundle.getMessage(MultiNetbeansInstanceChooser.class, "ChooseInstance.DialogTitle");
+ String optionActive = NbBundle.getMessage(MultiNetbeansInstanceChooser.class, "ChooseInstance.ActiveSelected");
+ String optionNewInstance = NbBundle.getMessage(MultiNetbeansInstanceChooser.class, "ChooseInstance.CreateNewInstance");
+ String cancel = NbBundle.getMessage(MultiNetbeansInstanceChooser.class, "ChooseInstance.Cancel");
+ final NotifyDescriptor nd = new NotifyDescriptor.Confirmation(new JScrollPane(list), title);
+ nd.setValid(false);
+ list.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
+
+ @Override
+ public void valueChanged(ListSelectionEvent e) {
+ nd.setValid(!list.getSelectionModel().isSelectionEmpty());
+ }
+ });
+
+ nd.setOptions(new Object[]{optionActive, optionNewInstance, cancel});
+ Object showQuestion = DialogDisplayer.getDefault().notify(nd);
+ if (showQuestion.equals(optionNewInstance)) {
+ return Result.createNewInstance();
+ } else if (showQuestion.equals(optionActive)) {
+ return Result.createActivate((OpenedNetbeansInstance) list.getSelectedValue());
+ }
+
+ return Result.createCancel();
+
+ }
+}
Added: trunk/soft/fudaa-crue/ui-commandline/src/main/java/org/fudaa/fudaa/crue/uicommandline/MultiNetbeansInstanceInstaller.java
===================================================================
--- trunk/soft/fudaa-crue/ui-commandline/src/main/java/org/fudaa/fudaa/crue/uicommandline/MultiNetbeansInstanceInstaller.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-commandline/src/main/java/org/fudaa/fudaa/crue/uicommandline/MultiNetbeansInstanceInstaller.java 2012-04-19 09:09:39 UTC (rev 7085)
@@ -0,0 +1,45 @@
+package org.fudaa.fudaa.crue.uicommandline;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.io.File;
+import java.io.IOException;
+import org.openide.filesystems.FileUtil;
+import org.openide.modules.ModuleInstall;
+import org.openide.util.Exceptions;
+import org.openide.windows.WindowManager;
+
+/**
+ *
+ * @author deniger ( genesis)
+ */
+public class MultiNetbeansInstanceInstaller extends ModuleInstall implements Runnable, PropertyChangeListener {
+
+ @Override
+ public void close() {
+ File frameName = MultiNetbeansInstanceUtils.getFrameName();
+ if (frameName.exists()) {
+ frameName.delete();
+ }
+ //we clean for the main instance only:
+ if (!MultiNetbeansInstanceUtils.isCopiedInstance()) {
+ MultiNetbeansInstanceUtils.cleanUserDirs();
+ }
+ }
+
+ @Override
+ public void propertyChange(PropertyChangeEvent evt) {
+ MultiNetbeansInstanceUtils.storeFrameName();
+ }
+
+ @Override
+ public void restored() {
+ WindowManager.getDefault().invokeWhenUIReady(this);
+ }
+
+ @Override
+ public void run() {
+ MultiNetbeansInstanceUtils.storeFrameName();
+ WindowManager.getDefault().getMainWindow().addPropertyChangeListener("title", this);
+ }
+}
Added: trunk/soft/fudaa-crue/ui-commandline/src/main/java/org/fudaa/fudaa/crue/uicommandline/MultiNetbeansInstanceUtils.java
===================================================================
--- trunk/soft/fudaa-crue/ui-commandline/src/main/java/org/fudaa/fudaa/crue/uicommandline/MultiNetbeansInstanceUtils.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-commandline/src/main/java/org/fudaa/fudaa/crue/uicommandline/MultiNetbeansInstanceUtils.java 2012-04-19 09:09:39 UTC (rev 7085)
@@ -0,0 +1,160 @@
+package org.fudaa.fudaa.crue.uicommandline;
+
+import java.io.*;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.openide.filesystems.FileObject;
+import org.openide.filesystems.FileUtil;
+import org.openide.util.Exceptions;
+import org.openide.windows.WindowManager;
+
+/**
+ *
+ * @author deniger ( genesis)
+ */
+public class MultiNetbeansInstanceUtils {
+
+ public static final String INSTANCE_LOCKER_FILENAME = "frame-title.txt";
+ public static final String USER_DIR_PREFIX = "userDir";
+ private static String IS_COPY_PROPERTY = "thisInstanceIsACopy";
+
+ public static boolean isCopiedInstance() {
+ return Boolean.TRUE.toString().equals(System.getProperty(IS_COPY_PROPERTY));
+ }
+
+ public static void storedCopiedInstance() {
+ System.setProperty(IS_COPY_PROPERTY, Boolean.TRUE.toString());
+ }
+
+ public static File createTempDir(final String prefix, File parent) throws IOException {
+ final File tempFile = File.createTempFile(prefix, "", parent);
+ if (!tempFile.delete()) {
+ throw new IOException();
+ }
+
+ if (!tempFile.mkdir()) {
+ throw new IOException();
+ }
+
+ return tempFile;
+ }
+
+ public static List<File> listUserDir() {
+ List<File> userDirs = new ArrayList<File>();
+ File f = getUserDir();
+ File[] listFiles = f.listFiles();
+ for (File file : listFiles) {
+ if (isSubalternUserDir(file)) {
+ userDirs.add(file);
+ }
+ }
+ return userDirs;
+ }
+
+ private static boolean isSubalternUserDir(File file) {
+ return file.isDirectory() && file.getName().startsWith(USER_DIR_PREFIX);
+ }
+
+ public static File createNewUserDir() throws IOException {
+ File userDir = getUserDir();
+ File newUserDir = new File(userDir, "userDir" + new SimpleDateFormat("yyyy-MM-dd-HH'h'mm'm'ss's'").format(new Date()));
+ if (newUserDir.exists()) {
+ newUserDir = createTempDir(USER_DIR_PREFIX, userDir);
+ }
+ newUserDir.mkdirs();
+ //copy of the userDirFiles
+ FileObject newUserDirFileObject = FileUtil.toFileObject(newUserDir);
+ File[] listFiles = userDir.listFiles();
+ for (File file : listFiles) {
+ if (!isSubalternUserDir(file) && !"lock".equals(file.getName()) && !INSTANCE_LOCKER_FILENAME.equals(file.getName())) {
+ FileObject source = FileUtil.toFileObject(file);
+ source.copy(newUserDirFileObject, source.getName(), source.getExt());
+ }
+ }
+ return newUserDir;
+ }
+
+ public static final boolean isWindows() {
+ return (System.getProperty("os.name").startsWith("Win"));
+ }
+
+ public static File getUserDir() {
+ final FileObject configRoot = FileUtil.getConfigRoot();
+ return FileUtil.toFile(configRoot).getParentFile();
+ }
+
+ public static File getFrameName() {
+ return getFrameName(getUserDir());
+ }
+
+ public static File getFrameName(File userDir) {
+ return new File(userDir, INSTANCE_LOCKER_FILENAME);
+ }
+
+ public static String getMainWindowTitle() {
+ return WindowManager.getDefault().getMainWindow().getTitle();
+ }
+
+ public static String readFrameName(File frameTitleFile) {
+ String res = null;
+ FileReader reader = null;
+ try {
+ reader = new FileReader(frameTitleFile);
+ BufferedReader buffReadder = new BufferedReader(reader);
+ res = buffReadder.readLine();
+ } catch (IOException ex) {
+ Logger.getLogger(ArgumentLineAnalyser.class.getName()).log(Level.SEVERE, null, ex);
+ } finally {
+ if (reader != null) {
+ try {
+ reader.close();
+ } catch (IOException ex) {
+ Logger.getLogger(ArgumentLineAnalyser.class.getName()).log(Level.SEVERE, null, ex);
+ }
+ }
+ }
+
+ return res;
+
+ }
+
+ public static void cleanUserDirs() {
+ List<File> userDirOpened = MultiNetbeansInstanceUtils.listUserDir();
+ for (File userDir : userDirOpened) {
+ File frameName = MultiNetbeansInstanceUtils.getFrameName(userDir);
+ if (!frameName.exists()) {
+ try {
+ FileUtil.toFileObject(userDir).delete();
+ } catch (IOException ex) {
+ Exceptions.printStackTrace(ex);
+ }
+ }
+ }
+ }
+
+ public static synchronized void storeFrameName() {
+ File f = getFrameName();
+ FileWriter w = null;
+ try {
+ w = new FileWriter(f, false);
+ final String mainWindowTitle = getMainWindowTitle();
+ w.append(mainWindowTitle);
+ } catch (IOException ex) {
+ Exceptions.printStackTrace(ex);
+ Logger.getLogger(ArgumentLineAnalyser.class.getName()).log(Level.SEVERE, null, ex);
+ } finally {
+ if (w != null) {
+ try {
+ w.close();
+ } catch (IOException ex) {
+ Exceptions.printStackTrace(ex);
+ Logger.getLogger(ArgumentLineAnalyser.class.getName()).log(Level.SEVERE, null, ex);
+ }
+ }
+ }
+ }
+}
Added: trunk/soft/fudaa-crue/ui-commandline/src/main/java/org/fudaa/fudaa/crue/uicommandline/OpenedNetbeansInstance.java
===================================================================
--- trunk/soft/fudaa-crue/ui-commandline/src/main/java/org/fudaa/fudaa/crue/uicommandline/OpenedNetbeansInstance.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-commandline/src/main/java/org/fudaa/fudaa/crue/uicommandline/OpenedNetbeansInstance.java 2012-04-19 09:09:39 UTC (rev 7085)
@@ -0,0 +1,47 @@
+package org.fudaa.fudaa.crue.uicommandline;
+
+import java.io.File;
+
+/**
+ *
+ * @author deniger ( genesis)
+ */
+class OpenedNetbeansInstance implements Comparable<OpenedNetbeansInstance> {
+ private final File userDir;
+ private final String frameName;
+ private final boolean current;
+
+ public OpenedNetbeansInstance(File userDir, String frameName, boolean current) {
+ this.userDir = userDir;
+ this.frameName = frameName;
+ this.current = current;
+ }
+
+ public String getFrameName() {
+ return frameName;
+ }
+
+ public File getUserDir() {
+ return userDir;
+ }
+
+ public boolean isCurrent() {
+ return current;
+ }
+
+ @Override
+ public int compareTo(OpenedNetbeansInstance o) {
+ if (o == null) {
+ return 1;
+ }
+ if (o == this) {
+ return 0;
+ }
+ int idx = frameName.compareTo(o.frameName);
+ if (idx == 0) {
+ idx = userDir.compareTo(o.userDir);
+ }
+ return idx;
+ }
+
+}
Added: trunk/soft/fudaa-crue/ui-commandline/src/main/nbm/manifest.mf
===================================================================
--- trunk/soft/fudaa-crue/ui-commandline/src/main/nbm/manifest.mf (rev 0)
+++ trunk/soft/fudaa-crue/ui-commandline/src/main/nbm/manifest.mf 2012-04-19 09:09:39 UTC (rev 7085)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+OpenIDE-Module-Localizing-Bundle: org/fudaa/fudaa/crue/uicommandline/Bundle.properties
+OpenIDE-Module-Install: org/fudaa/fudaa/crue/uicommandline/MultiNetbeansInstanceInstaller.class
\ No newline at end of file
Added: trunk/soft/fudaa-crue/ui-commandline/src/main/nbm/module.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-commandline/src/main/nbm/module.xml (rev 0)
+++ trunk/soft/fudaa-crue/ui-commandline/src/main/nbm/module.xml 2012-04-19 09:09:39 UTC (rev 7085)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nbm>
+ <!--
+ <moduleType>autoload</moduleType>
+ <codeNameBase>org.fudaa.fudaa.crue.uicommandline/1</codeNameBase>
+ <licenseName>Apache License, Version 2.0</licenseName>
+ <licenseFile>license.txt</licenseFile>
+ -->
+</nbm>
Added: trunk/soft/fudaa-crue/ui-commandline/src/main/resources/org/fudaa/fudaa/crue/uicommandline/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-commandline/src/main/resources/org/fudaa/fudaa/crue/uicommandline/Bundle.properties (rev 0)
+++ trunk/soft/fudaa-crue/ui-commandline/src/main/resources/org/fudaa/fudaa/crue/uicommandline/Bundle.properties 2012-04-19 09:09:39 UTC (rev 7085)
@@ -0,0 +1,9 @@
+# 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=
+ChooseInstance.DialogTitle=Choisir une instance
+ChooseInstance.ActiveSelected=Activer l'instance s\u00e9lectionn\u00e9e
+ChooseInstance.CreateNewInstance=Cr\u00e9er une nouvelle instance
+ChooseInstance.Cancel=Annuler
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-05-02 22:16:44
|
Revision: 7143
http://fudaa.svn.sourceforge.net/fudaa/?rev=7143&view=rev
Author: deniger
Date: 2012-05-02 22:16:37 +0000 (Wed, 02 May 2012)
Log Message:
-----------
CRUE-117
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/etude/EMHProjet.java
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/calcul/Crue9Exec.java
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/create/RunCreator.java
trunk/soft/fudaa-crue/crue-server/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/services/CrueRunLauncherServiceImpl.java
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/etude/EMHProjet.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/etude/EMHProjet.java 2012-05-02 21:54:07 UTC (rev 7142)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/etude/EMHProjet.java 2012-05-02 22:16:37 UTC (rev 7143)
@@ -138,6 +138,11 @@
return new File(dirOfRun, modele.getNom());
}
+ public File getDirForRunModele(final ManagerEMHScenario scenarioCrue, ManagerEMHModeleBase modele, final EMHRun run) {
+ final File dirOfRun = getDirForRun(scenarioCrue, run);
+ return new File(dirOfRun, modele.getNom());
+ }
+
/**
* @return l'association idFichier->File pour les fichier d'etude
*/
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/calcul/Crue9Exec.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/calcul/Crue9Exec.java 2012-05-02 21:54:07 UTC (rev 7142)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/calcul/Crue9Exec.java 2012-05-02 22:16:37 UTC (rev 7143)
@@ -67,7 +67,7 @@
replace.put("@DC@", getSansExtensionAndUpperCase(dc));
if (!CtuluLibFile.replaceAndCopyFile(template, datFile, replace, null)) {
getUI().error(DodicoLib.getS("Copie de fichier"),
- DodicoLib.getS("Erreur lors de la création du fichier {0} ", datFile.getAbsolutePath()), false);
+ DodicoLib.getS("Erreur lors de la création du fichier {0} ", datFile.getAbsolutePath()), false);
return false;
}
@@ -88,7 +88,7 @@
}
private String getSansExtensionAndUpperCase(final File file) {
- return new File(file.getParentFile(), CtuluLibFile.getSansExtension(file.getName()).toUpperCase()).getAbsolutePath();
+ return CtuluLibFile.getSansExtension(file.getName()).toUpperCase();
}
protected boolean launch(CExecListener listener) {
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/create/RunCreator.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/create/RunCreator.java 2012-05-02 21:54:07 UTC (rev 7142)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/projet/create/RunCreator.java 2012-05-02 22:16:37 UTC (rev 7143)
@@ -5,6 +5,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
@@ -12,14 +13,19 @@
import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.commons.lang.StringUtils;
+import org.fudaa.ctulu.CtuluLibFile;
+import org.fudaa.ctulu.CtuluLibString;
import org.fudaa.ctulu.CtuluLog;
import org.fudaa.dodico.crue.common.BusinessMessages;
import org.fudaa.dodico.crue.common.ConnexionInformation;
import org.fudaa.dodico.crue.common.CrueFileHelper;
import org.fudaa.dodico.crue.common.CrueOperationResult;
+import org.fudaa.dodico.crue.io.common.CrueFileType;
+import org.fudaa.dodico.crue.metier.emh.EMHModeleBase;
import org.fudaa.dodico.crue.metier.etude.EMHInfosVersion;
import org.fudaa.dodico.crue.metier.etude.EMHProjet;
import org.fudaa.dodico.crue.metier.etude.EMHRun;
+import org.fudaa.dodico.crue.metier.etude.ManagerEMHModeleBase;
import org.fudaa.dodico.crue.metier.etude.ManagerEMHScenario;
import org.fudaa.dodico.crue.metier.etude.RunFile;
import org.fudaa.dodico.crue.metier.factory.CruePrefix;
@@ -48,6 +54,77 @@
return runNamePattern;
}
+ private void copyLinkedCrue9Files(ManagerEMHScenario scenario, CtuluLog log, EMHRun newRun) {
+ if (scenario.isCrue10() && scenario.getLinkedscenarioCrue9() != null) {
+ ManagerEMHScenario linkedScenarioCrue9 = projet.getScenario(scenario.getLinkedscenarioCrue9());
+ if (linkedScenarioCrue9 == null) {
+ log.addWarn("create.runCreator.linkedScenarioCrue9.cantFind", scenario.getLinkedscenarioCrue9());
+ } else if (linkedScenarioCrue9.getRunCourant() == null) {
+ log.addWarn("create.runCreator.linkedScenarioCrue9.noRunCourant", scenario.getLinkedscenarioCrue9());
+ } else {
+ File dirForRunModeleCrue9 = projet.getDirForRunModeleCrue9(linkedScenarioCrue9, linkedScenarioCrue9.getRunCourant());
+ if (!dirForRunModeleCrue9.exists()) {
+ log.addWarn("create.runCreator.linkedScenarioCrue9.runDirNotExisting", dirForRunModeleCrue9.getAbsolutePath());
+ } else {
+ File xxcprovx = new File(dirForRunModeleCrue9, "xxcprovx.dat");
+ boolean copyXxprovx = true;
+ if (!xxcprovx.exists()) {
+ copyXxprovx = false;
+ log.addWarn("create.runCreator.linkedScenarioCrue9.xxcprovxNotExisting", dirForRunModeleCrue9.getAbsolutePath());
+ } else {
+ testxxprovxContent(xxcprovx, log);
+ }
+ Map<String, RunFile> runFilesResultat = projet.getRunFilesResultat(linkedScenarioCrue9,
+ linkedScenarioCrue9.getRunCourant());
+ //un scenario crue9 a forcément un seul modele.
+ final ManagerEMHModeleBase modeleCrue9 = linkedScenarioCrue9.getFils().get(0);
+ final RunFile stoRunFile = runFilesResultat.get(ManagerEMHScenario.getResKey(modeleCrue9, CrueFileType.STO));
+ boolean copySto = true;
+ boolean copyStr = true;
+ if (stoRunFile == null || !stoRunFile.getFile().exists()) {
+ copySto = false;
+ final boolean undefined = stoRunFile == null;
+ if (undefined) {
+ log.addWarn("create.runCreator.linkedScenarioCrue9.stoNotDefined");
+
+ } else {
+ log.addWarn("create.runCreator.linkedScenarioCrue9.stoNotExisting", stoRunFile.getFile().getAbsolutePath());
+
+ }
+ }
+ final RunFile strRunFile = runFilesResultat.get(ManagerEMHScenario.getResKey(modeleCrue9, CrueFileType.STR));
+ if (strRunFile == null || !strRunFile.getFile().exists()) {
+ copyStr = false;
+ final boolean strUndefined = strRunFile == null;
+ if (strUndefined) {
+ log.addWarn("create.runCreator.linkedScenarioCrue9.strNotDefined");
+ } else {
+ log.addWarn("create.runCreator.linkedScenarioCrue9.strNotExisting", strRunFile.getFile().getAbsolutePath());
+ }
+ }
+ for (ManagerEMHModeleBase targetModele : scenario.getFils()) {
+ File destDir = projet.getDirForRunModele(scenario, targetModele, newRun);
+ destDir.mkdirs();
+ if (copyXxprovx) {
+ CtuluLibFile.copyFile(xxcprovx, new File(destDir, xxcprovx.getName()));
+ }
+ if (copySto) {
+ CtuluLibFile.copyFile(stoRunFile.getFile(), new File(destDir, stoRunFile.getFile().getName()));
+ }
+ if (copyStr) {
+ CtuluLibFile.copyFile(strRunFile.getFile(), new File(destDir, strRunFile.getFile().getName()));
+ }
+ }
+ }
+
+ }
+ }
+ }
+
+ private boolean isAbsolute(String fileName) {
+ return fileName.indexOf('\\') >= 0 || fileName.indexOf('/') >= 0;
+ }
+
private void validOptions(RunCreatorOptions options, CtuluLog log) {
if ((options.getSelectedRun() == null) && (!options.isUseInputFileFromStudy())) {
log.addSevereError("create.runCreator.noSelectedRun");
@@ -188,6 +265,7 @@
}
}
+ copyLinkedCrue9Files(scenario, log, newRun);
return new CrueOperationResult<EMHRun>(newRun, log);
}
@@ -253,4 +331,15 @@
return run;
}
+
+ private void testxxprovxContent(File xxcprovx, CtuluLog log) {
+ List<String> litFichierLineByLine = CtuluLibFile.litFichierLineByLine(xxcprovx);
+ if (litFichierLineByLine.size() != 4) {
+ log.addError("create.runCreator.linkedScenarioCrue9.xxcprovx.NotValid");
+ } else {
+ if (isAbsolute(litFichierLineByLine.get(2)) || isAbsolute(litFichierLineByLine.get(3))) {
+ log.addWarn("create.runCreator.linkedScenarioCrue9.xxcprovx.containsAbsolutePath");
+ }
+ }
+ }
}
Modified: trunk/soft/fudaa-crue/crue-server/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties 2012-05-02 21:54:07 UTC (rev 7142)
+++ trunk/soft/fudaa-crue/crue-server/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties 2012-05-02 22:16:37 UTC (rev 7143)
@@ -653,4 +653,14 @@
rcal.extractTimeSteps=R\u00e9cup\u00e9ration des pas de temps
rcal.entryDefinedSeveralTime=L'entr\u00e9e {0} est d\u00e9finie plusieurs fois. La derni\u00e8re occurence \u00e9crase les occurences existantes.
load.rptg.noResPrtGeoasFound.error=Le fichier {0} n''a pas \u00e9t\u00e9 charg\u00e9 car aucun r\u00e9sultat n'est d\u00e9fini ( pas de balise ResPrtGeo).
-load.emhTypeNonCompatible.error=Le chargement du r\u00e9sultat pour l''EMH {0} a \u00e9chou\u00e9. Le r\u00e9sultat est d\u00e9fini pour un type {1} alors que l''EMH est de type {2}
\ No newline at end of file
+load.emhTypeNonCompatible.error=Le chargement du r\u00e9sultat pour l''EMH {0} a \u00e9chou\u00e9. Le r\u00e9sultat est d\u00e9fini pour un type {1} alors que l''EMH est de type {2}
+create.runCreator.linkedScenarioCrue9.cantFind=Le sc\u00e9nario Cru9 {0} li\u00e9 \u00e0 ce sc\u00e9nario n''existe pas
+create.runCreator.linkedScenarioCrue9.noRunCourant=Le sc\u00e9nario Cru9 {0} li\u00e9 \u00e0 ce sc\u00e9nario n''a pas de run courant
+create.runCreator.linkedScenarioCrue9.runDirNotExisting=Le r\u00e9pertoire du run courant n''existe pas : {0}
+create.runCreator.linkedScenarioCrue9.xxcprovxNotExisting=Le fichier "xxcprovx.dat" n''existe pas dans le r\u00e9pertoire {0}
+create.runCreator.linkedScenarioCrue9.strNotExisting=Le fichier STR suivant n''a pas \u00e9t\u00e9 trouv\u00e9: {0}
+create.runCreator.linkedScenarioCrue9.stoNotExisting=Le fichier STO suivant n''a pas \u00e9t\u00e9 trouv\u00e9: {0}
+create.runCreator.linkedScenarioCrue9.stoNotDefined=Le fichier STO n''est pas d\u00e9fini
+create.runCreator.linkedScenarioCrue9.strNotDefined=Le fichier STR n''est pas d\u00e9fini
+create.runCreator.linkedScenarioCrue9.xxcprovx.NotValid=Le fichier xxcprovx.dat n''est pas valide: il ne contient pas 4 lignes
+create.runCreator.linkedScenarioCrue9.xxcprovx.containsAbsolutePath="Les chemins des fichiers de donn\u00e9es Crue9 devraient \u00eatre en relatif dans xxcprovx.dat
\ No newline at end of file
Modified: trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/services/CrueRunLauncherServiceImpl.java
===================================================================
--- trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/services/CrueRunLauncherServiceImpl.java 2012-05-02 21:54:07 UTC (rev 7142)
+++ trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/services/CrueRunLauncherServiceImpl.java 2012-05-02 22:16:37 UTC (rev 7143)
@@ -81,7 +81,7 @@
public void run(final ExecInputDefault execInputDefault, Map<CrueFileType, RunCalculOption> options, Runnable runAfter) {
//TODO faire un thread et logger les résulat.
selectedPerspectiveService.activePerspective(PerspectiveEnum.POST);
- perspectiveServicePost.setDirty(true);
+
ManagerEMHScenario scenario = execInputDefault.getScenario();
if (scenario.isCrue9()) {
Crue9Runnable runnable = new Crue9Runnable(execInputDefault, runAfter);
@@ -89,12 +89,18 @@
"Progression.Crue9.Name"), runnable);
ph.start();
runnable.setProgressHandle(ph);
+ perspectiveServicePost.setDirty(true);
new Thread(runnable).start();
// requestProcessor.post(runnable);
} else {
- Crue10OptionBuilder optionsBuilder = new Crue10OptionBuilder(getExecOptions());
- ExecConfigurer createConfigurer = optionsBuilder.createConfigurer(execInputDefault, options);
- getCrue10Runner(execInputDefault.getProjet().getCoeurConfig()).launchOn(execInputDefault, null, createConfigurer);
+ perspectiveServicePost.setDirty(true);
+ try {
+ Crue10OptionBuilder optionsBuilder = new Crue10OptionBuilder(getExecOptions());
+ ExecConfigurer createConfigurer = optionsBuilder.createConfigurer(execInputDefault, options);
+ getCrue10Runner(execInputDefault.getProjet().getCoeurConfig()).launchOn(execInputDefault, null, createConfigurer);
+ } finally {
+ perspectiveServicePost.setDirty(false);
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-05-03 22:38:42
|
Revision: 7151
http://fudaa.svn.sourceforge.net/fudaa/?rev=7151&view=rev
Author: deniger
Date: 2012-05-03 22:38:34 +0000 (Thu, 03 May 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/ccal/CRLogReader.java
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/CtuluLogRecordNode.java
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/LogIconProvider.java
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/AbstractPerspectiveService.java
trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/log/Bundle.properties
trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostReportsTopComponent.java
trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/action/PostCloseAction.java
trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/node/ReportNodesBuilder.java
trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/perspective/PerspectiveServicePost.java
trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/Bundle.properties
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/OpenRunCourantNodeAction.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/OpenRunNodeAction.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/OpenScenarioAction.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/resources/org/fudaa/fudaa/crue/study/actions/Bundle.properties
Added Paths:
-----------
trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostReportStdoutTopComponent.form
trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostReportStdoutTopComponent.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/UnloadScenarioAction.java
Removed Paths:
-------------
trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/node/PostManagerEMHNode.java
trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/node/PostReportAvcNode.java
trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/node/PostReportNode.java
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/ccal/CRLogReader.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/ccal/CRLogReader.java 2012-05-03 21:58:17 UTC (rev 7150)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/ccal/CRLogReader.java 2012-05-03 22:38:34 UTC (rev 7151)
@@ -18,6 +18,7 @@
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.apache.commons.lang.CharUtils;
import org.apache.commons.lang.StringUtils;
import org.fudaa.ctulu.CtuluLibFile;
import org.fudaa.ctulu.CtuluLog;
@@ -109,7 +110,12 @@
CtuluLogRecord record = new CtuluLogRecord(getLevel(levelDetail), msg, id);
record.setLevelDetail(levelDetail);
readLog.addRecord(record);
- LocalDateTime date = DateDurationConverter.getDate(split[COLUMN_DATE]);
+ String dateValue = split[COLUMN_DATE];
+ //dans le cas de la sortie standard, la ligne commence par E ou S ou @
+ if (StringUtils.isNotEmpty(dateValue) && (!CharUtils.isAsciiNumeric(dateValue.charAt(0)))) {
+ dateValue = dateValue.substring(1);
+ }
+ LocalDateTime date = DateDurationConverter.getDate(dateValue);
record.setLogDate(date.toDateTime().toDate());
List args = new ArrayList();
args.add(split[COLUMN_FIRST_ARG]);
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/CtuluLogRecordNode.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/CtuluLogRecordNode.java 2012-05-03 21:58:17 UTC (rev 7150)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/CtuluLogRecordNode.java 2012-05-03 22:38:34 UTC (rev 7151)
@@ -23,7 +23,7 @@
*
* @author genesis
*/
-public class CtuluLogRecordNode extends AbstractNode implements CtuluLogRecordContainer {
+public final class CtuluLogRecordNode extends AbstractNode implements CtuluLogRecordContainer {
public CtuluLogRecordNode(CtuluLogRecord record, ResourceBundle resourceBundle) {
super(Children.LEAF, Lookups.singleton(record));
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/LogIconProvider.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/LogIconProvider.java 2012-05-03 21:58:17 UTC (rev 7150)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/LogIconProvider.java 2012-05-03 22:38:34 UTC (rev 7151)
@@ -5,6 +5,7 @@
package org.fudaa.fudaa.crue.common.log;
import java.awt.Image;
+import java.util.EnumMap;
import java.util.HashMap;
import java.util.Map;
import org.fudaa.ctulu.CtuluLogLevel;
@@ -16,10 +17,11 @@
*/
public class LogIconProvider {
- private static Map<CtuluLogLevel, Image> IMAGES = new HashMap<CtuluLogLevel, Image>();
- private static Map<CtuluLogLevel, String> RESOURCES = new HashMap<CtuluLogLevel, String>();
+ private static final Map<CtuluLogLevel, Image> IMAGES = new EnumMap<CtuluLogLevel, Image>(CtuluLogLevel.class);
+ private static final Map<CtuluLogLevel, String> RESOURCES = new EnumMap<CtuluLogLevel, String>(CtuluLogLevel.class);
static {
+ RESOURCES.put(CtuluLogLevel.DEBUG, "org/fudaa/fudaa/crue/common/icons/information.png");
RESOURCES.put(CtuluLogLevel.INFO, "org/fudaa/fudaa/crue/common/icons/information.png");
RESOURCES.put(CtuluLogLevel.WARNING, "org/fudaa/fudaa/crue/common/icons/avertissement.png");
RESOURCES.put(CtuluLogLevel.ERROR, "org/fudaa/fudaa/crue/common/icons/erreur-non-bloquante.png");
@@ -30,6 +32,7 @@
Image res = IMAGES.get(level);
if (res == null) {
res = ImageUtilities.loadImage(RESOURCES.get(level));
+ IMAGES.put(level, res);
}
return res;
}
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/AbstractPerspectiveService.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/AbstractPerspectiveService.java 2012-05-03 21:58:17 UTC (rev 7150)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/AbstractPerspectiveService.java 2012-05-03 22:38:34 UTC (rev 7151)
@@ -129,7 +129,7 @@
}
@Override
- public final boolean deactivate() {
+ public boolean deactivate() {
if (isDirty()) {
return false;
}
Modified: trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/log/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/log/Bundle.properties 2012-05-03 21:58:17 UTC (rev 7150)
+++ trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/log/Bundle.properties 2012-05-03 22:38:34 UTC (rev 7151)
@@ -8,6 +8,7 @@
PropertyLogMessageDescription=Message
Type=Type
Level=Niveau
+MessageLevel.DEBUG=Debug
MessageLevel.INFO=Informations
MessageLevel.WARNING=Avertissement
MessageLevel.ERROR=Erreur
Copied: trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostReportStdoutTopComponent.form (from rev 7146, trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostReportsTopComponent.form)
===================================================================
--- trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostReportStdoutTopComponent.form (rev 0)
+++ trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostReportStdoutTopComponent.form 2012-05-03 22:38:34 UTC (rev 7151)
@@ -0,0 +1,18 @@
+<?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"/>
+ <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,44,0,0,1,-112"/>
+ </AuxValues>
+
+ <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
+</Form>
Copied: trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostReportStdoutTopComponent.java (from rev 7146, trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostReportsTopComponent.java)
===================================================================
--- trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostReportStdoutTopComponent.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostReportStdoutTopComponent.java 2012-05-03 22:38:34 UTC (rev 7151)
@@ -0,0 +1,121 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.fudaa.fudaa.crue.post;
+
+import org.fudaa.ctulu.CtuluLogGroup;
+import org.fudaa.dodico.crue.metier.emh.EMHScenario;
+import org.fudaa.fudaa.crue.common.RoleNames;
+import org.fudaa.fudaa.crue.common.log.CtuluLogsTopComponent;
+import org.fudaa.fudaa.crue.common.services.PostRunService;
+import org.fudaa.fudaa.crue.post.node.ReportNodesBuilder;
+import org.fudaa.fudaa.crue.study.services.EMHProjetService;
+import org.netbeans.api.settings.ConvertAsProperties;
+import org.openide.awt.ActionID;
+import org.openide.awt.ActionReference;
+import org.openide.util.Lookup;
+import org.openide.util.LookupEvent;
+import org.openide.util.LookupListener;
+import org.openide.util.NbBundle;
+import org.openide.windows.TopComponent;
+
+/**
+ * Top component which displays something.
+ */
+@ConvertAsProperties(dtd = "-//org.fudaa.fudaa.crue.post//PostReportStdoutTopComponent//EN",
+ autostore = false)
+@TopComponent.Description(preferredID = "PostReportStdoutTopComponent",
+ iconBase = "org/fudaa/fudaa/crue/post/carre-vert_16.png",
+ persistenceType = TopComponent.PERSISTENCE_ALWAYS)
+@TopComponent.Registration(mode = "output", openAtStartup = false, roles = {RoleNames.POST})
+@ActionID(category = "Window", id = "org.fudaa.fudaa.crue.post.PostReportStdoutTopComponent")
+@ActionReference(path = "Menu/Window/Post")
+@TopComponent.OpenActionRegistration(displayName = "#CTL_PostReportStdoutTopComponent",
+ preferredID = "PostReportStdoutTopComponent")
+public final class PostReportStdoutTopComponent extends TopComponent implements LookupListener {
+
+ private PostRunService postService = Lookup.getDefault().lookup(PostRunService.class);
+ EMHProjetService projetService = Lookup.getDefault().lookup(EMHProjetService.class);
+ private final Lookup.Result<EMHScenario> resultat;
+
+ public PostReportStdoutTopComponent() {
+ initComponents();
+ setName(NbBundle.getMessage(PostReportStdoutTopComponent.class, "CTL_PostReportStdoutTopComponent"));
+ setToolTipText(NbBundle.getMessage(PostReportStdoutTopComponent.class, "HINT_PostReportStdoutTopComponent"));
+ resultat = postService.getLookup().lookupResult(EMHScenario.class);
+ resultat.addLookupListener(this);
+ resultChanged(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.
+ */
+ // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
+ private void initComponents() {
+
+ setLayout(new java.awt.BorderLayout());
+ }// </editor-fold>//GEN-END:initComponents
+ // Variables declaration - do not modify//GEN-BEGIN:variables
+ // End of variables declaration//GEN-END:variables
+
+ @Override
+ public void componentOpened() {
+ resultChanged(null);
+ }
+
+ @Override
+ public void componentClosed() {
+ removeAll();
+ }
+
+ @Override
+ public void resultChanged(LookupEvent ev) {
+ if (!isOpened()) {
+ return;
+ }
+ if (postService.isRunLoaded()) {
+ runLoadedFromCurrentProject();
+ } else {
+ runUnloaded();
+ }
+ }
+
+ 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
+ }
+
+ @Override
+ protected void componentActivated() {
+ super.componentActivated();
+ }
+
+ @Override
+ protected void componentDeactivated() {
+ super.componentDeactivated();
+ }
+
+ void readProperties(java.util.Properties p) {
+// String version = p.getProperty("version");
+ // TODO read your settings according to their version
+ }
+
+ private void runLoadedFromCurrentProject() {
+ EMHScenario scenarioLoaded = postService.getScenarioLoaded();
+ ReportNodesBuilder builder = new ReportNodesBuilder();
+ removeAll();
+ CtuluLogGroup buildGroups = builder.buildStdoutGroups(scenarioLoaded, this.projetService.getSelectedProject().getCoeurConfig());
+ CtuluLogsTopComponent logComponent = new CtuluLogsTopComponent();
+ logComponent.setLogGroup(buildGroups);
+ add(logComponent);
+ }
+
+ private void runUnloaded() {
+ removeAll();
+ }
+}
Modified: trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostReportsTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostReportsTopComponent.java 2012-05-03 21:58:17 UTC (rev 7150)
+++ trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostReportsTopComponent.java 2012-05-03 22:38:34 UTC (rev 7151)
@@ -5,7 +5,6 @@
package org.fudaa.fudaa.crue.post;
import java.util.List;
-import javax.swing.ActionMap;
import javax.swing.JTabbedPane;
import org.fudaa.ctulu.CtuluLogGroup;
import org.fudaa.dodico.crue.metier.emh.EMHScenario;
@@ -17,9 +16,6 @@
import org.netbeans.api.settings.ConvertAsProperties;
import org.openide.awt.ActionID;
import org.openide.awt.ActionReference;
-import org.openide.explorer.ExplorerManager;
-import org.openide.explorer.ExplorerUtils;
-import org.openide.nodes.Node;
import org.openide.util.Lookup;
import org.openide.util.LookupEvent;
import org.openide.util.LookupListener;
Modified: trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/action/PostCloseAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/action/PostCloseAction.java 2012-05-03 21:58:17 UTC (rev 7150)
+++ trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/action/PostCloseAction.java 2012-05-03 22:38:34 UTC (rev 7151)
@@ -30,6 +30,7 @@
return new PostCloseAction();
}
+ @Override
public void actionPerformed(ActionEvent e) {
postService.unloadRun();
selectedPerspectiveService.activePerspective(PerspectiveEnum.STUDY);
Deleted: trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/node/PostManagerEMHNode.java
===================================================================
--- trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/node/PostManagerEMHNode.java 2012-05-03 21:58:17 UTC (rev 7150)
+++ trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/node/PostManagerEMHNode.java 2012-05-03 22:38:34 UTC (rev 7151)
@@ -1,20 +0,0 @@
-package org.fudaa.fudaa.crue.post.node;
-
-import org.fudaa.dodico.crue.metier.emh.CatEMHConteneur;
-import org.fudaa.fudaa.crue.common.CrueIconsProvider;
-import org.openide.nodes.AbstractNode;
-import org.openide.nodes.Children;
-import org.openide.util.lookup.Lookups;
-
-/**
- *
- * @author deniger ( genesis)
- */
-public class PostManagerEMHNode extends AbstractNode {
-
- public PostManagerEMHNode(Children children, CatEMHConteneur container) {
- super(children, Lookups.singleton(container));
- setName(container.getNom());
- setIconBaseWithExtension(CrueIconsProvider.getIconBase(container.getCatType()));
- }
-}
Deleted: trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/node/PostReportAvcNode.java
===================================================================
--- trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/node/PostReportAvcNode.java 2012-05-03 21:58:17 UTC (rev 7150)
+++ trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/node/PostReportAvcNode.java 2012-05-03 22:38:34 UTC (rev 7151)
@@ -1,18 +0,0 @@
-package org.fudaa.fudaa.crue.post.node;
-
-import org.fudaa.dodico.crue.metier.emh.CompteRenduAvancement;
-import org.openide.nodes.AbstractNode;
-import org.openide.nodes.Children;
-import org.openide.util.lookup.Lookups;
-
-/**
- *
- * @author deniger ( genesis)
- */
-public class PostReportAvcNode extends AbstractNode {
-
- public PostReportAvcNode(Children children, CompteRenduAvancement container) {
- super(children, Lookups.singleton(container));
- setName(container.getAvcFile() == null ? "?" : container.getAvcFile().getName());
- }
-}
Deleted: trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/node/PostReportNode.java
===================================================================
--- trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/node/PostReportNode.java 2012-05-03 21:58:17 UTC (rev 7150)
+++ trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/node/PostReportNode.java 2012-05-03 22:38:34 UTC (rev 7151)
@@ -1,22 +0,0 @@
-package org.fudaa.fudaa.crue.post.node;
-
-import org.fudaa.dodico.crue.metier.emh.CompteRendu;
-import org.openide.nodes.AbstractNode;
-import org.openide.nodes.Children;
-import org.openide.util.actions.SystemAction;
-import org.openide.util.lookup.Lookups;
-
-/**
- *
- * @author deniger ( genesis)
- */
-public class PostReportNode extends AbstractNode {
-
- public PostReportNode(Children children, CompteRendu container) {
- super(children, Lookups.singleton(container));
- setName(container.getLogFile().getName());
- }
-
-
-
-}
Modified: trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/node/ReportNodesBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/node/ReportNodesBuilder.java 2012-05-03 21:58:17 UTC (rev 7150)
+++ trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/node/ReportNodesBuilder.java 2012-05-03 22:38:34 UTC (rev 7151)
@@ -1,17 +1,16 @@
package org.fudaa.fudaa.crue.post.node;
+import java.io.File;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import org.fudaa.ctulu.CtuluLog;
import org.fudaa.ctulu.CtuluLogGroup;
-import org.fudaa.dodico.crue.common.BusinessMessages;
import org.fudaa.dodico.crue.io.ccal.CRLogReader;
import org.fudaa.dodico.crue.io.ccal.CrueLogTranslator;
import org.fudaa.dodico.crue.io.ccal.CrueTranslationReaderWriter;
import org.fudaa.dodico.crue.io.common.CrueIOResu;
import org.fudaa.dodico.crue.metier.emh.CompteRendu;
-import org.fudaa.dodico.crue.metier.emh.CompteRenduAvancement;
import org.fudaa.dodico.crue.metier.emh.CompteRendusInfoEMH;
import org.fudaa.dodico.crue.metier.emh.EMH;
import org.fudaa.dodico.crue.metier.emh.EMHModeleBase;
@@ -20,8 +19,6 @@
import org.fudaa.dodico.crue.metier.helper.EMHHelper;
import org.fudaa.dodico.crue.projet.coeur.CoeurConfigContrat;
import org.fudaa.fudaa.crue.options.services.ConfigurationManagerService;
-import org.openide.nodes.Children;
-import org.openide.nodes.Node;
import org.openide.util.Lookup;
/**
@@ -30,31 +27,7 @@
*/
public class ReportNodesBuilder {
- public Node buildCompteRendus(EMHScenario scenarioLoaded) {
- List<EMHModeleBase> modeles = scenarioLoaded.getModeles();
- List<Node> children = new ArrayList<Node>();
- children.addAll(buildReportNodes(scenarioLoaded));
-
- for (EMHModeleBase model : modeles) {
- children.add(loadModele(model));
- }
- Children.Array array = new Children.Array();
- array.add((Node[]) children.toArray(new Node[children.size()]));
- return new PostManagerEMHNode(array, scenarioLoaded);
- }
-
- private Node loadModele(EMHModeleBase modele) {
- List<Node> children = buildReportNodes(modele);
- if (children.isEmpty()) {
- return new PostManagerEMHNode(Children.LEAF, modele);
- } else {
- Children.Array array = new Children.Array();
- array.add((Node[]) children.toArray(new Node[children.size()]));
- return new PostManagerEMHNode(array, modele);
- }
- }
-
- private CtuluLogGroup createLogGroups(EMHModeleBase modele) {
+ private CtuluLogGroup createLogGroups(EMH modele) {
CompteRendusInfoEMH reportEMH = (CompteRendusInfoEMH) EMHHelper.selectInfoEMH(modele, EnumInfosEMH.LOGS);
CtuluLogGroup gr = new CtuluLogGroup(null);
gr.getMainLog().setDesc(modele.getNom());
@@ -79,47 +52,51 @@
ConfigurationManagerService configurationManagerService = Lookup.getDefault().lookup(ConfigurationManagerService.class);
public List<CtuluLogGroup> buildGroups(EMHScenario scenarioLoaded, CoeurConfigContrat coeur) {
+ return buildGroups(scenarioLoaded, coeur, false);
+ }
+ public List<CtuluLogGroup> buildGroups(EMHScenario scenarioLoaded, CoeurConfigContrat coeur, boolean onlyScenario) {
+
List<CtuluLogGroup> groups = new ArrayList<CtuluLogGroup>();
String currentLocale = configurationManagerService.getCurrentLocale();
String messageURL = coeur.getMessageURL(currentLocale);
- CrueLogTranslator translationData = null;
+ CrueLogTranslator translator = null;
+ CtuluLog translationLog = null;
if (messageURL != null) {
CrueTranslationReaderWriter reader = new CrueTranslationReaderWriter();
- CtuluLog log = new CtuluLog();
- CrueIOResu<CrueLogTranslator> res = reader.readXML(messageURL, log);
- if (log.isNotEmpty()) {
- CtuluLogGroup translation = new CtuluLogGroup(BusinessMessages.RESOURCE_BUNDLE);
- translation.setMainAnalyze(log);
- groups.add(translation);
+ translationLog = new CtuluLog();
+ CrueIOResu<CrueLogTranslator> res = reader.readXML(new File(messageURL), translationLog);
+ translator = res.getMetier();
+ }
+ if (onlyScenario) {
+ CtuluLogGroup scenarioLogs = createLogGroups(scenarioLoaded);
+ if (translationLog != null && translationLog.isNotEmpty()) {
+ scenarioLogs.addLogFirstPosition(translationLog);
}
- translationData = res.getMetier();
+ if (translator != null) {
+ translator.translateGroup(scenarioLogs);
+ }
+ groups.add(scenarioLogs);
+ return groups;
}
+
List<EMHModeleBase> modeles = scenarioLoaded.getModeles();
+ boolean first = true;
for (EMHModeleBase modele : modeles) {
CtuluLogGroup logGroup = createLogGroups(modele);
- if (translationData != null) {
- translationData.translateGroup(logGroup);
+ if (first && translationLog != null && translationLog.isNotEmpty()) {
+ logGroup.addLogFirstPosition(translationLog);
}
+ first = false;
+ if (translator != null) {
+ translator.translateGroup(logGroup);
+ }
+ groups.add(logGroup);
}
return groups;
}
- private List<Node> buildReportNodes(EMH emh) {
- List<Node> children = new ArrayList<Node>();
- CompteRenduAvancement avc = (CompteRenduAvancement) EMHHelper.selectInfoEMH(emh, EnumInfosEMH.AVANCEMENT);
- if (avc != null) {
- children.add(new PostReportAvcNode(Children.LEAF, avc));
- }
- CompteRendusInfoEMH selectInfoEMH = (CompteRendusInfoEMH) EMHHelper.selectInfoEMH(emh, EnumInfosEMH.LOGS);
- if (selectInfoEMH != null) {
- Collection<CompteRendu> compteRendus = selectInfoEMH.getCompteRendus();
- for (CompteRendu compteRendu : compteRendus) {
- if (compteRendu.getLogFile().exists()) {
- children.add(new PostReportNode(Children.LEAF, compteRendu));
- }
- }
- }
- return children;
+ public CtuluLogGroup buildStdoutGroups(EMHScenario scenarioLoaded, CoeurConfigContrat coeurConfig) {
+ return buildGroups(scenarioLoaded, coeurConfig, true).get(0);
}
}
Modified: trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/perspective/PerspectiveServicePost.java
===================================================================
--- trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/perspective/PerspectiveServicePost.java 2012-05-03 21:58:17 UTC (rev 7150)
+++ trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/perspective/PerspectiveServicePost.java 2012-05-03 22:38:34 UTC (rev 7151)
@@ -6,7 +6,10 @@
import java.util.Arrays;
import java.util.Collections;
+import java.util.HashMap;
import java.util.HashSet;
+import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import org.fudaa.fudaa.crue.common.PerspectiveEnum;
import org.fudaa.fudaa.crue.common.services.AbstractPerspectiveService;
@@ -17,6 +20,8 @@
import org.openide.util.LookupEvent;
import org.openide.util.LookupListener;
import org.openide.util.lookup.ServiceProvider;
+import org.openide.windows.TopComponent;
+import org.openide.windows.WindowManager;
/**
*
@@ -28,10 +33,15 @@
private final Set<String> components = Collections.unmodifiableSet(new HashSet<String>(Arrays.asList("PostMainTopComponent",
"PostReportsTopComponent",
"PostAvctTopComponent")));
+ /**
+ * contient l'état ouvert ou non
+ */
+ private final Map<String, Boolean> ifOpened = new HashMap<String, Boolean>();
private CrueService crueService = Lookup.getDefault().lookup(CrueService.class);
public PerspectiveServicePost() {
super(PerspectiveEnum.POST);
+ ifOpened.put("PostReportStdoutTopComponent", Boolean.FALSE);
crueService.addEMHProjetStateLookupListener(new LookupListener() {
@Override
@@ -73,6 +83,18 @@
}
@Override
+ public boolean deactivate() {
+ boolean ok = super.deactivate();
+ if (ok) {
+ for (Entry<String, Boolean> entry : ifOpened.entrySet()) {
+ TopComponent topComponent = WindowManager.getDefault().findTopComponent(entry.getKey());
+ entry.setValue(topComponent != null && topComponent.isOpened());
+ }
+ }
+ return ok;
+ }
+
+ @Override
protected boolean modeChangedTo(PerspectiveState state) {
return true;
}
@@ -84,6 +106,19 @@
@Override
public Set<String> getTopComponents() {
+ Set<String> opened = null;
+ for (Entry<String, Boolean> entry : ifOpened.entrySet()) {
+ if (Boolean.TRUE.equals(entry.getValue())) {
+ if (opened == null) {
+ opened = new HashSet<String>();
+ }
+ opened.add(entry.getKey());
+ }
+ }
+ if (opened != null) {
+ opened.addAll(components);
+ return opened;
+ }
return components;
}
}
Modified: trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/Bundle.properties 2012-05-03 21:58:17 UTC (rev 7150)
+++ trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/Bundle.properties 2012-05-03 22:38:34 UTC (rev 7151)
@@ -7,6 +7,8 @@
CTL_LoadPost=Action inutile pour l'instant
HINT_PostReportsTopComponent=Liste des compte-rendus
CTL_PostReportsTopComponent=Compte-rendus
+HINT_PostReportStdoutTopComponent=Compte-rendu Sortie standard stdout.csv
+CTL_PostReportStdoutTopComponent=Compte-rendu sortie standard
HINT_PostAvctTopComponent=Fichier d'avancement
CTL_PostAvctTopComponent=Fichier d'avancement
PostReportsTopComponent.FirstColumn=Compte-Rendus
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/OpenRunCourantNodeAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/OpenRunCourantNodeAction.java 2012-05-03 21:58:17 UTC (rev 7150)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/OpenRunCourantNodeAction.java 2012-05-03 22:38:34 UTC (re...
[truncated message content] |
|
From: <de...@us...> - 2012-05-04 19:04:25
|
Revision: 7152
http://fudaa.svn.sourceforge.net/fudaa/?rev=7152&view=rev
Author: deniger
Date: 2012-05-04 19:04:19 +0000 (Fri, 04 May 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/services/ConfigurationManagerService.java
trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/services/InstallationService.java
trunk/soft/fudaa-crue/ui-options/src/main/resources/default-coeurs.zip
trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/services/CrueRunLauncherServiceImpl.java
trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/Bundle.properties
Added Paths:
-----------
trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/services/
trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/services/Bundle.properties
Removed Paths:
-------------
trunk/soft/fudaa-crue/ui-options/src/main/resources/default-coeurs-old.zip
Modified: trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/services/ConfigurationManagerService.java
===================================================================
--- trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/services/ConfigurationManagerService.java 2012-05-03 22:38:34 UTC (rev 7151)
+++ trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/services/ConfigurationManagerService.java 2012-05-04 19:04:19 UTC (rev 7152)
@@ -16,7 +16,6 @@
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.SwingConstants;
-import org.apache.commons.lang.StringUtils;
import org.fudaa.ctulu.CtuluLog;
import org.fudaa.ctulu.CtuluLogGroup;
import org.fudaa.dodico.crue.common.BusinessMessages;
@@ -25,14 +24,12 @@
import org.fudaa.dodico.crue.config.CrueConfigMetierLoader;
import org.fudaa.dodico.crue.io.common.CrueIOResu;
import org.fudaa.dodico.crue.io.conf.CrueCONFReaderWriter;
-import org.fudaa.dodico.crue.metier.etude.ManagerEMHScenario;
import org.fudaa.dodico.crue.projet.coeur.CoeurConfig;
import org.fudaa.dodico.crue.projet.coeur.CoeurConfigComparator;
import org.fudaa.dodico.crue.projet.coeur.CoeurConfigContrat;
import org.fudaa.dodico.crue.projet.coeur.CoeurManager;
import org.fudaa.dodico.crue.projet.coeur.CoeurManagerValidator;
import org.fudaa.dodico.crue.projet.conf.Configuration;
-import org.fudaa.dodico.crue.projet.conf.Option;
import org.fudaa.dodico.crue.projet.conf.OptionsEnum;
import org.fudaa.dodico.crue.projet.conf.OptionsManager;
import org.fudaa.dodico.crue.projet.conf.UserConfiguration;
Modified: trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/services/InstallationService.java
===================================================================
--- trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/services/InstallationService.java 2012-05-03 22:38:34 UTC (rev 7151)
+++ trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/services/InstallationService.java 2012-05-04 19:04:19 UTC (rev 7152)
@@ -86,8 +86,11 @@
@Override
public void run() {
- DialogHelper.showNotifyOperationTermine(NbBundle.getMessage(InstallationService.class, "Installation.CreateDefaultSiteAndCoeur.DialogTitle"),
- NbBundle.getMessage(InstallationService.class, "Installation.CreateDefaultSiteAndCoeur.DialogContent", siteConfig.getAbsolutePath(), coeurDir.getAbsoluteFile()));
+ DialogHelper.showNotifyOperationTermine(NbBundle.getMessage(InstallationService.class,
+ "Installation.CreateDefaultSiteAndCoeur.DialogTitle"),
+ NbBundle.getMessage(InstallationService.class,
+ "Installation.CreateDefaultSiteAndCoeur.DialogContent",
+ siteConfig.getAbsolutePath(), coeurDir.getAbsoluteFile()));
}
});
}
@@ -106,8 +109,14 @@
public File getSiteDir() {
if (etcDir == null) {
- File platformDir = new File(System.getProperty("netbeans.home"));
- etcDir = new File(platformDir.getParentFile(), "etc");
+ String property = System.getProperty("dev.etcDir");
+ if (property != null) {
+ Logger.getLogger(InstallationService.class.getName()).log(Level.WARNING, "custom etc dir used: {0} ", property);
+ etcDir = new File(property);
+ } else {
+ File platformDir = new File(System.getProperty("netbeans.home"));
+ etcDir = new File(platformDir.getParentFile(), "etc");
+ }
}
return etcDir;
}
Deleted: trunk/soft/fudaa-crue/ui-options/src/main/resources/default-coeurs-old.zip
===================================================================
(Binary files differ)
Modified: trunk/soft/fudaa-crue/ui-options/src/main/resources/default-coeurs.zip
===================================================================
(Binary files differ)
Modified: trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/services/CrueRunLauncherServiceImpl.java
===================================================================
--- trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/services/CrueRunLauncherServiceImpl.java 2012-05-03 22:38:34 UTC (rev 7151)
+++ trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/services/CrueRunLauncherServiceImpl.java 2012-05-04 19:04:19 UTC (rev 7152)
@@ -3,6 +3,7 @@
import java.io.File;
import java.util.EnumMap;
import java.util.Map;
+import java.util.MissingResourceException;
import org.apache.commons.lang.StringUtils;
import org.fudaa.dodico.crue.io.common.CrueFileType;
import org.fudaa.dodico.crue.metier.etude.ManagerEMHScenario;
@@ -93,11 +94,16 @@
new Thread(runnable).start();
// requestProcessor.post(runnable);
} else {
+ final CoeurConfigContrat coeurConfig = execInputDefault.getProjet().getCoeurConfig();
+ if (!validCrue10(coeurConfig)) {
+ return;
+ }
+
perspectiveServicePost.setDirty(true);
try {
Crue10OptionBuilder optionsBuilder = new Crue10OptionBuilder(getExecOptions());
ExecConfigurer createConfigurer = optionsBuilder.createConfigurer(execInputDefault, options);
- getCrue10Runner(execInputDefault.getProjet().getCoeurConfig()).launchOn(execInputDefault, null, createConfigurer);
+ getCrue10Runner(coeurConfig).launchOn(execInputDefault, null, createConfigurer);
runAfter.run();
} finally {
perspectiveServicePost.setDirty(false);
@@ -105,6 +111,22 @@
}
}
+ /**
+ *
+ * @param coeurConfig
+ * @return true si l'excecutable existe.
+ */
+ private boolean validCrue10(final CoeurConfigContrat coeurConfig) {
+ File execFile = new File(coeurConfig.getExecFile());
+ if (!execFile.exists()) {
+ DialogHelper.showError(NbBundle.getMessage(CrueRunLauncherServiceImpl.class, "crue10Exe.notExist"),
+ NbBundle.getMessage(CrueRunLauncherServiceImpl.class, "crue10Exe.notExist.Details",
+ coeurConfig.getXsdVersion(), execFile.getAbsolutePath()));
+ return false;
+ }
+ return true;
+ }
+
public void runOld(ExecInputDefault execInputDefault, Map<CrueFileType, RunCalculOption> options) {
//TODO faire un thread et logger les résulat.
ManagerEMHScenario scenario = execInputDefault.getScenario();
@@ -121,7 +143,7 @@
if (scenario.isCrue9()) {
return validCrue9();
}
- return new File(coeurConfig.getExecFile()).exists();
+ return validCrue10(coeurConfig);
}
/**
Modified: trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/Bundle.properties 2012-05-03 22:38:34 UTC (rev 7151)
+++ trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/Bundle.properties 2012-05-04 19:04:19 UTC (rev 7152)
@@ -20,3 +20,4 @@
LaunchCrue9.ExecNotDefined.DialogMessage=<html><body>Le chemin vers l'ex\u00e9cutable Crue9 n'est pas d\u00e9fini.<br>Pour le faire, aller dans le menu Outils et Option.</body></html>
LaunchCrue9.ExecNotDefined.DialogTitle=Ex\u00e9cutable Crue9 non d\u00e9fini
Progression.Crue9.Name=Lancement de Crue9
+
Copied: trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/services/Bundle.properties (from rev 7151, trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/Bundle.properties)
===================================================================
--- trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/services/Bundle.properties (rev 0)
+++ trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/services/Bundle.properties 2012-05-04 19:04:19 UTC (rev 7152)
@@ -0,0 +1,6 @@
+# Localized module labels. Defaults taken from POM (<name>, <description>, <groupId>) if unset.
+#OpenIDE-Module-Name=
+#OpenIDE-Module-Short-Description=
+#OpenIDE-Module-Long-Description=
+crue10Exe.notExist=Ex\u00e9cutable crue10 non trouv\u00e9
+crue10Exe.notExist.Details=<html><body>L''ex\u00e9cutable crue10.exe du coeur {0} n''a pas \u00e9t\u00e9 trouv\u00e9. Il est attendu \u00e0 l''emplacement:<br><ul><li> {1}</li></ul></body></html>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-05-08 15:58:16
|
Revision: 7170
http://fudaa.svn.sourceforge.net/fudaa/?rev=7170&view=rev
Author: deniger
Date: 2012-05-08 15:58:05 +0000 (Tue, 08 May 2012)
Log Message:
-----------
otfa batch
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-server/nbactions-noIntegrationTests.xml
trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/OtfaUtils.java
trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/service/OtfaService.java
Modified: trunk/soft/fudaa-crue/crue-server/nbactions-noIntegrationTests.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-server/nbactions-noIntegrationTests.xml 2012-05-08 15:48:43 UTC (rev 7169)
+++ trunk/soft/fudaa-crue/crue-server/nbactions-noIntegrationTests.xml 2012-05-08 15:58:05 UTC (rev 7170)
@@ -7,7 +7,7 @@
<goal>org.codehaus.mojo:exec-maven-plugin:1.2:exec</goal>
</goals>
<properties>
- <exec.args>-DSiteConfigDir="C:\Data\etc" -classpath %classpath ${packageClassName} 'C:\Data\otfa-simple-valide.otfa.xml'</exec.args>
+ <exec.args>-DSiteConfigDir="C:\Data\etc" -classpath %classpath ${packageClassName} 'C:\Data\otfa-simple-invalide.otfa.xml'</exec.args>
<exec.executable>java</exec.executable>
<exec.classpathScope>runtime</exec.classpathScope>
</properties>
@@ -19,7 +19,7 @@
<goal>org.codehaus.mojo:exec-maven-plugin:1.2:exec</goal>
</goals>
<properties>
- <exec.args>-Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address} -DSiteConfigDir="C:\Data\etc" -classpath %classpath ${packageClassName} 'C:\Data\otfa-simple-valide.otfa.xml'</exec.args>
+ <exec.args>-Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address} -DSiteConfigDir="C:\Data\etc" -classpath %classpath ${packageClassName} 'C:\Data\otfa-simple-invalide.otfa.xml'</exec.args>
<exec.executable>java</exec.executable>
<exec.classpathScope>runtime</exec.classpathScope>
<jpda.listen>true</jpda.listen>
@@ -32,7 +32,7 @@
<goal>org.codehaus.mojo:exec-maven-plugin:1.2:exec</goal>
</goals>
<properties>
- <exec.args>${profiler.args} -DSiteConfigDir="C:\Data\etc" -classpath %classpath ${packageClassName} 'C:\Data\otfa-simple-valide.otfa.xml'</exec.args>
+ <exec.args>${profiler.args} -DSiteConfigDir="C:\Data\etc" -classpath %classpath ${packageClassName} 'C:\Data\otfa-simple-invalide.otfa.xml'</exec.args>
<exec.executable>${profiler.java}</exec.executable>
<profiler.action>profile</profiler.action>
</properties>
Modified: trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/OtfaUtils.java
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/OtfaUtils.java 2012-05-08 15:48:43 UTC (rev 7169)
+++ trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/OtfaUtils.java 2012-05-08 15:58:05 UTC (rev 7170)
@@ -4,7 +4,6 @@
*/
package org.fudaa.fudaa.crue.otfa;
-import java.io.File;
import java.util.List;
import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneLineResult;
import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneResult;
Modified: trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/service/OtfaService.java
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/service/OtfaService.java 2012-05-08 15:48:43 UTC (rev 7169)
+++ trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/service/OtfaService.java 2012-05-08 15:58:05 UTC (rev 7170)
@@ -103,6 +103,10 @@
if (addState) {
dynamicContent.add(OtfaState.OPENED);
}
+ if (campagne.getResult().getGlobalValidation() != null && campagne.getResult().getGlobalValidation().containsSomething()) {
+ LogsDisplayer.displayError(campagne.getResult().getGlobalValidation(),
+ campagne.getResult().getGlobalValidation().getMainLog().getDesci18n());
+ }
}
public void unsetResultat() {
@@ -217,7 +221,8 @@
return;
}
OtfaExecutor executor = new OtfaExecutor(configurationManagerService.getCoeurManager(),
- installationService.getConnexionInformation(), postRunService.getCalculCrueRunnerManagerBatch(),
+ installationService.getConnexionInformation(),
+ postRunService.getCalculCrueRunnerManagerBatch(),
configurationManagerService.getOptionsManager().createOptions());
final LaunchOtfaCampagneProcess process = new LaunchOtfaCampagneProcess(executor, getCurrentOTFA().getOtfaCampagne());
final OtfaCampagneResult result = CrueProgressUtils.showProgressDialogAndRun(process, NbBundle.getMessage(OtfaService.class,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-05-10 20:32:00
|
Revision: 7181
http://fudaa.svn.sourceforge.net/fudaa/?rev=7181&view=rev
Author: deniger
Date: 2012-05-10 20:31:54 +0000 (Thu, 10 May 2012)
Log Message:
-----------
Version 0.52
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-commandline/pom.xml
trunk/soft/fudaa-crue/ui-comparison/pom.xml
Modified: trunk/soft/fudaa-crue/ui-commandline/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-commandline/pom.xml 2012-05-10 20:28:38 UTC (rev 7180)
+++ trunk/soft/fudaa-crue/ui-commandline/pom.xml 2012-05-10 20:31:54 UTC (rev 7181)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.51-SNAPSHOT</version>
+ <version>0.52-SNAPSHOT</version>
</parent>
<artifactId>ui-commandline</artifactId>
<packaging>nbm</packaging>
Modified: trunk/soft/fudaa-crue/ui-comparison/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-comparison/pom.xml 2012-05-10 20:28:38 UTC (rev 7180)
+++ trunk/soft/fudaa-crue/ui-comparison/pom.xml 2012-05-10 20:31:54 UTC (rev 7181)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.51-SNAPSHOT</version>
+ <version>0.52-SNAPSHOT</version>
</parent>
<artifactId>ui-comparison</artifactId>
<packaging>nbm</packaging>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-05-14 21:38:37
|
Revision: 7203
http://fudaa.svn.sourceforge.net/fudaa/?rev=7203&view=rev
Author: deniger
Date: 2012-05-14 21:38:30 +0000 (Mon, 14 May 2012)
Log Message:
-----------
0.53
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/SelectedPerspectiveService.java
trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/OtfaPropertiesTopComponent.java
trunk/soft/fudaa-crue/ui-otfa/src/main/resources/modes/properties-otfa.wsmode
trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostMainTopComponent.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/FileListTopComponent.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/ScenariosTopComponent.java
trunk/soft/fudaa-crue/ui-study/src/main/resources/modes/properties-study.wsmode
trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/layer.xml
Added Paths:
-----------
trunk/soft/fudaa-crue/ui-study/src/main/resources/modes/editor-study.wsmode
trunk/soft/fudaa-crue/ui-study/src/main/resources/modes/filelist-study.wsmode
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/SelectedPerspectiveService.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/SelectedPerspectiveService.java 2012-05-14 17:06:22 UTC (rev 7202)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/SelectedPerspectiveService.java 2012-05-14 21:38:30 UTC (rev 7203)
@@ -7,6 +7,7 @@
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
+import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.EnumMap;
import org.fudaa.fudaa.crue.common.PerspectiveEnum;
@@ -16,6 +17,8 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import org.apache.commons.lang.ObjectUtils;
import org.openide.util.Lookup;
import org.openide.util.lookup.AbstractLookup;
@@ -149,6 +152,21 @@
: currentPerspective.getDefaultTopComponents());
}
+ public static boolean isSeparate(Mode mode) {
+ if (mode == null) {
+ return false;
+ }
+ Class<? extends Mode> aClass = mode.getClass();
+ try {
+ Method method = aClass.getMethod("getState");
+ Object invoke = method.invoke(mode);
+ return Integer.valueOf(1).equals(invoke);
+ } catch (Exception noSuchMethodException) {
+ Logger.getLogger(SelectedPerspectiveService.class.getName()).log(Level.WARNING, "can't find state", noSuchMethodException);
+ }
+ return false;
+ }
+
private void updateCurrentViews(PerspectiveEnum oldPerspectiveEnum, PerspectiveEnum newPerspectiveEnum) {
//on ferme toutes les perspectives:
Set<TopComponent> opened = WindowManager.getDefault().getRegistry().getOpened();
@@ -165,8 +183,7 @@
}
for (TopComponent topComponent : opened) {
Mode mode = WindowManager.getDefault().findMode(topComponent);
-
- if (dockedModes.contains(mode) && (!mode.getName().startsWith("floating"))) {
+ if (!isSeparate(mode)) {
topComponent.close();
closed.add(topComponent);
}
@@ -178,6 +195,11 @@
}
}
+// WindowManager.getDefault().setRole(newPerspectiveEnum.name());
+// for (TopComponent topComponent : toreopen) {
+// topComponent.open();
+// topComponent.requestActive();
+// }
List<TopComponent> current = closedTopComponents.get(newPerspectiveEnum);
if (current != null) {
for (TopComponent topComponent : current) {
@@ -192,5 +214,6 @@
: currentPerspective.getDefaultTopComponents());
closedTopComponents.put(newPerspectiveEnum, new ArrayList<TopComponent>());
}
+
}
}
Modified: trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/OtfaPropertiesTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/OtfaPropertiesTopComponent.java 2012-05-14 17:06:22 UTC (rev 7202)
+++ trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/OtfaPropertiesTopComponent.java 2012-05-14 21:38:30 UTC (rev 7203)
@@ -25,7 +25,7 @@
@ActionReference(path = "Menu/Window/OTFA", position = 2)
public final class OtfaPropertiesTopComponent extends NbSheetCustom {
- public static final String TOPCOMPONENT_ID = "OTfaPropertiesTopComponent";
+ public static final String TOPCOMPONENT_ID = "OtfaPropertiesTopComponent";
public OtfaPropertiesTopComponent() {
super(true);
Modified: trunk/soft/fudaa-crue/ui-otfa/src/main/resources/modes/properties-otfa.wsmode
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/src/main/resources/modes/properties-otfa.wsmode 2012-05-14 17:06:22 UTC (rev 7202)
+++ trunk/soft/fudaa-crue/ui-otfa/src/main/resources/modes/properties-otfa.wsmode 2012-05-14 21:38:30 UTC (rev 7203)
@@ -10,5 +10,5 @@
</constraints>
<bounds x="1440" y="604" width="288" height="345" />
<frame state="0"/>
- <empty-behavior permanent="true"/>
+ <empty-behavior permanent="false"/>
</mode>
Modified: trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostMainTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostMainTopComponent.java 2012-05-14 17:06:22 UTC (rev 7202)
+++ trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostMainTopComponent.java 2012-05-14 21:38:30 UTC (rev 7203)
@@ -7,7 +7,6 @@
import javax.swing.JLabel;
import javax.swing.JScrollPane;
import org.fudaa.dodico.crue.metier.emh.EMHScenario;
-import org.fudaa.fudaa.crue.common.RoleNames;
import org.fudaa.fudaa.crue.common.services.PostRunService;
import org.fudaa.fudaa.crue.emh.EMHTreePanel;
import org.fudaa.fudaa.crue.study.services.EMHProjetService;
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/FileListTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/FileListTopComponent.java 2012-05-14 17:06:22 UTC (rev 7202)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/FileListTopComponent.java 2012-05-14 21:38:30 UTC (rev 7203)
@@ -23,7 +23,7 @@
@TopComponent.Description(preferredID = FileListTopComponent.TOPCOMPONENT_ID,
iconBase = "org/fudaa/fudaa/crue/study/icons/modele_16.png",
persistenceType = TopComponent.PERSISTENCE_ALWAYS)
-@TopComponent.Registration(mode = "explorer", position = 1, openAtStartup = false)
+@TopComponent.Registration(mode = "filelist-study", position = 1, openAtStartup = false)
@ActionID(category = "Window", id = "org.fudaa.fudaa.crue.study.FileListTopComponent")
@TopComponent.OpenActionRegistration(displayName = "#CTL_FileListAction",
preferredID = FileListTopComponent.TOPCOMPONENT_ID)
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 2012-05-14 17:06:22 UTC (rev 7202)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/ScenariosTopComponent.java 2012-05-14 21:38:30 UTC (rev 7203)
@@ -25,7 +25,7 @@
@TopComponent.Description(preferredID = ScenariosTopComponent.TOPCOMPONENT_ID,
iconBase = "org/fudaa/fudaa/crue/study/icons/scenario_16.png",
persistenceType = TopComponent.PERSISTENCE_ALWAYS)
-@TopComponent.Registration(mode = "editor", openAtStartup = false)
+@TopComponent.Registration(mode = "editor-study", openAtStartup = false)
@ActionID(category = "Window", id = "org.fudaa.fudaa.crue.study.ScenariosTopComponent")
@TopComponent.OpenActionRegistration(displayName = "#CTL_ScenariosAction",
preferredID = ScenariosTopComponent.TOPCOMPONENT_ID)
Added: trunk/soft/fudaa-crue/ui-study/src/main/resources/modes/editor-study.wsmode
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/resources/modes/editor-study.wsmode (rev 0)
+++ trunk/soft/fudaa-crue/ui-study/src/main/resources/modes/editor-study.wsmode 2012-05-14 21:38:30 UTC (rev 7203)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<mode version="2.4">
+ <name unique="editor-study" />
+ <kind type="editor" />
+ <state type="joined" />
+ <bounds x="0" y="0" width="0" height="0" />
+ <frame state="0"/>
+ <active-tc id="ScenariosTopComponent" />
+ <empty-behavior permanent="true"/>
+</mode>
Added: trunk/soft/fudaa-crue/ui-study/src/main/resources/modes/filelist-study.wsmode
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/resources/modes/filelist-study.wsmode (rev 0)
+++ trunk/soft/fudaa-crue/ui-study/src/main/resources/modes/filelist-study.wsmode 2012-05-14 21:38:30 UTC (rev 7203)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<mode version="2.4">
+ <module name="org.netbeans.core.ui/1" spec="1.2" />
+ <name unique="filelist-study" />
+ <kind type="view" />
+ <state type="joined" />
+ <constraints>
+ <path orientation="horizontal" number="1" weight="0.14712778429073858"/>
+ <path orientation="vertical" number="1" weight="0.5"/>
+ </constraints>
+ <bounds x="192" y="228" width="614" height="520" />
+ <frame state="0"/>
+ <empty-behavior permanent="true"/>
+</mode>
Modified: trunk/soft/fudaa-crue/ui-study/src/main/resources/modes/properties-study.wsmode
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/resources/modes/properties-study.wsmode 2012-05-14 17:06:22 UTC (rev 7202)
+++ trunk/soft/fudaa-crue/ui-study/src/main/resources/modes/properties-study.wsmode 2012-05-14 21:38:30 UTC (rev 7203)
@@ -5,10 +5,10 @@
<kind type="view" />
<state type="joined" />
<constraints>
- <path orientation="horizontal" number="20" weight="0.3"/>
- <path orientation="vertical" number="21" weight="0.25"/>
+ <path orientation="horizontal" number="1" weight="0.3"/>
+ <path orientation="vertical" number="2" weight="0.25"/>
</constraints>
<bounds x="1440" y="604" width="288" height="345" />
<frame state="0"/>
- <empty-behavior permanent="true"/>
+ <empty-behavior permanent="false"/>
</mode>
Modified: trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/layer.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/layer.xml 2012-05-14 17:06:22 UTC (rev 7202)
+++ trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/layer.xml 2012-05-14 21:38:30 UTC (rev 7203)
@@ -94,6 +94,8 @@
<folder name="Windows2">
<folder name="Modes">
<file name="properties-study.wsmode" url="/modes/properties-study.wsmode"/>
+ <file name="editor-study.wsmode" url="/modes/editor-study.wsmode"/>
+ <file name="filelist-study.wsmode" url="/modes/filelist-study.wsmode"/>
</folder>
</folder>
</filesystem>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-05-15 10:04:43
|
Revision: 7204
http://fudaa.svn.sourceforge.net/fudaa/?rev=7204&view=rev
Author: deniger
Date: 2012-05-15 10:04:36 +0000 (Tue, 15 May 2012)
Log Message:
-----------
Removed Paths:
-------------
trunk/soft/fudaa-crue/ui-branding/src/main/resources/modes/
trunk/soft/fudaa-crue/ui-modelling/src/main/resources/modes/
trunk/soft/fudaa-crue/ui-study/src/main/resources/modes/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-05-15 15:50:02
|
Revision: 7207
http://fudaa.svn.sourceforge.net/fudaa/?rev=7207&view=rev
Author: deniger
Date: 2012-05-15 15:49:49 +0000 (Tue, 15 May 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/ccal/CRLogReader.java
trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/io/ccal/TestCrueLogReader.java
trunk/soft/fudaa-crue/ui-branding/pom.xml
trunk/soft/fudaa-crue/ui-branding/src/main/java/org/fudaa/fudaa/crue/branding/InitGeneralUIInstaller.java
trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/layer.xml
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/property/EntiteProperty.java
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/property/FunctionProperty.java
trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/layer.xml
trunk/soft/fudaa-crue/ui-otfa/src/main/resources/org/fudaa/fudaa/crue/otfa/layer.xml
trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/layer.xml
trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/layer.xml
Added Paths:
-----------
trunk/soft/fudaa-crue/ui-branding/src/main/java/org/fudaa/fudaa/crue/branding/BottomLineBorder.java
trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/toolbar.xml
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/ccal/CRLogReader.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/ccal/CRLogReader.java 2012-05-15 15:26:37 UTC (rev 7206)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/ccal/CRLogReader.java 2012-05-15 15:49:49 UTC (rev 7207)
@@ -32,16 +32,16 @@
* @author deniger ( genesis)
*/
public class CRLogReader {
-
+
public static final int COLUMN_ARGS = 6;
public static final int COLUMN_LINE_NUMBER = 5;
public static final int COLUMN_FILE = 4;
public static final int COLUMN_DATE = 0;
public static final int COLUMN_ID = 1;
public static final int COLUMN_LEVEL = 2;
- public static final int COLUMN_FIRST_ARG = 3;
+ public static final int COLUMN_FONCTION = 3;
private static final Logger LOGGER = Logger.getLogger(CRLogReader.class.getName());
-
+
public static CtuluLogLevel getLevel(String in) {
if (in == null) {
return CtuluLogLevel.ERROR;
@@ -69,7 +69,7 @@
}
return CtuluLogLevel.ERROR;
}
-
+
public CrueIOResu<CtuluLog> read(File f) {
FileReader reader = null;
CrueIOResu<CtuluLog> read = null;
@@ -82,7 +82,7 @@
}
return read;
}
-
+
public CrueIOResu<CtuluLog> read(URL url) {
InputStream input = null;
CrueIOResu<CtuluLog> read = null;
@@ -96,7 +96,7 @@
}
return read;
}
-
+
public CrueIOResu<CtuluLog> read(Reader f) {
CtuluLog readLog = new CtuluLog();
CtuluLog log = new CtuluLog();
@@ -120,6 +120,9 @@
}
LocalDateTime date = DateDurationConverter.getDate(dateValue);
record.setLogDate(date.toDateTime().toDate());
+ if (split.length > COLUMN_FONCTION) {
+ record.setRessourceFunction(split[COLUMN_FONCTION]);
+ }
if (split.length > COLUMN_FILE) {
record.setRessource(split[COLUMN_FILE]);
}
@@ -127,7 +130,6 @@
record.setRessourceLine(split[COLUMN_LINE_NUMBER]);
}
List args = new ArrayList();
- args.add(split[COLUMN_FIRST_ARG]);
if (split.length > COLUMN_ARGS) {
//on reconstruit la chaine pour prendre en compte les quotes:
StringBuilder builder = new StringBuilder();
@@ -160,9 +162,9 @@
log.addWarn("io.log.errorWhileReader", ioe.getMessage());
}
return new CrueIOResu<CtuluLog>(readLog, log);
-
+
}
-
+
private CtuluLogRecord createDefaultRecord(String line) {
final CtuluLogRecord ctuluLogRecord = new CtuluLogRecord(CtuluLogLevel.INFO, line);
ctuluLogRecord.setLevelDetail(SeveriteManager.INFO);
Modified: trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/io/ccal/TestCrueLogReader.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/io/ccal/TestCrueLogReader.java 2012-05-15 15:26:37 UTC (rev 7206)
+++ trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/io/ccal/TestCrueLogReader.java 2012-05-15 15:49:49 UTC (rev 7207)
@@ -22,10 +22,10 @@
* @author deniger ( genesis)
*/
public class TestCrueLogReader {
-
+
public TestCrueLogReader() {
}
-
+
@Test
public void testRead() {
CRLogReader reader = new CRLogReader();
@@ -34,7 +34,7 @@
CtuluLog metier = read.getMetier();
List<CtuluLogRecord> records = new ArrayList<CtuluLogRecord>(metier.getRecords());
assertEquals(2170, records.size());
-
+
CtuluLogRecord last = records.get(2169);
assertEquals(72, last.getId());
Date logDate = last.getLogDate();
@@ -42,31 +42,31 @@
assertEquals("2012-04-04T09:37:22.000", DateDurationConverter.dateToXsd(dateTime));
assertEquals("DEBUG3", last.getLevelDetail());
assertEquals(CtuluLogLevel.DEBUG, last.getLevel());
- Object[] args = last.getArgs();
- assertEquals(2, args.length);
- assertEquals("ecrireFichier", args[0]);
- assertEquals("./../tests/RUNS/Sc_M10-8_c9c10/R000000//Mo_M10-8_c9c10/M10-8_c9c10.rcal.xml", args[1]);
assertEquals("FichierXML.cpp", last.getRessource());
assertEquals("333", last.getRessourceLine());
-
+ assertEquals("ecrireFichier", last.getRessourceFunction());
+ Object[] args = last.getArgs();
+ assertEquals(1, args.length);
+ assertEquals("./../tests/RUNS/Sc_M10-8_c9c10/R000000//Mo_M10-8_c9c10/M10-8_c9c10.rcal.xml", args[0]);
+
CtuluLogRecord modified = records.get(2167);//cette ligne a été modifiée pour enlever les 2 dernières colonnes
+ assertEquals("ajouterResultatsCalcul", modified.getRessourceFunction());
assertEquals(CtuluLogLevel.INFO, modified.getLevel());
Object[] argsModified = modified.getArgs();
- assertEquals(1, argsModified.length);
- assertEquals("ajouterResultatsCalcul", argsModified[0]);
-
-
- CtuluLogRecord with3Args = records.get(2166);
- Object[] threeArgs = with3Args.getArgs();
- assertEquals(3, threeArgs.length);
- assertEquals("lancerCalculTransitoirePdtFixe", threeArgs[0]);
- assertEquals("Sc_M10-8_c9c10", threeArgs[1]);
- assertEquals("Cc;_T1", threeArgs[2]);//modifie pour tester que le ; n'est pas pris en compte
-
-
-
-
-
-
+ assertEquals(0, argsModified.length);
+
+
+ CtuluLogRecord with2Args = records.get(2166);
+ assertEquals("lancerCalculTransitoirePdtFixe", with2Args.getRessourceFunction());
+ Object[] twoArgs = with2Args.getArgs();
+ assertEquals(2, twoArgs.length);
+ assertEquals("Sc_M10-8_c9c10", twoArgs[0]);
+ assertEquals("Cc;_T1", twoArgs[1]);//modifie pour tester que le ; n'est pas pris en compte
+
+
+
+
+
+
}
}
Modified: trunk/soft/fudaa-crue/ui-branding/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/pom.xml 2012-05-15 15:26:37 UTC (rev 7206)
+++ trunk/soft/fudaa-crue/ui-branding/pom.xml 2012-05-15 15:49:49 UTC (rev 7207)
@@ -24,6 +24,11 @@
</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-modules</artifactId>
<version>${netbeans.version}</version>
</dependency>
Added: trunk/soft/fudaa-crue/ui-branding/src/main/java/org/fudaa/fudaa/crue/branding/BottomLineBorder.java
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/java/org/fudaa/fudaa/crue/branding/BottomLineBorder.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/java/org/fudaa/fudaa/crue/branding/BottomLineBorder.java 2012-05-15 15:49:49 UTC (rev 7207)
@@ -0,0 +1,36 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.fudaa.fudaa.crue.branding;
+
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Insets;
+import javax.swing.border.Border;
+
+/**
+ *
+ * @author deniger
+ */
+public class BottomLineBorder implements Border {
+
+ BottomLineBorder() {
+ }
+
+ @Override
+ public Insets getBorderInsets(Component c) {
+ return new Insets(0, 0, 1, 0);
+ }
+
+ @Override
+ public boolean isBorderOpaque() {
+ return true;
+ }
+
+ @Override
+ public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) {
+ g.setColor(c.getBackground().darker());
+ g.drawLine(x, y + height - 2, x + width, y + height - 2);
+ }
+}
Modified: trunk/soft/fudaa-crue/ui-branding/src/main/java/org/fudaa/fudaa/crue/branding/InitGeneralUIInstaller.java
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/java/org/fudaa/fudaa/crue/branding/InitGeneralUIInstaller.java 2012-05-15 15:26:37 UTC (rev 7206)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/java/org/fudaa/fudaa/crue/branding/InitGeneralUIInstaller.java 2012-05-15 15:49:49 UTC (rev 7207)
@@ -1,22 +1,93 @@
package org.fudaa.fudaa.crue.branding;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.FlowLayout;
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import javax.swing.JToggleButton;
import javax.swing.UIManager;
+import javax.swing.border.Border;
+import javax.swing.border.MatteBorder;
+import org.openide.awt.Toolbar;
+import org.openide.awt.ToolbarPool;
import org.openide.modules.ModuleInfo;
import org.openide.modules.ModuleInstall;
import org.openide.util.Lookup;
import org.openide.util.Lookup.Item;
+import org.openide.windows.WindowManager;
-public class InitGeneralUIInstaller extends ModuleInstall {
-
-
+/**
+ * Gere la configuration des Toolbar et l'initialisation des build numbers.
+ *
+ * @author deniger
+ */
+public class InitGeneralUIInstaller extends ModuleInstall implements Runnable {
+
@Override
public void validate() throws IllegalStateException {
super.validate();
}
-
+
@Override
+ public void run() {
+ Toolbar[] toolbars = ToolbarPool.getDefault().getToolbars();
+ ToolbarPool.getDefault().setConfiguration("toolbar");
+ Toolbar state = getStateToolbar(toolbars);
+ if (state != null) {
+ state.setOpaque(false);
+ state.setBorder(BorderFactory.createCompoundBorder(state.getBorder(), BorderFactory.createEmptyBorder(5, 15, 5, 5)));
+ }
+ Toolbar perspective = getPerspectiveToolbar(toolbars);
+ if (perspective != null) {
+ Component[] components = perspective.getComponents();
+ perspective.removeAll();
+ perspective.setOpaque(false);
+ perspective.setLayout(new BorderLayout());
+ JPanel buttons = new JPanel(new FlowLayout(FlowLayout.CENTER, 5, 0));
+ buttons.setOpaque(false);
+ Border commonBorder = null;
+ for (int i = 0; i < components.length; i++) {
+ final JToggleButton cmp = (JToggleButton) components[i];
+ cmp.setBorderPainted(true);
+ cmp.setOpaque(true);
+ if (commonBorder == null) {
+ final MatteBorder matteBorder = BorderFactory.createMatteBorder(1, 1, 0, 1, cmp.getBackground().darker());
+ commonBorder = BorderFactory.createCompoundBorder(matteBorder, BorderFactory.createEmptyBorder(0, 2, 0, 2));
+ }
+ cmp.setBorder(commonBorder);
+ buttons.setOpaque(false);
+ buttons.add(components[i]);
+
+ }
+ perspective.add(buttons, BorderLayout.SOUTH);
+ perspective.setBorder(BorderFactory.createCompoundBorder(new BottomLineBorder(), BorderFactory.createEmptyBorder(0, 5, 0, 5)));
+ }
+ }
+
+ public static Toolbar getPerspectiveToolbar(Toolbar[] in) {
+ return getPerspective("Perspective", in);
+ }
+
+ public static Toolbar getStateToolbar(Toolbar[] in) {
+ return getPerspective("State", in);
+ }
+
+ public static Toolbar getPerspective(String name, Toolbar[] in) {
+ if (in == null || name == null) {
+ return null;
+ }
+ for (int i = 0; i < in.length; i++) {
+ if (name.equals(in[i].getName())) {
+ return in[i];
+ }
+ }
+ return null;
+ }
+
+ @Override
public void restored() {
-
+ WindowManager.getDefault().invokeWhenUIReady(this);
UIManager.put("EditorTabDisplayerUI", "org.fudaa.fudaa.crue.branding.NoTabsTabDisplayerUI");
Lookup.Template<ModuleInfo> template = new Lookup.Template<ModuleInfo>(ModuleInfo.class, "Module[org.fudaa.soft.fudaa.crue.ui.branding", null);
Item<ModuleInfo> modules = Lookup.getDefault().lookupItem(template);
@@ -27,5 +98,4 @@
}
}
}
-
}
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 2012-05-15 15:26:37 UTC (rev 7206)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/layer.xml 2012-05-15 15:49:49 UTC (rev 7207)
@@ -44,6 +44,10 @@
</folder>
</folder>
<folder name="Toolbars">
+ <file name="Standard.xml_hidden"/>
+ <file name="toolbar.xml" url="toolbar.xml">
+ <attr intvalue="1" name="position"/>
+ </file>
<file name="Clipboard_hidden"/>
<file name="File_hidden"/>
<file name="Memory_hidden"/>
Added: trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/toolbar.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/toolbar.xml (rev 0)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/toolbar.xml 2012-05-15 15:49:49 UTC (rev 7207)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Configuration PUBLIC "-//NetBeans IDE//DTD toolbar 1.1//EN"
+ "http://www.netbeans.org/dtds/toolbar1_1.dtd">
+<Configuration>
+ <Row>
+ <Toolbar name="UndoRedo" visible="true" draggable="false" align="left" position="1"/>
+ <Toolbar name="Perspective" visible="true" draggable="false" align="left" position="2"/>
+ <Toolbar name="State" visible="true" draggable="false" align="left" position="3"/>
+ </Row>
+</Configuration>
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/property/EntiteProperty.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/property/EntiteProperty.java 2012-05-15 15:26:37 UTC (rev 7206)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/property/EntiteProperty.java 2012-05-15 15:49:49 UTC (rev 7207)
@@ -5,7 +5,6 @@
package org.fudaa.fudaa.crue.common.log.property;
import java.lang.reflect.InvocationTargetException;
-import java.util.MissingResourceException;
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
import org.fudaa.ctulu.CtuluLogRecord;
@@ -24,7 +23,7 @@
public EntiteProperty(CtuluLogRecord record) {
super(ID, String.class, getDefaultDisplayName(),
- getDescription());
+ getDescription());
this.record = record;
PropertyCrueUtils.configureNoCustomEditor(this);
}
@@ -36,8 +35,8 @@
public static String getDefaultDisplayName() {
return NbBundle.getMessage(EntiteProperty.class, "EntityPropertyName");
}
-
- public static PropertyColumnFilterable createColumn() {
+
+ public static PropertyColumnFilterable createColumn() {
PropertyColumnFilterable res = new PropertyColumnFilterable();
res.setColumnId(ID);
res.setDescription(getDescription());
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/property/FunctionProperty.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/property/FunctionProperty.java 2012-05-15 15:26:37 UTC (rev 7206)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/property/FunctionProperty.java 2012-05-15 15:49:49 UTC (rev 7207)
@@ -48,11 +48,7 @@
@Override
public String toString() {
- Object[] args = record.getArgs();
- if (ArrayUtils.isNotEmpty(args)) {
- return (String) args[0];
- }
- return StringUtils.EMPTY;
+ return record.getRessourceFunction();
}
@Override
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/layer.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/layer.xml 2012-05-15 15:26:37 UTC (rev 7206)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/layer.xml 2012-05-15 15:49:49 UTC (rev 7207)
@@ -8,7 +8,7 @@
</folder>
</folder>
<folder name="Toolbars">
- <folder name="Persective">
+ <folder name="Perspective">
<file name="org-fudaa-fudaa-crue-modelling-perspective-ActiveModelisation.shadow">
<attr name="originalFile" stringvalue="Actions/File/org-fudaa-fudaa-crue-modelling-perspective-ActiveModelisation.instance"/>
<attr intvalue="3" name="position"/>
Modified: trunk/soft/fudaa-crue/ui-otfa/src/main/resources/org/fudaa/fudaa/crue/otfa/layer.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/src/main/resources/org/fudaa/fudaa/crue/otfa/layer.xml 2012-05-15 15:26:37 UTC (rev 7206)
+++ trunk/soft/fudaa-crue/ui-otfa/src/main/resources/org/fudaa/fudaa/crue/otfa/layer.xml 2012-05-15 15:49:49 UTC (rev 7207)
@@ -10,7 +10,7 @@
</folder>
</folder>
<folder name="Toolbars">
- <folder name="Persective">
+ <folder name="Perspective">
<file name="org-fudaa-fudaa-crue-otfa-perspective-ActiveOtfa.shadow">
<attr name="originalFile" stringvalue="Actions/File/org-fudaa-fudaa-crue-otfa-perspective-ActiveOtfa.instance"/>
<attr intvalue="5" name="position"/>
Modified: trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/layer.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/layer.xml 2012-05-15 15:26:37 UTC (rev 7206)
+++ trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/layer.xml 2012-05-15 15:49:49 UTC (rev 7207)
@@ -25,7 +25,7 @@
</folder>
</folder>
<folder name="Toolbars">
- <folder name="Persective">
+ <folder name="Perspective">
<file name="org-fudaa-fudaa-crue-post-perspective-ActivePost.shadow">
<attr name="originalFile" stringvalue="Actions/File/org-fudaa-fudaa-crue-post-perspective-ActivePost.instance"/>
<attr intvalue="4" name="position"/>
Modified: trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/layer.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/layer.xml 2012-05-15 15:26:37 UTC (rev 7206)
+++ trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/layer.xml 2012-05-15 15:49:49 UTC (rev 7207)
@@ -75,16 +75,16 @@
</folder>
</folder>
<folder name="Toolbars">
- <folder name="Persective">
+ <!--Perspective repris dans toolbar.xml et dans InitGeneralUIInstaller-->
+ <folder name="Perspective">
+ <attr intvalue="2" name="position"/>
<file name="org-fudaa-fudaa-crue-study-perspective-ActiveStudy.shadow">
<attr name="originalFile" stringvalue="Actions/File/org-fudaa-fudaa-crue-study-perspective-ActiveStudy.instance"/>
<attr intvalue="2" name="position"/>
</file>
</folder>
-
-
+ <!--State repris dans toolbar.xml et dans InitGeneralUIInstaller-->
<folder name="State">
- <attr name="position" intvalue="3"/>
<file name="org-fudaa-fudaa-crue-study-services-GlobalStateManager.shadow">
<attr name="originalFile" stringvalue="Actions/File/org-fudaa-fudaa-crue-study-services-GlobalStateManager.instance"/>
<attr intvalue="1" name="position"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-05-15 17:16:58
|
Revision: 7209
http://fudaa.svn.sourceforge.net/fudaa/?rev=7209&view=rev
Author: deniger
Date: 2012-05-15 17:16:52 +0000 (Tue, 15 May 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/layer.xml
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingVisualTopComponent.java
Added Paths:
-----------
trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/modelling-computeWsmode.xml
trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/modelling-editorWsmode.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 2012-05-15 17:07:26 UTC (rev 7208)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/layer.xml 2012-05-15 17:16:52 UTC (rev 7209)
@@ -45,7 +45,7 @@
</folder>
<folder name="Toolbars">
<file name="Standard.xml_hidden"/>
- <file name="toolbar.xml" url="toolbar.xml">
+ <file name="toolbar.xml" url="toolbar.xml">
<attr intvalue="1" name="position"/>
</file>
<file name="Clipboard_hidden"/>
@@ -63,6 +63,8 @@
<file name="sutdy-modeles.wsmode" url="sutdy-modelesWsmode.xml"/>
<file name="sutdy-sousmodeles.wsmode" url="sutdy-sousmodelesWsmode.xml"/>
<file name="modelling-emh.wsmode" url="modelling-emhWsmode.xml"/>
+ <file name="modelling-compute.wsmode" url="modelling-computeWsmode.xml"/>
+ <file name="modelling-editor.wsmode" url="modelling-editorWsmode.xml"/>
<file name="modelling-branches.wsmode" url="modelling-branchesWsmode.xml"/>
<file name="post-reports.wsmode" url="post-reportsWsmode.xml"/>
<file name="post-emh.wsmode" url="post-emhWsmode.xml"/>
Copied: trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/modelling-computeWsmode.xml (from rev 7205, trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/modelling-emhWsmode.xml)
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/modelling-computeWsmode.xml (rev 0)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/modelling-computeWsmode.xml 2012-05-15 17:16:52 UTC (rev 7209)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mode version="2.4">
+ <name unique="modelling-compute"/>
+ <kind type="view"/>
+ <state type="joined"/>
+ <constraints>
+ <path orientation="horizontal" number="2" weight="0.14712778429073858"/>
+ <path orientation="vertical" number="1" weight="0.5"/>
+ </constraints>
+ <bounds x="192" y="228" width="614" height="520"/>
+ <frame state="0"/>
+
+ <empty-behavior permanent="true"/>
+</mode>
Copied: trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/modelling-editorWsmode.xml (from rev 7205, trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/study-scenariosWsmode.xml)
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/modelling-editorWsmode.xml (rev 0)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/modelling-editorWsmode.xml 2012-05-15 17:16:52 UTC (rev 7209)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mode version="2.4">
+ <name unique="modelling-editor"/>
+ <kind type="editor"/>
+ <state type="joined"/>
+ <constraints>
+ <path orientation="vertical" number="0" weight="0.5"/>
+ </constraints>
+ <bounds x="0" y="0" width="0" height="0"/>
+ <frame state="0"/>
+
+ <empty-behavior permanent="true"/>
+</mode>
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingVisualTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingVisualTopComponent.java 2012-05-15 17:07:26 UTC (rev 7208)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingVisualTopComponent.java 2012-05-15 17:16:52 UTC (rev 7209)
@@ -17,7 +17,7 @@
@TopComponent.Description(preferredID = ModellingVisualTopComponent.TOPCOMPONENT_ID,
iconBase = "org/fudaa/fudaa/crue/modelling/rond-orange_16.png",
persistenceType = TopComponent.PERSISTENCE_ALWAYS)
-@TopComponent.Registration(mode = "editor", openAtStartup = false)
+@TopComponent.Registration(mode = "modelling-editor", openAtStartup = false)
@ActionID(category = "Window", id = "org.fudaa.fudaa.crue.modelling.ModellingVisualTopComponent")
@TopComponent.OpenActionRegistration(displayName = ModellingVisualTopComponent.TOPCOMPONENT_ACTION_DISPLAYNAME,
preferredID = ModellingVisualTopComponent.TOPCOMPONENT_ID)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X