Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[7492] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2012-07-13 08:28:16
|
Revision: 7492
http://fudaa.svn.sourceforge.net/fudaa/?rev=7492&view=rev
Author: deniger
Date: 2012-07-13 08:28:05 +0000 (Fri, 13 Jul 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/edition/EditionBrancheCreator.java
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/edition/EditionChangeActivity.java
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/edition/EditionCreateEMH.java
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/edition/EditionDelete.java
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCLimMScenario.java
trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/layer.xml
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/CondInitNodeFactory.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCiniTopComponent.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/global/GlobalContainerNode.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AbstractModellingListTopComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/services/EnumModification.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/OpenEMHAction.java
Added Paths:
-----------
trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/modelling-oresWsmode.xml
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/edition/EditionBrancheCreator.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/edition/EditionBrancheCreator.java 2012-07-13 06:51:55 UTC (rev 7491)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/edition/EditionBrancheCreator.java 2012-07-13 08:28:05 UTC (rev 7492)
@@ -97,15 +97,28 @@
return null;
}
- protected CatEMHBranche createBranche(EMHSousModele sousModele, EnumBrancheType brancheType, CatEMHNoeud noeudAmont,
+ /**
+ * @param initBrancheName si non null, sera utilisé. Dans ce cas, on suppose que le nom est unique.
+ * @param sousModele
+ * @param brancheType
+ * @param noeudAmont
+ * @param noeudAval
+ * @param ccm
+ * @param distance
+ * @return
+ */
+ protected CatEMHBranche createBranche(String initBrancheName, EMHSousModele sousModele, EnumBrancheType brancheType, CatEMHNoeud noeudAmont,
CatEMHNoeud noeudAval,
CrueConfigMetier ccm, double distance) {
if (!isDistanceValid(brancheType, distance, ccm)) {
return null;
}
final EMHScenario scenario = sousModele.getParent().getParent();
- String brancheName = sectionCreator.getUniqueNomFinder().findNewName(EnumCatEMH.BRANCHE, scenario);
- CatEMHBranche branche = createBranche(brancheName, brancheType, ccm, sousModele, distance);
+ String brancheName = initBrancheName;
+ if (brancheName == null) {
+ brancheName = sectionCreator.getUniqueNomFinder().findNewName(EnumCatEMH.BRANCHE, scenario);
+ }
+ CatEMHBranche branche = createBrancheInstance(brancheName, brancheType, ccm, sousModele, distance);
CatEMHNoeud noeudAmontToUse = noeudAmont;
CatEMHNoeud noeudAvalToUse = noeudAval;
if (noeudAmontToUse == null) {
@@ -122,7 +135,7 @@
}
- private CatEMHBranche createBranche(String name, EnumBrancheType brancheType, CrueConfigMetier ccm, EMHSousModele sousModele,
+ private CatEMHBranche createBrancheInstance(String name, EnumBrancheType brancheType, CrueConfigMetier ccm, EMHSousModele sousModele,
double distance) {
switch (brancheType) {
case EMHBrancheBarrageFilEau:
@@ -164,7 +177,7 @@
private CatEMHBranche createEMHBrancheBarrageGenerique(String name, CrueConfigMetier ccm, EMHSousModele sousModele,
double distance) {
EMHBrancheBarrageGenerique branche = new EMHBrancheBarrageGenerique(name);
- addDefaultsSectionProfils(ccm, name, sousModele, branche, distance);
+ addDefaultsSectionSansGeometrie(ccm, name, sousModele, branche, distance);
final DonCalcSansPrtBrancheBarrageGenerique dcsp = new DonCalcSansPrtBrancheBarrageGenerique(ccm);
dcsp.setRegimeDenoye(loiCreator.createLoiFF(name, sousModele.getParent().getParent(), EnumTypeLoi.LoiQpilZam, ccm));
dcsp.setRegimeNoye(loiCreator.createLoiFF(name, sousModele.getParent().getParent(), EnumTypeLoi.LoiQDz, ccm));
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/edition/EditionChangeActivity.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/edition/EditionChangeActivity.java 2012-07-13 06:51:55 UTC (rev 7491)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/edition/EditionChangeActivity.java 2012-07-13 08:28:05 UTC (rev 7492)
@@ -7,6 +7,7 @@
import java.util.Collection;
import org.fudaa.ctulu.CtuluLog;
import org.fudaa.dodico.crue.config.CrueConfigMetier;
+import org.fudaa.dodico.crue.metier.emh.DonCLimMScenario;
import org.fudaa.dodico.crue.metier.emh.EMH;
import org.fudaa.dodico.crue.metier.emh.EMHModeleBase;
import org.fudaa.dodico.crue.metier.emh.OrdCalcScenario;
@@ -34,11 +35,11 @@
}
private void updateOCAL(EMHModeleBase modele) {
- OrdCalcScenario ordCalcScenario = modele.getParent().getOrdCalcScenario();
+ DonCLimMScenario dclm = modele.getParent().getDonCLimMScenario();
Collection<EMH> emhs = modele.getParent().getAllSimpleEMH();
for (EMH emh : emhs) {
if (!emh.getActuallyActive()) {
- ordCalcScenario.removeEMH(emh);
+ dclm.removeEMHFromCalcul(emh);
}
}
}
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/edition/EditionCreateEMH.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/edition/EditionCreateEMH.java 2012-07-13 06:51:55 UTC (rev 7491)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/edition/EditionCreateEMH.java 2012-07-13 08:28:05 UTC (rev 7492)
@@ -78,7 +78,7 @@
if (!brancheTypeWithDistanceNotNull.contains(brancheType)) {
distanceToUse = 0;
}
- createBranche = brancheCreator.createBranche(defaultSousModele, brancheType, noeudAmont, noeudAval, crueConfigMetier, distanceToUse);
+ createBranche = brancheCreator.createBranche(null, defaultSousModele, brancheType, noeudAmont, noeudAval, crueConfigMetier, distanceToUse);
new EditionOPTIChanged().propagateChange(defaultSousModele.getParent(), crueConfigMetier);
return createBranche;
}
@@ -187,7 +187,7 @@
for (ListBrancheContent data : branches) {
CatEMHNoeud noeudAmont = noeudsByNoms.get(data.getNoeudAmont());
CatEMHNoeud noeudAval = noeudsByNoms.get(data.getNoeudAval());
- CatEMHBranche branche = brancheCreator.createBranche(sousModele, data.getType(), noeudAmont, noeudAval, ccm, data.getLongueur());
+ CatEMHBranche branche = brancheCreator.createBranche(data.getNom(), sousModele, data.getType(), noeudAmont, noeudAval, ccm, data.getLongueur());
branche.setCommentaire(data.getCommentaire());
}
new EditionOPTIChanged().propagateChange(sousModele.getParent(), ccm);
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/edition/EditionDelete.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/edition/EditionDelete.java 2012-07-13 06:51:55 UTC (rev 7491)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/edition/EditionDelete.java 2012-07-13 08:28:05 UTC (rev 7492)
@@ -297,7 +297,7 @@
if (completelyDeleted) {
scenario.getIdRegistry().unregister(section);
}
- scenario.getDonCLimMScenario().removeEMH(section);
+ scenario.getDonCLimMScenario().removeEMHFromCalcul(section);
res.nbSectionRemoved++;
}
@@ -305,6 +305,6 @@
private static void removeEMH(EMHScenario scenario, EMH toRemove) {
scenario.getIdRegistry().unregister(toRemove);
- scenario.getDonCLimMScenario().removeEMH(toRemove);
+ scenario.getDonCLimMScenario().removeEMHFromCalcul(toRemove);
}
}
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCLimMScenario.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCLimMScenario.java 2012-07-13 06:51:55 UTC (rev 7491)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/emh/DonCLimMScenario.java 2012-07-13 08:28:05 UTC (rev 7492)
@@ -1,7 +1,7 @@
/**
* *********************************************************************
* Module: DonCLimMScenario.java Author: deniger Purpose: Defines the Class DonCLimMScenario
- **********************************************************************
+ * *********************************************************************
*/
package org.fudaa.dodico.crue.metier.emh;
@@ -15,13 +15,12 @@
public class DonCLimMScenario extends DonCLimMCommon implements Sortable {
/**
- * @pdRoleInfo migr=no name=CalcPseudoPerm assc=donCLimMScenarioCalculPermanent coll=java.util.List impl=java.util.ArrayList
- * mult=0..* type=Composition
+ * @pdRoleInfo migr=no name=CalcPseudoPerm assc=donCLimMScenarioCalculPermanent coll=java.util.List impl=java.util.ArrayList mult=0..*
+ * type=Composition
*/
private java.util.List<CalcPseudoPerm> calcPseudoPerm;
/**
- * @pdRoleInfo migr=no name=CalcTrans assc=donCLimMScenarioCalculTransitoire coll=java.util.List impl=java.util.ArrayList
- * mult=0..* type=Composition
+ * @pdRoleInfo migr=no name=CalcTrans assc=donCLimMScenarioCalculTransitoire coll=java.util.List impl=java.util.ArrayList mult=0..* type=Composition
*/
private java.util.List<CalcTrans> calcTrans;
@@ -50,8 +49,7 @@
}
- @Override
- public void removeEMH(EMH emh) {
+ public void removeEMHFromCalcul(EMH emh) {
if (calcPseudoPerm != null) {
for (CalcPseudoPerm pseudoPerm : calcPseudoPerm) {
pseudoPerm.remove(emh);
@@ -89,6 +87,7 @@
/**
* @pdGenerated default setter
+ *
* @param newCalcPseudoPerm
*/
public void setCalcPseudoPerm(final java.util.List<CalcPseudoPerm> newCalcPseudoPerm) {
@@ -100,6 +99,7 @@
/**
* @pdGenerated default add
+ *
* @param newCalcPseudoPerm
*/
public void addCalcPseudoPerm(final CalcPseudoPerm newCalcPseudoPerm) {
@@ -116,6 +116,7 @@
/**
* @pdGenerated default remove
+ *
* @param oldCalcPseudoPerm
*/
public void removeCalcPseudoPerm(final CalcPseudoPerm oldCalcPseudoPerm) {
@@ -160,6 +161,7 @@
/**
* @pdGenerated default setter
+ *
* @param newCalcTrans
*/
public void setCalcTrans(final java.util.List<CalcTrans> newCalcTrans) {
@@ -171,6 +173,7 @@
/**
* @pdGenerated default add
+ *
* @param newCalcTrans
*/
public void addCalcTrans(final CalcTrans newCalcTrans) {
@@ -187,6 +190,7 @@
/**
* @pdGenerated default remove
+ *
* @param oldCalcTrans
*/
public void removeCalcTrans(final CalcTrans oldCalcTrans) {
Modified: trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/layer.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/layer.xml 2012-07-13 06:51:55 UTC (rev 7491)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/layer.xml 2012-07-13 08:28:05 UTC (rev 7492)
@@ -108,6 +108,7 @@
<file name="modelling-optg.wsmode" url="modelling-optgWsmode.xml"/>
<file name="modelling-optr.wsmode" url="modelling-optrWsmode.xml"/>
<file name="modelling-opti.wsmode" url="modelling-optiWsmode.xml"/>
+ <file name="modelling-ores.wsmode" url="modelling-oresWsmode.xml"/>
<file name="modelling-pnum.wsmode" url="modelling-pnumWsmode.xml"/>
<file name="modelling-pcal.wsmode" url="modelling-pcalWsmode.xml"/>
<file name="post-editor.wsmode" url="post-editorWsmode.xml"/>
Copied: trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/modelling-oresWsmode.xml (from rev 7465, trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/modelling-optgWsmode.xml)
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/modelling-oresWsmode.xml (rev 0)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/modelling-oresWsmode.xml 2012-07-13 08:28:05 UTC (rev 7492)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mode version="2.4">
+ <name unique="modelling-ores"/>
+ <kind type="view"/>
+ <state type="separated"/>
+ <bounds x="250" y="50" width="536" height="436" />
+ <frame state="0"/>
+ <empty-behavior permanent="false"/>
+</mode>
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/CondInitNodeFactory.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/CondInitNodeFactory.java 2012-07-13 06:51:55 UTC (rev 7491)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/CondInitNodeFactory.java 2012-07-13 08:28:05 UTC (rev 7492)
@@ -41,7 +41,7 @@
CrueConfigMetier ccm = modellingScenarioService.getSelectedProjet().getCoeurConfig().getCrueConfigMetier();
List<Node> nodes = new ArrayList<Node>();
if (methodeInterpol.isNoeudActiveRequireDPTI()) {
- nodes.add(buildNoeud(sousModele, ccm));
+ nodes.add(buildNoeud(methodeInterpol,sousModele, ccm));
}
if (methodeInterpol.isBrancheActiveRequireDPTI()) {
nodes.add(buildBranche(sousModele, ccm));
@@ -55,9 +55,8 @@
return nodes;
}
- private Node buildNoeud(EMHSousModele sousModele, CrueConfigMetier ccm) {
+ private Node buildNoeud(EnumMethodeInterpol methodeInterpol,EMHSousModele sousModele, CrueConfigMetier ccm) {
List<Node> nodes = createNodes(sousModele.getNoeuds(), ccm);
- EnumMethodeInterpol methodeInterpol = sousModele.getParent().getOrdPrtCIniModeleBase().getMethodeInterpol();
if (EnumMethodeInterpol.BAIGNOIRE.equals(methodeInterpol) && !nodes.isEmpty()) {
CondInitNode first = (CondInitNode) nodes.get(0);
final PropertySupportReflection main = (PropertySupportReflection) first.find(CondInitNode.PROP_VALUE);
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCiniTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCiniTopComponent.java 2012-07-13 06:51:55 UTC (rev 7491)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCiniTopComponent.java 2012-07-13 08:28:05 UTC (rev 7492)
@@ -5,6 +5,7 @@
package org.fudaa.fudaa.crue.modelling.calcul;
import java.awt.BorderLayout;
+import java.awt.EventQueue;
import java.util.ArrayList;
import org.fudaa.dodico.crue.edition.bean.ListCommonProperties;
import java.util.List;
@@ -19,6 +20,8 @@
import org.fudaa.fudaa.crue.modelling.list.AbstractListContentNode;
import org.fudaa.fudaa.crue.modelling.list.ListNoeudContentNode;
import org.fudaa.fudaa.crue.modelling.listener.ExplorerManagerListenerHelper;
+import org.fudaa.fudaa.crue.modelling.services.EnumModification;
+import org.fudaa.fudaa.crue.modelling.services.ScenarioModificationEvent;
import org.openide.explorer.ExplorerManager;
import org.openide.explorer.view.OutlineView;
import org.openide.nodes.AbstractNode;
@@ -87,7 +90,14 @@
AbstractNode root = new AbstractNode(NodeChildrenHelper.createChildren(createNodes), Lookups.singleton(getModele()));
getExplorerManager().setRootContext(root);
helper.addListener();
- NodeHelper.expandAll(getExplorerManager(), outlineView);
+ EventQueue.invokeLater(new Runnable() {
+
+ @Override
+ public void run() {
+ NodeHelper.expandAll(getExplorerManager(), outlineView);
+ }
+ });
+
return outlineView;
}
@@ -143,6 +153,7 @@
LogsDisplayer.displayError(res, getName());
}
if (!res.containsErrorOrSevereError()) {
+ modellingScenarioModificationService.setScenarioModified(new ScenarioModificationEvent(EnumModification.DPTI));
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-13 06:51:55 UTC (rev 7491)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/EMHModificationProcessor.java 2012-07-13 08:28:05 UTC (rev 7492)
@@ -20,6 +20,7 @@
if (emh.getUserActive() == newValue) {
return null;
}
+ emh.setUserActive(newValue);
EditionChangeActivity change = new EditionChangeActivity();
return change.propagateActivityChanged(modele, emh, ccm);
}
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-07-13 06:51:55 UTC (rev 7491)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/global/GlobalContainerNode.java 2012-07-13 08:28:05 UTC (rev 7492)
@@ -139,11 +139,7 @@
null,
SystemAction.get(ModellingListSectionsNodeAction.Reopen.class),
SystemAction.get(ModellingListSectionsNodeAction.NewFrame.class),
- SystemAction.get(ModellingListSectionAddNodeAction.class),
- null,
- SystemAction.get(ModellingListCondInitNodeAction.Reopen.class),
- SystemAction.get(ModellingListCondInitNodeAction.NewFrame.class)
- };
+ SystemAction.get(ModellingListSectionAddNodeAction.class),};
}
}
@@ -166,7 +162,10 @@
SystemAction.get(ModellingModeleOPTINodeAction.NewFrame.class),
null,
SystemAction.get(ModellingModelePNUMNodeAction.Reopen.class),
- SystemAction.get(ModellingModelePNUMNodeAction.NewFrame.class)
+ SystemAction.get(ModellingModelePNUMNodeAction.NewFrame.class),
+ null,
+ SystemAction.get(ModellingListCondInitNodeAction.Reopen.class),
+ SystemAction.get(ModellingListCondInitNodeAction.NewFrame.class)
};
}
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AbstractModellingListTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AbstractModellingListTopComponent.java 2012-07-13 06:51:55 UTC (rev 7491)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AbstractModellingListTopComponent.java 2012-07-13 08:28:05 UTC (rev 7492)
@@ -103,6 +103,7 @@
outlineView.getOutline().setRootVisible(false);
outlineView.getOutline().setToolTipText(null);
outlineView.setDefaultActionAllowed(true);
+ outlineView.setTreeSortable(false);
jContainerName = new JTextField();
jContainerName.setEditable(false);
jContainerName.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(3, 2, 5, 2),
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/services/EnumModification.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/services/EnumModification.java 2012-07-13 06:51:55 UTC (rev 7491)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/services/EnumModification.java 2012-07-13 08:28:05 UTC (rev 7492)
@@ -10,5 +10,5 @@
*/
public enum EnumModification {
- EMH_ORDER, COMMENTAIRE, ACTIVITY, EMH_RELATION, EMH_NAME, EMH_CREATION, EMH_COMMENTAIRE, OPTG, OPTR, OPTI, ORES, PNUM, PCAL
+ EMH_ORDER, COMMENTAIRE, ACTIVITY, EMH_RELATION, EMH_NAME, EMH_CREATION, EMH_COMMENTAIRE, OPTG, OPTR, OPTI, ORES, PNUM, PCAL,DPTI
}
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/OpenEMHAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/OpenEMHAction.java 2012-07-13 06:51:55 UTC (rev 7491)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/OpenEMHAction.java 2012-07-13 08:28:05 UTC (rev 7492)
@@ -11,7 +11,6 @@
import org.fudaa.ebli.commun.EbliActionSimple;
import org.fudaa.fudaa.crue.common.helper.DialogHelper;
import org.fudaa.fudaa.crue.planimetry.controller.PlanimetryController;
-import org.openide.DialogDisplayer;
import org.openide.util.NbBundle;
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
