Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[7678] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2012-09-28 18:52:06
|
Revision: 7678
http://fudaa.svn.sourceforge.net/fudaa/?rev=7678&view=rev
Author: deniger
Date: 2012-09-28 18:51:59 +0000 (Fri, 28 Sep 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/dclm/CrueConverterDCLM.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingComputeDataTopComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/CalculAddDclmNodeAction.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/global/GlobalActionChildFactory.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/listener/NodeInternChangedListener.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/Bundle.properties
trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/layer.xml
trunk/soft/fudaa-crue/ui-modelling/src/test/java/org/fudaa/fudaa/crue/modelling/GlobalActionsChildFactoryTest.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerBrancheController.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerCasierController.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerNodeController.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerSectionController.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerTraceController.java
Added Paths:
-----------
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingContainersTopComponent.form
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingContainersTopComponent.java
Removed Paths:
-------------
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingActionsTopComponent.form
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingActionsTopComponent.java
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/dclm/CrueConverterDCLM.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/dclm/CrueConverterDCLM.java 2012-09-28 16:44:51 UTC (rev 7677)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/dclm/CrueConverterDCLM.java 2012-09-28 18:51:59 UTC (rev 7678)
@@ -579,7 +579,9 @@
for (final CalcTransBrancheSaintVenantQruis in : calculMetier.getCalcTransBrancheSaintVenantQruis()) {
final CrueDaoDCLMContents.CalcTransBrancheSaintVenantHydrogrammeRuisPersist dao = new CrueDaoDCLMContents.CalcTransBrancheSaintVenantHydrogrammeRuisPersist();
dao.HydrogrammeQruis = new CrueDaoDCLMContents.HydrogrammeQruisPersist();
- dao.HydrogrammeQruis.NomRef = in.getLoi().getNom();
+ if (in.getLoi() != null) {
+ dao.HydrogrammeQruis.NomRef = in.getLoi().getNom();
+ }
dao.NomRef = in.getEmh().getNom();
calculPersist.listeElementsCalculTransitoire.add(dao);
}
Deleted: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingActionsTopComponent.form
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingActionsTopComponent.form 2012-09-28 16:44:51 UTC (rev 7677)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingActionsTopComponent.form 2012-09-28 18:51:59 UTC (rev 7678)
@@ -1,18 +0,0 @@
-<?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>
Deleted: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingActionsTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingActionsTopComponent.java 2012-09-28 16:44:51 UTC (rev 7677)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingActionsTopComponent.java 2012-09-28 18:51:59 UTC (rev 7678)
@@ -1,147 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.fudaa.fudaa.crue.modelling;
-
-import javax.swing.ActionMap;
-import javax.swing.BorderFactory;
-import org.apache.commons.lang.StringUtils;
-import org.fudaa.dodico.crue.metier.emh.EMHScenario;
-import org.fudaa.fudaa.crue.common.node.NodeHelper;
-import org.fudaa.fudaa.crue.modelling.global.GlobalActionChildFactory;
-import org.fudaa.fudaa.crue.modelling.global.GlobalContainerNode;
-import org.fudaa.fudaa.crue.modelling.services.ScenarioModificationEvent;
-import org.openide.util.NbBundle;
-import org.openide.windows.TopComponent;
-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.explorer.view.OutlineView;
-import org.openide.nodes.Node;
-import org.openide.util.LookupListener;
-
-/**
- * Top component which displays something.
- */
-@ConvertAsProperties(dtd = "-//org.fudaa.fudaa.crue.modelling//ModellingActionsTopComponent//EN",
-autostore = false)
-...@To...scription(preferredID = ModellingActionsTopComponent.TOPCOMPONENT_ID,
-iconBase = "org/fudaa/fudaa/crue/modelling/rond-orange_16.png",
-persistenceType = TopComponent.PERSISTENCE_ALWAYS)
-...@To...gistration(mode = "modelling-topLeft", openAtStartup = false, position = 1)
-@ActionID(category = "Window", id = "org.fudaa.fudaa.crue.modelling.ModellingActionsTopComponent")
-@ActionReference(path = "Menu/Window/Modelling",position=4)
-@TopComponent.OpenActionRegistration(displayName = ModellingActionsTopComponent.TOPCOMPONENT_ACTION_DISPLAYNAME,
-preferredID = ModellingActionsTopComponent.TOPCOMPONENT_ID)
-public final class ModellingActionsTopComponent extends AbstractModellingTopComponent implements LookupListener, ExplorerManager.Provider {
-
- public static final String TOPCOMPONENT_ID = "ModellingActionsTopComponent";
- public static final String TOPCOMPONENT_ACTION = "CTL_" + TOPCOMPONENT_ID;
- public static final String TOPCOMPONENT_ACTION_DISPLAYNAME = "#" + TOPCOMPONENT_ACTION;
- private final ExplorerManager em = new ExplorerManager();
- private org.openide.explorer.view.OutlineView outlineView;
-
- public ModellingActionsTopComponent() {
- initComponents();
- setName(NbBundle.getMessage(ModellingActionsTopComponent.class, TOPCOMPONENT_ACTION));
- setToolTipText(NbBundle.getMessage(ModellingActionsTopComponent.class, "HINT_" + TOPCOMPONENT_ID));
- outlineView = new OutlineView();
- outlineView.setBorder(BorderFactory.createEmptyBorder(0, 3, 0, 0));
- outlineView.getOutline().setRootVisible(false);
- outlineView.getOutline().setFullyNonEditable(true);
- outlineView.getOutline().setFillsViewportHeight(true);
- outlineView.getOutline().setColumnHidingAllowed(false);
- outlineView.addPropertyColumn(GlobalContainerNode.PROP_VISIBILITY, StringUtils.EMPTY);
- add(outlineView);
- outlineView.getOutline().getColumnModel().getColumn(1).setWidth(20);
- outlineView.getOutline().getColumnModel().getColumn(1).setPreferredWidth(20);
- ActionMap map = this.getActionMap();
- associateLookup(ExplorerUtils.createLookup(em, map));
- }
-
- @Override
- public ExplorerManager getExplorerManager() {
- return em;
- }
-
- @Override
- protected void setEditable(boolean b) {
- }
-
- @Override
- protected void componentActivated() {
- super.componentActivated();
- ExplorerUtils.activateActions(em, true);
- }
-
- @Override
- protected void componentDeactivated() {
- super.componentDeactivated();
- ExplorerUtils.activateActions(em, false);
- }
-
- @Override
- public void cancelModification() {
- }
-
- @Override
- public void valideModification() {
- }
-
- /**
- * WARN: A utiliser uniquement pour les tests
- */
- protected void testScenarioLoaded(EMHScenario scenario) {
- em.setRootContext(GlobalActionChildFactory.createGlobalActionsNode(scenario));
- }
-
- @Override
- protected void scenarioLoaded() {
- em.setRootContext(GlobalActionChildFactory.createGlobalActionsNode(getModellingService().getScenarioLoaded()));
- NodeHelper.expandAll(em, outlineView);
- }
-
- @Override
- protected void scenarioReloaded() {
- scenarioLoaded();
- }
-
- @Override
- protected void scenarioChanged(ScenarioModificationEvent event) {
-// scenarioReloaded();
- }
-
- @Override
- protected void scenarioUnloaded() {
- em.setRootContext(Node.EMPTY);
- }
-
- /**
- * 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 componentClosedTemporarily() {
- }
-
- 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");
- }
-
- void readProperties(java.util.Properties p) {
- String version = p.getProperty("version");
- }
-}
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingComputeDataTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingComputeDataTopComponent.java 2012-09-28 16:44:51 UTC (rev 7677)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingComputeDataTopComponent.java 2012-09-28 18:51:59 UTC (rev 7678)
@@ -204,6 +204,7 @@
NodeHelper.expandAll(getExplorerManager(), outlineView);
helper.addListener(true);
helper.getNodeListener().setModifiedInArborescenceChanged(true);
+ helper.getNodeListener().setModifiedIfDisplayNameChanged(false);
}
@Override
Copied: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingContainersTopComponent.form (from rev 7523, trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingActionsTopComponent.form)
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingContainersTopComponent.form (rev 0)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingContainersTopComponent.form 2012-09-28 18:51:59 UTC (rev 7678)
@@ -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-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingContainersTopComponent.java (from rev 7638, trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingActionsTopComponent.java)
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingContainersTopComponent.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingContainersTopComponent.java 2012-09-28 18:51:59 UTC (rev 7678)
@@ -0,0 +1,147 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.fudaa.fudaa.crue.modelling;
+
+import javax.swing.ActionMap;
+import javax.swing.BorderFactory;
+import org.apache.commons.lang.StringUtils;
+import org.fudaa.dodico.crue.metier.emh.EMHScenario;
+import org.fudaa.fudaa.crue.common.node.NodeHelper;
+import org.fudaa.fudaa.crue.modelling.global.GlobalActionChildFactory;
+import org.fudaa.fudaa.crue.modelling.global.GlobalContainerNode;
+import org.fudaa.fudaa.crue.modelling.services.ScenarioModificationEvent;
+import org.openide.util.NbBundle;
+import org.openide.windows.TopComponent;
+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.explorer.view.OutlineView;
+import org.openide.nodes.Node;
+import org.openide.util.LookupListener;
+
+/**
+ * Top component which displays something.
+ */
+@ConvertAsProperties(dtd = "-//org.fudaa.fudaa.crue.modelling//ModellingContainersTopComponent//EN",
+autostore = false)
+...@To...scription(preferredID = ModellingContainersTopComponent.TOPCOMPONENT_ID,
+iconBase = "org/fudaa/fudaa/crue/modelling/rond-orange_16.png",
+persistenceType = TopComponent.PERSISTENCE_ALWAYS)
+...@To...gistration(mode = "modelling-topLeft", openAtStartup = false, position = 1)
+@ActionID(category = "Window", id = "org.fudaa.fudaa.crue.modelling.ModellingActionsTopComponent")
+@ActionReference(path = "Menu/Window/Modelling", position = 4)
+@TopComponent.OpenActionRegistration(displayName = ModellingContainersTopComponent.TOPCOMPONENT_ACTION_DISPLAYNAME,
+preferredID = ModellingContainersTopComponent.TOPCOMPONENT_ID)
+public final class ModellingContainersTopComponent extends AbstractModellingTopComponent implements LookupListener, ExplorerManager.Provider {
+
+ public static final String TOPCOMPONENT_ID = "ModellingContainersTopComponent";
+ public static final String TOPCOMPONENT_ACTION = "CTL_" + TOPCOMPONENT_ID;
+ public static final String TOPCOMPONENT_ACTION_DISPLAYNAME = "#" + TOPCOMPONENT_ACTION;
+ private final ExplorerManager em = new ExplorerManager();
+ private org.openide.explorer.view.OutlineView outlineView;
+
+ public ModellingContainersTopComponent() {
+ initComponents();
+ setName(NbBundle.getMessage(ModellingContainersTopComponent.class, TOPCOMPONENT_ACTION));
+ setToolTipText(NbBundle.getMessage(ModellingContainersTopComponent.class, "HINT_" + TOPCOMPONENT_ID));
+ outlineView = new OutlineView(NbBundle.getMessage(ModellingContainersTopComponent.class, "ModellingContainersTopComponent.ColumnName"));
+ outlineView.setBorder(BorderFactory.createEmptyBorder(0, 3, 0, 0));
+ outlineView.getOutline().setRootVisible(false);
+ outlineView.getOutline().setFullyNonEditable(true);
+ outlineView.getOutline().setFillsViewportHeight(true);
+ outlineView.getOutline().setColumnHidingAllowed(false);
+ outlineView.addPropertyColumn(GlobalContainerNode.PROP_VISIBILITY, NbBundle.getMessage(ModellingContainersTopComponent.class, "ModellingContainersTopComponent.ColumnVisible"));
+ add(outlineView);
+ outlineView.getOutline().getColumnModel().getColumn(1).setWidth(20);
+ outlineView.getOutline().getColumnModel().getColumn(1).setPreferredWidth(20);
+ ActionMap map = this.getActionMap();
+ associateLookup(ExplorerUtils.createLookup(em, map));
+ }
+
+ @Override
+ public ExplorerManager getExplorerManager() {
+ return em;
+ }
+
+ @Override
+ protected void setEditable(boolean b) {
+ }
+
+ @Override
+ protected void componentActivated() {
+ super.componentActivated();
+ ExplorerUtils.activateActions(em, true);
+ }
+
+ @Override
+ protected void componentDeactivated() {
+ super.componentDeactivated();
+ ExplorerUtils.activateActions(em, false);
+ }
+
+ @Override
+ public void cancelModification() {
+ }
+
+ @Override
+ public void valideModification() {
+ }
+
+ /**
+ * WARN: A utiliser uniquement pour les tests
+ */
+ protected void testScenarioLoaded(EMHScenario scenario) {
+ em.setRootContext(GlobalActionChildFactory.createGlobalContainerNode(scenario));
+ }
+
+ @Override
+ protected void scenarioLoaded() {
+ em.setRootContext(GlobalActionChildFactory.createGlobalContainerNode(getModellingService().getScenarioLoaded()));
+ NodeHelper.expandAll(em, outlineView);
+ }
+
+ @Override
+ protected void scenarioReloaded() {
+ scenarioLoaded();
+ }
+
+ @Override
+ protected void scenarioChanged(ScenarioModificationEvent event) {
+// scenarioReloaded();
+ }
+
+ @Override
+ protected void scenarioUnloaded() {
+ em.setRootContext(Node.EMPTY);
+ }
+
+ /**
+ * 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 componentClosedTemporarily() {
+ }
+
+ 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");
+ }
+
+ void readProperties(java.util.Properties p) {
+ String version = p.getProperty("version");
+ }
+}
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/CalculAddDclmNodeAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/CalculAddDclmNodeAction.java 2012-09-28 16:44:51 UTC (rev 7677)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/CalculAddDclmNodeAction.java 2012-09-28 18:51:59 UTC (rev 7678)
@@ -72,7 +72,7 @@
pn.add(cbEMH);
updateComboBox(scenario, cbEMH, (CalcBuilder) cb.getSelectedItem());
final DialogDescriptor descriptor = new DialogDescriptor(pn, getName());
- descriptor.setValid(false);
+
cb.addItemListener(new ItemListener() {
@Override
public void itemStateChanged(ItemEvent e) {
@@ -86,6 +86,7 @@
descriptor.setValid(cb.getSelectedItem() != null && cbEMH.getSelectedItem() != null);
}
});
+ descriptor.setValid(cb.getSelectedItem() != null && cbEMH.getSelectedItem() != null);
Dialog dialog = DialogDisplayer.getDefault().createDialog(descriptor);
dialog.pack();
dialog.setLocationRelativeTo(WindowManager.getDefault().getMainWindow());
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/global/GlobalActionChildFactory.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/global/GlobalActionChildFactory.java 2012-09-28 16:44:51 UTC (rev 7677)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/global/GlobalActionChildFactory.java 2012-09-28 18:51:59 UTC (rev 7678)
@@ -25,7 +25,7 @@
return new GlobalContainerNode.EMHModeleNode(NodeChildrenHelper.createChildren(child), modele);
}
- public static Node createGlobalActionsNode(EMHScenario scenario) {
+ public static Node createGlobalContainerNode(EMHScenario scenario) {
GlobalContainerNode scenarioNode = createScenarioNode(scenario);
List<Node> main = new ArrayList<Node>();
main.add(scenarioNode);
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/listener/NodeInternChangedListener.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/listener/NodeInternChangedListener.java 2012-09-28 16:44:51 UTC (rev 7677)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/listener/NodeInternChangedListener.java 2012-09-28 18:51:59 UTC (rev 7678)
@@ -22,11 +22,20 @@
private AbstractModellingTopComponent target;
boolean modifiedInArborescenceChanged = false;
+ boolean modifiedIfDisplayNameChanged = false;
public NodeInternChangedListener(AbstractModellingTopComponent target) {
this.target = target;
}
+ public boolean isModifiedIfDisplayNameChanged() {
+ return modifiedIfDisplayNameChanged;
+ }
+
+ public void setModifiedIfDisplayNameChanged(boolean modifiedIfDisplayNameChanged) {
+ this.modifiedIfDisplayNameChanged = modifiedIfDisplayNameChanged;
+ }
+
public boolean isModifiedInArborescenceChanged() {
return modifiedInArborescenceChanged;
}
@@ -37,8 +46,10 @@
@Override
public void propertyChange(PropertyChangeEvent evt) {
- if (Node.PROP_DISPLAY_NAME.equals(evt.getPropertyName())) {
- target.setModified(true);
+ if (modifiedIfDisplayNameChanged) {
+ if (Node.PROP_DISPLAY_NAME.equals(evt.getPropertyName())) {
+ target.setModified(true);
+ }
}
}
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-09-28 16:44:51 UTC (rev 7677)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/perspective/PerspectiveServiceModelling.java 2012-09-28 18:51:59 UTC (rev 7678)
@@ -19,7 +19,7 @@
import org.fudaa.fudaa.crue.common.services.PerspectiveService;
import org.fudaa.fudaa.crue.common.services.PerspectiveState;
import org.fudaa.fudaa.crue.modelling.AbstractModellingTopComponent;
-import org.fudaa.fudaa.crue.modelling.ModellingActionsTopComponent;
+import org.fudaa.fudaa.crue.modelling.ModellingContainersTopComponent;
import org.fudaa.fudaa.crue.modelling.ModellingComputeDataTopComponent;
import org.fudaa.fudaa.crue.modelling.ModellingCtuluLogTopComponent;
import org.fudaa.fudaa.crue.modelling.ModellingFilesTopComponent;
@@ -47,7 +47,7 @@
public class PerspectiveServiceModelling extends AbstractPerspectiveService {
private final Set<String> components = Collections.unmodifiableSet(new HashSet<String>(Arrays.asList(
- ModellingActionsTopComponent.TOPCOMPONENT_ID,
+ ModellingContainersTopComponent.TOPCOMPONENT_ID,
ModellingComputeDataTopComponent.TOPCOMPONENT_ID,
ModellingFilesTopComponent.TOPCOMPONENT_ID,
ModellingPropertiesTopComponent.TOPCOMPONENT_ID,
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/Bundle.properties 2012-09-28 16:44:51 UTC (rev 7677)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/Bundle.properties 2012-09-28 18:51:59 UTC (rev 7678)
@@ -17,8 +17,10 @@
HINT_ModellingComputeDataTopComponent=Donn\u00e9es des calculs
emhTopComponent.NoScenarioLoadedInformations=<Vide>
SaveScenio.Bilan.DialogTitle=Sauvegarde du sc\u00e9nario {0}
-CTL_ModellingActionsTopComponent=Gestionnaire de conteneurs
-HINT_ModellingActionsTopComponent=Gestionnaire de conteneurs
+
+CTL_ModellingContainersTopComponent=Gestionnaire de conteneurs
+HINT_ModellingContainersTopComponent=Gestionnaire de conteneurs
+ModellingContainersTopComponent.ColumnName=Conteneur
CTL_ModellingFilesTopComponent=Gestionnaire de calques
HINT_ModellingFilesTopComponent=Gestionnaire de calques
CTL_ModellingPropertiesTopComponent=Propri\u00e9t\u00e9s
@@ -37,3 +39,4 @@
NodeEMHNoeud.TypeDescription.Name=Description
AddCalcTransitoire.Menu=Ajouter un calcul transitoire
AddCalcPseudoPerm.Menu=Ajouter un calcul pseudo-permanent
+ModellingContainersTopComponent.ColumnVisible=Visible
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-09-28 16:44:51 UTC (rev 7677)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/layer.xml 2012-09-28 18:51:59 UTC (rev 7678)
@@ -2,7 +2,17 @@
<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
<filesystem>
- <folder name="Menu">
+ <folder name="Actions">
+ <folder name="Window">
+ <file name="org-fudaa-fudaa-crue-modelling-ModellingActionsTopComponent.instance_hidden"/>
+ <file name="org-fudaa-fudaa-crue-modelling-ModellingContainersTopComponent.instance">
+ <attr name="iconBase" stringvalue="org/fudaa/fudaa/crue/modelling/rond-orange_16.png"/>
+ <attr name="instanceCreate" methodvalue="org.openide.windows.TopComponent.openAction"/>
+ <attr name="preferredID" stringvalue="ModellingActionsTopComponent"/>
+ </file>
+ </folder>
+ </folder>
+ <folder name="Menu">
<!-- <folder name="Modelling">
<attr name="displayName" bundlevalue="org.fudaa.fudaa.crue.modelling.Bundle#Menu/Modelling"/>
<attr name="position" intvalue="5"/>
Modified: trunk/soft/fudaa-crue/ui-modelling/src/test/java/org/fudaa/fudaa/crue/modelling/GlobalActionsChildFactoryTest.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/test/java/org/fudaa/fudaa/crue/modelling/GlobalActionsChildFactoryTest.java 2012-09-28 16:44:51 UTC (rev 7677)
+++ trunk/soft/fudaa-crue/ui-modelling/src/test/java/org/fudaa/fudaa/crue/modelling/GlobalActionsChildFactoryTest.java 2012-09-28 18:51:59 UTC (rev 7678)
@@ -14,7 +14,7 @@
public static void main(String[] args) {
EMHScenario emhScenario = ModellingTestHelper.readScenario();
- ModellingActionsTopComponent topComponent = new ModellingActionsTopComponent();
+ ModellingContainersTopComponent topComponent = new ModellingContainersTopComponent();
topComponent.testScenarioLoaded(emhScenario);
ModellingTestHelper.display(topComponent);
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerBrancheController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerBrancheController.java 2012-09-28 16:44:51 UTC (rev 7677)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerBrancheController.java 2012-09-28 18:51:59 UTC (rev 7678)
@@ -49,6 +49,7 @@
new OpenEMHAction.NewFrame(ctx),
null,
res.getSigEditAction(),
+ res.getEditor().getExportAction(),
res.getPlanimetryVisuController().getProjectBrancheOnLineAction(),
null,
res.getEditor().getActionDelete(),
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerCasierController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerCasierController.java 2012-09-28 16:44:51 UTC (rev 7677)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerCasierController.java 2012-09-28 18:51:59 UTC (rev 7678)
@@ -46,6 +46,7 @@
new OpenEMHAction.NewFrame(ctx),
null,
res.getSigEditAction(),
+ res.getEditor().getExportAction(),
null,
res.getEditor().getActionDelete(),
res.getPlanimetryVisuController().getDeleteCascade(),
@@ -148,5 +149,4 @@
}
}
}
-
}
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerNodeController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerNodeController.java 2012-09-28 16:44:51 UTC (rev 7677)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerNodeController.java 2012-09-28 18:51:59 UTC (rev 7678)
@@ -49,6 +49,7 @@
new OpenEMHAction.NewFrame(ctx),
null,
res.getSigEditAction(),
+ res.getEditor().getExportAction(),
null,
res.getEditor().getActionDelete(),
res.getPlanimetryVisuController().getDeleteCascade(),
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerSectionController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerSectionController.java 2012-09-28 16:44:51 UTC (rev 7677)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerSectionController.java 2012-09-28 18:51:59 UTC (rev 7678)
@@ -10,7 +10,6 @@
import org.fudaa.ctulu.gis.GISZoneCollectionPoint;
import org.fudaa.dodico.crue.metier.emh.EMH;
import org.fudaa.dodico.crue.metier.emh.EnumCatEMH;
-import org.fudaa.dodico.crue.metier.emh.EnumNoeudType;
import org.fudaa.dodico.crue.metier.emh.EnumSectionType;
import org.fudaa.dodico.crue.metier.emh.RelationEMHSectionDansBranche;
import org.fudaa.dodico.crue.metier.helper.EMHHelper;
@@ -46,6 +45,7 @@
new OpenEMHAction.NewFrame(ctx),
null,
res.getSigEditAction(),
+ res.getEditor().getExportAction(),
null,
res.getEditor().getActionDelete(),
res.getPlanimetryVisuController().getDeleteCascade(),
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerTraceController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerTraceController.java 2012-09-28 16:44:51 UTC (rev 7677)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerTraceController.java 2012-09-28 18:51:59 UTC (rev 7678)
@@ -8,7 +8,6 @@
import java.util.Set;
import org.fudaa.ctulu.gis.GISZoneCollectionGeometry;
import org.fudaa.ctulu.gis.GISZoneCollectionLigneBrisee;
-import org.fudaa.ctulu.gis.GISZoneCollectionPoint;
import org.fudaa.dodico.crue.metier.emh.EMH;
import org.fudaa.dodico.crue.metier.emh.EnumCatEMH;
import org.fudaa.dodico.crue.metier.emh.EnumSectionType;
@@ -44,6 +43,7 @@
new OpenEMHAction.NewFrame(ctx),
null,
res.getSigEditAction(),
+ res.getEditor().getExportAction(),
null,
res.getEditor().getActionDelete(),
res.getPlanimetryVisuController().getDeleteCascade(),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
