Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[6664] trunk/soft/fudaa-crue
|
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 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=
-Menu/Study=Studies
-CTL_LoadStudy=Load a study
+Menu/Study=Etudes
CTL_ModeleListAction=ModeleList
CTL_ModeleListTopComponent=ModeleList Window
CTL_ScenariosAction=Scenarios
Deleted: trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/Bundle_fr.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/Bundle_fr.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_fr.properties 2011-11-11 22:17:59 UTC (rev 6664)
@@ -1,7 +0,0 @@
-# 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=
-Menu/Study=Etudes
-CTL_LoadStudy=Charger une \u00e9tude
Copied: trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/actions/Bundle.properties (from rev 6659, 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/actions/Bundle.properties (rev 0)
+++ trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/actions/Bundle.properties 2011-11-11 22:17:59 UTC (rev 6664)
@@ -0,0 +1,2 @@
+CTL_LoadStudy=Charger une \u00e9tude
+CTL_CloseStudy=Fermer l'\u00e9tude courante
Copied: trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/etude.gif (from rev 6659, trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/frame.gif)
===================================================================
(Binary files differ)
Copied: trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/services/Bundle.properties (from rev 6659, 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/services/Bundle.properties (rev 0)
+++ trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/services/Bundle.properties 2011-11-11 22:17:59 UTC (rev 6664)
@@ -0,0 +1,4 @@
+OpenEtuFileAction=Ouverture de l''\u00e9tude {0}
+EtuFile=Fichier Etu
+ChooseEtu=Choisir fichier Etude (*.etu.xml)"
+OpenEtu=Ouvrir l'\u00e9tude
\ No newline at end of file
Modified: trunk/soft/fudaa-crue/ui-wrapper/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-wrapper/pom.xml 2011-11-11 09:45:50 UTC (rev 6663)
+++ trunk/soft/fudaa-crue/ui-wrapper/pom.xml 2011-11-11 22:17:59 UTC (rev 6664)
@@ -32,6 +32,7 @@
<configuration>
<publicPackages>
<publicPackage>org.*</publicPackage>
+ <publicPackage>com.memoire.*</publicPackage>
</publicPackages>
</configuration>
</plugin>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
