Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[7487] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2012-07-12 21:33:14
|
Revision: 7487
http://fudaa.svn.sourceforge.net/fudaa/?rev=7487&view=rev
Author: deniger
Date: 2012-07-12 21:33:07 +0000 (Thu, 12 Jul 2012)
Log Message:
-----------
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/emh/AbstractModellingEMHTopComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/EMHModificationProcessor.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/ModellingEMHBrancheTopComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/ModellingEMHCasierTopComponent.java
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/resources/org/fudaa/fudaa/crue/modelling/calcul/Bundle.properties
trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/list/Bundle.properties
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryController.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryVisuPanelController.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 2012-07-12 21:24:53 UTC (rev 7486)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/edition/ListCasierModificationProcess.java 2012-07-12 21:33:07 UTC (rev 7487)
@@ -10,6 +10,7 @@
import org.fudaa.dodico.crue.config.CrueConfigMetier;
import org.fudaa.dodico.crue.edition.EditionChangeActivity;
import org.fudaa.dodico.crue.edition.EditionChangeUtils;
+import org.fudaa.dodico.crue.edition.EditionRename;
import org.fudaa.dodico.crue.edition.ReorderEMHProcess;
import org.fudaa.dodico.crue.metier.emh.CatEMHCasier;
import org.fudaa.dodico.crue.metier.emh.CatEMHNoeud;
@@ -111,6 +112,7 @@
if (newData != null) {
if (casier.getUserActive() != newData.active) {
casier.setUserActive(newData.active);
+ //le changement du caractère actif sera propage par la suite.
activeModified = true;
}
}
@@ -120,7 +122,7 @@
if (casierNameChanged) {
for (CatEMHCasier casier : casiers) {
CasierData newData = dataByUid.get(casier.getUiId());
- casier.setNom(newData.casierName);
+ new EditionRename().rename(casier, newData.casierName);
}
}
if (casierRelationNoeudChanged) {
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/AbstractModellingEMHTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/AbstractModellingEMHTopComponent.java 2012-07-12 21:24:53 UTC (rev 7486)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/AbstractModellingEMHTopComponent.java 2012-07-12 21:33:07 UTC (rev 7487)
@@ -11,6 +11,7 @@
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
import org.fudaa.ctulu.CtuluLogLevel;
+import org.fudaa.dodico.crue.edition.EditionRename;
import org.fudaa.dodico.crue.metier.emh.EMH;
import org.fudaa.dodico.crue.metier.emh.EMHScenario;
import org.fudaa.dodico.crue.validation.ValidationPatternHelper;
@@ -40,13 +41,11 @@
@Override
public void valideModification() {
- EMHModificationProcessor processor = new EMHModificationProcessor();
final String newName = jEMHName.getText();
- String error = processor.isNameValid(getEMH(), newName);
+ String error = new EditionRename().rename(getEMH(), newName);
if (error != null) {
DialogHelper.showError(error);
} else {
- processor.changeName(getEMH(), newName);
modellingScenarioModificationService.setScenarioModified(new ScenarioModificationEvent(EnumModification.EMH_NAME));
setModified(false);
}
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/EMHModificationProcessor.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/EMHModificationProcessor.java 2012-07-12 21:24:53 UTC (rev 7486)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/EMHModificationProcessor.java 2012-07-12 21:33:07 UTC (rev 7487)
@@ -7,9 +7,7 @@
import org.fudaa.ctulu.CtuluLog;
import org.fudaa.dodico.crue.config.CrueConfigMetier;
import org.fudaa.dodico.crue.edition.EditionChangeActivity;
-import org.fudaa.dodico.crue.edition.EditionRename;
import org.fudaa.dodico.crue.metier.emh.CatEMHActivable;
-import org.fudaa.dodico.crue.metier.emh.EMH;
import org.fudaa.dodico.crue.metier.emh.EMHModeleBase;
/**
@@ -18,10 +16,6 @@
*/
public class EMHModificationProcessor {
- public String changeName(EMH emh, String newName) {
- return new EditionRename().rename(emh, newName);
- }
-
public CtuluLog changeActivity(CatEMHActivable emh, EMHModeleBase modele, CrueConfigMetier ccm, boolean newValue) {
if (emh.getUserActive() == newValue) {
return null;
@@ -29,14 +23,4 @@
EditionChangeActivity change = new EditionChangeActivity();
return change.propagateActivityChanged(modele, emh, ccm);
}
-
- /**
- *
- * @param emh
- * @param newName
- * @return une chaine non vide si erreur
- */
- public String isNameValid(EMH emh, String newName) {
- return new EditionRename().isNameValid(emh, newName);
- }
}
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/ModellingEMHBrancheTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/ModellingEMHBrancheTopComponent.java 2012-07-12 21:24:53 UTC (rev 7486)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/ModellingEMHBrancheTopComponent.java 2012-07-12 21:33:07 UTC (rev 7487)
@@ -10,6 +10,7 @@
import java.awt.event.ActionListener;
import javax.swing.JCheckBox;
import javax.swing.JPanel;
+import org.fudaa.dodico.crue.edition.EditionRename;
import org.fudaa.dodico.crue.metier.emh.CatEMHActivable;
import org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
import org.fudaa.dodico.crue.metier.emh.EMH;
@@ -58,14 +59,13 @@
@Override
public void valideModification() {
- EMHModificationProcessor processor = new EMHModificationProcessor();
final String newName = jEMHName.getText();
final CatEMHBranche emh = getEMH();
- String error = processor.isNameValid(emh, newName);
+ String error = new EditionRename().rename(emh, newName);
if (error != null) {
DialogHelper.showError(error);
} else {
- processor.changeName(emh, newName);
+ EMHModificationProcessor processor = new EMHModificationProcessor();
processor.changeActivity(emh, emh.getParent().getParent(), getCcm(), cbActive.isSelected());
modellingScenarioModificationService.setScenarioModified(new ScenarioModificationEvent(EnumModification.EMH_NAME));
setModified(false);
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/ModellingEMHCasierTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/ModellingEMHCasierTopComponent.java 2012-07-12 21:24:53 UTC (rev 7486)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/ModellingEMHCasierTopComponent.java 2012-07-12 21:33:07 UTC (rev 7487)
@@ -10,6 +10,7 @@
import java.awt.event.ActionListener;
import javax.swing.JCheckBox;
import javax.swing.JPanel;
+import org.fudaa.dodico.crue.edition.EditionRename;
import org.fudaa.dodico.crue.metier.emh.CatEMHActivable;
import org.fudaa.dodico.crue.metier.emh.CatEMHCasier;
import org.fudaa.dodico.crue.metier.emh.EMH;
@@ -59,14 +60,13 @@
@Override
public void valideModification() {
- EMHModificationProcessor processor = new EMHModificationProcessor();
final String newName = jEMHName.getText();
final CatEMHCasier emh = getEMH();
- String error = processor.isNameValid(emh, newName);
+ String error = new EditionRename().rename(emh, newName);
if (error != null) {
DialogHelper.showError(error);
} else {
- processor.changeName(emh, newName);
+ EMHModificationProcessor processor = new EMHModificationProcessor();
processor.changeActivity(emh, emh.getParent().getParent(), getCcm(), cbActive.isSelected());
modellingScenarioModificationService.setScenarioModified(new ScenarioModificationEvent(EnumModification.EMH_NAME));
setModified(false);
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:24:53 UTC (rev 7486)
+++ 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)
@@ -11,6 +11,7 @@
import org.openide.nodes.Children;
import org.openide.nodes.Node;
import org.openide.util.NbBundle;
+import org.openide.util.actions.SystemAction;
import org.openide.util.lookup.Lookups;
import org.openide.windows.TopComponent;
@@ -19,21 +20,21 @@
* @author Frédéric Deniger
*/
public class ModellingOpenEMHNodeAction extends AbstractModellingOpenTopNodeAction {
-
+
public ModellingOpenEMHNodeAction(String name) {
super(name, null);
}
-
+
public ModellingOpenEMHNodeAction() {
super(NbBundle.getMessage(ModellingOpenEMHNodeAction.class, "ModellingOpenEMHNodeAction.DisplayName"), null);
}
-
+
@Override
protected void activeWithValue(TopComponent opened, Node selectedNode) {
EMH emh = selectedNode.getLookup().lookup(EMH.class);
((AbstractModellingEMHTopComponent) opened).reloadWithEMHUid(emh.getUiId());
}
-
+
@Override
protected TopComponent openNew(Node selectedNode) {
EMH emh = selectedNode.getLookup().lookup(EMH.class);
@@ -41,18 +42,23 @@
top.setEMHUid(emh.getUiId());
return top;
}
-
+
public static void open(EMH emh, boolean reopen) {
if (emh == null) {
return;
}
- ModellingOpenEMHNodeAction action = new ModellingOpenEMHNodeAction();
+ ModellingOpenEMHNodeAction action = null;
+ if (reopen) {
+ action = SystemAction.get(ModellingOpenEMHNodeAction.Reopen.class);
+ } else {
+ action = SystemAction.get(ModellingOpenEMHNodeAction.NewFrame.class);
+ }
action.setReopen(reopen);
AbstractNode node = new AbstractNode(Children.LEAF, Lookups.singleton(emh));
action.performAction(new Node[]{node});
-
+
}
-
+
private AbstractModellingEMHTopComponent create(EMH emh) {
EnumCatEMH catType = emh.getCatType();
switch (catType) {
@@ -68,7 +74,7 @@
}
throw new UnsupportedOperationException("Not supported yet.");
}
-
+
@Override
protected String getMode(TopComponent top) {
Class<? extends TopComponent> aClass = top.getClass();
@@ -85,10 +91,10 @@
if (ModellingEMHBrancheTopComponent.class.isAssignableFrom(aClass)) {
return ModellingEMHBrancheTopComponent.MODE;
}
-
+
throw new UnsupportedOperationException("Not supported yet.");
}
-
+
@Override
protected boolean isEnable(Node[] activatedNodes) {
if (activatedNodes.length == 1) {
@@ -100,17 +106,17 @@
}
return false;
}
-
+
public static class Reopen extends ModellingOpenEMHNodeAction {
-
+
public Reopen() {
super(NbBundle.getMessage(ModellingOpenEMHNodeAction.class, "ModellingOpenEMHNodeAction.DisplayName"));
setReopen(true);
}
}
-
+
public static class NewFrame extends ModellingOpenEMHNodeAction {
-
+
public NewFrame() {
super(NbBundle.getMessage(ModellingOpenEMHNodeAction.class, "ModellingOpenEMHNodeAction.NewFrame.DisplayName"));
setReopen(false);
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/calcul/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/calcul/Bundle.properties 2012-07-12 21:24:53 UTC (rev 7486)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/calcul/Bundle.properties 2012-07-12 21:33:07 UTC (rev 7487)
@@ -22,6 +22,8 @@
HINT_ModellingScenarioORESTopComponent=Demandes de r\u00e9sultats
CTL_ModellingModelePNUMTopComponent=Param\u00e8tres num\u00e9riques
HINT_ModellingModelePNUMTopComponent=Param\u00e8tres num\u00e9riques
+CTL_ModellingListCiniTopComponent=Conditions initiales
+HINT_ModellingListCiniTopComponent=Conditions initiales
CTL_ModellingScenarioPCALTopComponent=Param\u00e8tres calcul
HINT_ModellingScenarioPCALTopComponent=Param\u00e8tres calcul
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/list/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/list/Bundle.properties 2012-07-12 21:24:53 UTC (rev 7486)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/list/Bundle.properties 2012-07-12 21:33:07 UTC (rev 7487)
@@ -35,8 +35,7 @@
HINT_ModellingListSectionAddTopComponent=Ajouter des sections
ListTopComponent.SousModele.Label=Sous-mod\u00e8le:
-CTL_ModellingListCiniTopComponent=Conditions initiales
-HINT_ModellingListCiniTopComponent=Conditions initiales
+
Add.Name=Ajouter
Paste.Name=Coller
Delete.Name=Supprimer
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryController.java 2012-07-12 21:24:53 UTC (rev 7486)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryController.java 2012-07-12 21:33:07 UTC (rev 7487)
@@ -48,7 +48,6 @@
PlanimetryVisuPanel visuPanel;
Map<String, LayerController> controllersByName = new HashMap<String, LayerController>();
PlanimetryCalqueState state = new PlanimetryCalqueState();
-
PlanimetryEMHEditor emhEditor;
public PlanimetryEMHEditor getEmhEditor() {
@@ -58,8 +57,6 @@
public void setEmhEditor(PlanimetryEMHEditor emhEditor) {
this.emhEditor = emhEditor;
}
-
-
public void apply(VisuConfiguration cloned) {
visuConfiguration = cloned;
@@ -353,6 +350,14 @@
getTraceController().getLayer().setVisible(layerVisibility.isTraceVisible());
}
+ public boolean isEMHLayer(BCalque layer) {
+ return getBrancheController().getLayer() == layer
+ || getCasierController().getLayer() == layer
+ || getNodeController().getLayer() == layer
+ || getSectionController().getLayer() == layer
+ || getTraceController().getLayer() == layer;
+ }
+
public List<BCalque> getMainLayers() {
List<BCalque> res = new ArrayList<BCalque>();
res.add(getBrancheController().getLayer());
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryVisuPanelController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryVisuPanelController.java 2012-07-12 21:24:53 UTC (rev 7486)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryVisuPanelController.java 2012-07-12 21:33:07 UTC (rev 7487)
@@ -11,13 +11,17 @@
import javax.swing.Action;
import javax.swing.JComponent;
import org.fudaa.ctulu.CtuluUI;
+import org.fudaa.dodico.crue.metier.emh.EMH;
+import org.fudaa.ebli.calque.BCalque;
import org.fudaa.ebli.calque.BCalqueInteraction;
+import org.fudaa.ebli.calque.ZCalqueSelectionInteractionSimple;
import org.fudaa.ebli.calque.ZEbliCalquesPanel;
import org.fudaa.ebli.commun.EbliActionInterface;
import org.fudaa.ebli.commun.EbliActionPaletteAbstract;
import org.fudaa.ebli.geometrie.GrBoite;
import org.fudaa.fudaa.crue.planimetry.ConfigureUIAction;
import org.fudaa.fudaa.crue.planimetry.PLanimetryDeplacementAction;
+import org.fudaa.fudaa.crue.planimetry.PlanimetryVisuPanel;
import org.fudaa.fudaa.crue.planimetry.action.DeleteEMHCascadeAction;
import org.fudaa.fudaa.sig.layer.FSigVisuPanelController;
@@ -25,7 +29,7 @@
*
* @author deniger ( genesis)
*/
-public class PlanimetryVisuPanelController extends FSigVisuPanelController {
+public class PlanimetryVisuPanelController extends FSigVisuPanelController implements ZCalqueSelectionInteractionSimple.EditorDelegate {
Collection<String> useAsPalette = Arrays.asList("CHANGE_REFERENCE", "GLOBAL_MOVE");
Collection<String> useAsTab = Arrays.asList("INFOS", "PALETTE_EDTION");
@@ -51,7 +55,23 @@
}
}
});
+ ZCalqueSelectionInteractionSimple selection = (ZCalqueSelectionInteractionSimple) getCalqueInteraction("cqSELECTION");
+ selection.setEditorDelegate(this);
+ }
+ @Override
+ public String edit() {
+ BCalque calqueActif = getView().getScene().getCalqueActif();
+ PlanimetryVisuPanel panel = (PlanimetryVisuPanel) getView();
+ if (panel.getPlanimetryController().isEMHLayer(calqueActif) && panel.getPlanimetryController().getEmhEditor() != null) {
+ List<EMH> selectedEMHs = panel.getSelectedEMHs();
+ if (selectedEMHs != null && selectedEMHs.size() == 1) {
+ panel.getPlanimetryController().getEmhEditor().edit(selectedEMHs.get(0), true);
+ }
+ return null;
+ }
+
+ return getVisuPanel().getEditor().edit();
}
DeleteEMHCascadeAction deleteCascadeAction;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
