Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[5742] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2010-04-19 20:35:41
|
Revision: 5742
http://fudaa.svn.sourceforge.net/fudaa/?rev=5742&view=rev
Author: deniger
Date: 2010-04-19 20:35:33 +0000 (Mon, 19 Apr 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/ctulu/CtuluAnalyze.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/CompareActionBuilder.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/ExecuteCompareActionOnObject.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterArrayDouble.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterArrayFloat.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterArrayInteger.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterArrayLong.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterBean.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterCollection.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterFente.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterResultatPasDeTemps.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterValParamDouble.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterValParamEntier.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/FactoryEqualsTester.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/ResultatTest.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBReader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoader.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoaderCrue9.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/CruePrefix.java
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/common/commonMessages.properties
trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/comparaison/common/comparaisonMessages.properties
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueLauncher.java
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioComparaisonUI.java
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/ctulu/CtuluAnalyze.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/ctulu/CtuluAnalyze.java 2010-04-08 20:50:20 UTC (rev 5741)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/ctulu/CtuluAnalyze.java 2010-04-19 20:35:33 UTC (rev 5742)
@@ -358,6 +358,10 @@
return logs.isEmpty();
}
+ public boolean isNotEmpty() {
+ return !isEmpty();
+ }
+
/**
* @param _e l'exception a ajouter a l'anayse
*/
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/CompareActionBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/CompareActionBuilder.java 2010-04-08 20:50:20 UTC (rev 5741)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/CompareActionBuilder.java 2010-04-19 20:35:33 UTC (rev 5742)
@@ -8,5 +8,11 @@
*/
public interface CompareActionBuilder {
+ /**
+ * @param target
+ * @param parent
+ * @param collector
+ * @return true si identique...
+ */
boolean launch(ComparaisonNodeFinal target, ResultatTest parent, CtuluAnalyze collector);
}
\ No newline at end of file
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/ExecuteCompareActionOnObject.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/ExecuteCompareActionOnObject.java 2010-04-08 20:50:20 UTC (rev 5741)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/ExecuteCompareActionOnObject.java 2010-04-19 20:35:33 UTC (rev 5742)
@@ -32,11 +32,11 @@
List b = target.listObjectB;
if (a == b) { return true; }
if (a == null) {
- parent.addDiff(new ResultatTest(a, b, "Liste de a est null"));
+ parent.addDiff(new ResultatTest(a, b, "list.a.isNull"));
return false;
}
if (b == null) {
- parent.addDiff(new ResultatTest(a, b, "Liste de b est null"));
+ parent.addDiff(new ResultatTest(a, b, "list.b.isNull"));
return false;
}
int size = a.size();
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterArrayDouble.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterArrayDouble.java 2010-04-08 20:50:20 UTC (rev 5741)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterArrayDouble.java 2010-04-19 20:35:33 UTC (rev 5742)
@@ -1,6 +1,5 @@
package org.fudaa.dodico.crue.comparaison.tester;
-import org.fudaa.dodico.crue.comparaison.common.ComparaisonMessages;
/**
* @author denf01a
@@ -37,8 +36,7 @@
if (!objTester.isSameDouble(o1[idx], o2[idx])) {
// TODO améliorer le tout pour avoir plus de res.
if (res != null) {
- res.addDiff(new ResultatTest(o1[idx], o2[idx], ComparaisonMessages.getString("comparaison.collection.item",
- idx)));
+ res.addDiff(new ResultatTest(o1[idx], o2[idx], "comparaison.collection.item", idx));
}
return false;
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterArrayFloat.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterArrayFloat.java 2010-04-08 20:50:20 UTC (rev 5741)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterArrayFloat.java 2010-04-19 20:35:33 UTC (rev 5742)
@@ -1,6 +1,5 @@
package org.fudaa.dodico.crue.comparaison.tester;
-import org.fudaa.dodico.crue.comparaison.common.ComparaisonMessages;
/**
* @author denf01a
@@ -37,8 +36,7 @@
if (!objTester.isSameDouble(o1[idx], o2[idx])) {
// TODO améliorer le tout pour avoir plus de res.
if (res != null) {
- res.addDiff(new ResultatTest(o1[idx], o2[idx], ComparaisonMessages.getString("comparaison.collection.item",
- idx)));
+ res.addDiff(new ResultatTest(o1[idx], o2[idx], "comparaison.collection.item", idx));
}
return false;
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterArrayInteger.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterArrayInteger.java 2010-04-08 20:50:20 UTC (rev 5741)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterArrayInteger.java 2010-04-19 20:35:33 UTC (rev 5742)
@@ -1,6 +1,5 @@
package org.fudaa.dodico.crue.comparaison.tester;
-import org.fudaa.dodico.crue.comparaison.common.ComparaisonMessages;
/**
* @author denf01a
@@ -38,8 +37,7 @@
if (!isSame) {
// TODO améliorer le tout pour avoir plus de res.
if (res != null) {
- res.addDiff(new ResultatTest(o1[idx], o2[idx], ComparaisonMessages.getString("comparaison.collection.item",
- idx)));
+ res.addDiff(new ResultatTest(o1[idx], o2[idx], "comparaison.collection.item", idx));
}
return false;
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterArrayLong.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterArrayLong.java 2010-04-08 20:50:20 UTC (rev 5741)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterArrayLong.java 2010-04-19 20:35:33 UTC (rev 5742)
@@ -1,6 +1,5 @@
package org.fudaa.dodico.crue.comparaison.tester;
-import org.fudaa.dodico.crue.comparaison.common.ComparaisonMessages;
/**
* @author denf01a
@@ -38,8 +37,7 @@
if (!isSame) {
// TODO améliorer le tout pour avoir plus de res.
if (res != null) {
- res.addDiff(new ResultatTest(o1[idx], o2[idx], ComparaisonMessages.getString("comparaison.collection.item",
- idx)));
+ res.addDiff(new ResultatTest(o1[idx], o2[idx], "comparaison.collection.item", idx));
}
return false;
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterBean.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterBean.java 2010-04-08 20:50:20 UTC (rev 5741)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterBean.java 2010-04-19 20:35:33 UTC (rev 5742)
@@ -1,6 +1,7 @@
package org.fudaa.dodico.crue.comparaison.tester;
import java.beans.PropertyDescriptor;
+import java.text.NumberFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -14,7 +15,6 @@
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
import org.fudaa.dodico.crue.common.CustomPropertyUtilsBeanInstaller;
-import org.fudaa.dodico.crue.comparaison.common.ComparaisonMessages;
import org.fudaa.dodico.crue.metier.emh.InfosEMH;
import org.fudaa.dodico.crue.metier.emh.ObjetWithID;
import org.slf4j.Logger;
@@ -58,7 +58,7 @@
return true;
}
- private static final String TYPE_DIFF = ComparaisonMessages.getString("compare.type.diff");
+ private static final String TYPE_DIFF = "compare.type.diff";
private final static Logger LOGGER = LoggerFactory.getLogger(EqualsTesterBean.class);
@@ -185,11 +185,17 @@
if (o1 instanceof ObjetWithID) {
pref = ((ObjetWithID) o1).getId() + ": ";
}
- final ResultatTest item = new ResultatTest(a, b, pref
- + ComparaisonMessages.getString("compare.property.diff", propName));
+ NumberFormat formatter = factory.getPropEps().getFormatter(propName);
+
+ final ResultatTest item = new ResultatTest(format(a, formatter), format(b, formatter), "compare.property.diff",
+ pref, propName);
item.updatePrint();
res.addDiff(item);
}
}
+ private Object format(final Object b, NumberFormat formatter) {
+ return formatter == null ? b : formatter.format(b);
+ }
+
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterCollection.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterCollection.java 2010-04-08 20:50:20 UTC (rev 5741)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterCollection.java 2010-04-19 20:35:33 UTC (rev 5742)
@@ -3,8 +3,6 @@
import java.util.Collection;
import java.util.Iterator;
-import org.fudaa.dodico.crue.comparaison.common.ComparaisonMessages;
-
/**
* @author denf01a
* @creation 22 juin 2009
@@ -16,7 +14,7 @@
private final String propName;
private final EqualsTester equalTester;
- public static final String TAILLE_DIFF = ComparaisonMessages.getString("comparaison.collection.size");
+ public static final String TAILLE_DIFF = "comparaison.collection.size";
public EqualsTesterCollection(final FactoryEqualsTester factory, final String propName) {
super();
@@ -83,7 +81,7 @@
private void addDiff(final ResultatTest res, final int idx, final Object obj1, final Object obj2) {
if (res != null) {
- res.addDiff(new ResultatTest(obj1, obj2, ComparaisonMessages.getString("comparaison.collection.item", idx)));
+ res.addDiff(new ResultatTest(obj1, obj2, "comparaison.collection.item", idx));
}
}
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterFente.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterFente.java 2010-04-08 20:50:20 UTC (rev 5741)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterFente.java 2010-04-19 20:35:33 UTC (rev 5742)
@@ -35,14 +35,14 @@
bool = false;
if (res != null) {
res.addDiff(new ResultatTest(o1.getLargeurFente(), o2.getLargeurFente(), "compare.property.diff",
- "largeurFentre"));
+ "largeurFente"));
}
}
if (!profondeurFente.isSameDouble(o1.getProfondeurFente(), o2.getProfondeurFente())) {
bool = false;
if (res != null) {
res.addDiff(new ResultatTest(o1.getProfondeurFente(), o2.getProfondeurFente(), "compare.property.diff",
- "profondeurFentre"));
+ "profondeurFente"));
}
}
return bool;
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterResultatPasDeTemps.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterResultatPasDeTemps.java 2010-04-08 20:50:20 UTC (rev 5741)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterResultatPasDeTemps.java 2010-04-19 20:35:33 UTC (rev 5742)
@@ -1,5 +1,6 @@
package org.fudaa.dodico.crue.comparaison.tester;
+import java.text.NumberFormat;
import java.util.ArrayList;
import java.util.List;
import java.util.TreeMap;
@@ -8,6 +9,7 @@
import org.apache.commons.lang.StringUtils;
import org.fudaa.dodico.crue.common.DoubleComparator;
import org.fudaa.dodico.crue.io.neuf.FCBSequentialReader.ResultatCalculPasDeTemps;
+import org.fudaa.dodico.crue.property.CrueProperties;
/**
* @author denf01a
@@ -17,14 +19,17 @@
public class EqualsTesterResultatPasDeTemps extends AbstractEqualsTester<ResultatCalculPasDeTemps> {
private final double epsPdt;
+ private final CrueProperties crueProperties;
final EqualsTesterDouble ruinouTester;
+ private NumberFormat pdtFormater;
/**
* @param epsPdt
*/
- public EqualsTesterResultatPasDeTemps(final double epsPdt, final EqualsTesterDouble ruinouTester) {
+ public EqualsTesterResultatPasDeTemps(final double epsPdt, final EqualsTesterDouble ruinouTester, CrueProperties props) {
super();
this.epsPdt = epsPdt;
+ this.crueProperties = props;
this.ruinouTester = ruinouTester;
}
@@ -33,6 +38,13 @@
return false;
}
+ private NumberFormat getNumberFormatForPdt() {
+ if (pdtFormater == null) {
+ pdtFormater = crueProperties.getFormatter("pdt");
+ }
+ return pdtFormater;
+ }
+
@Override
public boolean isSameSafe(final ResultatCalculPasDeTemps o1, final ResultatCalculPasDeTemps o2,
final ResultatTest res, final TesterContext context) {
@@ -52,28 +64,29 @@
for (int i = 0; i < nbPdt2; i++) {
pdtIn2.add(o2.getPdt(i));
}
+
List<String> pdtContainedBy2AndNotBy1 = new ArrayList<String>();
List<String> pdtContainedBy1AndNotBy2 = new ArrayList<String>();
for (Double pdt : pdtIn2) {
if (!pdtIn1.containsKey(pdt)) {
- pdtContainedBy2AndNotBy1.add(Double.toString(pdt));
+ pdtContainedBy2AndNotBy1.add(getNumberFormatForPdt().format(pdt));
}
}
for (Double pdt : pdtIn1.keySet()) {
if (!pdtIn2.contains(pdt)) {
- pdtContainedBy1AndNotBy2.add(Double.toString(pdt));
+ pdtContainedBy1AndNotBy2.add(getNumberFormatForPdt().format(pdt));
}
}
if (pdtContainedBy1AndNotBy2.size() > 0) {
bool = false;
- res.addDiff(new ResultatTest(StringUtils.join(pdtContainedBy1AndNotBy2, ", "), StringUtils.EMPTY,
+ res.addDiff(new ResultatTest(StringUtils.join(pdtContainedBy1AndNotBy2, "; "), StringUtils.EMPTY,
"compare.pdt.inA.diff"));
}
if (pdtContainedBy2AndNotBy1.size() > 0) {
bool = false;
- res.addDiff(new ResultatTest(StringUtils.join(pdtContainedBy2AndNotBy1, ", "), StringUtils.EMPTY,
+ res.addDiff(new ResultatTest(StringUtils.EMPTY, StringUtils.join(pdtContainedBy2AndNotBy1, "; "),
"compare.pdt.inB.diff"));
}
List<String> pdtWithDifferentRegul = new ArrayList<String>();
@@ -87,27 +100,26 @@
boolean isRegu2 = o2.isRegulation(pos2);
boolean isRegu1 = o1.isRegulation(pos1);
if (isRegu1 != isRegu2) {
- pdtWithDifferentRegul.add(Double.toString(pdt));
+ pdtWithDifferentRegul.add(getNumberFormatForPdt().format(pdt));
} else if (!isRegu1) {
double rui1 = o1.getRuinou(pos1);
double rui2 = o2.getRuinou(pos2);
if (!ruinouTester.isSameDouble(rui1, rui2)) {
- pdtWithDifferentRuinou.add(Double.toString(pdt));
+ pdtWithDifferentRuinou.add(getNumberFormatForPdt().format(pdt));
}
}
}
}
if (pdtWithDifferentRegul.size() > 0) {
- res.addDiff(new ResultatTest(StringUtils.EMPTY, StringUtils.join(pdtWithDifferentRegul, ", "),
+ res.addDiff(new ResultatTest(StringUtils.EMPTY, StringUtils.join(pdtWithDifferentRegul, "; "),
"compare.pdt.withDifferentRegu"));
}
if (pdtWithDifferentRuinou.size() > 0) {
- res.addDiff(new ResultatTest(StringUtils.EMPTY, StringUtils.join(pdtWithDifferentRuinou, ", "),
+ res.addDiff(new ResultatTest(StringUtils.EMPTY, StringUtils.join(pdtWithDifferentRuinou, "; "),
"compare.pdt.withDifferentRuinou"));
}
+ res.setNbObjectTested(o1.getNbPdt());
return bool;
- // return abs.isSameDouble(o1.getAbscisse(), o2.getAbscisse()) && ord.isSameDouble(o1.getOrdonnee(),
- // o2.getOrdonnee());
}
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterValParamDouble.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterValParamDouble.java 2010-04-08 20:50:20 UTC (rev 5741)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterValParamDouble.java 2010-04-19 20:35:33 UTC (rev 5742)
@@ -1,7 +1,6 @@
package org.fudaa.dodico.crue.comparaison.tester;
import org.apache.commons.lang.ObjectUtils;
-import org.fudaa.dodico.crue.comparaison.common.ComparaisonMessages;
import org.fudaa.dodico.crue.metier.emh.ValParamDouble;
/**
@@ -27,7 +26,7 @@
final TesterContext context) throws Exception {
if (!ObjectUtils.equals(o1.getId(), o2.getId())) {
if (res != null) {
- res.addDiff(new ResultatTest(o1.getId(), o2.getId(), ComparaisonMessages.getString("compare.type.diff")));
+ res.addDiff(new ResultatTest(o1.getId(), o2.getId(), "compare.type.diff"));
return false;
}
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterValParamEntier.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterValParamEntier.java 2010-04-08 20:50:20 UTC (rev 5741)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterValParamEntier.java 2010-04-19 20:35:33 UTC (rev 5742)
@@ -1,7 +1,6 @@
package org.fudaa.dodico.crue.comparaison.tester;
import org.apache.commons.lang.ObjectUtils;
-import org.fudaa.dodico.crue.comparaison.common.ComparaisonMessages;
import org.fudaa.dodico.crue.metier.emh.ValParamEntier;
/**
@@ -27,7 +26,7 @@
final TesterContext context) throws Exception {
if (!ObjectUtils.equals(o1.getId(), o2.getId())) {
if (res != null) {
- res.addDiff(new ResultatTest(o1.getId(), o2.getId(), ComparaisonMessages.getString("compare.type.diff")));
+ res.addDiff(new ResultatTest(o1.getId(), o2.getId(), "compare.type.diff"));
return false;
}
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/FactoryEqualsTester.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/FactoryEqualsTester.java 2010-04-08 20:50:20 UTC (rev 5741)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/FactoryEqualsTester.java 2010-04-19 20:35:33 UTC (rev 5742)
@@ -58,17 +58,13 @@
final EqualsTesterFente fente = new EqualsTesterFente(new EqualsTesterDouble(factory.getEpsFor("largeurFente")),
new EqualsTesterDouble(factory.getEpsFor("profondeurFente")));
res.put(DonPrtGeoProfilSectionFenteData.class, fente);
- res.put(ResultatCalculPasDeTemps.class, new EqualsTesterResultatPasDeTemps(factory.getEpsFor("pdt"),
- new EqualsTesterDouble(factory.getEpsFor("qruis"))));
- res.put(ResultatCalcul.class, new EqualsTesterResultatCalcul(factory.getEpsFor("pdt"),
- new EqualsTesterBean(factory)));
return res;
}
private static Map<Class, EqualsTester> createMainKnownEqualsTester(final FactoryEqualsTester factory) {
final Map<Class, EqualsTester> res = new HashMap<Class, EqualsTester>();
res.put(ResultatCalculPasDeTemps.class, new EqualsTesterResultatPasDeTemps(factory.getEpsFor("pdt"),
- new EqualsTesterDouble(factory.getEpsFor("qruis"))));
+ new EqualsTesterDouble(factory.getEpsFor("qruis")), factory.getPropEps()));
res.put(ResultatCalcul.class, new EqualsTesterResultatCalcul(factory.getEpsFor("pdt"),
new EqualsTesterBean(factory)));
return res;
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/ResultatTest.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/ResultatTest.java 2010-04-08 20:50:20 UTC (rev 5741)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/tester/ResultatTest.java 2010-04-19 20:35:33 UTC (rev 5742)
@@ -5,8 +5,9 @@
import java.util.List;
import org.apache.commons.collections.CollectionUtils;
+import org.fudaa.dodico.crue.comparaison.common.ComparaisonMessages;
+import org.fudaa.dodico.crue.metier.emh.ObjetNomme;
import org.fudaa.dodico.crue.metier.emh.ObjetWithID;
-import org.fudaa.dodico.crue.metier.emh.ObjetNomme;
/**
* @author denf01a
@@ -20,6 +21,7 @@
private List<ResultatTest> filsExt;
private String msg;
+ private String traductedMsg;
private Object[] msgArguments;
@@ -42,14 +44,13 @@
public ResultatTest(final Object a, final Object b, final String msg) {
objetA = a;
objetB = b;
- this.msg = msg;
+ setMsg(msg);
}
public ResultatTest(final Object a, final Object b, final String msg, final Object... args) {
objetA = a;
objetB = b;
- this.msg = msg;
- msgArguments = args;
+ setMsg(msg, args);
}
private void addFils(final ResultatTest item) {
@@ -145,12 +146,14 @@
return same;
}
- public void setMsg(final String msg) {
+ public void setMsg(final String msg, final Object... msgArguments) {
this.msg = msg;
+ this.msgArguments = msgArguments;
+ this.traductedMsg = ComparaisonMessages.getString(msg, msgArguments);
}
- protected void setMsgArguments(final Object[] msgArguments) {
- this.msgArguments = msgArguments;
+ public void setMsg(final String msg) {
+ setMsg(msg, null);
}
/**
@@ -200,4 +203,11 @@
return same;
}
+ /**
+ * @return the traductedMsg
+ */
+ public String getTraductedMsg() {
+ return traductedMsg;
+ }
+
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBReader.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBReader.java 2010-04-08 20:50:20 UTC (rev 5741)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBReader.java 2010-04-19 20:35:33 UTC (rev 5742)
@@ -42,7 +42,7 @@
tempInt = bf.getInt(0);
// toujours pas ... ce n'est pas un fichier correct
if (tempInt != firstInt) {
- analyze_.addFatalError("crue.io.fcb.notValid");
+ analyze_.addError("crue.io.fcb.notValid");
return null;
}
infos.setOrder(helper.getOrder());
@@ -85,8 +85,10 @@
infos.regulation = (icodav == 1 || icodav == 3);
final int nbBranches = bf.getInt();
int nbCharTitreDCDh = 256;
- final String nomDc = helper.getStingFromBuffer(nbCharTitreDCDh);
- final String nomDh = helper.getStingFromBuffer(nbCharTitreDCDh);
+ /** final String nomDc = **/
+ helper.getStingFromBuffer(nbCharTitreDCDh);
+ /** final String nomDh = **/
+ helper.getStingFromBuffer(nbCharTitreDCDh);
// -- on passe a la ligne contenant ibmax et iparam --//
// helper.skipRecord();
@@ -109,12 +111,9 @@
helper.readSequentialData();
// readRegulationParam(infos); pas pris en compte dans le lot0
}
-
// -- on arrive au CORPS, on repere les indice de chaque PDT --//
readPdt(infos);
-
// --on passee les lignes de Crue--//
-
return infos;
}
@@ -161,11 +160,7 @@
// final TDoubleArrayList pdtRegul = new TDoubleArrayList();
while (helper.getAvailable() > 0) {
- long position = helper.getCurrentPosition();
- long size = helper.getChannel().size();
helper.readData();
- position = helper.getCurrentPosition();
- size = helper.getChannel().size();
// ici on a la ligne
// write(9) test,sngl(t) si regul
// (ifi2) test,sngl(t),sngl(ruinou) pour un pas de temps normal
@@ -185,22 +180,15 @@
// on enregistre la position intéressante: celle juste avant les donnéées
posNormal.add(helper.getCurrentPosition());
// on saute la ligne profil ou regul
- position = helper.getCurrentPosition();
helper.skipRecord();
- position = helper.getCurrentPosition();
- size = helper.getChannel().size();
// si pas regu
if (!isRegu) {
// on saute la ligne branche
helper.skipRecord();
- position = helper.getCurrentPosition();
- size = helper.getChannel().size();
// on saute la ligne point
helper.skipRecord();
- position = helper.getCurrentPosition();
- size = helper.getChannel().size();
}
}
infos.setPdt(new FCBSequentialReader.ResultatCalculPasDeTemps(posNormal, pdtNormal, regul, ruinouNormal));
@@ -265,7 +253,7 @@
final int ipro = buffer.getInt();
// bizarre, l'indice est ecrit en derniere position
if (ipro != (i + 1)) {
- analyze_.addFatalError("io.crue.fcb.profilIndice.error");
+ analyze_.addError("io.crue.fcb.profilIndice.error");
throw new IOException("io.crue.fcb.profilIndice.error");
}
// helper.getBuffer().getDouble();
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoader.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoader.java 2010-04-08 20:50:20 UTC (rev 5741)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoader.java 2010-04-19 20:35:33 UTC (rev 5742)
@@ -85,7 +85,7 @@
emhScenario = new ScenarioLoaderCrue10(scenario, readFileBilan, propDefinition, analyzer).compute(files);
}
}
- if (emhScenario == null) { return errorMng; }
+ if (emhScenario == null || errorMng.containsFatalError()) { return errorMng; }
emhScenario.sort();
emhScenario.setNom(scenario.getNom());
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoaderCrue9.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoaderCrue9.java 2010-04-08 20:50:20 UTC (rev 5741)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoaderCrue9.java 2010-04-19 20:35:33 UTC (rev 5742)
@@ -113,16 +113,16 @@
// on charge les valeurs par defaut pour ores.
final CtuluAnalyze ores = new CtuluAnalyze();
Crue10FileFormatFactory.getInstance().getORES().read("/default.ores.xml", ores, res);
- if (ores.containsErrorOrFatalError()) {
+ if (ores.isNotEmpty()) {
errorMng.getAnalyser().add(ores);
}
if (ores.containsFatalError()) { return null; }
// on verifie que l'on peut renommer les noms correctement.
final CtuluAnalyze verifiePrefixeNomDonneesCrue9 = CruePrefix.verifiePrefixeNomDonneesCrue9(res);
- if (verifiePrefixeNomDonneesCrue9.containsErrorOrFatalError()) {
+ if (verifiePrefixeNomDonneesCrue9.isNotEmpty()) {
errorMng.getAnalyser().add(verifiePrefixeNomDonneesCrue9);
- return null;
}
+ if (verifiePrefixeNomDonneesCrue9.containsFatalError()) { return null; }
final EMHScenario emhScenario = res.getScenarioData();
res.getModele().setNom(modele.getNom());
@@ -380,7 +380,9 @@
private void loadFcb(final EMHScenario emh, final CrueData data, final File dhFile,
final CrueErrorManager loadResFile, final File sto, final File str, final File fcb) throws Exception {// NOPMD ok
- if (CtuluLibFile.exists(sto) && CtuluLibFile.exists(str) && CtuluLibFile.exists(fcb)) {
+ if (!CtuluLibFile.exists(fcb)) {
+ loadResFile.getMainAnalyze().addFatalError("load.fcbFile.noExist", fcb == null ? "?" : fcb.getName());
+ } else if (CtuluLibFile.exists(sto) && CtuluLibFile.exists(str)) {
final long fcbTime = fcb.lastModified();
if (fcbTime < getMax(sto, str, dhFile)) {
loadResFile.getMainAnalyze().addError("load.fcbFile.cancelledBecauseTooOld");
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/CruePrefix.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/CruePrefix.java 2010-04-08 20:50:20 UTC (rev 5741)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/validation/CruePrefix.java 2010-04-19 20:35:33 UTC (rev 5742)
@@ -255,15 +255,12 @@
// il faut ajouter un warning uniquement
final int length = newNom.length();
if (length > NB_CAR_MAX) {
- analyze.addError(codeErreur, oldName, newNom);
+ analyze.addFatalError(codeErreur, oldName, newNom);
} else {
// cas des casier profil a part.
if ((obj instanceof EMHCasierProfil && length > NB_CAR_MAX_CRUE9_CASIER_PROFIL) || (length > NB_CAR_MAX_CRUE9)) {
analyze.addWarn(codeErreur + ".warn", oldName, newNom);
}
- if (length > NB_CAR_MAX) {
- analyze.addError(codeErreur, oldName, newNom);
- }
obj.setNom(newNom);
if (!newNom.equals(oldName)) {
Set<String> oldNames = newNameOldNames.get(newNom);
@@ -406,53 +403,10 @@
}
}
- // // Lois de calculs transitoires (DCLM)
- // final DonCLimMScenario dclm = crueData.getConditionsLim();
- // if (dclm != null) {
- // final List<CalcTrans> calcsTrans = dclm.getCalcTrans();
- // if (calcsTrans != null) {
- // for (int i = 0, imax = calcsTrans.size(); i < imax; i++) {
- // final CalcTrans calcTrans = calcsTrans.get(i);
- //
- // CruePrefix.addPrefixIfNeeded(CruePrefix.P_HYDRO_QAPP, calcTrans.getIteratorCalcTransNoeudNiveauContinuQapp());
- // CruePrefix.addPrefixIfNeeded(CruePrefix.P_HYDRO_QRUIS, calcTrans
- // .getIteratorCalcTransBrancheSaintVenantQruis());
- // CruePrefix.addPrefixIfNeeded(CruePrefix.P_HYDRO_QRUIS, calcTrans.getIteratorCalcTransCasierProfilQruis());
- // CruePrefix.addPrefixIfNeeded(CruePrefix.P_LIMNIGRAMME, calcTrans
- // .getIteratorCalcTransNoeudNiveauContinuLimnigramme());
- // CruePrefix.addPrefixIfNeeded(CruePrefix.P_TARAGE, calcTrans.getIteratorCalcTransNoeudNiveauContinuTarage());
- // CruePrefix.addPrefixIfNeeded(CruePrefix.P_MANOEUVRE, calcTrans.getIteratorCalcTransBrancheOrificeManoeuvre());
- // }
- // }
- // }
-
- // Loi régime noyé (attribut de DonCalcSansPrtBrancheBarrageGenerique - DCSP)
- // Loi régime dénoyé (attribut de DonCalcSansPrtBrancheBarrageGenerique - DCSP)
- // Loi niveaux associés (attribut de DonCalcSansPrtBrancheNiveauxAssocies - DCSP)
- // Loi perte de charge (attribut de DonCalcSansPrtBranchePdc - DCSP)
- // for (final EMH emh : listeEMHs) {
- // if (emh.getDCSP() != null) {
- // final List<DonCalcSansPrt> donnees = emh.getDCSP();
- // for (final DonCalcSansPrt donnee : donnees) {
- //
- // if (donnee instanceof DonCalcSansPrtBrancheBarrageGenerique) {
- // final DonCalcSansPrtBrancheBarrageGenerique brancheBarrageGen = (DonCalcSansPrtBrancheBarrageGenerique) donnee;
- // CruePrefix.addPrefixIfNeeded(CruePrefix.P_REGIME_NOYE, brancheBarrageGen.getRegimeNoye());
- // CruePrefix.addPrefixIfNeeded(CruePrefix.P_REGIME_DENOYE, brancheBarrageGen.getRegimeDenoye());
- // } else if (donnee instanceof DonCalcSansPrtBrancheNiveauxAssocies) {
- // final DonCalcSansPrtBrancheNiveauxAssocies brancheNiveauxAssoc = (DonCalcSansPrtBrancheNiveauxAssocies) donnee;
- // CruePrefix.addPrefixIfNeeded(CruePrefix.P_NIV_ASSOC, brancheNiveauxAssoc.getZasso());
- // } else if (donnee instanceof DonCalcSansPrtBranchePdc) {
- // final DonCalcSansPrtBranchePdc branchePdc = (DonCalcSansPrtBranchePdc) donnee;
- // CruePrefix.addPrefixIfNeeded(CruePrefix.P_PERTE_CHARGE, branchePdc.getPdc());
- // }
- // }
- // }
- // }
for (final Map.Entry<String, Set<String>> it : newNameOldNames.entrySet()) {
if (it.getValue().size() > 1) {
- analyze.addError("crue9.sameId.forDifferentNames.error", it.getKey(), StringUtils.join(
- it.getValue().iterator(), ", "));
+ analyze.addFatalError("crue9.sameId.forDifferentNames.error", it.getKey(), StringUtils.join(it.getValue()
+ .iterator(), ", "));
}
}
Modified: trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/common/commonMessages.properties
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/common/commonMessages.properties 2010-04-08 20:50:20 UTC (rev 5741)
+++ trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/common/commonMessages.properties 2010-04-19 20:35:33 UTC (rev 5742)
@@ -39,6 +39,7 @@
load.strFile.notDone = Le chargement du fichier STR n'a pas \u00E9t\u00E9 effectu\u00E9e. Les donn\u00E9es ne seront pas charg\u00E9es en m\u00E9moire.
load.strFile.noExist = Le fichier STR {0} n''existe pas
load.stoFile.noExist = Le fichier STO {0} n''existe pas
+load.fcbFile.noExist = Le fichier FCB {0} n''existe pas
load.validFcb = Validation des donn\u00E9es du fichier FCB
load.validStoStr = Validation des donn\u00E9es des fichiers STO/STR
Modified: trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/comparaison/common/comparaisonMessages.properties
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/comparaison/common/comparaisonMessages.properties 2010-04-08 20:50:20 UTC (rev 5741)
+++ trunk/soft/fudaa-crue/dodico/src/main/resources/org/fudaa/dodico/crue/comparaison/common/comparaisonMessages.properties 2010-04-19 20:35:33 UTC (rev 5742)
@@ -2,8 +2,10 @@
comparaison.collection.item = L''\u00E9l\u00E9ment {0} de la liste est diff\u00E9rent
comparaison.collection.size = Les listes ont un taille diff\u00E9rentes
comparaison.error = Une erreur est survenue dans la comparaison: {0}
+list.a.isNull=Liste de A est null
+list.b.isNull=Liste de B est null
-compare.property.diff = La propri\u00E9t\u00E9 {0} est diff\u00E9rente
+compare.property.diff = {0} La propri\u00E9t\u00E9 {1} est diff\u00E9rente
compare.type.diff = Les types des objets sont diff\u00E9rents
file.read.badContent.error = Le fichier {0} n''est pas un fichier de d\u00E9finition des comparaisons
Modified: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueLauncher.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueLauncher.java 2010-04-08 20:50:20 UTC (rev 5741)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/explorer/CrueLauncher.java 2010-04-19 20:35:33 UTC (rev 5742)
@@ -76,8 +76,8 @@
infoCrue_.banner = new BuIcon(pathLogo);
// infoCrue_.logo = new BuIcon(pathLogo);
infoCrue_.name = "Fudaa-Crue";
- infoCrue_.version = "0.25";
- infoCrue_.date = "09-Avril-2010";
+ infoCrue_.version = "0.26";
+ infoCrue_.date = "19-Avril-2010";
infoCrue_.rights = "";
infoCrue_.contact = "fu...@ge...";
infoCrue_.license = "GPL2";
Modified: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioComparaisonUI.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioComparaisonUI.java 2010-04-08 20:50:20 UTC (rev 5741)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioComparaisonUI.java 2010-04-19 20:35:33 UTC (rev 5742)
@@ -426,7 +426,7 @@
if (resTest.isSame()) { return; }
final CompareTreeTableNode node = new CompareTreeTableNode();
parent.add(node);
- node.msg = resTest.getMsg();
+ node.msg = resTest.getTraductedMsg();
node.a = resTest.getObjetA();
node.valueA = ObjectUtils.toString(resTest.getPrintA(), ObjectUtils.toString(resTest.getObjetA(), "null"));
node.valueB = ObjectUtils.toString(resTest.getPrintB(), ObjectUtils.toString(resTest.getObjetB(), "null"));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
