Revision: 8753
http://sourceforge.net/p/fudaa/svn/8753
Author: deniger
Date: 2014-06-03 22:17:57 +0000 (Tue, 03 Jun 2014)
Log Message:
-----------
correction bogues OTFA/Rapport
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagneItem.java
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagneLine.java
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutor.java
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagneItem.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagneItem.java 2014-06-03 22:04:01 UTC (rev 8752)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagneItem.java 2014-06-03 22:17:57 UTC (rev 8753)
@@ -25,7 +25,6 @@
public OtfaCampagneItem() {
}
-
OtfaCampagneItem(OtfaCampagneItem toCopy) {
if (toCopy != null) {
this.etuFile = toCopy.etuFile;
@@ -59,7 +58,6 @@
this.cheminCSV = cheminCSV;
}
-
public boolean isEmpty() {
return StringUtils.isBlank(coeurName) && StringUtils.isBlank(scenarioNom) && StringUtils.isBlank(etuFile);
}
@@ -196,4 +194,13 @@
return true;
}
+ void initRapportDataFrom(OtfaCampagneItem cible) {
+ if (cible == null) {
+ return;
+ }
+ this.rapportOnTransitoire = cible.rapportOnTransitoire;
+ this.rapport = cible.rapport;
+ this.cheminCSV = cible.cheminCSV;
+ }
+
}
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagneLine.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagneLine.java 2014-06-03 22:04:01 UTC (rev 8752)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagneLine.java 2014-06-03 22:17:57 UTC (rev 8753)
@@ -85,6 +85,8 @@
newCible.setLaunchCompute(cible.isLaunchCompute());
newCible.setEtuPath(reference.getEtuPath());
newCible.setCoeurName(cible.getCoeurName());
+ newCible.initRapportDataFrom(cible);
+
ConversionNameConverter converter = new ConversionNameConverter(cible.isCrue9() ? CrueVersionType.CRUE9 : CrueVersionType.CRUE10);
newCible.setScenarioNom(converter.convert(reference.getScenarioNom()));
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutor.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutor.java 2014-06-03 22:04:01 UTC (rev 8752)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutor.java 2014-06-03 22:17:57 UTC (rev 8753)
@@ -77,7 +77,8 @@
final EMHRun run = managerScenario.getRunCourant();
CtuluLog log = logs.createNewLog("otfa.report.loading");
if (run == null) {
- log.addWarn("otfa.report.notGenerated.NoCurrentRun");
+ log.addError("otfa.report.notGenerated.NoCurrentRun");
+ return;
}
ReportIndexReaderHelper helper = new ReportIndexReaderHelper(projet);
final ReportContentType contentType = ReportViewLineInfoAndType.getContentType(item.getRapport());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
