Menu
▾
▴
fudaa-svn-commit
|
From: <de...@us...> - 2012-04-23 19:44:04
|
Revision: 7107
http://fudaa.svn.sourceforge.net/fudaa/?rev=7107&view=rev
Author: deniger
Date: 2012-04-23 19:43:56 +0000 (Mon, 23 Apr 2012)
Log Message:
-----------
ajout entr?\195?\169e dans logs
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingEMHTopComponent.form
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingEMHTopComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingProfilesTopComponent.form
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingProfilesTopComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingVisualTopComponent.form
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingVisualTopComponent.java
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingEMHTopComponent.form
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingEMHTopComponent.form 2012-04-23 19:43:25 UTC (rev 7106)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingEMHTopComponent.form 2012-04-23 19:43:56 UTC (rev 7107)
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
<Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
<AuxValues>
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingEMHTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingEMHTopComponent.java 2012-04-23 19:43:25 UTC (rev 7106)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingEMHTopComponent.java 2012-04-23 19:43:56 UTC (rev 7107)
@@ -7,6 +7,7 @@
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.ModellingScenarioService;
import org.fudaa.fudaa.crue.emh.EMHTreePanel;
import org.fudaa.fudaa.crue.study.services.EMHProjetService;
@@ -27,7 +28,7 @@
@TopComponent.Description(preferredID = "ModellingEMHTopComponent",
iconBase = "org/fudaa/fudaa/crue/modelling/rond-orange_16.png",
persistenceType = TopComponent.PERSISTENCE_ALWAYS)
-@TopComponent.Registration(mode = "explorer", openAtStartup = false)
+@TopComponent.Registration(mode = "explorer", openAtStartup = false,position=1,roles = {RoleNames.MODELLING})
@ActionID(category = "Window", id = "org.fudaa.fudaa.crue.modelling.ModellingEMHTopComponent")
@TopComponent.OpenActionRegistration(displayName = "#CTL_ModellingEMHAction",
preferredID = "ModellingEMHTopComponent")
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingProfilesTopComponent.form
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingProfilesTopComponent.form 2012-04-23 19:43:25 UTC (rev 7106)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingProfilesTopComponent.form 2012-04-23 19:43:56 UTC (rev 7107)
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
<Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
<AuxValues>
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingProfilesTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingProfilesTopComponent.java 2012-04-23 19:43:25 UTC (rev 7106)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingProfilesTopComponent.java 2012-04-23 19:43:56 UTC (rev 7107)
@@ -4,10 +4,11 @@
*/
package org.fudaa.fudaa.crue.modelling;
+import org.fudaa.fudaa.crue.common.RoleNames;
+import org.netbeans.api.settings.ConvertAsProperties;
+import org.openide.awt.ActionID;
import org.openide.util.NbBundle;
import org.openide.windows.TopComponent;
-import org.netbeans.api.settings.ConvertAsProperties;
-import org.openide.awt.ActionID;
/**
* Top component which displays something.
@@ -17,25 +18,24 @@
@TopComponent.Description(preferredID = "ModellingProfilesTopComponent",
iconBase = "org/fudaa/fudaa/crue/modelling/rond-orange_16.png",
persistenceType = TopComponent.PERSISTENCE_ALWAYS)
-@TopComponent.Registration(mode = "output",openAtStartup = false)
+@TopComponent.Registration(mode = "output", openAtStartup = false, position = 1, roles = {RoleNames.MODELLING})
@ActionID(category = "Window", id = "org.fudaa.fudaa.crue.modelling.ModellingProfilesTopComponent")
//@ActionReference(path = "Menu/Window" /*, position = 333 */)
@TopComponent.OpenActionRegistration(displayName = "#CTL_ModellingProfilesAction",
preferredID = "ModellingProfilesTopComponent")
public final class ModellingProfilesTopComponent extends TopComponent {
- public ModellingProfilesTopComponent() {
- initComponents();
- setName(NbBundle.getMessage(ModellingProfilesTopComponent.class, "CTL_ModellingProfilesTopComponent"));
- setToolTipText(NbBundle.getMessage(ModellingProfilesTopComponent.class, "HINT_ModellingProfilesTopComponent"));
+ public ModellingProfilesTopComponent() {
+ initComponents();
+ setName(NbBundle.getMessage(ModellingProfilesTopComponent.class, "CTL_ModellingProfilesTopComponent"));
+ setToolTipText(NbBundle.getMessage(ModellingProfilesTopComponent.class, "HINT_ModellingProfilesTopComponent"));
- }
+ }
- /** This method is called from within the constructor to
- * initialize the form.
- * WARNING: Do NOT modify this code. The content of this method is
- * always regenerated by the Form Editor.
- */
+ /**
+ * This method is called from within the constructor to initialize the form. WARNING: Do NOT modify this code. The content of
+ * this method is always regenerated by the Form Editor.
+ */
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void initComponents() {
@@ -52,29 +52,29 @@
.addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 300, Short.MAX_VALUE)
);
}// </editor-fold>//GEN-END:initComponents
-
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JScrollPane jScrollPane1;
// End of variables declaration//GEN-END:variables
- @Override
- public void componentOpened() {
- // TODO add custom code on component opening
- }
- @Override
- public void componentClosed() {
- // TODO add custom code on component closing
- }
+ @Override
+ public void componentOpened() {
+ // TODO add custom code on component opening
+ }
- 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
+ public void componentClosed() {
+ // TODO add custom code on component closing
+ }
- void readProperties(java.util.Properties p) {
- String version = p.getProperty("version");
- // TODO read your settings according to their version
- }
+ void writeProperties(java.util.Properties p) {
+ // better to version settings since initial version as advocated at
+ // http://wiki.apidesign.org/wiki/PropertyFiles
+ p.setProperty("version", "1.0");
+ // TODO store your settings
+ }
+
+ void readProperties(java.util.Properties p) {
+ String version = p.getProperty("version");
+ // TODO read your settings according to their version
+ }
}
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingVisualTopComponent.form
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingVisualTopComponent.form 2012-04-23 19:43:25 UTC (rev 7106)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingVisualTopComponent.form 2012-04-23 19:43:56 UTC (rev 7107)
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
<Form version="1.4" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
<AuxValues>
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-04-23 19:43:25 UTC (rev 7106)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingVisualTopComponent.java 2012-04-23 19:43:56 UTC (rev 7107)
@@ -4,10 +4,11 @@
*/
package org.fudaa.fudaa.crue.modelling;
+import org.fudaa.fudaa.crue.common.RoleNames;
+import org.netbeans.api.settings.ConvertAsProperties;
+import org.openide.awt.ActionID;
import org.openide.util.NbBundle;
import org.openide.windows.TopComponent;
-import org.netbeans.api.settings.ConvertAsProperties;
-import org.openide.awt.ActionID;
/**
* Top component which displays something.
@@ -17,7 +18,7 @@
@TopComponent.Description(preferredID = "ModellingVisualTopComponent",
iconBase = "org/fudaa/fudaa/crue/modelling/rond-orange_16.png",
persistenceType = TopComponent.PERSISTENCE_ALWAYS)
-@TopComponent.Registration(mode = "editor", openAtStartup = false)
+@TopComponent.Registration(mode = "editor", openAtStartup = false,roles = {RoleNames.MODELLING})
@ActionID(category = "Window", id = "org.fudaa.fudaa.crue.modelling.ModellingVisualTopComponent")
//@ActionReference(path = "Menu/Window" /*, position = 333 */)
@TopComponent.OpenActionRegistration(displayName = "#CTL_ModellingVisualAction",
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-07-12 21:53:51
|
Revision: 7488
http://fudaa.svn.sourceforge.net/fudaa/?rev=7488&view=rev
Author: deniger
Date: 2012-07-12 21:53:44 +0000 (Thu, 12 Jul 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/AbstractModellingOpenTopNodeAction.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/ModellingOpenEMHNodeAction.java
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/AbstractModellingOpenTopNodeAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/AbstractModellingOpenTopNodeAction.java 2012-07-12 21:33:07 UTC (rev 7487)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/AbstractModellingOpenTopNodeAction.java 2012-07-12 21:53:44 UTC (rev 7488)
@@ -33,8 +33,8 @@
public boolean isReopen() {
return reopen;
}
-
- protected String getMode(TopComponent top){
+
+ protected String getMode(TopComponent top) {
return mode;
}
@@ -65,10 +65,6 @@
DialogHelper.showError(NbBundle.getMessage(AbstractModellingOpenTopNodeAction.class, "CurrentViewIsModified.Error"));
return false;
}
-// UserSaveAnswer askForSave = topComponent.askForSave();
-// if (UserSaveAnswer.CANCEL.equals(askForSave)) {
-// return false;
-// }
}
return true;
}
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/ModellingOpenEMHNodeAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/ModellingOpenEMHNodeAction.java 2012-07-12 21:33:07 UTC (rev 7487)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/ModellingOpenEMHNodeAction.java 2012-07-12 21:53:44 UTC (rev 7488)
@@ -53,7 +53,6 @@
} else {
action = SystemAction.get(ModellingOpenEMHNodeAction.NewFrame.class);
}
- action.setReopen(reopen);
AbstractNode node = new AbstractNode(Children.LEAF, Lookups.singleton(emh));
action.performAction(new Node[]{node});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-10-02 19:35:07
|
Revision: 7689
http://fudaa.svn.sourceforge.net/fudaa/?rev=7689&view=rev
Author: deniger
Date: 2012-10-02 19:34:57 +0000 (Tue, 02 Oct 2012)
Log Message:
-----------
correction position labels
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/AbstractModellingOpenTopNodeAction.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ModellingOpenDFRTNodeAction.java
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/AbstractModellingOpenTopNodeAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/AbstractModellingOpenTopNodeAction.java 2012-10-02 19:16:33 UTC (rev 7688)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/AbstractModellingOpenTopNodeAction.java 2012-10-02 19:34:57 UTC (rev 7689)
@@ -54,7 +54,7 @@
}
public void openNewTopComponent(Node[] activatedNodes) {
- TopComponent openNew = openNew(activatedNodes[0]);
+ TopComponent openNew = openNew(activatedNodes.length == 0 ? null : activatedNodes[0]);
activeInMode(openNew, getMode(openNew));
}
@@ -98,7 +98,7 @@
openNewTopComponent(activatedNodes);
} else {
Set<TopComponent> opened = WindowManager.getDefault().getRegistry().getOpened();
- Class topComponentClass = getExpectedTopComponentClass(activatedNodes[0]);
+ Class topComponentClass = getExpectedTopComponentClass(activatedNodes.length == 0 ? null : activatedNodes[0]);
TopComponent openedTopComponent = (TopComponent) EMHHelper.selectFirstOfClass(opened, topComponentClass);
if (openedTopComponent == null) {
openNewTopComponent(activatedNodes);
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ModellingOpenDFRTNodeAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ModellingOpenDFRTNodeAction.java 2012-10-02 19:16:33 UTC (rev 7688)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ModellingOpenDFRTNodeAction.java 2012-10-02 19:34:57 UTC (rev 7689)
@@ -81,7 +81,7 @@
@Override
protected String getMode(TopComponent top) {
- return DLHYTopComponent.MODE;
+ return DFRTTopComponent.MODE;
}
@Override
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-10-15 11:48:54
|
Revision: 7744
http://fudaa.svn.sourceforge.net/fudaa/?rev=7744&view=rev
Author: deniger
Date: 2012-10-15 11:48:47 +0000 (Mon, 15 Oct 2012)
Log Message:
-----------
Ajout test unitaire pour CRUE-317
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/ModellingEMHSectionTopComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/global/GlobalContainerNode.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ListNodePopupFactory.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionAction.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionTopComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/node/ModellingEMHSectionProfilNode.java
Added Paths:
-----------
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionOpenNodeAction.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionOpenOnSelectedSectionNodeAction.java
Removed Paths:
-------------
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionNodeAction.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionOnSelectedSectionNodeAction.java
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/ModellingEMHSectionTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/ModellingEMHSectionTopComponent.java 2012-10-15 10:16:05 UTC (rev 7743)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/ModellingEMHSectionTopComponent.java 2012-10-15 11:48:47 UTC (rev 7744)
@@ -11,7 +11,7 @@
import javax.swing.JLabel;
import javax.swing.JPanel;
import org.fudaa.dodico.crue.metier.emh.EMHSectionProfil;
-import org.fudaa.fudaa.crue.modelling.loi.ProfilSectionOnSelectedSectionNodeAction;
+import org.fudaa.fudaa.crue.modelling.loi.ProfilSectionOpenOnSelectedSectionNodeAction;
import org.openide.util.NbBundle;
import org.openide.windows.TopComponent;
@@ -59,7 +59,7 @@
protected void openInProfilEditor() {
if (isProfilSection()) {
- ProfilSectionOnSelectedSectionNodeAction.open(getEMHUid(), true);
+ ProfilSectionOpenOnSelectedSectionNodeAction.open(getEMHUid(), true);
}
}
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/global/GlobalContainerNode.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/global/GlobalContainerNode.java 2012-10-15 10:16:05 UTC (rev 7743)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/global/GlobalContainerNode.java 2012-10-15 11:48:47 UTC (rev 7744)
@@ -13,7 +13,7 @@
import org.fudaa.fudaa.crue.modelling.action.*;
import org.fudaa.fudaa.crue.modelling.loi.ModellingOpenDFRTNodeAction;
import org.fudaa.fudaa.crue.modelling.loi.ModellingOpenDLHYNodeAction;
-import org.fudaa.fudaa.crue.modelling.loi.ProfilSectionNodeAction;
+import org.fudaa.fudaa.crue.modelling.loi.ProfilSectionOpenNodeAction;
import org.fudaa.fudaa.crue.modelling.perspective.PerspectiveServiceModelling;
import org.fudaa.fudaa.crue.modelling.services.ModellingScenarioVisuService;
import org.fudaa.fudaa.crue.planimetry.configuration.ContainerActivityVisibility;
@@ -188,8 +188,8 @@
@Override
public Action[] getActions(boolean context) {
return new Action[]{
- SystemAction.get(ProfilSectionNodeAction.Reopen.class),
- SystemAction.get(ProfilSectionNodeAction.NewFrame.class),
+ SystemAction.get(ProfilSectionOpenNodeAction.Reopen.class),
+ SystemAction.get(ProfilSectionOpenNodeAction.NewFrame.class),
null,
SystemAction.get(ModellingOpenDLHYNodeAction.Reopen.class),
SystemAction.get(ModellingOpenDLHYNodeAction.NewFrame.class),
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ListNodePopupFactory.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ListNodePopupFactory.java 2012-10-15 10:16:05 UTC (rev 7743)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ListNodePopupFactory.java 2012-10-15 11:48:47 UTC (rev 7744)
@@ -17,7 +17,7 @@
import org.fudaa.fudaa.crue.common.node.NodeHelper;
import org.fudaa.fudaa.crue.modelling.AbstractModellingTopComponent;
import org.fudaa.fudaa.crue.modelling.emh.ModellingOpenEMHNodeAction;
-import org.fudaa.fudaa.crue.modelling.loi.ProfilSectionOnSelectedSectionNodeAction;
+import org.fudaa.fudaa.crue.modelling.loi.ProfilSectionOpenOnSelectedSectionNodeAction;
import org.openide.explorer.view.NodePopupFactory;
import org.openide.nodes.Node;
import org.openide.util.NbBundle;
@@ -60,7 +60,7 @@
@Override
public void actionPerformed(ActionEvent e) {
- ProfilSectionOnSelectedSectionNodeAction.open(emh.getUiId(), true);
+ ProfilSectionOpenOnSelectedSectionNodeAction.open(emh.getUiId(), true);
}
}
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionAction.java 2012-10-15 10:16:05 UTC (rev 7743)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionAction.java 2012-10-15 11:48:47 UTC (rev 7744)
@@ -33,6 +33,6 @@
@Override
public void doAction() {
- ProfilSectionNodeAction.open();
+ ProfilSectionOpenNodeAction.open();
}
}
Deleted: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionNodeAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionNodeAction.java 2012-10-15 10:16:05 UTC (rev 7743)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionNodeAction.java 2012-10-15 11:48:47 UTC (rev 7744)
@@ -1,69 +0,0 @@
-package org.fudaa.fudaa.crue.modelling.loi;
-
-import org.fudaa.fudaa.crue.modelling.action.AbstractModellingOpenTopNodeAction;
-import org.openide.nodes.Node;
-import org.openide.util.NbBundle;
-import org.openide.util.actions.SystemAction;
-import org.openide.windows.TopComponent;
-
-/**
- *
- *
- * @author Frédéric Deniger
- */
-public class ProfilSectionNodeAction extends AbstractModellingOpenTopNodeAction {
-
- public ProfilSectionNodeAction(String name) {
- super(name, null);
- }
-
- public ProfilSectionNodeAction() {
- super(NbBundle.getMessage(ProfilSectionNodeAction.class, "ModellingOpenProfilSectionNodeAction.DisplayName"), null);
- }
-
- @Override
- protected void activeWithValue(TopComponent opened, Node selectedNode) {
- }
-
- @Override
- protected TopComponent openNew(Node selectedNode) {
- ProfilSectionTopComponent top = new ProfilSectionTopComponent();
- return top;
- }
-
- @Override
- protected Class getExpectedTopComponentClass(Node selectedNode) {
- return ProfilSectionTopComponent.class;
- }
-
- @Override
- protected String getMode(TopComponent top) {
- return ProfilSectionTopComponent.MODE;
- }
-
- @Override
- protected boolean isEnable(Node[] activatedNodes) {
- return true;
- }
-
- public static void open() {
- ProfilSectionNodeAction action = SystemAction.get(ProfilSectionNodeAction.Reopen.class);
- action.performAction(new Node[0]);
- }
-
- public static class Reopen extends ProfilSectionNodeAction {
-
- public Reopen() {
- super(NbBundle.getMessage(ProfilSectionNodeAction.class, "ModellingOpenProfilSectionNodeAction.DisplayName"));
- setReopen(true);
- }
- }
-
- public static class NewFrame extends ProfilSectionNodeAction {
-
- public NewFrame() {
- super(NbBundle.getMessage(ProfilSectionNodeAction.class, "ModellingOpenProfilSectionNodeAction.NewFrame.DisplayName"));
- setReopen(false);
- }
- }
-}
Deleted: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionOnSelectedSectionNodeAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionOnSelectedSectionNodeAction.java 2012-10-15 10:16:05 UTC (rev 7743)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionOnSelectedSectionNodeAction.java 2012-10-15 11:48:47 UTC (rev 7744)
@@ -1,115 +0,0 @@
-package org.fudaa.fudaa.crue.modelling.loi;
-
-import org.fudaa.dodico.crue.metier.emh.EMHSectionProfil;
-import org.fudaa.fudaa.crue.modelling.action.AbstractModellingOpenTopNodeAction;
-import org.openide.nodes.AbstractNode;
-import org.openide.nodes.Children;
-import org.openide.nodes.Node;
-import org.openide.util.Lookup;
-import org.openide.util.NbBundle;
-import org.openide.util.actions.SystemAction;
-import org.openide.util.lookup.Lookups;
-import org.openide.windows.TopComponent;
-
-/**
- *
- * Ouvre l'éditeur de ProfilSection en sélectionnant une section.
- *
- * @author Frédéric Deniger
- */
-public class ProfilSectionOnSelectedSectionNodeAction extends AbstractModellingOpenTopNodeAction {
-
-
- public ProfilSectionOnSelectedSectionNodeAction(String name) {
- super(name, null);
- }
-
- public ProfilSectionOnSelectedSectionNodeAction() {
- super(NbBundle.getMessage(ProfilSectionOnSelectedSectionNodeAction.class, "ProfilSectionOnSelectedSectionNodeAction.DisplayName"), null);
- }
-
- @Override
- protected void activeWithValue(TopComponent opened, Node selectedNode) {
- final Lookup lookup = selectedNode.getLookup();
- Long uid = lookup.lookup(Long.class);
- if (uid == null) {
- EMHSectionProfil profil = lookup.lookup(EMHSectionProfil.class);
- if (profil != null) {
- uid = profil.getUiId();
- }
- }
- if (uid != null) {
- ((ProfilSectionTopComponent) opened).selectProfil(uid);
- }
- }
-
- @Override
- protected TopComponent openNew(Node selectedNode) {
- ProfilSectionTopComponent top = new ProfilSectionTopComponent();
- final Lookup lookup = selectedNode.getLookup();
- Long uid = lookup.lookup(Long.class);
- if (uid == null) {
- EMHSectionProfil profil = lookup.lookup(EMHSectionProfil.class);
- if (profil != null) {
- uid = profil.getUiId();
- }
- }
- if(uid!=null){
- top.putClientProperty(ProfilSectionTopComponent.PROPERTY_INIT_UID, uid);
- }
- return top;
- }
-
- @Override
- protected Class getExpectedTopComponentClass(Node selectedNode) {
- return ProfilSectionTopComponent.class;
- }
-
- @Override
- protected String getMode(TopComponent top) {
- return ProfilSectionTopComponent.MODE;
- }
-
- public static void open(Long sectionUid, boolean reopen) {
- if (sectionUid == null) {
- return;
- }
- ProfilSectionOnSelectedSectionNodeAction action = null;
- if (reopen) {
- action = SystemAction.get(ProfilSectionOnSelectedSectionNodeAction.Reopen.class);
- } else {
- action = SystemAction.get(ProfilSectionOnSelectedSectionNodeAction.NewFrame.class);
- }
- AbstractNode node = new AbstractNode(Children.LEAF, Lookups.fixed(sectionUid));
- action.performAction(new Node[]{node});
- }
-
- @Override
- protected boolean isEnable(Node[] activatedNodes) {
- if (activatedNodes.length == 1) {
- final Lookup lookup = activatedNodes[0].getLookup();
- Long uid = lookup.lookup(Long.class);
- if (uid == null) {
- return lookup.lookup(EMHSectionProfil.class) != null;
- }
- return true;
- }
- return false;
- }
-
- public static class Reopen extends ProfilSectionOnSelectedSectionNodeAction {
-
- public Reopen() {
- super(NbBundle.getMessage(ProfilSectionOnSelectedSectionNodeAction.class, "ProfilSectionOnSelectedSectionNodeAction.DisplayName"));
- setReopen(true);
- }
- }
-
- public static class NewFrame extends ProfilSectionOnSelectedSectionNodeAction {
-
- public NewFrame() {
- super(NbBundle.getMessage(ProfilSectionOnSelectedSectionNodeAction.class, "ProfilSectionOnSelectedSectionNodeAction.NewFrame.DisplayName"));
- setReopen(false);
- }
- }
-}
Copied: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionOpenNodeAction.java (from rev 7687, trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionNodeAction.java)
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionOpenNodeAction.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionOpenNodeAction.java 2012-10-15 11:48:47 UTC (rev 7744)
@@ -0,0 +1,69 @@
+package org.fudaa.fudaa.crue.modelling.loi;
+
+import org.fudaa.fudaa.crue.modelling.action.AbstractModellingOpenTopNodeAction;
+import org.openide.nodes.Node;
+import org.openide.util.NbBundle;
+import org.openide.util.actions.SystemAction;
+import org.openide.windows.TopComponent;
+
+/**
+ *
+ *
+ * @author Frédéric Deniger
+ */
+public class ProfilSectionOpenNodeAction extends AbstractModellingOpenTopNodeAction {
+
+ public ProfilSectionOpenNodeAction(String name) {
+ super(name, null);
+ }
+
+ public ProfilSectionOpenNodeAction() {
+ super(NbBundle.getMessage(ProfilSectionOpenNodeAction.class, "ModellingOpenProfilSectionNodeAction.DisplayName"), null);
+ }
+
+ @Override
+ protected void activeWithValue(TopComponent opened, Node selectedNode) {
+ }
+
+ @Override
+ protected TopComponent openNew(Node selectedNode) {
+ ProfilSectionTopComponent top = new ProfilSectionTopComponent();
+ return top;
+ }
+
+ @Override
+ protected Class getExpectedTopComponentClass(Node selectedNode) {
+ return ProfilSectionTopComponent.class;
+ }
+
+ @Override
+ protected String getMode(TopComponent top) {
+ return ProfilSectionTopComponent.MODE;
+ }
+
+ @Override
+ protected boolean isEnable(Node[] activatedNodes) {
+ return true;
+ }
+
+ public static void open() {
+ ProfilSectionOpenNodeAction action = SystemAction.get(ProfilSectionOpenNodeAction.Reopen.class);
+ action.performAction(new Node[0]);
+ }
+
+ public static class Reopen extends ProfilSectionOpenNodeAction {
+
+ public Reopen() {
+ super(NbBundle.getMessage(ProfilSectionOpenNodeAction.class, "ModellingOpenProfilSectionNodeAction.DisplayName"));
+ setReopen(true);
+ }
+ }
+
+ public static class NewFrame extends ProfilSectionOpenNodeAction {
+
+ public NewFrame() {
+ super(NbBundle.getMessage(ProfilSectionOpenNodeAction.class, "ModellingOpenProfilSectionNodeAction.NewFrame.DisplayName"));
+ setReopen(false);
+ }
+ }
+}
Copied: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionOpenOnSelectedSectionNodeAction.java (from rev 7687, trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionOnSelectedSectionNodeAction.java)
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionOpenOnSelectedSectionNodeAction.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionOpenOnSelectedSectionNodeAction.java 2012-10-15 11:48:47 UTC (rev 7744)
@@ -0,0 +1,115 @@
+package org.fudaa.fudaa.crue.modelling.loi;
+
+import org.fudaa.dodico.crue.metier.emh.EMHSectionProfil;
+import org.fudaa.fudaa.crue.modelling.action.AbstractModellingOpenTopNodeAction;
+import org.openide.nodes.AbstractNode;
+import org.openide.nodes.Children;
+import org.openide.nodes.Node;
+import org.openide.util.Lookup;
+import org.openide.util.NbBundle;
+import org.openide.util.actions.SystemAction;
+import org.openide.util.lookup.Lookups;
+import org.openide.windows.TopComponent;
+
+/**
+ *
+ * Ouvre l'éditeur de ProfilSection en sélectionnant une section.
+ *
+ * @author Frédéric Deniger
+ */
+public class ProfilSectionOpenOnSelectedSectionNodeAction extends AbstractModellingOpenTopNodeAction {
+
+
+ public ProfilSectionOpenOnSelectedSectionNodeAction(String name) {
+ super(name, null);
+ }
+
+ public ProfilSectionOpenOnSelectedSectionNodeAction() {
+ super(NbBundle.getMessage(ProfilSectionOpenOnSelectedSectionNodeAction.class, "ProfilSectionOnSelectedSectionNodeAction.DisplayName"), null);
+ }
+
+ @Override
+ protected void activeWithValue(TopComponent opened, Node selectedNode) {
+ final Lookup lookup = selectedNode.getLookup();
+ Long uid = lookup.lookup(Long.class);
+ if (uid == null) {
+ EMHSectionProfil profil = lookup.lookup(EMHSectionProfil.class);
+ if (profil != null) {
+ uid = profil.getUiId();
+ }
+ }
+ if (uid != null) {
+ ((ProfilSectionTopComponent) opened).selectProfil(uid);
+ }
+ }
+
+ @Override
+ protected TopComponent openNew(Node selectedNode) {
+ ProfilSectionTopComponent top = new ProfilSectionTopComponent();
+ final Lookup lookup = selectedNode.getLookup();
+ Long uid = lookup.lookup(Long.class);
+ if (uid == null) {
+ EMHSectionProfil profil = lookup.lookup(EMHSectionProfil.class);
+ if (profil != null) {
+ uid = profil.getUiId();
+ }
+ }
+ if(uid!=null){
+ top.putClientProperty(ProfilSectionTopComponent.PROPERTY_INIT_UID, uid);
+ }
+ return top;
+ }
+
+ @Override
+ protected Class getExpectedTopComponentClass(Node selectedNode) {
+ return ProfilSectionTopComponent.class;
+ }
+
+ @Override
+ protected String getMode(TopComponent top) {
+ return ProfilSectionTopComponent.MODE;
+ }
+
+ public static void open(Long sectionUid, boolean reopen) {
+ if (sectionUid == null) {
+ return;
+ }
+ ProfilSectionOpenOnSelectedSectionNodeAction action = null;
+ if (reopen) {
+ action = SystemAction.get(ProfilSectionOpenOnSelectedSectionNodeAction.Reopen.class);
+ } else {
+ action = SystemAction.get(ProfilSectionOpenOnSelectedSectionNodeAction.NewFrame.class);
+ }
+ AbstractNode node = new AbstractNode(Children.LEAF, Lookups.fixed(sectionUid));
+ action.performAction(new Node[]{node});
+ }
+
+ @Override
+ protected boolean isEnable(Node[] activatedNodes) {
+ if (activatedNodes.length == 1) {
+ final Lookup lookup = activatedNodes[0].getLookup();
+ Long uid = lookup.lookup(Long.class);
+ if (uid == null) {
+ return lookup.lookup(EMHSectionProfil.class) != null;
+ }
+ return true;
+ }
+ return false;
+ }
+
+ public static class Reopen extends ProfilSectionOpenOnSelectedSectionNodeAction {
+
+ public Reopen() {
+ super(NbBundle.getMessage(ProfilSectionOpenOnSelectedSectionNodeAction.class, "ProfilSectionOnSelectedSectionNodeAction.DisplayName"));
+ setReopen(true);
+ }
+ }
+
+ public static class NewFrame extends ProfilSectionOpenOnSelectedSectionNodeAction {
+
+ public NewFrame() {
+ super(NbBundle.getMessage(ProfilSectionOpenOnSelectedSectionNodeAction.class, "ProfilSectionOnSelectedSectionNodeAction.NewFrame.DisplayName"));
+ setReopen(false);
+ }
+ }
+}
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionTopComponent.java 2012-10-15 10:16:05 UTC (rev 7743)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionTopComponent.java 2012-10-15 11:48:47 UTC (rev 7744)
@@ -738,7 +738,7 @@
}
CatEMHBranche branche = current.getBranche();
CatEMHBranche selectedBranche = sousModeleBranches.getSelectedBranche();
- if (selectedBranche != branche) {
+ if (selectedBranche != branche||branche==null) {
sousModeleBranches.setSelectedBranche(branche);
}
cbSections.setSelectedItem(current);
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/node/ModellingEMHSectionProfilNode.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/node/ModellingEMHSectionProfilNode.java 2012-10-15 10:16:05 UTC (rev 7743)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/node/ModellingEMHSectionProfilNode.java 2012-10-15 11:48:47 UTC (rev 7744)
@@ -6,7 +6,7 @@
import org.fudaa.fudaa.crue.modelling.action.DeleteEMHCascadeNodeAction;
import org.fudaa.fudaa.crue.modelling.action.DeleteEMHUniqueNodeAction;
import org.fudaa.fudaa.crue.modelling.emh.ModellingOpenEMHNodeAction;
-import org.fudaa.fudaa.crue.modelling.loi.ProfilSectionOnSelectedSectionNodeAction;
+import org.fudaa.fudaa.crue.modelling.loi.ProfilSectionOpenOnSelectedSectionNodeAction;
import org.openide.nodes.Children;
import org.openide.util.actions.SystemAction;
@@ -35,8 +35,8 @@
SystemAction.get(ModellingOpenEMHNodeAction.Reopen.class),
SystemAction.get(ModellingOpenEMHNodeAction.NewFrame.class),
null,
- SystemAction.get(ProfilSectionOnSelectedSectionNodeAction.Reopen.class),
- SystemAction.get(ProfilSectionOnSelectedSectionNodeAction.NewFrame.class),
+ SystemAction.get(ProfilSectionOpenOnSelectedSectionNodeAction.Reopen.class),
+ SystemAction.get(ProfilSectionOpenOnSelectedSectionNodeAction.NewFrame.class),
null,
SystemAction.get(ChangeSousModeleParentNodeAction.class),
null,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-06-15 21:23:57
|
Revision: 8764
http://sourceforge.net/p/fudaa/svn/8764
Author: deniger
Date: 2014-06-15 21:23:52 +0000 (Sun, 15 Jun 2014)
Log Message:
-----------
CRUE-628
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/edition/ListCasierModificationProcess.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ListRelationSectionContentNode.java
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/edition/ListCasierModificationProcess.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/edition/ListCasierModificationProcess.java 2014-06-10 22:29:37 UTC (rev 8763)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/edition/ListCasierModificationProcess.java 2014-06-15 21:23:52 UTC (rev 8764)
@@ -5,6 +5,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.apache.commons.lang.StringUtils;
import org.fudaa.ctulu.CtuluLog;
import org.fudaa.dodico.crue.common.Pair;
import org.fudaa.dodico.crue.common.transformer.TransformerHelper;
@@ -55,6 +56,7 @@
//on vérifie les noms
boolean casierNameChanged = false;
boolean casierRelationNoeudChanged = false;
+
List<CatEMHNoeud> noeuds = emhSousModele.getNoeuds();
List<EMH> casierFromOtherSousModeles = emhSousModele.getParent().getParent().getIdRegistry().getEMHs(EnumCatEMH.CASIER);
casierFromOtherSousModeles.removeAll(casiers);
@@ -91,6 +93,7 @@
newCasierName));
}
}
+
if (newData.noeudName != null && newData.casierName != null) {
String casierNameForNoeud = CruePrefix.getNomAvecPrefixFor(newData.noeudName, EnumCatEMH.CASIER);
if (!casierNameForNoeud.equals(newData.casierName)) {
@@ -107,6 +110,7 @@
boolean reorderDone = ReorderEMHProcess.reorder(emhSousModele, casiers, EnumCatEMH.CASIER);
boolean activeModified = false;
+ boolean commentaireModified = false;
for (CatEMHCasier casier : casiers) {
CasierData newData = dataByUid.get(casier.getUiId());
if (newData != null) {
@@ -115,6 +119,10 @@
//le changement du caractère actif sera propage par la suite.
activeModified = true;
}
+ if (!StringUtils.equals(newData.commentaire, casier.getCommentaire())) {
+ casier.setCommentaire(newData.commentaire);
+ commentaireModified = true;
+ }
}
}
@@ -153,6 +161,9 @@
if (casierRelationNoeudChanged) {
modifications.add(EnumModification.EMH_RELATION);
}
+ if (commentaireModified) {
+ modifications.add(EnumModification.COMMENTAIRE);
+ }
boolean modification = !modifications.isEmpty();
if (modification && modellingScenarioModificationService != null) {//pour les tests:
modellingScenarioModificationService.setScenarioModified(new ScenarioModificationEvent(modifications));
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ListRelationSectionContentNode.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ListRelationSectionContentNode.java 2014-06-10 22:29:37 UTC (rev 8763)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ListRelationSectionContentNode.java 2014-06-15 21:23:52 UTC (rev 8764)
@@ -127,7 +127,8 @@
//commentaire
- Node.Property commentaire = new PropertySupportReadWrite<ListRelationSectionContent, String>(this, relationSectionContent, String.class, PROP_NAME,
+ Node.Property commentaire = new PropertySupportReadWrite<ListRelationSectionContent, String>(this, relationSectionContent, String.class,
+ ListCommonProperties.PROP_COMMENTAIRE,
AbstractListContentNode.getCommentDisplay()) {
@Override
protected void setValueInInstance(String newVal) {
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