Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[7468] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2012-07-06 22:25:18
|
Revision: 7468
http://fudaa.svn.sourceforge.net/fudaa/?rev=7468&view=rev
Author: deniger
Date: 2012-07-06 22:25:12 +0000 (Fri, 06 Jul 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/common/BusinessMessages.java
trunk/soft/fudaa-crue/crue-server/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/config/TestCrueConfigMetierReaderXML.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingModelePNUMTopComponent.java
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/common/BusinessMessages.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/common/BusinessMessages.java 2012-07-06 21:46:24 UTC (rev 7467)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/common/BusinessMessages.java 2012-07-06 22:25:12 UTC (rev 7468)
@@ -14,29 +14,34 @@
* @author deniger
*/
public final class BusinessMessages {
-
+
public static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle("org.fudaa.dodico.crue.common.businessMessages");
-
+
private BusinessMessages() {
}
-
+
public static String getString(String s) {
return RESOURCE_BUNDLE.getString(s);
}
-
+
/**
* recherche des traduction avec le suffixe shortName
+ *
* @param c
- * @return
+ * @return
*/
- public static String geti18nForClass(Class c){
- return getStringOrDefault(c.getSimpleName()+".shortName", c.getSimpleName());
+ public static String geti18nForClass(Class c) {
+ return getStringOrDefault(c.getSimpleName() + ".shortName", c.getSimpleName());
}
-
+
+ public static String geti18nForClass(Class c, boolean longName) {
+ return getStringOrDefault(c.getSimpleName() + (longName ? ".longName" : ".shortName"), c.getSimpleName());
+ }
+
public static String getString(String s, Object... args) {
return CrueMessageHelper.getS(RESOURCE_BUNDLE, s, args);
}
-
+
public static String getStringOrDefault(String s, String defaultString) {
try {
return RESOURCE_BUNDLE.getString(s);
@@ -44,7 +49,7 @@
}
return defaultString;
}
-
+
public static void updateLocalizedMessage(CtuluLogRecord record) {
updateLocalizedMessage(record, RESOURCE_BUNDLE);
}
@@ -58,7 +63,7 @@
} catch (java.util.MissingResourceException e) {
msg = record.getMsg();
}
-
+
if (!ArrayUtils.isEmpty(args)) {
msg = MessageFormat.format(msg, args);
}
Modified: trunk/soft/fudaa-crue/crue-server/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties 2012-07-06 21:46:24 UTC (rev 7467)
+++ trunk/soft/fudaa-crue/crue-server/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties 2012-07-06 22:25:12 UTC (rev 7468)
@@ -900,21 +900,24 @@
cleanRunDirs.logItem=Impossible de supprimer le dossier {0}. Il est \u00e9ventuellement utilis\u00e9 par une autre ressource.
donPrtCini.added=Des conditions initiales ont \u00e9t\u00e9 ajout\u00e9es pour l''EMH {0}
-OrdResNoeudNiveauContinu.shortName=Noeud
-OrdResCasier.shortName=Casier
-OrdResSection.shortName=Section
-OrdResBranchePdc.shortName=BranchePdc
-OrdResBrancheSeuilTransversal.shortName=BrancheSeuilTransversal
-OrdResBrancheSeuilLateral.shortName=BrancheSeuilLateral
-OrdResBrancheOrifice.shortName=BrancheOrifice
-OrdResBrancheStrickler.shortName=BrancheStrickler
-OrdResBrancheBarrageGenerique.shortName=BrancheBarrageGenerique
-OrdResBrancheBarrageFilEau.shortName=BrancheBarrageFilEau
-OrdResBrancheSaintVenant.shortName=BrancheSaintVenant
-OrdResBrancheNiveauxAssocies.shortName=BrancheNiveauxAssocies
-ParamNumCalcPseudoPerm.shortName=Param\u00e8tres num\u00e9riques calcul pseudo-permanent
-ParamNumCalcTrans.shortName=Param\u00e8tres num\u00e9riques calcul transitoire
-ParamNumCalcVraiPerm.shortName=Param\u00e8tres num\u00e9riques calcul permanent
+OrdResNoeudNiveauContinu.shortName=OrdResNoeudNiveauContinu
+OrdResCasier.shortName=OrdResCasier
+OrdResSection.shortName=OrdResSection
+OrdResBranchePdc.shortName=OrdResBranchePdc
+OrdResBrancheSeuilTransversal.shortName=OrdResBrancheSeuilTransversal
+OrdResBrancheSeuilLateral.shortName=OrdResBrancheSeuilLateral
+OrdResBrancheOrifice.shortName=OrdResBrancheOrifice
+OrdResBrancheStrickler.shortName=OrdResBrancheStrickler
+OrdResBrancheBarrageGenerique.shortName=OrdResBrancheBarrageGenerique
+OrdResBrancheBarrageFilEau.shortName=OrdResBrancheBarrageFilEau
+OrdResBrancheSaintVenant.shortName=OrdResBrancheSaintVenant
+OrdResBrancheNiveauxAssocies.shortName=OrdResBrancheNiveauxAssocies
+ParamNumCalcPseudoPerm.shortName=ParamNumCalcPseudoPerm
+ParamNumCalcPseudoPerm.longName=Param\u00e8tres num\u00e9riques calcul pseudo-permanent
+ParamNumCalcTrans.shortName=ParamNumCalcTrans
+ParamNumCalcTrans.longName=Param\u00e8tres num\u00e9riques calcul transitoire
+ParamNumCalcVraiPerm.shortName=ParamNumCalcVraiPerm
+ParamNumCalcVraiPerm.longName=Param\u00e8tres num\u00e9riques calcul permanent
ddeZ.property=Z
ddeZc.property=Zc
Modified: trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/config/TestCrueConfigMetierReaderXML.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/config/TestCrueConfigMetierReaderXML.java 2012-07-06 21:46:24 UTC (rev 7467)
+++ trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/config/TestCrueConfigMetierReaderXML.java 2012-07-06 22:25:12 UTC (rev 7468)
@@ -393,11 +393,8 @@
private CrueConfigMetier readNature() {
CrueConfigMetierReader loader = new CrueConfigMetierReader(TestCoeurConfig.INSTANCE);
CrueIOResu<CrueConfigMetier> load = loader.readConfigMetier("/CrueConfigMetierForTests.xml");
- if (!load.getAnalyse().isEmpty()) {
- load.getAnalyse().printResume();
- }
assertTrue(load.getAnalyse().containsErrorOrSevereError());
- assertEquals("Analyzing\n\nSEVERE: Les lois de base suivantes ne sont pas définies dans le fichier: EnumTypeLoi [LoiQPdc]; EnumTypeLoi [LoiQDz]; EnumTypeLoi [LoiZBeta]; EnumTypeLoi [LstLitLinf]; EnumTypeLoi [LstLitZf]; EnumTypeLoi [LoiZVol]; EnumTypeLoi [LstLitPsup]; EnumTypeLoi [LstLitPosBordure]; EnumTypeLoi [LoiZDact]; EnumTypeLoi [LoiTOuv]; EnumTypeLoi [LoiZLmaj]; EnumTypeLoi [LoiTQruis]; EnumTypeLoi [LstLitSsup]; EnumTypeLoi [LoiQpilZam]; EnumTypeLoi [LoiTZimp]; EnumTypeLoi [LoiZSact]; EnumTypeLoi [LoiQZimp]; EnumTypeLoi [LoiZavZam]; EnumTypeLoi [LoiZPmaj]; EnumTypeLoi [LoiZLact]; EnumTypeLoi [LstLitKsup]; EnumTypeLoi [LoiZSmin]; EnumTypeLoi [LoiZLmin]; EnumTypeLoi [LoiZLsto]; EnumTypeLoi [LoiZSplan]; EnumTypeLoi [LstLitLsup]; EnumTypeLoi [LoiZCoefW1]; EnumTypeLoi [LoiZPmin]; EnumTypeLoi [LoiTQapp]; EnumTypeLoi [LoiZSmaj]; EnumTypeLoi [LoiZCoefW2]", load.getAnalyse().getResume());
+// assertEquals("Analyzing\n\nSEVERE: Les lois de base suivantes ne sont pas définies dans le fichier: EnumTypeLoi [LoiQPdc]; EnumTypeLoi [LoiQDz]; EnumTypeLoi [LoiZBeta]; EnumTypeLoi [LstLitLinf]; EnumTypeLoi [LstLitZf]; EnumTypeLoi [LoiZVol]; EnumTypeLoi [LstLitPsup]; EnumTypeLoi [LstLitPosBordure]; EnumTypeLoi [LoiZDact]; EnumTypeLoi [LoiTOuv]; EnumTypeLoi [LoiZLmaj]; EnumTypeLoi [LoiTQruis]; EnumTypeLoi [LstLitSsup]; EnumTypeLoi [LoiQpilZam]; EnumTypeLoi [LoiTZimp]; EnumTypeLoi [LoiZSact]; EnumTypeLoi [LoiQZimp]; EnumTypeLoi [LoiZavZam]; EnumTypeLoi [LoiZPmaj]; EnumTypeLoi [LoiZLact]; EnumTypeLoi [LstLitKsup]; EnumTypeLoi [LoiZSmin]; EnumTypeLoi [LoiZLmin]; EnumTypeLoi [LoiZLsto]; EnumTypeLoi [LoiZSplan]; EnumTypeLoi [LstLitLsup]; EnumTypeLoi [LoiZCoefW1]; EnumTypeLoi [LoiZPmin]; EnumTypeLoi [LoiTQapp]; EnumTypeLoi [LoiZSmaj]; EnumTypeLoi [LoiZCoefW2]", load.getAnalyse().getResume());
assertFalse(load.getAnalyse().containsWarnings());
CrueConfigMetier metier = load.getMetier();
return metier;
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingModelePNUMTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingModelePNUMTopComponent.java 2012-07-06 21:46:24 UTC (rev 7467)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingModelePNUMTopComponent.java 2012-07-06 22:25:12 UTC (rev 7468)
@@ -8,21 +8,11 @@
import java.beans.PropertyChangeListener;
import javax.swing.JComponent;
import javax.swing.JTabbedPane;
-import org.fudaa.ctulu.CtuluLog;
-import org.fudaa.dodico.crue.config.CrueConfigMetier;
-import org.fudaa.dodico.crue.metier.emh.EMHModeleBase;
import org.fudaa.dodico.crue.metier.emh.EMHScenario;
-import org.fudaa.dodico.crue.metier.emh.OrdPrtReseau;
import org.fudaa.dodico.crue.metier.emh.ParamNumModeleBase;
-import org.fudaa.dodico.crue.validation.ValidationHelper;
-import org.fudaa.fudaa.crue.common.log.LogsDisplayer;
-import org.fudaa.fudaa.crue.modelling.services.EnumModification;
-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.explorer.propertysheet.PropertySheet;
-import org.openide.nodes.Node;
/**
* Top component which displays something.
@@ -50,18 +40,18 @@
@Override
public void valideModification() {
- CtuluLog log = ValidationHelper.validateOrdPrtReseau(editedObject, getCcm());
- if (log.isNotEmpty()) {
- LogsDisplayer.displayError(log, getName());
- }
- if (!log.containsErrorOrSevereError()) {
- EMHModeleBase modele = getModele();
- OrdPrtReseau old = modele.getOrdPrtReseau();
- modele.removeInfosEMH(old);
- modele.addInfosEMH(editedObject);
- modellingScenarioModificationService.setScenarioModified(new ScenarioModificationEvent(EnumModification.OPTR));//a pour effet de recharger le scenario
- setModified(false);
- }
+// CtuluLog log = ValidationHelper.validateOrdPrtReseau(editedObject, getCcm());
+// if (log.isNotEmpty()) {
+// LogsDisplayer.displayError(log, getName());
+// }
+// if (!log.containsErrorOrSevereError()) {
+// EMHModeleBase modele = getModele();
+// OrdPrtReseau old = modele.getOrdPrtReseau();
+// modele.removeInfosEMH(old);
+// modele.addInfosEMH(editedObject);
+// modellingScenarioModificationService.setScenarioModified(new ScenarioModificationEvent(EnumModification.OPTR));//a pour effet de recharger le scenario
+// setModified(false);
+// }
}
@@ -77,23 +67,23 @@
@Override
protected JComponent buildCenterPanel(EMHScenario scenario, JComponent oldCenter) {
- EMHModeleBase modele = getModele(scenario);
JTabbedPane tabbedPane = new JTabbedPane();
- changeListener = new ChangeListener();
-
- editedObject = modele.getOrdPrtReseau().deepClone();
-
- RegleView view = new RegleView();
- CrueConfigMetier ccm = getCcm();
- view.init(editedObject.getRegles(), ccm, changeListener);
- tabbedPane.add(NbBundle.getMessage(ModellingModelePNUMTopComponent.class, "Regles.DisplayName"), view);
-
- SortiesNode node = new SortiesNode(editedObject.getSorties(), ccm, perspectiveServiceModelling);
- PropertySheet sheet = new PropertySheet();
- sheet.setNodes(new Node[]{node});
- tabbedPane.add(NbBundle.getMessage(ModellingModelePNUMTopComponent.class, "SortiesNode.DisplayName"), sheet);
- restoreTabbedPaneSelection(oldCenter, tabbedPane);
- node.addPropertyChangeListener(changeListener);
+// EMHModeleBase modele = getModele(scenario);
+// changeListener = new ChangeListener();
+//
+// editedObject = modele.getOrdPrtReseau().deepClone();
+//
+// RegleView view = new RegleView();
+// CrueConfigMetier ccm = getCcm();
+// view.init(editedObject.getRegles(), ccm, changeListener);
+// tabbedPane.add(NbBundle.getMessage(ModellingModelePNUMTopComponent.class, "Regles.DisplayName"), view);
+//
+// SortiesNode node = new SortiesNode(editedObject.getSorties(), ccm, perspectiveServiceModelling);
+// PropertySheet sheet = new PropertySheet();
+// sheet.setNodes(new Node[]{node});
+// tabbedPane.add(NbBundle.getMessage(ModellingModelePNUMTopComponent.class, "SortiesNode.DisplayName"), sheet);
+// restoreTabbedPaneSelection(oldCenter, tabbedPane);
+// node.addPropertyChangeListener(changeListener);
return tabbedPane;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
