Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[7880] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2012-11-14 08:38:53
|
Revision: 7880
http://fudaa.svn.sourceforge.net/fudaa/?rev=7880&view=rev
Author: deniger
Date: 2012-11-14 08:38:46 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/config/SeveriteManager.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/DHReader.java
trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/io/TestCrueDC.java
trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/io/TestCrueDH.java
trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/io/TestCrueOPTRFile.java
trunk/soft/fudaa-crue/crue-server/src/test/resources/CrueConfigMetierForTestsFalse.xml
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/AbstractPerspectiveService.java
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/config/SeveriteManager.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/config/SeveriteManager.java 2012-11-14 08:31:59 UTC (rev 7879)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/config/SeveriteManager.java 2012-11-14 08:38:46 UTC (rev 7880)
@@ -16,6 +16,7 @@
public static final String VERBOSITE_ID = "Ten_Severite";
public static final String INFO = "INFO";
+ public static final String DEFAULT_DEBUG_LEVEL_FOR_CRUE9 = "DEBUG2";
public static final String DEBUG3 = "DEBUG3";
private final List<ItemEnum> levels;
private final Map<String, ItemEnum> verbosite;
@@ -51,8 +52,8 @@
if (!mng.isManaged(INFO)) {
log.addSevereError("config.verbositeRequiredLevelNotFound", INFO);
}
- if (!mng.isManaged(DEBUG3)) {
- log.addSevereError("config.verbositeRequiredLevelNotFound", DEBUG3);
+ if (!mng.isManaged(DEFAULT_DEBUG_LEVEL_FOR_CRUE9)) {
+ log.addSevereError("config.verbositeRequiredLevelNotFound", DEFAULT_DEBUG_LEVEL_FOR_CRUE9);
}
return mng;
}
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 2012-11-14 08:31:59 UTC (rev 7879)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileReader.java 2012-11-14 08:38:46 UTC (rev 7880)
@@ -2294,9 +2294,9 @@
metier.getOrCreateOPTG();
metier.getOrCreateOPTI();
if (!"0".equals(isorti)) {
- metier.getOrCreateOPTR().getSorties().modifyVerbositeForAll(SeveriteManager.DEBUG3);
- metier.getOrCreateOPTG().getSorties().modifyVerbositeForAll(SeveriteManager.DEBUG3);
- metier.getOrCreateOPTI().getSorties().modifyVerbositeForAll(SeveriteManager.DEBUG3);
+ metier.getOrCreateOPTR().getSorties().modifyVerbositeForAll(SeveriteManager.DEFAULT_DEBUG_LEVEL_FOR_CRUE9);
+ metier.getOrCreateOPTG().getSorties().modifyVerbositeForAll(SeveriteManager.DEFAULT_DEBUG_LEVEL_FOR_CRUE9);
+ metier.getOrCreateOPTI().getSorties().modifyVerbositeForAll(SeveriteManager.DEFAULT_DEBUG_LEVEL_FOR_CRUE9);
}
if (metier.getPNUM().getParamNumCalcTrans() == null) {
metier.getPNUM().setParamNumCalcTrans(new ParamNumCalcTrans(metier.getCrueConfigMetier()));
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/neuf/DHReader.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/neuf/DHReader.java 2012-11-14 08:31:59 UTC (rev 7879)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/neuf/DHReader.java 2012-11-14 08:38:46 UTC (rev 7880)
@@ -1294,7 +1294,7 @@
}
if (ilecam == 1) {
- // LOI FONCTION DU TEMPS FOURNIE, AVEC DEBUG3 PAS DE TEMPS CONSTANT
+ // LOI FONCTION DU TEMPS FOURNIE, AVEC DEFAULT_DEBUG_LEVEL_FOR_CRUE9 PAS DE TEMPS CONSTANT
final Duration pasDeTempsDefLoi = readDuration(reader);
final Duration decal = readDuration(reader, 4);
@@ -1650,7 +1650,7 @@
// // Enregistrement de isorti dans PCAL
crueData.getOrCreateOCAL().getSorties().modifyVerbositeForAll(isorti == 0
? SeveriteManager.INFO
- : SeveriteManager.DEBUG3);
+ : SeveriteManager.DEFAULT_DEBUG_LEVEL_FOR_CRUE9);
// pour cree un PCAL par defaut.
crueData.getOrCreatePCAL();
Modified: trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/io/TestCrueDC.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/io/TestCrueDC.java 2012-11-14 08:31:59 UTC (rev 7879)
+++ trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/io/TestCrueDC.java 2012-11-14 08:38:46 UTC (rev 7880)
@@ -194,8 +194,8 @@
assertTrue(sorties.getAvancement().getSortieFichier());
assertTrue(sorties.getTrace().getSortieEcran());
assertTrue(sorties.getTrace().getSortieFichier());
- assertEquals(SeveriteManager.DEBUG3, sorties.getTrace().getVerbositeEcran());
- assertEquals(SeveriteManager.DEBUG3, sorties.getTrace().getVerbositeFichier());
+ assertEquals(SeveriteManager.DEFAULT_DEBUG_LEVEL_FOR_CRUE9, sorties.getTrace().getVerbositeEcran());
+ assertEquals(SeveriteManager.DEFAULT_DEBUG_LEVEL_FOR_CRUE9, sorties.getTrace().getVerbositeFichier());
}
private void testBatiCasier(final CrueData data) {
@@ -468,7 +468,7 @@
final CtuluLog analyzer = new CtuluLog(BusinessMessages.RESOURCE_BUNDLE);
final CrueData data = readModeleCrue9(analyzer, FICHIER_TEST_MODELE3_1_DC_ISORTI_0);
assertFalse(analyzer.containsSevereError());
- data.getOPTG().getSorties().getTrace().setVerbositeEcran(SeveriteManager.DEBUG3);
+ data.getOPTG().getSorties().getTrace().setVerbositeEcran(SeveriteManager.DEFAULT_DEBUG_LEVEL_FOR_CRUE9);
File f = createTempFile();
writeModeleCrue9(analyzer, f, data);
try {
Modified: trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/io/TestCrueDH.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/io/TestCrueDH.java 2012-11-14 08:31:59 UTC (rev 7879)
+++ trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/io/TestCrueDH.java 2012-11-14 08:38:46 UTC (rev 7880)
@@ -119,7 +119,7 @@
testAnalyser(analyzer);
//le dh active OCAL
TestCrueDC.assertSortieTrueAndInfo(data.getMetier().getOCAL().getSorties());
- data.getMetier().getOCAL().getSorties().getTrace().setVerbositeFichier(SeveriteManager.DEBUG3);
+ data.getMetier().getOCAL().getSorties().getTrace().setVerbositeFichier(SeveriteManager.DEFAULT_DEBUG_LEVEL_FOR_CRUE9);
File f = createTempFile();
Crue9FileFormatFactory.getDHFileFormat().writeMetier(data, f, analyzer);
testAnalyser(analyzer);
Modified: trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/io/TestCrueOPTRFile.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/io/TestCrueOPTRFile.java 2012-11-14 08:31:59 UTC (rev 7879)
+++ trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/io/TestCrueOPTRFile.java 2012-11-14 08:38:46 UTC (rev 7880)
@@ -20,13 +20,13 @@
public class TestCrueOPTRFile extends AbstractIOTestCase {
/**
- *
+ *
*/
protected static final String FICHIER_TEST_OPTR_XML = "/v1_2/M3-0_c10.optr.xml";
protected static final String FICHIER_TEST_OPTR_XML_FALSE = "/v1_2/M3-0_c10-false.optr.xml";
/**
- *
+ *
*/
public TestCrueOPTRFile() {
super(Crue10FileFormatFactory.getVersion(CrueFileType.OPTR, TestCoeurConfig.INSTANCE), FICHIER_TEST_OPTR_XML);
@@ -34,7 +34,7 @@
public void testLecture() {
- final OrdPrtReseau data = readModele(FICHIER_TEST_OPTR_XML,TestCoeurConfig.INSTANCE);
+ final OrdPrtReseau data = readModele(FICHIER_TEST_OPTR_XML, TestCoeurConfig.INSTANCE);
testData(data);
}
@@ -111,9 +111,8 @@
public OrdPrtReseau readModele(String file, CoeurConfigContrat version) {
final CtuluLog analyzer = new CtuluLog();
final OrdPrtReseau data = (OrdPrtReseau) Crue10FileFormatFactory.getVersion(CrueFileType.OPTR, version).read(file, analyzer, createDefault())
- .getMetier();
+ .getMetier();
testAnalyser(analyzer);
return data;
}
-
}
Modified: trunk/soft/fudaa-crue/crue-server/src/test/resources/CrueConfigMetierForTestsFalse.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/test/resources/CrueConfigMetierForTestsFalse.xml 2012-11-14 08:31:59 UTC (rev 7879)
+++ trunk/soft/fudaa-crue/crue-server/src/test/resources/CrueConfigMetierForTestsFalse.xml 2012-11-14 08:38:46 UTC (rev 7880)
@@ -39,7 +39,7 @@
<ItemEnum Id="4">Lt_StoG</ItemEnum>
</ItemTypeEnum>
<ItemTypeEnum Nom="Ten_Severite">
- <ItemEnum Id="0">DEBUG3</ItemEnum>
+ <ItemEnum Id="0">DEBUG2</ItemEnum>
<ItemEnum Id="2">FATAL</ItemEnum>
</ItemTypeEnum>
</TypeEnums>
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/AbstractPerspectiveService.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/AbstractPerspectiveService.java 2012-11-14 08:31:59 UTC (rev 7879)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/AbstractPerspectiveService.java 2012-11-14 08:38:46 UTC (rev 7880)
@@ -201,7 +201,6 @@
@Override
public void setState(PerspectiveState state) {
if (PerspectiveState.MODE_READ_ONLY_ALWAYS.equals(this.state)) {
- setState(this.state);
return;
}
doSetState(state);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
