Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[5946] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2010-09-18 00:52:28
|
Revision: 5946
http://fudaa.svn.sourceforge.net/fudaa/?rev=5946&view=rev
Author: deniger
Date: 2010-09-18 00:52:21 +0000 (Sat, 18 Sep 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterBean.java
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterResultatCalcul.java
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/config/CrueConfigMetierReader.java
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/config/PropertyFormaterBuilder.java
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileReader.java
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBReader.java
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBValueObject.java
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/transformer/ToStringHelper.java
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/validation/DelegateValidatorBranche.java
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/validation/DelegateValidatorSection.java
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/validation/ValidatorForCrue9Export.java
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/validation/ValidatorResultat.java
trunk/soft/fudaa-crue/crue-server/src/main/resources/CrueConfigMetier.xml
trunk/soft/fudaa-crue/crue-server/src/main/resources/default.ores.xml
trunk/soft/fudaa-crue/crue-server/src/main/resources/org/fudaa/dodico/crue/validation/validationMessages.properties
trunk/soft/fudaa-crue/crue-ui/src/main/java/org/fudaa/fudaa/crue/common/CrueExportCtuluFileChooserTest.java
trunk/soft/fudaa-crue/crue-ui/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioLoaderUI.java
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterBean.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterBean.java 2010-09-18 00:15:19 UTC (rev 5945)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterBean.java 2010-09-18 00:52:21 UTC (rev 5946)
@@ -103,7 +103,7 @@
for (final Object o : m.keySet()) {
prop.add(ObjectUtils.toString(o));
}
- context.addWarn("usable.properties", StringUtils.join(prop, " , "));
+ context.addWarn("usable.properties", StringUtils.join(prop, "; "));
} catch (final Exception e1) {
LOGGER.error("isSameSafe", e1);
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterResultatCalcul.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterResultatCalcul.java 2010-09-18 00:15:19 UTC (rev 5945)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterResultatCalcul.java 2010-09-18 00:52:21 UTC (rev 5946)
@@ -70,7 +70,7 @@
String simpleName = read1.getClass().getSimpleName();
if (!logDone.contains(simpleName)) {
logDone.add(simpleName);
- LOGGER.warn("OrdRes: Comparaison sur " + simpleName + ": " + StringUtils.join(props, ", "));
+ LOGGER.warn("OrdRes: Comparaison sur " + simpleName + ": " + StringUtils.join(props, "; "));
}
}
beanTester.setPropToCompare(props);
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/config/CrueConfigMetierReader.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/config/CrueConfigMetierReader.java 2010-09-18 00:15:19 UTC (rev 5945)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/config/CrueConfigMetierReader.java 2010-09-18 00:52:21 UTC (rev 5946)
@@ -290,7 +290,7 @@
Collection<EnumTypeLoi> loiTypes = EnumTypeLoi.getListTypeLoi();
Collection<?> removeAll = ListUtils.removeAll(loiTypes, typeLoiDone);
if (removeAll.size() > 0) {
- analyser.addFatalError("configLoi.LoiNotDefinedFound.error", StringUtils.join(removeAll, ", "));
+ analyser.addFatalError("configLoi.LoiNotDefinedFound.error", StringUtils.join(removeAll, "; "));
}
propDefinition.setConfigLoi(CrueConfigMetierReader.createMap(loisLoaded));
} else {
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/config/PropertyFormaterBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/config/PropertyFormaterBuilder.java 2010-09-18 00:15:19 UTC (rev 5945)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/config/PropertyFormaterBuilder.java 2010-09-18 00:52:21 UTC (rev 5946)
@@ -1,8 +1,10 @@
package org.fudaa.dodico.crue.config;
import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
import java.text.NumberFormat;
import java.util.HashMap;
+import java.util.Locale;
import java.util.Map;
public class PropertyFormaterBuilder {
@@ -27,6 +29,7 @@
NumberFormat numberFormat = this.nbDecFormat.get(nbDec);
if (numberFormat == null) {
numberFormat = new DecimalFormat();
+ ((DecimalFormat)numberFormat).setDecimalFormatSymbols(new DecimalFormatSymbols(Locale.US));
numberFormat.setGroupingUsed(false);
numberFormat.setMaximumFractionDigits(nbDec);
numberFormat.setMinimumFractionDigits(nbDec);
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileReader.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileReader.java 2010-09-18 00:15:19 UTC (rev 5945)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileReader.java 2010-09-18 00:52:21 UTC (rev 5946)
@@ -2047,12 +2047,12 @@
final Collection usedButNotCreationProfils = ListUtils.removeAll(usedNomSection, createdNomSection);
if (!usedButNotCreationProfils.isEmpty()) {
analyze_.addFatalError(usedButNotCreationProfils.size() == 1 ? "io.dc.sectionUsedButNotExist.one"
- : "io.dc.sectionUsedButNotExist.multi", StringUtils.join(usedButNotCreationProfils, ", "));
+ : "io.dc.sectionUsedButNotExist.multi", StringUtils.join(usedButNotCreationProfils, "; "));
}
final Collection createdButNotUsed = ListUtils.removeAll(createdNomSection, usedNomSection);
if (!createdButNotUsed.isEmpty()) {
analyze_.addWarn(createdButNotUsed.size() == 1 ? "io.dc.sectionCreatedButNotUsed.one"
- : "io.dc.sectionCreatedButNotUsed.multi", StringUtils.join(createdButNotUsed, ", "));
+ : "io.dc.sectionCreatedButNotUsed.multi", StringUtils.join(createdButNotUsed, "; "));
}
checkCasier(metier);
if (this.definedNodes != null) {
@@ -2073,7 +2073,7 @@
if (!notDefinedNode.isEmpty()) {
ArrayList<String> listeTriee = new ArrayList<String>(notDefinedNode);
Collections.sort(listeTriee);
- analyze_.addWarn("dc.carteNodes.nodesNotDefined", StringUtils.join(listeTriee, ", "));
+ analyze_.addWarn("dc.carteNodes.nodesNotDefined", StringUtils.join(listeTriee, "; "));
}
}
}
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBReader.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBReader.java 2010-09-18 00:15:19 UTC (rev 5945)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBReader.java 2010-09-18 00:52:21 UTC (rev 5946)
@@ -252,7 +252,7 @@
}
prof.setNom(nom);
- prof.setXp(buffer.getFloat());
+ prof.setDistance(buffer.getFloat());
prof.setZf(buffer.getFloat());
if (containsSsfente) {
prof.setZfSsFente(buffer.getFloat());
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBValueObject.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBValueObject.java 2010-09-18 00:15:19 UTC (rev 5945)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBValueObject.java 2010-09-18 00:52:21 UTC (rev 5946)
@@ -61,15 +61,15 @@
*/
public static class EnteteProfil extends AbstractEntete {
- private double xp;
+ private double distance;
private double zf;
private double zfSsFente;
/**
* @param distance the distance to set
*/
- protected void setXp(final double distance) {
- this.xp = distance;
+ protected void setDistance(final double distance) {
+ this.distance = distance;
}
/**
@@ -89,8 +89,8 @@
/**
* @return the distance
*/
- public double getXp() {
- return xp;
+ public double getDistance() {
+ return distance;
}
/**
@@ -109,7 +109,7 @@
@Override
public String toString() {
- return nom + " dist=" + xp + ", Zf=" + zf + ", ZfSsFente=" + zfSsFente;
+ return nom + " dist=" + distance + ", Zf=" + zf + ", ZfSsFente=" + zfSsFente;
}
}
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/transformer/ToStringHelper.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/transformer/ToStringHelper.java 2010-09-18 00:15:19 UTC (rev 5945)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/transformer/ToStringHelper.java 2010-09-18 00:52:21 UTC (rev 5946)
@@ -28,6 +28,6 @@
* @return
*/
public static String transformTo(List in, Transformer transformer) {
- return StringUtils.join(CollectionUtils.collect(in, transformer), ", ");
+ return StringUtils.join(CollectionUtils.collect(in, transformer), "; ");
}
}
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/validation/DelegateValidatorBranche.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/validation/DelegateValidatorBranche.java 2010-09-18 00:15:19 UTC (rev 5945)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/validation/DelegateValidatorBranche.java 2010-09-18 00:52:21 UTC (rev 5946)
@@ -75,14 +75,14 @@
new PredicateFactory.PredicateRelationEMHSectionDansBranche(EnumPositionSection.AVAL));
if (relationsAmont.size() > 1) {
String param = StringUtils.join(CollectionUtils.collect(relationsAmont,
- new TransformerHelper.TransformerRelationToEMHId()), ", ");
+ new TransformerHelper.TransformerRelationToEMHId()), "; ");
emhLog.addError("validation.branche.mustContainOnlyOneSectionAmont", emh.getId(), param);
} else if (relationsAmont.isEmpty()) {
emhLog.addError("validation.branche.mustContainAtLeatOneSectionAmont");
}
if (relationAval.size() > 1) {
String param = StringUtils.join(CollectionUtils.collect(relationAval,
- new TransformerHelper.TransformerRelationToEMHId()), ", ");
+ new TransformerHelper.TransformerRelationToEMHId()), "; ");
emhLog.addError("validation.branche.mustContainOnlyOneSectionAval", emh.getId(), param);
} else if (relationAval.isEmpty()) {
emhLog.addError("validation.branche.mustContainAtLeatOneSectionAval");
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/validation/DelegateValidatorSection.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/validation/DelegateValidatorSection.java 2010-09-18 00:15:19 UTC (rev 5945)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/validation/DelegateValidatorSection.java 2010-09-18 00:52:21 UTC (rev 5946)
@@ -38,7 +38,7 @@
if (select != null && select.size() > 1) {
CollectionUtils.transform(select, new TransformerHelper.TransformerRelationToEMHId());
emhLog.addFatalError("validation.section.containedByMaxOneActiveBranche", emh.getId(), StringUtils.join(select,
- ", "));
+ "; "));
}
}
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/validation/ValidatorForCrue9Export.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/validation/ValidatorForCrue9Export.java 2010-09-18 00:15:19 UTC (rev 5945)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/validation/ValidatorForCrue9Export.java 2010-09-18 00:52:21 UTC (rev 5946)
@@ -273,7 +273,7 @@
}
}
if (!unused.isEmpty()) {
- log.addWarn("dh.dclm.unused", StringUtils.join(unused, ", "));
+ log.addWarn("dh.dclm.unused", StringUtils.join(unused, "; "));
}
final List<CalcTrans> calcsTrans = EMHHelper.collectCalcTrans(ordCalc.getOrdCalc());
if (calcsTrans.size() > 1) {
@@ -287,7 +287,7 @@
}
}
if (!unused.isEmpty()) {
- log.addWarn("dh.loi.unused", StringUtils.join(unused, ", "));
+ log.addWarn("dh.loi.unused", StringUtils.join(unused, "; "));
}
if (!log.isEmpty()) {
log.setDesc(ValidationMessages.getString("test.inactif"));
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/validation/ValidatorResultat.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/validation/ValidatorResultat.java 2010-09-18 00:15:19 UTC (rev 5945)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/validation/ValidatorResultat.java 2010-09-18 00:52:21 UTC (rev 5946)
@@ -16,7 +16,6 @@
import org.apache.commons.lang.StringUtils;
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.dodico.crue.common.CrueErrorManager;
-import org.fudaa.dodico.crue.common.ProjetMessages;
import org.fudaa.dodico.crue.io.common.CrueData;
import org.fudaa.dodico.crue.io.neuf.FCBSequentialReader;
import org.fudaa.dodico.crue.io.neuf.STOSequentialReader;
@@ -256,8 +255,11 @@
if (foundBranche == null) {
analyze.addError("res.branche.notFound", id);
// error = true;
- } else if ("EMHBrancheSaintVenant".equals(foundBranche.getType())) {
- foundBranche.addInfosEMH(res.getContainerBranches().createInfoEMH(foundBranche));
+ } else {
+ String type = foundBranche.getType();
+ if ("EMHBrancheSaintVenant".equals(type)||"EMHBrancheStrickler".equals(type)) {
+ foundBranche.addInfosEMH(res.getContainerBranches().createInfoEMH(foundBranche));
+ }
}
}
}
Modified: trunk/soft/fudaa-crue/crue-server/src/main/resources/CrueConfigMetier.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/resources/CrueConfigMetier.xml 2010-09-18 00:15:19 UTC (rev 5945)
+++ trunk/soft/fudaa-crue/crue-server/src/main/resources/CrueConfigMetier.xml 2010-09-18 00:52:21 UTC (rev 5946)
@@ -1504,6 +1504,14 @@
<MinNormalite Strict="false">0</MinNormalite>
<MaxNormalite Strict="false">+Infini</MaxNormalite>
</ItemVariable>
+ <ItemVariable Nom="Distance">
+ <Nature NomRef="Nat_X" />
+ <ValeurDefaut></ValeurDefaut>
+ <MinValidite Strict="false">0</MinValidite>
+ <MaxValidite Strict="false">+Infini</MaxValidite>
+ <MinNormalite Strict="false">0</MinNormalite>
+ <MaxNormalite Strict="false">+Infini</MaxNormalite>
+ </ItemVariable>
<!-- "Xt";"X";;;;">=-1000,0";"<=1000,0"-->
<ItemVariable Nom="Xt">
<Nature NomRef="Nat_X" />
Modified: trunk/soft/fudaa-crue/crue-server/src/main/resources/default.ores.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/resources/default.ores.xml 2010-09-18 00:15:19 UTC (rev 5945)
+++ trunk/soft/fudaa-crue/crue-server/src/main/resources/default.ores.xml 2010-09-18 00:52:21 UTC (rev 5946)
@@ -25,13 +25,6 @@
<DdeSplan>true</DdeSplan>
<DdeVol>true</DdeVol>
</OrdResCasierProfil>
- <!-- dans le futur
- <OrdResCasierMNT>
- <DdeQech>false</DdeQech>
- <DdeSplan>false</DdeSplan>
- <DdeVol>false</DdeVol>
- </OrdResCasierMNT>
- -->
</OrdResCasiers>
<OrdResSections>
<OrdResSectionProfil>
Modified: trunk/soft/fudaa-crue/crue-server/src/main/resources/org/fudaa/dodico/crue/validation/validationMessages.properties
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/resources/org/fudaa/dodico/crue/validation/validationMessages.properties 2010-09-18 00:15:19 UTC (rev 5945)
+++ trunk/soft/fudaa-crue/crue-server/src/main/resources/org/fudaa/dodico/crue/validation/validationMessages.properties 2010-09-18 00:52:21 UTC (rev 5946)
@@ -90,5 +90,5 @@
rptg.NoeudForCasier.notFound = Les r\xE9sultats de pr\xE9traitement contiennent un r\xE9sultat pour le CatEMHCasier du CatEMHNoeud {0} mais ce CatEMHCasier n'existe pas
rptg.casier.notExist = Le CatEMHNoeud {0} n''est pas d\xE9fini dans l''\xE9tude. Les r\xE9sultats de pr\xE9traitement contiennent un r\xE9sultat sur le profil {1} affect\xE9 au CatEMHCasier de ce CatEMHNoeud
rptg.section.notFound = La CatEMHSection {0} n''est pas d\xE9finie dans l''\xE9tude. Les r\xE9sultats de pr\xE9traitement ne correspondent pas aux donn\xE9es.
-res.noResultatForEMH= Les r\xE9sultats pour l''EMH {0} n'ont pas \xE9t\xE9 lus dans le fichier de r\xE9sultat. Est-ce que le fichier de r\xE9sultat correspond aux donn\xE9es d'entr\xE9es ?
+res.noResultatForEMH= Les r\xE9sultats pour l''EMH {0} n'ont pas \xE9t\xE9 lus dans le fichier de r\xE9sultat. Est-ce que le fichier de r\xE9sultat correspond aux donn\xE9es d''entr\xE9es ?
res.noResultatPretraitementForEMH= Les r\xE9sultats de pr\xE9traitement pour l''EMH {0} n'ont pas \xE9t\xE9 lus dans le fichier de r\xE9sultat de pr\xE9traitement. Est-ce que le fichier de r\xE9sultat correspond aux donn\xE9es d'entr\xE9es ?
\ No newline at end of file
Modified: trunk/soft/fudaa-crue/crue-ui/src/main/java/org/fudaa/fudaa/crue/common/CrueExportCtuluFileChooserTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-ui/src/main/java/org/fudaa/fudaa/crue/common/CrueExportCtuluFileChooserTest.java 2010-09-18 00:15:19 UTC (rev 5945)
+++ trunk/soft/fudaa-crue/crue-ui/src/main/java/org/fudaa/fudaa/crue/common/CrueExportCtuluFileChooserTest.java 2010-09-18 00:52:21 UTC (rev 5946)
@@ -61,7 +61,7 @@
overwrittenFile = overwrittenFile.subList(0, 2);
overwrittenFile.add("...");
}
- return CtuluLibDialog.confirmeOverwriteFiles(ui.getParentComponent(), StringUtils.join(overwrittenFile, ", "));
+ return CtuluLibDialog.confirmeOverwriteFiles(ui.getParentComponent(), StringUtils.join(overwrittenFile, "; "));
}
return true;
}
Modified: trunk/soft/fudaa-crue/crue-ui/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioLoaderUI.java
===================================================================
--- trunk/soft/fudaa-crue/crue-ui/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioLoaderUI.java 2010-09-18 00:15:19 UTC (rev 5945)
+++ trunk/soft/fudaa-crue/crue-ui/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioLoaderUI.java 2010-09-18 00:52:21 UTC (rev 5946)
@@ -32,7 +32,7 @@
}
public boolean loadScenarioAndShowBilan(final UiContext uiContext) {
- final boolean ok = loadScenarioInManager(uiContext, null);
+ final boolean ok = loadScenarioInManager(uiContext, scenario.getRunCourant());
if (!ok) {
uiContext.getCtuluUi().error(Messages.getString("ihm.res.chargt.scenario.abort"));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
