Menu
▾
▴
fudaa-svn-commit
|
From: <de...@us...> - 2013-04-04 09:45:10
|
Revision: 8379
http://fudaa.svn.sourceforge.net/fudaa/?rev=8379&view=rev
Author: deniger
Date: 2013-04-04 09:44:57 +0000 (Thu, 04 Apr 2013)
Log Message:
-----------
version 0.68
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-compare/pom.xml
trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterResultatCalcul.java
trunk/soft/fudaa-crue/crue-config/pom.xml
trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/CrueConfigMetierReader.java
trunk/soft/fudaa-crue/crue-core/pom.xml
trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerDate.java
trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerMillis.java
trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerSecond.java
trunk/soft/fudaa-crue/crue-emh/pom.xml
trunk/soft/fudaa-crue/crue-io/pom.xml
trunk/soft/fudaa-crue/crue-otfa/pom.xml
trunk/soft/fudaa-crue/crue-project/pom.xml
trunk/soft/fudaa-crue/crue-sysdoc/pom.xml
trunk/soft/fudaa-crue/crue-test/pom.xml
trunk/soft/fudaa-crue/pom.xml
trunk/soft/fudaa-crue/ui-application/pom.xml
trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf
trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrueDev.conf
trunk/soft/fudaa-crue/ui-branding/pom.xml
trunk/soft/fudaa-crue/ui-commandline/pom.xml
trunk/soft/fudaa-crue/ui-common/pom.xml
trunk/soft/fudaa-crue/ui-comparison/pom.xml
trunk/soft/fudaa-crue/ui-emh/pom.xml
trunk/soft/fudaa-crue/ui-loader/pom.xml
trunk/soft/fudaa-crue/ui-loi/pom.xml
trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbesUiController.java
trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/SecondValueEditor.java
trunk/soft/fudaa-crue/ui-modelling/pom.xml
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DLHYTopComponent.java
trunk/soft/fudaa-crue/ui-options/pom.xml
trunk/soft/fudaa-crue/ui-options/src/main/resources/FudaaCrue_Site.xml
trunk/soft/fudaa-crue/ui-otfa/pom.xml
trunk/soft/fudaa-crue/ui-planimetry/pom.xml
trunk/soft/fudaa-crue/ui-post/pom.xml
trunk/soft/fudaa-crue/ui-report/pom.xml
trunk/soft/fudaa-crue/ui-study/pom.xml
trunk/soft/fudaa-crue/ui-sysdoc/pom.xml
trunk/soft/fudaa-crue/ui-views/pom.xml
trunk/soft/fudaa-crue/ui-wrapper/pom.xml
Added Paths:
-----------
trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/SecondParser.java
Modified: trunk/soft/fudaa-crue/crue-compare/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/crue-compare/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
</parent>
<artifactId>crue-compare</artifactId>
<name>Crue Compare</name>
Modified: trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterResultatCalcul.java
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterResultatCalcul.java 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterResultatCalcul.java 2013-04-04 09:44:57 UTC (rev 8379)
@@ -120,7 +120,6 @@
}
public String resultatTimeKeyToString(ResultatTimeKey resultatKey, ResultKeyFormatter formatter) {
- //TODO modifier le resultatKeyToString avec transformer:
String toString = stringByTimeKey.get(resultatKey);
if (toString == null) {
toString = formatter.getResulatKeyTempsSceToStringTransformer().transform(resultatKey);
Modified: trunk/soft/fudaa-crue/crue-config/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-config/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/crue-config/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
</parent>
<artifactId>crue-config</artifactId>
<name>Crue Config</name>
Modified: trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/CrueConfigMetierReader.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/CrueConfigMetierReader.java 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/CrueConfigMetierReader.java 2013-04-04 09:44:57 UTC (rev 8379)
@@ -223,7 +223,7 @@
//utile pour la verbosité.
int currentIdx = nature.ItemEnum.size();
for (DaoItemEnum object : nature.ItemEnum) {
- int idx = currentIdx--;
+ int idx = --currentIdx;
if (object.Id != null) {
idx = Integer.parseInt(object.Id);
}
Modified: trunk/soft/fudaa-crue/crue-core/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-core/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/crue-core/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
</parent>
<artifactId>crue-core</artifactId>
<name>Crue Core</name>
Added: trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/SecondParser.java
===================================================================
--- trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/SecondParser.java (rev 0)
+++ trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/SecondParser.java 2013-04-04 09:44:57 UTC (rev 8379)
@@ -0,0 +1,13 @@
+/*
+ GPL 2
+ */
+package org.fudaa.dodico.crue.common.time;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public interface SecondParser {
+
+ Double parseInSec(String in);
+}
Modified: trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerDate.java
===================================================================
--- trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerDate.java 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerDate.java 2013-04-04 09:44:57 UTC (rev 8379)
@@ -6,6 +6,7 @@
import org.apache.commons.lang.StringUtils;
import org.fudaa.ctulu.CtuluNumberFormatI;
import org.fudaa.dodico.crue.common.transformer.ToStringTransformer;
+import org.joda.time.DateTime;
import org.joda.time.LocalDateTime;
import org.joda.time.format.DateTimeFormatter;
import org.joda.time.format.ISODateTimeFormat;
@@ -14,7 +15,7 @@
*
* @author Frederic Deniger
*/
-public class ToStringTransformerDate implements ToStringTransformer, CtuluNumberFormatI {
+public class ToStringTransformerDate implements ToStringTransformer, CtuluNumberFormatI, SecondParser {
private static final DateTimeFormatter XSD_DATE_FORMATTER = ISODateTimeFormat.dateHourMinuteSecondMillis();
LocalDateTime date;
@@ -29,6 +30,24 @@
this.date = date;
}
+ @Override
+ public Double parseInSec(String in) {
+ //ce n'est pas une date
+ if (in.indexOf('T') < 0) {
+ return initTransformer.parseInSec(in);
+ }
+ if (in.indexOf('.') < 0) {
+ return parseInSec(in + ".000");
+ }
+ try {
+ DateTime parseDateTime = XSD_DATE_FORMATTER.parseDateTime(in);
+ long millis = parseDateTime.getMillis() - date.toDateTime().getMillis();
+ return millis / 1000d;
+ } catch (Exception ex) {
+ }
+ return null;
+ }
+
public LocalDateTime getDate() {
return date;
}
@@ -51,7 +70,7 @@
}
Number value = (Number) in;
LocalDateTime plusMillis = date.plusMillis((int) (value.doubleValue() * 1000));
- return plusMillis.toString(XSD_DATE_FORMATTER);
+ return format(plusMillis);
}
@Override
@@ -75,6 +94,6 @@
return initTransformer.format(sec);
}
LocalDateTime plusMillis = date.plusMillis((int) (sec * 1000));
- return plusMillis.toString(XSD_DATE_FORMATTER);
+ return format(plusMillis);
}
}
Modified: trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerMillis.java
===================================================================
--- trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerMillis.java 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerMillis.java 2013-04-04 09:44:57 UTC (rev 8379)
@@ -16,7 +16,7 @@
*
* @author Frederic Deniger
*/
-public class ToStringTransformerMillis implements ToStringTransformer {
+public class ToStringTransformerMillis implements ToStringTransformer, SecondParser {
PeriodFormatter dureeFormater = new PeriodFormatterBuilder()
.appendDays().appendSeparatorIfFieldsBefore(":")
@@ -34,6 +34,7 @@
return dureeFormater.print(createPeriodFromMillis(value.longValue()));
}
+ @Override
public Double parseInSec(String in) {
try {
if (in.indexOf('.') < 0) {
Modified: trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerSecond.java
===================================================================
--- trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerSecond.java 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/time/ToStringTransformerSecond.java 2013-04-04 09:44:57 UTC (rev 8379)
@@ -11,7 +11,7 @@
*
* @author Frederic Deniger
*/
-public class ToStringTransformerSecond implements ToStringTransformer, CtuluNumberFormatI {
+public class ToStringTransformerSecond implements ToStringTransformer, CtuluNumberFormatI, SecondParser {
ToStringTransformerMillis millis = new ToStringTransformerMillis();
@@ -44,7 +44,8 @@
return millis.format((long) (sec * 1000L));
}
- public double parseInSec(String in) {
+ @Override
+ public Double parseInSec(String in) {
return millis.parseInSec(in);
}
}
Modified: trunk/soft/fudaa-crue/crue-emh/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/crue-emh/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
</parent>
<artifactId>crue-emh</artifactId>
<name>Crue EMH</name>
Modified: trunk/soft/fudaa-crue/crue-io/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-io/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/crue-io/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
</parent>
<artifactId>crue-io</artifactId>
<name>Crue IO</name>
Modified: trunk/soft/fudaa-crue/crue-otfa/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/crue-otfa/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
</parent>
<artifactId>crue-otfa</artifactId>
<name>Crue OTFA</name>
Modified: trunk/soft/fudaa-crue/crue-project/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-project/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/crue-project/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
</parent>
<artifactId>crue-project</artifactId>
<name>Crue Project</name>
Modified: trunk/soft/fudaa-crue/crue-sysdoc/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-sysdoc/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/crue-sysdoc/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
</parent>
<artifactId>crue-sysdoc</artifactId>
<name>Crue Sysdoc</name>
Modified: trunk/soft/fudaa-crue/crue-test/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-test/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/crue-test/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
</parent>
<artifactId>crue-test</artifactId>
Modified: trunk/soft/fudaa-crue/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -8,7 +8,7 @@
</parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
<name>Fudaa-Crue</name>
<packaging>pom</packaging>
<ciManagement>
Modified: trunk/soft/fudaa-crue/ui-application/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-application/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-application/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
</parent>
<artifactId>application</artifactId>
Modified: trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf
===================================================================
--- trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf 2013-04-04 09:44:57 UTC (rev 8379)
@@ -1,8 +1,8 @@
# ${HOME} will be replaced by user home directory according to platform
#default_userdir="${DEFAULT_USERDIR_ROOT}/0.62"
#default_cachedir="${DEFAULT_CACHEDIR_ROOT}/0.62"
-default_userdir="${HOME}\.${APPNAME}\0.67"
-default_mac_userdir="${HOME}/Library/Application Support/${APPNAME}/0.67/"
+default_userdir="${HOME}\.${APPNAME}\0.69"
+default_mac_userdir="${HOME}/Library/Application Support/${APPNAME}/0.69/"
# options used by the launcher by default, can be overridden by explicit
# command line switches
default_options="--branding fudaacrue -J-Xms24m -J-Xmx512m --multi-instances"
Modified: trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrueDev.conf
===================================================================
--- trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrueDev.conf 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrueDev.conf 2013-04-04 09:44:57 UTC (rev 8379)
@@ -1,5 +1,5 @@
# ${HOME} will be replaced by user home directory according to platform
-default_userdir="${HOME}\.${APPNAME}\0.66"
+default_userdir="${HOME}\.${APPNAME}\0.68"
# options used by the launcher by default, can be overridden by explicit
# command line switches
Modified: trunk/soft/fudaa-crue/ui-branding/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-branding/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
</parent>
<artifactId>ui-branding</artifactId>
Modified: trunk/soft/fudaa-crue/ui-commandline/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-commandline/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-commandline/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
</parent>
<artifactId>ui-commandline</artifactId>
<packaging>nbm</packaging>
Modified: trunk/soft/fudaa-crue/ui-common/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-common/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-common/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
</parent>
<artifactId>ui-common</artifactId>
Modified: trunk/soft/fudaa-crue/ui-comparison/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-comparison/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-comparison/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
</parent>
<artifactId>ui-comparison</artifactId>
<packaging>nbm</packaging>
Modified: trunk/soft/fudaa-crue/ui-emh/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-emh/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-emh/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
</parent>
<artifactId>ui-emh</artifactId>
<packaging>nbm</packaging>
Modified: trunk/soft/fudaa-crue/ui-loader/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-loader/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-loader/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
</parent>
<artifactId>ui-loader</artifactId>
<packaging>nbm</packaging>
Modified: trunk/soft/fudaa-crue/ui-loi/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-loi/pom.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.67-SNAPSHOT</version>
+ <version>0.69-SNAPSHOT</version>
</parent>
<artifactId>ui-loi</artifactId>
Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbesUiController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbesUiController.java 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbesUiController.java 2013-04-04 09:44:57 UTC (rev 8379)
@@ -19,11 +19,12 @@
import org.apache.commons.lang.StringUtils;
import org.fudaa.ctulu.CtuluNumberFormatDefault;
import org.fudaa.ctulu.CtuluNumberFormatI;
+import org.fudaa.ctulu.editor.CtuluValueEditorI;
import org.fudaa.ctulu.gui.PopupMenuReceiver;
import org.fudaa.ctulu.image.CtuluImageProducer;
import org.fudaa.ctulu.iterator.FixedIntegerIterator;
+import org.fudaa.dodico.crue.common.time.ToStringTransformerSecond;
import org.fudaa.dodico.crue.common.transformer.CtuluNumberFormatAppender;
-import org.fudaa.dodico.crue.common.time.ToStringTransformerSecond;
import org.fudaa.dodico.crue.config.ccm.CrueConfigMetier;
import org.fudaa.dodico.crue.config.ccm.DecimalFormatEpsilonEnum;
import org.fudaa.dodico.crue.config.ccm.ItemVariable;
@@ -42,89 +43,89 @@
* @author Frederic Deniger
*/
public class CourbesUiController implements CtuluImageProducer {
-
+
protected EGFillePanel panel;
protected EGTableGraphePanel tableGraphePanel;
protected EGAxeHorizontal axeH;
protected JPanel toolbar;
protected boolean useVariableForAxeH;
protected List<EbliActionInterface> editCourbeActions = new ArrayList<EbliActionInterface>();
-
+
protected void configureTablePanel() {
tableGraphePanel.getTable().setModel(createTableModel());
tableGraphePanel.setPreferredSize(new Dimension(300, 600));
}
-
+
public boolean isUseVariableForAxeH() {
return useVariableForAxeH;
}
-
+
public void setUseVariableForAxeH(boolean useVariableForAxeH) {
this.useVariableForAxeH = useVariableForAxeH;
}
-
+
public void installComboxSelector() {
tableGraphePanel.getTitleLabel().setVisible(false);
tableGraphePanel.remove(tableGraphePanel.getTitleLabel());
ComboboxCourbeSelector cb = new ComboboxCourbeSelector(getGraphe());
tableGraphePanel.add(cb.getCb(), BorderLayout.NORTH);
-
+
}
-
+
public EGGrapheSimpleModel getEGGrapheSimpleModel() {
return (EGGrapheSimpleModel) getGraphe().getModel();
}
-
+
public EGTableGraphePanel getTableGraphePanel() {
return tableGraphePanel;
}
-
+
public EGAxeHorizontal getAxeX() {
return getEGGrapheSimpleModel().getAxeX();
}
-
+
public List<EGAxeVertical> getAxesY() {
return getGraphe().getAllAxeVertical();
}
-
+
@Override
public BufferedImage produceImage(final Map _params) {
return panel.produceImage(_params);
-
+
}
-
+
@Override
public BufferedImage produceImage(int _w, int _h, Map _params) {
return panel.produceImage(_w, _h, _params);
}
-
+
@Override
public Dimension getDefaultImageDimension() {
return panel.getDefaultImageDimension();
}
-
+
public void addExportImagesToToolbar() {
toolbar.add(new ExportImageAction(panel).buildToolButton(EbliComponentFactory.INSTANCE));
toolbar.add(new ExportImageToClipboardAction(panel).buildToolButton(EbliComponentFactory.INSTANCE));
}
-
+
public JPanel getToolbar() {
return toolbar;
}
-
+
public EGFillePanel getPanel() {
return panel;
}
-
+
public EGGraphe getGraphe() {
return panel.getGraphe();
}
-
+
public void removeEditActions() {
tableGraphePanel.removeEditButtonsButCopy();
removeActions("MOVE_POINT", "SIMPLIFY");
}
-
+
public void removeActions(String... actionCommands) {
if (toolbar != null) {
Set<String> command = new HashSet<String>(Arrays.asList(actionCommands));
@@ -136,12 +137,12 @@
toolbar.remove(component);
}
}
-
+
}
}
-
+
}
-
+
public List<EbliActionInterface> getActions(String... command) {
EbliActionInterface[] specificActions = panel.getSpecificActions();
List<EbliActionInterface> res = new ArrayList<EbliActionInterface>();
@@ -157,11 +158,11 @@
}
return res;
}
-
+
public List<EbliActionInterface> getEditActions() {
return getActions("CONFIGURE", "CONFIGURE_REPERE");
}
-
+
public CourbesUiController() {
final EGGrapheSimpleModel grapheModel = new LoiGrapheSimpleModel();
axeH = new EGAxeHorizontal();
@@ -206,20 +207,20 @@
popupGraphe.install(panel.getGraphe(), tableGraphePanel.getTable(), CtuluUIForNetbeans.DEFAULT);
}
protected boolean editable;
-
+
public void setEditable(boolean b) {
editable = b;
tableGraphePanel.updateState();
for (EbliActionInterface ebliActionInterface : editCourbeActions) {
ebliActionInterface.setEnabled(b);
-
+
}
}
-
+
protected AbstractTableModel createTableModel() {
return new EGTableGraphePanel.SpecTableModel(tableGraphePanel);
}
-
+
public void configureAxeH(final PropertyNature natureAbscisse, boolean usePresentation) {
if (natureAbscisse == null) {
return;
@@ -230,7 +231,7 @@
axeH.setUnite(natureAbscisse.getUnite());
installFormatter(natureAbscisse, axeH, usePresentation);
}
-
+
public void configureAxeH(final ItemVariable varAbscisse, boolean usePresentation) {
if (varAbscisse == null) {
return;
@@ -238,15 +239,15 @@
configureAxeH(varAbscisse.getNature(), usePresentation);
axeH.setTitre(varAbscisse.getDisplayNom());
}
-
+
public EGAxeVertical findAxe(final ItemVariable varOrdonnee) {
if (varOrdonnee == null) {
return null;
}
return findAxe(varOrdonnee.getNature());
-
+
}
-
+
public EGAxeVertical findAxe(final PropertyNature nature) {
if (nature == null) {
return null;
@@ -259,15 +260,15 @@
}
return null;
}
-
+
public EGAxeVertical createAxeVertical(final ItemVariable varOrdonnee, boolean usePresentation) {
if (varOrdonnee == null) {
return null;
}
return createAxeVertical(varOrdonnee.getNature(), usePresentation);
-
+
}
-
+
public EGAxeVertical createAxeVertical(final PropertyNature nature, boolean usePresentation) {
EGAxeVertical axeV = null;
if (nature != null) {
@@ -281,17 +282,18 @@
installFormatter(nature, axeV, usePresentation);
return axeV;
}
-
- public void setAxeHSpecificFormats(CtuluNumberFormatI mainFormat, CtuluNumberFormatI detailFormat) {
+
+ public void setAxeHSpecificFormats(CtuluNumberFormatI mainFormat, CtuluNumberFormatI detailFormat, final CtuluValueEditorI _valueEditor) {
if (getAxeX() != null) {
getAxeX().setSpecificFormat(mainFormat);
getAxeX().setSpecificDetailFormat(detailFormat);
+ getAxeX().setValueEditor(_valueEditor);
}
}
-
+
protected void installFormatter(final PropertyNature var, EGAxe axe, boolean usePresentation) {
if (var != null) {
-
+
if (var.isEnum()) {
axe.setSpecificFormat(new EnumNumberFormatter(var));
axe.setAxisIterator(new FixedIntegerIterator(var.getItemEnumByValue().keys()));
@@ -308,7 +310,7 @@
}
axe.setUserObject(var);
}
-
+
public LoiPopupMenuReceiver createLoiPoupReceiver() {
return new LoiPopupMenuReceiver(panel);
}
@@ -328,7 +330,7 @@
configureAxeH(varAbscisse.getNature(), usePresentationFormat);
}
}
-
+
public void initAxeWithDuration(final PropertyNature var, EGAxe axe) {
final ToStringTransformerSecond toStringTransformerSecond = new ToStringTransformerSecond();
final CtuluNumberFormatDefault toSecondFormat = new CtuluNumberFormatDefault(var.getFormatter(DecimalFormatEpsilonEnum.COMPARISON));
Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/SecondValueEditor.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/SecondValueEditor.java 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/SecondValueEditor.java 2013-04-04 09:44:57 UTC (rev 8379)
@@ -11,9 +11,9 @@
import org.apache.commons.lang.StringUtils;
import org.fudaa.ctulu.CtuluDurationFormatter;
import org.fudaa.ctulu.CtuluLibString;
-import org.fudaa.ctulu.CtuluNumberFormatDefault;
+import org.fudaa.ctulu.CtuluNumberFormatI;
import org.fudaa.ctulu.editor.CtuluValueEditorDouble;
-import org.fudaa.dodico.crue.common.time.ToStringTransformerSecond;
+import org.fudaa.dodico.crue.common.time.SecondParser;
/**
*
@@ -21,11 +21,16 @@
*/
public class SecondValueEditor extends CtuluValueEditorDouble {
- final ToStringTransformerSecond transformer;
+ final SecondParser secondParser;
- public SecondValueEditor(ToStringTransformerSecond transformer, CtuluNumberFormatDefault toSecond) {
+ /**
+ *
+ * @param secondParser peut etre null si la date de deb ne l'est pas.
+ * @param toSecond
+ */
+ public SecondValueEditor(SecondParser secondParser, CtuluNumberFormatI toSecond) {
super(false);
- this.transformer = transformer;
+ this.secondParser = secondParser;
setFormatter(toSecond);
}
@@ -98,7 +103,7 @@
return res;
}...
[truncated message content] |
|
From: <de...@us...> - 2013-04-06 02:18:55
|
Revision: 8389
http://fudaa.svn.sourceforge.net/fudaa/?rev=8389&view=rev
Author: deniger
Date: 2013-04-06 02:18:47 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/AbstractLoiUiController.java
trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilSectionLoiUiController.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionTopComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/persist/CourbeConfigUpdater.java
Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/AbstractLoiUiController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/AbstractLoiUiController.java 2013-04-06 02:13:52 UTC (rev 8388)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/AbstractLoiUiController.java 2013-04-06 02:18:47 UTC (rev 8389)
@@ -90,9 +90,9 @@
tableGraphePanel.getTable().getColumnModel().getColumn(0).setCellRenderer(new LoiStateCellRenderer());
tableGraphePanel.getTable().getColumnModel().getColumn(1).setHeaderValue(configLoi.getVarAbscisse().getNom());
tableGraphePanel.getTable().getColumnModel().getColumn(2).setHeaderValue(varOrdonnee.getNom());
- getGraphe().fullRepaint();
getGraphe().restore();
getGraphe().fullRepaint();
+ panel.repaint();
loiModel.addObserver(new Observer() {
@Override
Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilSectionLoiUiController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilSectionLoiUiController.java 2013-04-06 02:13:52 UTC (rev 8388)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilSectionLoiUiController.java 2013-04-06 02:18:47 UTC (rev 8389)
@@ -288,7 +288,8 @@
updating = false;
updateValidationState();
updateWithAvailableFrottements(sousModeleParent.getFrtConteneur().getListFrt());
- getGraphe().restoreAllYAxe();
+ getGraphe().restore();
+ getGraphe().fullRepaint();
}
boolean updating;
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionTopComponent.java 2013-04-06 02:13:52 UTC (rev 8388)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionTopComponent.java 2013-04-06 02:18:47 UTC (rev 8389)
@@ -407,6 +407,8 @@
}
profilUiController.setEditable(editable);
applyCourbeConfig();
+ profilUiController.getGraphe().restore();
+ profilUiController.getGraphe().restore();
updating = false;
setModified(false);
}
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/persist/CourbeConfigUpdater.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/persist/CourbeConfigUpdater.java 2013-04-06 02:13:52 UTC (rev 8388)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/persist/CourbeConfigUpdater.java 2013-04-06 02:18:47 UTC (rev 8389)
@@ -55,7 +55,7 @@
String oldUnite = axeY.getUnite();
EGAxeVerticalPersist axeVConfig = config.getAxeVConfig(key);
if (axeVConfig != null) {
- axeVConfig.apply(axeY);
+ axeVConfig.applyAllButRange(axeY);
axeY.setTitre(oldTitle);
axeY.setUnite(oldUnite);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-04-23 21:17:52
|
Revision: 8402
http://fudaa.svn.sourceforge.net/fudaa/?rev=8402&view=rev
Author: deniger
Date: 2013-04-23 21:17:42 +0000 (Tue, 23 Apr 2013)
Log Message:
-----------
TraceCasiers
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-compare/pom.xml
trunk/soft/fudaa-crue/crue-config/pom.xml
trunk/soft/fudaa-crue/crue-core/pom.xml
trunk/soft/fudaa-crue/crue-emh/pom.xml
trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/result/ModeleResultatTimeKeyContent.java
trunk/soft/fudaa-crue/crue-io/pom.xml
trunk/soft/fudaa-crue/crue-otfa/pom.xml
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java
trunk/soft/fudaa-crue/crue-project/pom.xml
trunk/soft/fudaa-crue/crue-sysdoc/pom.xml
trunk/soft/fudaa-crue/crue-test/pom.xml
trunk/soft/fudaa-crue/crue-validation/pom.xml
trunk/soft/fudaa-crue/pom.xml
trunk/soft/fudaa-crue/ui-application/pom.xml
trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf
trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrueDev.conf
trunk/soft/fudaa-crue/ui-branding/pom.xml
trunk/soft/fudaa-crue/ui-commandline/pom.xml
trunk/soft/fudaa-crue/ui-common/pom.xml
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/DialogHelper.java
trunk/soft/fudaa-crue/ui-comparison/pom.xml
trunk/soft/fudaa-crue/ui-emh/pom.xml
trunk/soft/fudaa-crue/ui-loader/pom.xml
trunk/soft/fudaa-crue/ui-loi/pom.xml
trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbeVisibiltyUI.java
trunk/soft/fudaa-crue/ui-modelling/pom.xml
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AddSectionInBranchePanelContent.java
trunk/soft/fudaa-crue/ui-options/pom.xml
trunk/soft/fudaa-crue/ui-otfa/pom.xml
trunk/soft/fudaa-crue/ui-planimetry/pom.xml
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/SectionProfilAttachedToBrancheAction.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/TraceCasierImporterAction.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/TraceCasierToCasierAction.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/TraceProfilToSectionAction.java
trunk/soft/fudaa-crue/ui-post/pom.xml
trunk/soft/fudaa-crue/ui-report/pom.xml
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/extern/ExternFileChooser.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalBrancheChooser.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/planimetry/ReportPlanimetryConfigUI.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/time/ReportTimeStepTopPanel.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/time/ReportTimeVideoRecorderEditor.java
trunk/soft/fudaa-crue/ui-study/pom.xml
trunk/soft/fudaa-crue/ui-sysdoc/pom.xml
trunk/soft/fudaa-crue/ui-views/pom.xml
trunk/soft/fudaa-crue/ui-wrapper/pom.xml
Modified: trunk/soft/fudaa-crue/crue-compare/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/crue-compare/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<artifactId>crue-compare</artifactId>
<name>Crue Compare</name>
Modified: trunk/soft/fudaa-crue/crue-config/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-config/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/crue-config/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<artifactId>crue-config</artifactId>
<name>Crue Config</name>
Modified: trunk/soft/fudaa-crue/crue-core/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-core/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/crue-core/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<artifactId>crue-core</artifactId>
<name>Crue Core</name>
Modified: trunk/soft/fudaa-crue/crue-emh/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/crue-emh/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<artifactId>crue-emh</artifactId>
<name>Crue EMH</name>
Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/result/ModeleResultatTimeKeyContent.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/result/ModeleResultatTimeKeyContent.java 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/result/ModeleResultatTimeKeyContent.java 2013-04-23 21:17:42 UTC (rev 8402)
@@ -123,8 +123,14 @@
}
public long getGlobalTimeForResultatKey(ResultatTimeKey key) {
- createTimeByKey();
- return timeByKey.get(key);
+ if (key == null) {
+ return 0;
+ }
+ if (key.isPermanent()) {
+ createTimeByKey();
+ return timeByKey.get(key);
+ }
+ return key.getDuree();
}
/**
Modified: trunk/soft/fudaa-crue/crue-io/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-io/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/crue-io/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<artifactId>crue-io</artifactId>
<name>Crue IO</name>
Modified: trunk/soft/fudaa-crue/crue-otfa/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/crue-otfa/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<artifactId>crue-otfa</artifactId>
<name>Crue OTFA</name>
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java 2013-04-23 21:17:42 UTC (rev 8402)
@@ -68,6 +68,8 @@
public RTFAResultLines launch(OtfaCampagne in) {
RTFAResultLines result = null;
OutOfMemoryError oomError = null;
+ FileLocker locker = new FileLocker();
+ Set<File> allEtu = new HashSet<File>();
try {
if (!lineSaver.isStarted()) {
lineSaver.start(false);
@@ -93,7 +95,6 @@
return result;
}
- Set<File> allEtu = new HashSet<File>();
List<OtfaCampagneLine> lines = in.getLines();
for (OtfaCampagneLine line : lines) {
allEtu.add(line.getReference().getEtuFile(in.getOtfaDir()));
@@ -104,11 +105,11 @@
return result;
}
}
- FileLocker locker = new FileLocker();
try {
for (File file : allEtu) {
locker.lock(file, user);
}
+ Thread.currentThread().sleep(5000);
processAllLines(in, campagneLogs);
} finally {
for (File file : allEtu) {
@@ -124,7 +125,12 @@
} catch (OutOfMemoryError error) {
Logger.getLogger(OtfaExecutor.class.getName()).log(Level.WARNING, "message");
oomError = error;
+ } catch (Exception ex) {
+ Logger.getLogger(OtfaExecutor.class.getName()).log(Level.INFO, "message");
} finally {
+ for (File file : allEtu) {
+ locker.unlock(file);
+ }
lineSaver.close();
}
if (oomError != null) {
Modified: trunk/soft/fudaa-crue/crue-project/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-project/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/crue-project/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<artifactId>crue-project</artifactId>
<name>Crue Project</name>
Modified: trunk/soft/fudaa-crue/crue-sysdoc/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-sysdoc/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/crue-sysdoc/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<artifactId>crue-sysdoc</artifactId>
<name>Crue Sysdoc</name>
Modified: trunk/soft/fudaa-crue/crue-test/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-test/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/crue-test/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<artifactId>crue-test</artifactId>
Modified: trunk/soft/fudaa-crue/crue-validation/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-validation/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/crue-validation/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<artifactId>crue-validation</artifactId>
<name>Crue Validation</name>
Modified: trunk/soft/fudaa-crue/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -8,7 +8,7 @@
</parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
<name>Fudaa-Crue</name>
<packaging>pom</packaging>
<ciManagement>
Modified: trunk/soft/fudaa-crue/ui-application/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-application/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-application/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<artifactId>application</artifactId>
Modified: trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf
===================================================================
--- trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf 2013-04-23 21:17:42 UTC (rev 8402)
@@ -1,8 +1,8 @@
# ${HOME} will be replaced by user home directory according to platform
#default_userdir="${DEFAULT_USERDIR_ROOT}/0.62"
#default_cachedir="${DEFAULT_CACHEDIR_ROOT}/0.62"
-default_userdir="${HOME}\.${APPNAME}\0.69"
-default_mac_userdir="${HOME}/Library/Application Support/${APPNAME}/0.69/"
+default_userdir="${HOME}\.${APPNAME}\1.0RC2"
+default_mac_userdir="${HOME}/Library/Application Support/${APPNAME}/1.0RC2/"
# options used by the launcher by default, can be overridden by explicit
# command line switches
default_options="--branding fudaacrue -J-Xms24m -J-Xmx512m --multi-instances"
Modified: trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrueDev.conf
===================================================================
--- trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrueDev.conf 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrueDev.conf 2013-04-23 21:17:42 UTC (rev 8402)
@@ -1,5 +1,5 @@
# ${HOME} will be replaced by user home directory according to platform
-default_userdir="${HOME}\.${APPNAME}\0.68"
+default_userdir="${HOME}\.${APPNAME}\1.0RC2"
# options used by the launcher by default, can be overridden by explicit
# command line switches
Modified: trunk/soft/fudaa-crue/ui-branding/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-branding/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<artifactId>ui-branding</artifactId>
Modified: trunk/soft/fudaa-crue/ui-commandline/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-commandline/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-commandline/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<artifactId>ui-commandline</artifactId>
<packaging>nbm</packaging>
Modified: trunk/soft/fudaa-crue/ui-common/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-common/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-common/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<artifactId>ui-common</artifactId>
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/DialogHelper.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/DialogHelper.java 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/DialogHelper.java 2013-04-23 21:17:42 UTC (rev 8402)
@@ -202,12 +202,19 @@
return showQuestionAndSaveDialogConf(title, message, classToSave, null, null);
}
+ public static boolean showQuestion(DialogDescriptor dialogDescriptor, Class classToSave, String helpId, PerspectiveEnum perspective) {
+ if (helpId != null) {
+ SysdocUrlBuilder.installDialogHelpCtx(dialogDescriptor, helpId, perspective);
+ }
+ return showQuestion(dialogDescriptor, classToSave);
+ }
+
public static boolean showQuestionAndSaveDialogConf(String title, Object message, Class classToSave, String helpId, PerspectiveEnum perspective) {
DialogDescriptor descriptor = new DialogDescriptor(message, title);
if (helpId != null) {
SysdocUrlBuilder.installDialogHelpCtx(descriptor, helpId, perspective);
}
- return showQuestionAndSaveDialogConf(descriptor, classToSave);
+ return showQuestion(descriptor, classToSave);
}
/**
@@ -306,12 +313,12 @@
});
}
- public static boolean showQuestionAndSaveDialogConf(DialogDescriptor descriptor, Class classToSave) {
- return showQuestionAndSaveDialogConf(descriptor, classToSave, false);
+ public static boolean showQuestion(DialogDescriptor descriptor, Class classToSave) {
+ return showQuestion(descriptor, classToSave, false);
}
- public static boolean showQuestionAndSaveDialogConf(DialogDescriptor descriptor, Class classToSave, boolean minMaxaction) {
+ public static boolean showQuestion(DialogDescriptor descriptor, Class classToSave, boolean minMaxaction) {
JDialog createDialog = (JDialog) DialogDisplayer.getDefault().createDialog(descriptor);
createDialog.pack();
createDialog.setName(classToSave.getCanonicalName());
Modified: trunk/soft/fudaa-crue/ui-comparison/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-comparison/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-comparison/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<artifactId>ui-comparison</artifactId>
<packaging>nbm</packaging>
Modified: trunk/soft/fudaa-crue/ui-emh/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-emh/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-emh/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<artifactId>ui-emh</artifactId>
<packaging>nbm</packaging>
Modified: trunk/soft/fudaa-crue/ui-loader/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-loader/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-loader/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<artifactId>ui-loader</artifactId>
<packaging>nbm</packaging>
Modified: trunk/soft/fudaa-crue/ui-loi/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-loi/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<artifactId>ui-loi</artifactId>
Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbeVisibiltyUI.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbeVisibiltyUI.java 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbeVisibiltyUI.java 2013-04-23 21:17:42 UTC (rev 8402)
@@ -55,6 +55,6 @@
});
new CheckBoxListPopupListener(list);
SysdocUrlBuilder.installDialogHelpCtx(desc, "bdlAffichageCourbes", null);
- DialogHelper.showQuestionAndSaveDialogConf(desc, getClass());
+ DialogHelper.showQuestion(desc, getClass());
}
}
Modified: trunk/soft/fudaa-crue/ui-modelling/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-modelling/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-modelling</artifactId>
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AddSectionInBranchePanelContent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AddSectionInBranchePanelContent.java 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AddSectionInBranchePanelContent.java 2013-04-23 21:17:42 UTC (rev 8402)
@@ -102,7 +102,7 @@
tfDistance.validateData();
update(null, null);
updateBrancheDistance();
- return DialogHelper.showQuestionAndSaveDialogConf(dialog, getClass());
+ return DialogHelper.showQuestion(dialog, getClass());
}
@Override
Modified: trunk/soft/fudaa-crue/ui-options/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-options/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-options/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<artifactId>ui-options</artifactId>
<name>Crue UI Options</name>
Modified: trunk/soft/fudaa-crue/ui-otfa/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-otfa/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<artifactId>ui-otfa</artifactId>
Modified: trunk/soft/fudaa-crue/ui-planimetry/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/pom.xml 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-planimetry/pom.xml 2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.69-SNAPSHOT</version>
+ <version>1.0RC2-SNAPSHOT</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-planimetry</artifactId>
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/SectionProfilAttachedToBrancheAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/SectionProfilAttachedToBrancheAction.java 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/SectionProfilAttachedToBrancheAction.java 2013-04-23 21:17:42 UTC (rev 8402)
@@ -99,7 +99,7 @@
DialogHelper.readInPreferences(panel.getView(), "outlineView", getClass());
DialogDescriptor descriptor = new DialogDescriptor(panel, getTitle());
SysdocUrlBuilder.installDialogHelpCtx(descriptor, "affecteSectionsBranches", PerspectiveEnum.MODELLING);
- boolean accepted = DialogHelper.showQuestionAndSaveDialogConf(descriptor, getClass());
+ boolean accepted = DialogHelper.showQuestion(descriptor, getClass());
DialogHelper.writeInPreferences(panel.getView(), "outlineView", getClass());
if (accepted) {
final List<SectionProfilToBrancheParametersChange> acceptedModification = panel.getAcceptedModification();
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/TraceCasierImporterAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/TraceCasierImporterAction.java 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/TraceCasierImporterAction.java 2013-04-23 21:17:42 UTC (rev 8402)
@@ -2,6 +2,7 @@
import com.memoire.bu.BuFileFilter;
import com.memoire.bu.BuGridLayout;
+import java.awt.Dimension;
import java.awt.event.ActionEvent;
import java.io.File;
import javax.swing.event.DocumentEvent;
@@ -32,22 +33,22 @@
* @author deniger ( genesis)
*/
public class TraceCasierImporterAction extends EbliActionSimple {
-
+
private final PlanimetryController controller;
-
+
public TraceCasierImporterAction(PlanimetryController controller) {
super(NbBundle.getMessage(TraceCasierImporterAction.class, "TraceCasierImporterAction.ActionName"), null, TraceCasierImporterAction.class.
getSimpleName());
this.controller = controller;
}
-
+
@Override
public void actionPerformed(ActionEvent _e) {
ChooseInputFiles panel = new ChooseInputFiles();
+ panel.setPreferredSize(new Dimension(450, 350));
DialogDescriptor dialogDescriptor = new DialogDescriptor(panel, getTitle());
panel.setDialogDescriptor(dialogDescriptor);
- boolean accepted = DialogHelper.
- showQuestionAndSaveDialogConf(getTitle(), dialogDescriptor, getClass(), "importTraceCasiers", PerspectiveEnum.MODELLING);
+ boolean accepted = DialogHelper.showQuestion(dialogDescriptor, getClass(), "importTraceCasiers", PerspectiveEnum.MODELLING);
if (accepted) {
final File shapeFile = panel.getShapeFile();
final File profilFile = panel.getProfilDbfFile();
@@ -69,12 +70,12 @@
controller.getGroupExternController().addTraceCasiers(casiersZone, shapeFile, SigFormatHelper.EnumFormat.SHP);
DialogHelper.showNotifyOperationTermine(getTitle(), NbBundle.getMessage(TraceCasierImporterAction.class,
"TraceCasierImporterAction.Result", casiersZone.getNumGeometries()));
-
+
}
}
}
}
-
+
private CtuluLogResult<GISZoneCollectionLigneBrisee> loadFiles(File shapeFile, File profilFile, ProgressHandle progress) {
progress.switchToIndeterminate();
FSigFileLoadResult result = new FSigFileLoadResult();
@@ -87,13 +88,13 @@
CtuluLogResult<GISZoneCollectionLigneBrisee> toCasier = processor.toCasier();
return toCasier;
}
-
+
private static class ChooseInputFiles extends CtuluDialogPanel {
-
+
private final CtuluFileChooserPanel chooseShpFile;
private final CtuluFileChooserPanel chooseDbfFile;
DialogDescriptor dialogDescriptor;
-
+
public ChooseInputFiles() {
setLayout(new BuGridLayout(2, 5, 10));
chooseShpFile = addFileChooserPanel(this, NbBundle.getMessage(TraceCasierImporterAction.class, "importTraceCasier.ChooseShapefile.Label"), false,
@@ -105,12 +106,12 @@
public void insertUpdate(DocumentEvent e) {
updateValidState();
}
-
+
@Override
public void removeUpdate(DocumentEvent e) {
updateValidState();
}
-
+
@Override
public void changedUpdate(DocumentEvent e) {
updateValidState();
@@ -121,12 +122,12 @@
chooseDbfFile.setAllFileFilter(true);
chooseDbfFile.setFilter(new FileFilter[]{new BuFileFilter("dbf")});
}
-
+
public void setDialogDescriptor(DialogDescriptor dialogDescriptor) {
this.dialogDescriptor = dialogDescriptor;
updateValidState();
}
-
+
protected void updateValidState() {
if (getShapeFile() != null && chooseDbfFile.getFile() == null) {
chooseDbfFile.setInitDir(getShapeFile().getParentFile());
@@ -135,11 +136,11 @@
dialogDescriptor.setValid(getShapeFile() != null && getShapeFile().isFile());
}
}
-
+
protected File getShapeFile() {
return chooseShpFile.getFile();
}
-
+
protected File getProfilDbfFile() {
return chooseDbfFile.getFile();
}
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/TraceCasierToCasierAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/TraceCasierToCasierAction.java 2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/TraceCasierToCasierAction.java 2013-04-23 21:17:42 UTC (rev 8402)
@@ -60,7 +60,7 @@
DialogDescriptor des = new DialogDescriptor(panel, getTitle());
SysdocUrlBuilder.installDialogHelpCtx(des, "creationCasiersDepuisTraceCasiers", PerspectiveEnum.MODELLING);
DialogHelper.readInPreferences(panel.getView(), "outlineView", getClass());
- boolean accepted = DialogHelper.showQuestio...
[truncated message content] |
|
From: <de...@us...> - 2013-06-24 22:16:54
|
Revision: 8424
http://sourceforge.net/p/fudaa/svn/8424
Author: deniger
Date: 2013-06-24 22:16:50 +0000 (Mon, 24 Jun 2013)
Log Message:
-----------
CRUE-542
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-emh/src/main/java/org/fudaa/fudaa/crue/emh/EMHTreePanel.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingComputeDataTopComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingEMHTopComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/AbstractModellingAction.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingLaunchRunOptionsAction.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingLaunchRunQuickAction.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/AbstractModeleTopComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/AbstractScenarioTopComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingModeleOPTGTopComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/listener/NodeChangedListener.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/listener/NodeInternChangedListener.java
trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/action/Bundle.properties
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/ProjectEMHOnSIGAction.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/save/PlanimetryGisLoader.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/save/PlanimetryGisSaver.java
trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostEmhExplorerTopComponent.java
trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/Bundle.properties
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/AbstractReportTimeViewTopComponent.java
Modified: trunk/soft/fudaa-crue/ui-emh/src/main/java/org/fudaa/fudaa/crue/emh/EMHTreePanel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-emh/src/main/java/org/fudaa/fudaa/crue/emh/EMHTreePanel.java 2013-06-24 20:04:06 UTC (rev 8423)
+++ trunk/soft/fudaa-crue/ui-emh/src/main/java/org/fudaa/fudaa/crue/emh/EMHTreePanel.java 2013-06-24 22:16:50 UTC (rev 8424)
@@ -625,7 +625,7 @@
/**
* Init la construction graphique.
*/
- public JPanel build() {
+ public JPanel build(String nameSuffix) {
final Map<String, AbstractTreeNode> ref = new HashMap<String, AbstractTreeNode>();
final DefaultTreeTableModel treeModel = new EMHManagerBuilder().buildTreeScenario(projet.getPropDefinition(), scenarioLoaded,
@@ -667,7 +667,7 @@
}
};
receiver.install(treeEMH, null);
- treeEMH.setName("emhTree.treeTable");
+ treeEMH.setName("emhTree.treeTable." + nameSuffix);
treeEMH.addMouseListener(new MouseAdapter() {
@Override
public void mouseClicked(final MouseEvent e) {
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingComputeDataTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingComputeDataTopComponent.java 2013-06-24 20:04:06 UTC (rev 8423)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingComputeDataTopComponent.java 2013-06-24 22:16:50 UTC (rev 8424)
@@ -212,7 +212,8 @@
createNode.addNodeListener(calcNodeListener);
helper.addListener(true);
helper.getNodeListener().setModifiedIfArborescenceChanged(true);
- helper.getNodeListener().setModifiedIfDisplayNameChanged(true);
+ helper.getNodeListener().setModifiedIfDisplayNameChanged(false);
+ helper.getNodeListener().setModifiedIfNameChanged(true);
expandedNodesManager.restoreState();
}
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingEMHTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingEMHTopComponent.java 2013-06-24 20:04:06 UTC (rev 8423)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingEMHTopComponent.java 2013-06-24 22:16:50 UTC (rev 8424)
@@ -29,17 +29,17 @@
* Top component which displays something.
*/
@ConvertAsProperties(dtd = "-//org.fudaa.fudaa.crue.modelling//ModellingEMHTopComponent//EN",
-autostore = false)
+ autostore = false)
@TopComponent.Description(preferredID = ModellingEMHTopComponent.TOPCOMPONENT_ID,
-iconBase = "org/fudaa/fudaa/crue/modelling/rond-orange_16.png",
-persistenceType = TopComponent.PERSISTENCE_ALWAYS)
+ iconBase = "org/fudaa/fudaa/crue/modelling/rond-orange_16.png",
+ persistenceType = TopComponent.PERSISTENCE_ALWAYS)
@TopComponent.Registration(mode = "modelling-topRight", openAtStartup = false, position = 2)
@ActionID(category = "Window", id = "org.fudaa.fudaa.crue.modelling.ModellingEMHTopComponent")
@ActionReference(path = "Menu/Window/Modelling", position = 2)
@TopComponent.OpenActionRegistration(displayName = ModellingEMHTopComponent.TOPCOMPONENT_ACTION_DISPLAYNAME,
-preferredID = ModellingEMHTopComponent.TOPCOMPONENT_ID)
+ preferredID = ModellingEMHTopComponent.TOPCOMPONENT_ID)
public final class ModellingEMHTopComponent extends AbstractModellingTopComponent implements LookupListener, ExplorerManager.Provider {
-
+
ModellingSelectedEMHService modellingSelectedEMHService = Lookup.getDefault().lookup(ModellingSelectedEMHService.class);
public static final String TOPCOMPONENT_ID = "ModellingEMHTopComponent";
public static final String TOPCOMPONENT_ACTION = "CTL_" + TOPCOMPONENT_ID;
@@ -48,33 +48,32 @@
private SelectedEMHLookupListener selectedNodeLookupListener;
private final ExplorerManager em = new ExplorerManager();
private EMHTreePanel emhTreePanel;
-
+
public ModellingEMHTopComponent() {
initComponents();
setName(NbBundle.getMessage(ModellingEMHTopComponent.class, TOPCOMPONENT_ACTION));
setToolTipText(NbBundle.getMessage(ModellingEMHTopComponent.class, "HINT_" + TOPCOMPONENT_ID));
associateLookup(ExplorerUtils.createLookup(em, getActionMap()));
}
-
+
@Override
protected String getViewHelpCtxId() {
return "30-vueEMHs";
}
-
-
+
@Override
public ExplorerManager getExplorerManager() {
return em;
}
-
+
@Override
protected void setEditable(boolean b) {
}
-
+
@Override
public void cancelModificationHandler() {
}
-
+
@Override
public void valideModificationHandler() {
}
@@ -98,7 +97,7 @@
}
}
};
-
+
@Override
protected void scenarioLoaded() {
if (emhTreePanel != null) {
@@ -107,11 +106,12 @@
emhTreePanel = new EMHTreePanel(getModellingService().getSelectedProjet(),
getModellingService().getScenarioLoaded());
this.removeAll();
- this.add(new JScrollPane(emhTreePanel.build()));
+ this.add(new JScrollPane(emhTreePanel.build(getClass().getSimpleName())));
emhTreePanel.getTreeEMH().addTreeSelectionListener(treeSelectionListener);
+ super.revalidate();
this.repaint();
}
-
+
public void updatePanelFromSelection() {
if (emhTreePanel != null) {
Collection<? extends Long> allItems = resultatNodeSelected.allInstances();
@@ -124,9 +124,9 @@
}
}
}
-
+
private class SelectedEMHLookupListener implements LookupListener {
-
+
@Override
public void resultChanged(LookupEvent ev) {
if (WindowManager.getDefault().getRegistry().getActivated() != ModellingEMHTopComponent.this) {
@@ -134,16 +134,17 @@
}
}
}
-
+
@Override
protected void scenarioReloaded() {
scenarioLoaded();
}
-
+
@Override
protected void scenarioUnloaded() {
if (emhTreePanel != null) {
emhTreePanel.getTreeEMH().removeTreeSelectionListener(treeSelectionListener);
+ emhTreePanel.saveSize();
}
this.removeAll();
this.add(new JLabel(MessagesModelling.getMessage("emhTopComponent.NoScenarioLoadedInformations")));
@@ -173,9 +174,9 @@
resultatNodeSelected.removeLookupListener(selectedNodeLookupListener);
resultatNodeSelected = null;
}
-
+
}
-
+
@Override
protected void componentOpenedHandler() {
if (resultatNodeSelected == null) {
@@ -184,16 +185,16 @@
resultatNodeSelected.addLookupListener(selectedNodeLookupListener);
}
updatePanelFromSelection();
-
+
}
-
+
void writeProperties(java.util.Properties p) {
// better to version settings since initial version as advocated at
// http://wiki.apidesign.org/wiki/PropertyFiles
p.setProperty("version", "1.0");
// TODO store your settings
}
-
+
void readProperties(java.util.Properties p) {
// TODO read your settings according to their version
}
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/AbstractModellingAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/AbstractModellingAction.java 2013-06-24 20:04:06 UTC (rev 8423)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/AbstractModellingAction.java 2013-06-24 22:16:50 UTC (rev 8424)
@@ -1,7 +1,3 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
package org.fudaa.fudaa.crue.modelling.action;
import java.awt.event.ActionEvent;
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingLaunchRunOptionsAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingLaunchRunOptionsAction.java 2013-06-24 20:04:06 UTC (rev 8423)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingLaunchRunOptionsAction.java 2013-06-24 22:16:50 UTC (rev 8424)
@@ -6,6 +6,9 @@
import javax.swing.Action;
import org.fudaa.dodico.crue.projet.create.RunCreatorOptions;
+import org.fudaa.fudaa.crue.common.helper.DialogHelper;
+import org.fudaa.fudaa.crue.common.services.ModellingScenarioService;
+import org.fudaa.fudaa.crue.modelling.services.ModellingScenarioModificationService;
import org.fudaa.fudaa.crue.study.actions.RunOptionPanelBuilder;
import org.fudaa.fudaa.crue.study.services.EMHProjetServiceImpl;
import org.openide.awt.ActionID;
@@ -16,7 +19,7 @@
import org.openide.util.NbBundle;
@ActionID(category = "View",
- id = "org.fudaa.fudaa.crue.modelling.ModellingLaunchRunOptionsAction")
+ id = "org.fudaa.fudaa.crue.modelling.ModellingLaunchRunOptionsAction")
@ActionRegistration(displayName = "#CTL_ModellingLaunchRunOptionsAction")
@ActionReferences({
@ActionReference(path = "Actions/Modelling", position = 14)
@@ -24,6 +27,8 @@
public final class ModellingLaunchRunOptionsAction extends AbstractModellingAction {
EMHProjetServiceImpl projetService = Lookup.getDefault().lookup(EMHProjetServiceImpl.class);
+ ModellingScenarioModificationService modellingScenarioModificationService = Lookup.getDefault().lookup(
+ ModellingScenarioModificationService.class);
public ModellingLaunchRunOptionsAction() {
super(true);
@@ -37,6 +42,18 @@
@Override
public void doAction() {
+ if (modellingScenarioModificationService.isModified()) {
+ String okMsg = NbBundle.getMessage(ModellingLaunchRunOptionsAction.class, "saveBeforeLaunchingComputationOk");
+ String cancelMsg = NbBundle.getMessage(ModellingLaunchRunOptionsAction.class, "saveBeforeLaunchingComputationCancel");
+ Object returned = DialogHelper.
+ showQuestion(getActionTitle(), NbBundle.getMessage(ModellingLaunchRunOptionsAction.class,
+ "saveBeforeLaunchingComputation"), new String[]{okMsg, cancelMsg});
+ if (!okMsg.equals(returned)) {
+ return;
+ }
+ scenarioService.saveScenario();
+ }
+
RunOptionPanelBuilder panelBuilder = new RunOptionPanelBuilder(scenarioService.getManagerScenarioLoaded());
RunCreatorOptions options = panelBuilder.getOptions();
if (options == null) {//l'utilisateur a appuye sur cancel...
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingLaunchRunQuickAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingLaunchRunQuickAction.java 2013-06-24 20:04:06 UTC (rev 8423)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingLaunchRunQuickAction.java 2013-06-24 22:16:50 UTC (rev 8424)
@@ -1,10 +1,8 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
package org.fudaa.fudaa.crue.modelling.action;
import javax.swing.Action;
+import org.fudaa.fudaa.crue.common.helper.DialogHelper;
+import org.fudaa.fudaa.crue.modelling.services.ModellingScenarioModificationService;
import org.fudaa.fudaa.crue.study.services.EMHProjetServiceImpl;
import org.openide.awt.ActionID;
import org.openide.awt.ActionReference;
@@ -14,7 +12,7 @@
import org.openide.util.NbBundle;
@ActionID(category = "View",
- id = "org.fudaa.fudaa.crue.modelling.ModellingLaunchRunQuickAction")
+ id = "org.fudaa.fudaa.crue.modelling.ModellingLaunchRunQuickAction")
@ActionRegistration(displayName = "#CTL_ModellingLaunchRunQuickAction")
@ActionReferences({
@ActionReference(path = "Actions/Modelling", position = 13)
@@ -22,6 +20,8 @@
public final class ModellingLaunchRunQuickAction extends AbstractModellingAction {
EMHProjetServiceImpl projetService = Lookup.getDefault().lookup(EMHProjetServiceImpl.class);
+ ModellingScenarioModificationService modellingScenarioModificationService = Lookup.getDefault().lookup(
+ ModellingScenarioModificationService.class);
public ModellingLaunchRunQuickAction() {
super(true);
@@ -35,6 +35,17 @@
@Override
public void doAction() {
+ if (modellingScenarioModificationService.isModified()) {
+ String okMsg = NbBundle.getMessage(ModellingLaunchRunOptionsAction.class, "saveBeforeLaunchingComputationOk");
+ String cancelMsg = NbBundle.getMessage(ModellingLaunchRunOptionsAction.class, "saveBeforeLaunchingComputationCancel");
+ Object returned = DialogHelper.
+ showQuestion(getActionTitle(), NbBundle.getMessage(ModellingLaunchRunOptionsAction.class,
+ "saveBeforeLaunchingComputation"), new String[]{okMsg, cancelMsg});
+ if (!okMsg.equals(returned)) {
+ return;
+ }
+ scenarioService.saveScenario();
+ }
projetService.launchRun(scenarioService.getManagerScenarioLoaded());
}
}
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/AbstractModeleTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/AbstractModeleTopComponent.java 2013-06-24 20:04:06 UTC (rev 8423)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/AbstractModeleTopComponent.java 2013-06-24 22:16:50 UTC (rev 8424)
@@ -1,7 +1,3 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
package org.fudaa.fudaa.crue.modelling.calcul;
import com.memoire.bu.BuGridLayout;
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/AbstractScenarioTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/AbstractScenarioTopComponent.java 2013-06-24 20:04:06 UTC (rev 8423)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/AbstractScenarioTopComponent.java 2013-06-24 22:16:50 UTC (rev 8424)
@@ -1,7 +1,3 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
package org.fudaa.fudaa.crue.modelling.calcul;
import java.awt.BorderLayout;
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingModeleOPTGTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingModeleOPTGTopComponent.java 2013-06-24 20:04:06 UTC (rev 8423)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingModeleOPTGTopComponent.java 2013-06-24 22:16:50 UTC (rev 8424)
@@ -1,7 +1,3 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
package org.fudaa.fudaa.crue.modelling.calcul;
import java.beans.PropertyChangeEvent;
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/listener/NodeChangedListener.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/listener/NodeChangedListener.java 2013-06-24 20:04:06 UTC (rev 8423)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/listener/NodeChangedListener.java 2013-06-24 22:16:50 UTC (rev 8424)
@@ -1,7 +1,3 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
package org.fudaa.fudaa.crue.modelling.listener;
import java.beans.PropertyChangeEvent;
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/listener/NodeInternChangedListener.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/listener/NodeInternChangedListener.java 2013-06-24 20:04:06 UTC (rev 8423)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/listener/NodeInternChangedListener.java 2013-06-24 22:16:50 UTC (rev 8424)
@@ -23,6 +23,7 @@
private AbstractModellingTopComponent target;
boolean modifiedIfArborescenceChanged = false;
boolean modifiedIfDisplayNameChanged = true;
+ boolean modifiedIfNameChanged = false;
public NodeInternChangedListener(AbstractModellingTopComponent target) {
this.target = target;
@@ -44,13 +45,19 @@
this.modifiedIfArborescenceChanged = modifiedIfArborescenceChanged;
}
+ public void setModifiedIfNameChanged(boolean modifiedIfNameChanged) {
+ this.modifiedIfNameChanged = modifiedIfNameChanged;
+ }
+
+
@Override
public void propertyChange(PropertyChangeEvent evt) {
- if (modifiedIfDisplayNameChanged) {
- if (Node.PROP_DISPLAY_NAME.equals(evt.getPropertyName())) {
- target.setModified(true);
- }
+ if (modifiedIfDisplayNameChanged && Node.PROP_DISPLAY_NAME.equals(evt.getPropertyName())) {
+ target.setModified(true);
}
+ if (modifiedIfNameChanged && Node.PROP_NAME.equals(evt.getPropertyName())) {
+ target.setModified(true);
+ }
}
@Override
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/action/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/action/Bundle.properties 2013-06-24 20:04:06 UTC (rev 8423)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/action/Bundle.properties 2013-06-24 22:16:50 UTC (rev 8424)
@@ -66,3 +66,6 @@
ModellingListFrottementsNodeAction.NewFrame.Name=Ouvrir la liste des frottements (nouvelle fen\u00eatre)
ChooseModele.DialogTitle=Choisir un mod\u00e8le
ChooseSousModele.DialogTitle=Choisir un sous-mod\u00e8le
+saveBeforeLaunchingComputation=Le sc\u00e9nario est modifi\u00e9. Voulez-vous l'enregistrer avant le lancement du calcul ?
+saveBeforeLaunchingComputationOk=Enregister et lancer le calcul
+saveBeforeLaunchingComputationCancel=Ne pas lancer le calcul
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/ProjectEMHOnSIGAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/ProjectEMHOnSIGAction.java 2013-06-24 20:04:06 UTC (rev 8423)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/ProjectEMHOnSIGAction.java 2013-06-24 22:16:50 UTC (rev 8424)
@@ -34,6 +34,6 @@
@Override
protected boolean isProcessorEnable() {
- return process.isEnable();
+ return process != null && process.isEnable();
}
}
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/save/PlanimetryGisLoader.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/save/PlanimetryGisLoader.java 2013-06-24 20:04:06 UTC (rev 8423)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/save/PlanimetryGisLoader.java 2013-06-24 22:16:50 UTC (rev 8424)
@@ -2,6 +2,7 @@
import com.vividsolutions.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.Geometry;
+import com.vividsolutions.jts.geom.LineString;
import java.io.File;
import java.util.Arrays;
import java.util.HashMap;
@@ -208,29 +209,40 @@
return false;
}
Pair<FSigGeomSrcData, SigFormatHelper.EnumFormat> loadFile = LayerControllerSaverHelper.loadFile(file, new CtuluLog());
- if (loadFile == null || loadFile.first == null || ArrayUtils.isEmpty(loadFile.first.getPolygones())) {
+ if (loadFile == null || loadFile.first == null) {
return false;
}
- GISDataModel load = loadFile.first.getPolygones()[0];
- GISLib.preloadAttributes(load);
- int numGeometries = load.getNumGeometries();
- for (int i = 0; i < numGeometries; i++) {
- Geometry geometry = load.getGeometry(i);
- Coordinate[] coordinates = geometry.getCoordinates();
- if (coordinates == null || coordinates.length == 0) {
- continue;
- }
- String name = ObjectUtils.toString(load.getValue(0, i));
- CatEMHCasier casier = casierByName.get(name);
- if (casier == null) {
- continue;
- }
- GISPolygone polygone = GISGeometryFactory.INSTANCE.createLinearRing(coordinates);
- resultat.addCasierAsPolygone(polygone, casier);
+ if (ArrayUtils.isNotEmpty(loadFile.first.getPolygones())) {
+ GISDataModel load = loadFile.first.getPolygones()[0];
+ loadCasierFromModel(load, casierByName, resultat);
}
+ if (ArrayUtils.isNotEmpty(loadFile.first.getPolylignes())) {
+ GISDataModel load = loadFile.first.getPolylignes()[0];
+ loadCasierFromModel(load, casierByName, resultat);
+ }
} catch (Exception ex) {
Exceptions.printStackTrace(ex);
}
return true;
}
+
+ protected void loadCasierFromModel(GISDataModel load,
+ Map<String, CatEMHCasier> casierByName, NetworkGisPositionnerResult resultat) {
+ GISLib.preloadAttributes(load);
+ int numGeometries = load.getNumGeometries();
+ for (int i = 0; i < numGeometries; i++) {
+ Geometry geometry = load.getGeometry(i);
+ Coordinate[] coordinates = geometry.getCoordinates();
+ if (coordinates == null || coordinates.length == 0 || !(((LineString) geometry).isClosed())) {
+ continue;
+ }
+ String name = ObjectUtils.toString(load.getValue(0, i));
+ CatEMHCasier casier = casierByName.get(name);
+ if (casier == null) {
+ continue;
+ }
+ GISPolygone polygone = GISGeometryFactory.INSTANCE.createLinearRing(coordinates);
+ resultat.addCasierAsPolygone(polygone, casier);
+ }
+ }
}
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/save/PlanimetryGisSaver.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/save/PlanimetryGisSaver.java 2013-06-24 20:04:06 UTC (rev 8423)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/save/PlanimetryGisSaver.java 2013-06-24 22:16:50 UTC (rev 8424)
@@ -163,8 +163,8 @@
public void saveCasiers(File dirOfConfig) {
Map<String, TIntArrayList> casierIdxBySousModeleId = new HashMap<String, TIntArrayList>();
final LayerCasierController casierController = controller.getCasierController();
- GISZoneCollectionLigneBrisee brancheCollection = casierController.getCasierCollection();
- int size = brancheCollection.getNbGeometries();
+ GISZoneCollectionLigneBrisee casierCollection = casierController.getCasierCollection();
+ int size = casierCollection.getNbGeometries();
for (int i = 0; i < size; i++) {
CatEMHCasier emhFromPositionInModel = casierController.getEMHFromPositionInModel(i);
EMHSousModele parent = emhFromPositionInModel.getParent();
@@ -182,7 +182,7 @@
TIntArrayList positions = entry.getValue();
File destDir = new File(dirOfConfig, string);
destDir.mkdirs();
- GISDataModelFilterAdapter adapter = new GISDataModelFilterAdapter(brancheCollection, att, positions.toNativeArray());
+ GISDataModelFilterAdapter adapter = new GISDataModelFilterAdapter(casierCollection, att, positions.toNativeArray());
PlanimetryGISGMLZoneExporter exporter = new PlanimetryGISGMLZoneExporter();
File destFile = new File(destDir, CASIER_NAME);
try {
Modified: trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostEmhExplorerTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostEmhExplorerTopComponent.java 2013-06-24 20:04:06 UTC (rev 8423)
+++ trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostEmhExplorerTopComponent.java 2013-06-24 22:16:50 UTC (rev 8424)
@@ -37,12 +37,12 @@
@TopComponent.OpenActionRegistration(displayName = "#CTL_PostEmhExplorerTopComponent",
preferredID = PostEmhExplorerTopComponent.TOPCOMPONENT_ID)
public final class PostEmhExplorerTopComponent extends AbstractTopComponent implements LookupListener {
-
+
public static final String TOPCOMPONENT_ID = "PostEmhExplorerTopComponent";
private PostRunService postService = Lookup.getDefault().lookup(PostRunService.class);
EMHProjetServiceImpl projetService = Lookup.getDefault().lookup(EMHProjetServiceImpl.class);
private Result<EMHScenario> resultat;
-
+
public PostEmhExplorerTopComponent() {
initComponents();
setName(NbBundle.getMessage(PostEmhExplorerTopComponent.class, "CTL_PostEmhExplorerTopComponent"));
@@ -53,12 +53,12 @@
putClientProperty(TopComponent.PROP_UNDOCKING_DISABLED, Boolean.TRUE);
associateLookup(Lookup.EMPTY);
}
-
+
@Override
protected String getHelpCtxId() {
return SysdocUrlBuilder.getTopComponentHelpCtxId("01-vueExploreurEMHs", PerspectiveEnum.POST);
}
-
+
@Override
public void resultChanged(LookupEvent ev) {
if (postService.isRunLoaded()) {
@@ -67,17 +67,22 @@
runUnloaded();
}
}
-
+ EMHTreePanel emhTreePanel;
+
private void runLoadedFromCurrentProject() {
//TODO attention on suppose que le run a été chargé depuis le projet courant
- EMHTreePanel emhTreePanel = new EMHTreePanel(projetService.getSelectedProject(), postService.getScenarioLoaded());
+ emhTreePanel = new EMHTreePanel(projetService.getSelectedProject(), postService.getScenarioLoaded());
this.removeAll();
- this.add(new JScrollPane(emhTreePanel.build()));
+ this.add(new JScrollPane(emhTreePanel.build(getClass().getSimpleName())));
emhTreePanel.setTitle(postService.getManagerScenarioLoaded().getNom() + " / " + postService.getRunLoaded().getNom());
+ this.revalidate();
this.repaint();
}
-
+
private void runUnloaded() {
+ if (emhTreePanel != null) {
+ emhTreePanel.saveSize();
+ }
this.removeAll();
this.add(new JLabel(MessagesPost.getMessage("postMainTopComponent.NoRunLoadedInformations")));
super.revalidate();
@@ -113,18 +118,18 @@
runUnloaded();
}
}
-
+
@Override
public void componentClosedTemporarily() {
}
-
+
void writeProperties(java.util.Properties p) {
// better to version settings since initial version as advocated at
// http://wiki.apidesign.org/wiki/PropertyFiles
p.setProperty("version", "1.0");
// TODO store your settings
}
-
+
void readProperties(java.util.Properties p) {
// TODO read your settings according to their version
}
Modified: trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/Bundle.properties 2013-06-24 20:04:06 UTC (rev 8423)
+++ trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/Bundle.properties 2013-06-24 22:16:50 UTC (rev 8424)
@@ -16,7 +16,7 @@
PostReportsTopComponent.FirstColumn=Compte-Rendus
CTL_PostEmhEx...
[truncated message content] |
|
From: <de...@us...> - 2013-06-28 06:08:00
|
Revision: 8427
http://sourceforge.net/p/fudaa/svn/8427
Author: deniger
Date: 2013-06-28 06:07:56 +0000 (Fri, 28 Jun 2013)
Log Message:
-----------
correction bug divers
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/cr/CrueLogTranslator.java
trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/cr/LienMultimedia.java
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/property/MessageProperty.java
Added Paths:
-----------
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/editor/HtmlReadEditorSupport.java
Modified: trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/cr/CrueLogTranslator.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/cr/CrueLogTranslator.java 2013-06-27 13:45:30 UTC (rev 8426)
+++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/cr/CrueLogTranslator.java 2013-06-28 06:07:56 UTC (rev 8427)
@@ -79,7 +79,7 @@
LienMultimedia multimedia = liensMultimediaById.get(id);
if (multimedia != null) {
String href = multimedia.getHRef();
- String signet = doc.getSignet();
+ String signet = multimedia.getSignet();
if (StringUtils.isNotBlank(signet)) {
href = href + LienDocumentation.SIGNET_SEPARATOR + signet;
}
Modified: trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/cr/LienMultimedia.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/cr/LienMultimedia.java 2013-06-27 13:45:30 UTC (rev 8426)
+++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/cr/LienMultimedia.java 2013-06-28 06:07:56 UTC (rev 8427)
@@ -1,7 +1,3 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
package org.fudaa.dodico.crue.config.cr;
/**
Added: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/editor/HtmlReadEditorSupport.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/editor/HtmlReadEditorSupport.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/editor/HtmlReadEditorSupport.java 2013-06-28 06:07:56 UTC (rev 8427)
@@ -0,0 +1,47 @@
+/*
+ GPL 2
+ */
+package org.fudaa.fudaa.crue.common.editor;
+
+import com.memoire.bu.BuBorders;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.beans.PropertyEditor;
+import java.beans.PropertyEditorSupport;
+import javax.swing.JEditorPane;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.text.html.HTMLEditorKit;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class HtmlReadEditorSupport extends PropertyEditorSupport {
+
+ private final String html;
+
+ public HtmlReadEditorSupport(String html) {
+ this.html = html;
+ }
+
+ @Override
+ public Component getCustomEditor() {
+ final JEditorPane pane = new JEditorPane();
+ pane.setOpaque(false);
+ pane.setEditable(false);
+ pane.setEditorKit(new HTMLEditorKit());
+ pane.setText(html);
+ pane.setEditable(false);
+ JPanel pn = new JPanel(new BorderLayout());
+ pn.add(new JScrollPane(pane));
+ pn.setBorder(BuBorders.EMPTY3333);
+ return pn;
+ }
+
+ @Override
+ public boolean supportsCustomEditor() {
+ return true;
+ }
+}
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/property/MessageProperty.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/property/MessageProperty.java 2013-06-27 13:45:30 UTC (rev 8426)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/property/MessageProperty.java 2013-06-28 06:07:56 UTC (rev 8427)
@@ -4,8 +4,11 @@
*/
package org.fudaa.fudaa.crue.common.log.property;
+import java.beans.PropertyEditor;
import java.lang.reflect.InvocationTargetException;
+import org.apache.commons.lang.StringUtils;
import org.fudaa.ctulu.CtuluLogRecord;
+import org.fudaa.fudaa.crue.common.editor.HtmlReadEditorSupport;
import org.openide.nodes.PropertySupport;
import org.openide.util.NbBundle;
@@ -17,19 +20,27 @@
public static final String ID = "Message";
private final CtuluLogRecord record;
+ String html;
public MessageProperty(CtuluLogRecord record) {
super(ID, String.class, getDefaultDisplayName(),
- getDescription());
+ getDescription());
this.record = record;
-// PropertyCrueUtils.configureNoCustomEditor(this);
+ String msg = record.getLocalizedMessage();
+ html = msg;
+ if (msg.contains("\\n")) {
+ html = "<html><body>" + StringUtils.replace(msg, "\\n", "<br>") + "</body></html>";
+ setValue("htmlDisplayValue", html);
+
+ }
+
}
public static String getDescription() {
return NbBundle.getMessage(MessageProperty.class, "MessagePropertyDescription");
}
-
- public static PropertyColumnFilterable createColumn() {
+
+ public static PropertyColumnFilterable createColumn() {
PropertyColumnFilterable res = new PropertyColumnFilterable();
res.setColumnId(ID);
res.setDescription(getDescription());
@@ -42,12 +53,22 @@
}
@Override
+ public String getHtmlDisplayName() {
+ return html;
+ }
+
+ @Override
public String toString() {
return record.getLocalizedMessage();
}
@Override
public String getValue() throws IllegalAccessException, InvocationTargetException {
- return toString();
+ return html;
}
+
+ @Override
+ public PropertyEditor getPropertyEditor() {
+ return new HtmlReadEditorSupport(html);
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-07-11 22:03:35
|
Revision: 8436
http://sourceforge.net/p/fudaa/svn/8436
Author: deniger
Date: 2013-07-11 22:03:30 +0000 (Thu, 11 Jul 2013)
Log Message:
-----------
CRUE-541
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/coeur/CoeurConfig.java
trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/coeur/CoeurConfigContrat.java
trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/etude/ManagerEMHScenario.java
trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/conf/CrueConverterCONF.java
trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/conf/CrueDaoStructureCONF.java
trunk/soft/fudaa-crue/crue-io/src/test/java/org/fudaa/dodico/crue/io/conf/CrueCONFTest.java
trunk/soft/fudaa-crue/crue-io/src/test/resources/FudaaCrue_Site.xml
trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/create/RunCreator.java
trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/create/ScenarioConverterProcess.java
trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/SysdocBuilder.java
trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/common/SysdocFolder.java
trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/persist/PersistProcessor.java
trunk/soft/fudaa-crue/crue-sysdoc/src/main/resources/org/fudaa/dodico/crue/sysdoc/common/sysdocMessages.properties
trunk/soft/fudaa-crue/crue-validation/src/main/java/org/fudaa/dodico/crue/validation/ValidationHelperLoi.java
trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrueDev.conf
trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/splash.gif
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/CopyManagerNodeAction.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ManagerEMHScenarioNode.java
trunk/soft/fudaa-crue/ui-sysdoc/src/main/java/org/fudaa/fudaa/crue/sysdoc/ManagerRoleOptionProcessor.java
trunk/soft/fudaa-crue/ui-sysdoc/src/main/java/org/fudaa/fudaa/crue/sysdoc/admin/SysdocAdminUI.java
trunk/soft/fudaa-crue/ui-sysdoc/src/main/java/org/fudaa/fudaa/crue/sysdoc/services/SysdocService.java
trunk/soft/fudaa-crue/ui-sysdoc/src/main/resources/org/fudaa/fudaa/crue/sysdoc/Bundle.properties
Added Paths:
-----------
trunk/soft/fudaa-crue/crue-sysdoc/src/main/resources/sydoc.html
Removed Paths:
-------------
trunk/soft/fudaa-crue/crue-sysdoc/src/main/resources/sysdoc.html
Modified: trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/coeur/CoeurConfig.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/coeur/CoeurConfig.java 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/coeur/CoeurConfig.java 2013-07-11 22:03:30 UTC (rev 8436)
@@ -27,6 +27,7 @@
private String coeurFolderPath;
private String comment;
private boolean usedByDefault;
+ private boolean crue9Dependant;
private CrueVersionType crueVersionType;
private CrueConfigMetier crueConfigMetier;
private File baseDir;
@@ -35,6 +36,15 @@
return baseDir;
}
+ public boolean isCrue9Dependant() {
+ return crue9Dependant;
+ }
+
+ public void setCrue9Dependant(boolean crue9Dependant) {
+ this.crue9Dependant = crue9Dependant;
+ }
+
+
public void setBaseDir(File baseDir) {
this.baseDir = baseDir;
}
Modified: trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/coeur/CoeurConfigContrat.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/coeur/CoeurConfigContrat.java 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/coeur/CoeurConfigContrat.java 2013-07-11 22:03:30 UTC (rev 8436)
@@ -37,6 +37,8 @@
*/
boolean isUsedByDefault();
+ boolean isCrue9Dependant();
+
/**
* Utilise qu'en interne pour OTFA.
*
Modified: trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
===================================================================
--- trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties 2013-07-11 22:03:30 UTC (rev 8436)
@@ -415,6 +415,7 @@
valid.nbrCatEMHNoeud=Nombre de noeuds
valid.nbrCatEMHConteneur=Nombre de CatEMHConteneur
valid.nbrPtEvolutionFF=Nombre de PtEvolutionFF
+valid.firstAbsLoiDf.mustBeZero=Le premier point de la LoiDF {0} doit avoir une abscisse \u00e9gale \u00e0 0
valid.nbrPtProfil=Nombre de PtProfil
valid.noNodes=La liste de noeuds est vide.
valid.noBranches=La liste de branches est vide.
Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/etude/ManagerEMHScenario.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/etude/ManagerEMHScenario.java 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/etude/ManagerEMHScenario.java 2013-07-11 22:03:30 UTC (rev 8436)
@@ -39,6 +39,7 @@
super(CrueLevelType.SCENARIO, nom);
}
+ @Override
public String getEMHType() {
return EMHScenario.class.getSimpleName();
}
Modified: trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/conf/CrueConverterCONF.java
===================================================================
--- trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/conf/CrueConverterCONF.java 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/conf/CrueConverterCONF.java 2013-07-11 22:03:30 UTC (rev 8436)
@@ -73,6 +73,7 @@
metier.setName(dao.id);
metier.setComment(dao.Commentaire);
metier.setXsdVersion(dao.VersionGrammaire);
+ metier.setCrue9Dependant(dao.Crue9Dependant);
metier.setCoeurFolderPath(dao.DossierCoeur);
metier.setUsedByDefault(dao.CoeurParDefaut);
Modified: trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/conf/CrueDaoStructureCONF.java
===================================================================
--- trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/conf/CrueDaoStructureCONF.java 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/conf/CrueDaoStructureCONF.java 2013-07-11 22:03:30 UTC (rev 8436)
@@ -64,6 +64,7 @@
public String id;
public String Commentaire;
public String VersionGrammaire;
+ boolean Crue9Dependant;
public boolean CoeurParDefaut;
public String DossierCoeur;
}
Modified: trunk/soft/fudaa-crue/crue-io/src/test/java/org/fudaa/dodico/crue/io/conf/CrueCONFTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-io/src/test/java/org/fudaa/dodico/crue/io/conf/CrueCONFTest.java 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/crue-io/src/test/java/org/fudaa/dodico/crue/io/conf/CrueCONFTest.java 2013-07-11 22:03:30 UTC (rev 8436)
@@ -13,6 +13,7 @@
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
+import static junit.framework.Assert.assertTrue;
import org.fudaa.ctulu.CtuluLibFile;
import org.fudaa.ctulu.CtuluLog;
import org.fudaa.dodico.crue.common.BusinessMessages;
@@ -88,6 +89,7 @@
CoeurConfig coeur = coeurs.get(0);
assertEquals("CRUE10.1", coeur.getName());
assertEquals("Coeur Crue10.1", coeur.getComment());
+ assertTrue(coeur.isCrue9Dependant());
assertEquals("1.1.1", coeur.getXsdVersion());
assertEquals(coeur.getName(), coeurManager.getCoeurConfig(coeur.getName()).getName());
try {
@@ -100,6 +102,7 @@
coeur = coeurs.get(1);
assertEquals("CRUE10.2a", coeur.getName());
assertEquals("Coeur Crue10.2a", coeur.getComment());
+ assertFalse(coeur.isCrue9Dependant());
assertEquals("1.2", coeur.getXsdVersion());
assertEquals(new File(baseDir, "Crue10.2a").getAbsolutePath(), coeur.getCoeurFolder().getAbsolutePath());
assertEquals(false, coeur.isUsedByDefault());
Modified: trunk/soft/fudaa-crue/crue-io/src/test/resources/FudaaCrue_Site.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-io/src/test/resources/FudaaCrue_Site.xml 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/crue-io/src/test/resources/FudaaCrue_Site.xml 2013-07-11 22:03:30 UTC (rev 8436)
@@ -4,12 +4,14 @@
<Coeur id="CRUE10.1">
<Commentaire>Coeur Crue10.1</Commentaire>
<VersionGrammaire>1.1.1</VersionGrammaire>
+ <Crue9Dependant>true</Crue9Dependant>
<CoeurParDefaut>true</CoeurParDefaut>
<DossierCoeur>Crue10.1</DossierCoeur>
</Coeur>
<Coeur id="CRUE10.2a">
<Commentaire>Coeur Crue10.2a</Commentaire>
<VersionGrammaire>1.2</VersionGrammaire>
+ <Crue9Dependant>false</Crue9Dependant>
<CoeurParDefaut>false</CoeurParDefaut>
<DossierCoeur>Crue10.2a</DossierCoeur>
</Coeur>
Modified: trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/create/RunCreator.java
===================================================================
--- trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/create/RunCreator.java 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/create/RunCreator.java 2013-07-11 22:03:30 UTC (rev 8436)
@@ -59,6 +59,9 @@
}
private void copyLinkedCrue9Files(ManagerEMHScenario scenario, CtuluLog log, EMHRun newRun) {
+ if (!projet.getCoeurConfig().isCrue9Dependant()) {
+ return;
+ }
if (scenario.isCrue10() && scenario.getLinkedscenarioCrue9() != null) {
ManagerEMHScenario linkedScenarioCrue9 = projet.getScenario(scenario.getLinkedscenarioCrue9());
if (linkedScenarioCrue9 == null) {
Modified: trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/create/ScenarioConverterProcess.java
===================================================================
--- trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/create/ScenarioConverterProcess.java 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/create/ScenarioConverterProcess.java 2013-07-11 22:03:30 UTC (rev 8436)
@@ -53,7 +53,7 @@
EMHScenario emhScenario = null;
if (!errors.containsFatalError()) {
ManagerEMHScenario targetScenario = resultManager.getResult();
- if (targetScenario.isCrue10()) {
+ if (targetScenario.isCrue10() && projet.getCoeurConfig().isCrue9Dependant()) {
if (sourceScenario.isCrue9()) {
targetScenario.setLinkedscenarioCrue9(sourceScenario.getNom());
} else {
Modified: trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/SysdocBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/SysdocBuilder.java 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/SysdocBuilder.java 2013-07-11 22:03:30 UTC (rev 8436)
@@ -39,7 +39,7 @@
return group;
}
SysdocFolder sysdocFolder = new SysdocFolder(baseDir);
- CtuluLibFile.getFileFromJar("/sysdoc.html", sysdocFolder.getSysdocHelpFile());
+ CtuluLibFile.getFileFromJar("/sydoc.html", sysdocFolder.getSysdocHelpFile());
File tocFile = sysdocFolder.getTocFile();
String error = CtuluLibFile.canWrite(tocFile);
if (error != null) {
@@ -49,7 +49,7 @@
File copied = null;
if (tocFile.exists()) {
try {
- copied = File.createTempFile("sysdoc-toc", ".xml");
+ copied = File.createTempFile("sydoc-toc", ".xml");
CtuluLibFile.copyFile(tocFile, copied);
} catch (IOException iOException) {
log.addSevereError(iOException.getMessage());
Modified: trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/common/SysdocFolder.java
===================================================================
--- trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/common/SysdocFolder.java 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/common/SysdocFolder.java 2013-07-11 22:03:30 UTC (rev 8436)
@@ -12,7 +12,7 @@
public class SysdocFolder {
public static final String INDEXHTML_FILENAME = "index.html";
- public static final String SYSDOC_FOLDER_NAME = ".sysdoc";
+ public static final String SYSDOC_FOLDER_NAME = ".sydoc";
private final File baseDir;
private final File sysdocDir;
private final File sysdocSearchIndexDir;
@@ -26,7 +26,7 @@
}
public File getSysdocHelpFile() {
- return new File(sysdocDir, "sysdoc.html");
+ return new File(sysdocDir, "sydoc.html");
}
public File getSysdocSearchIndexDir() {
Modified: trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/persist/PersistProcessor.java
===================================================================
--- trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/persist/PersistProcessor.java 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/persist/PersistProcessor.java 2013-07-11 22:03:30 UTC (rev 8436)
@@ -39,7 +39,7 @@
public CtuluLog write(File file, DocEntry entry) {
CtuluLog log = new CtuluLog(SysdocMessages.RESOURCE_BUNDLE);
PersistContent content = new PersistContent();
- content.setXsdName("sysdoc-" + version + ".xsd");
+ content.setXsdName("sydoc-" + version + ".xsd");
content.setEntry(entry);
FileOutputStream out = null;
try {
Modified: trunk/soft/fudaa-crue/crue-sysdoc/src/main/resources/org/fudaa/dodico/crue/sysdoc/common/sysdocMessages.properties
===================================================================
--- trunk/soft/fudaa-crue/crue-sysdoc/src/main/resources/org/fudaa/dodico/crue/sysdoc/common/sysdocMessages.properties 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/crue-sysdoc/src/main/resources/org/fudaa/dodico/crue/sysdoc/common/sysdocMessages.properties 2013-07-11 22:03:30 UTC (rev 8436)
@@ -1,11 +1,11 @@
file.write.error=Erreur lors de l'\u00e9criture du fichier
file.read.error=Erreur lors de la lecture du fichier
-tocNotFound.Error=La table des mati\u00e8res n''a pas \u00e9t\u00e9 trouv\u00e9. Contacter le responsable de Sysdoc afin de g\u00e9n\u00e9rer les fichiers n\u00e9cessaires.
+tocNotFound.Error=La table des mati\u00e8res n''a pas \u00e9t\u00e9 trouv\u00e9. Contacter le responsable de Sydoc afin de g\u00e9n\u00e9rer les fichiers n\u00e9cessaires.
tocNotFound.Info=Chemin: {0}
tocContentInvalid.Error=Le contenu de la tables des mati\u00e8res est invalide. Chemin {0}
RebuildToc.Log=Construction de la table des mati\u00e8res
-RebuildToc.CantCreateBaseFolder.Error=Le dossier de base de Sysdoc ne peut pas \u00eatre cr\u00e9e: {0}.\n V\u00e9rifier les droits d'acc\u00e8s au dossier.
-RebuildToc.CantCreateSysdocFolder.Error=Le dossier interne de Sysdoc ne peut pas \u00eatre cr\u00e9e: {0}.\n V\u00e9rifier les droits d'acc\u00e8s au dossier.
+RebuildToc.CantCreateBaseFolder.Error=Le dossier de base de Sydoc ne peut pas \u00eatre cr\u00e9e: {0}.\n V\u00e9rifier les droits d'acc\u00e8s au dossier.
+RebuildToc.CantCreateSysdocFolder.Error=Le dossier interne de Sydoc ne peut pas \u00eatre cr\u00e9e: {0}.\n V\u00e9rifier les droits d'acc\u00e8s au dossier.
RebuildToc.NoEntryFound= le dossier ne contient pas de fichiers de documentation au format html.
RebuildToc.NoEntryFound.Info=Dossier concern\u00e9: {0}
RebuildToc.OldTocKept=La g\u00e9n\u00e9ration de la table des mati\u00e8res a \u00e9chou\u00e9. L'ancien fichier a \u00e9t\u00e9 conserv\u00e9
Copied: trunk/soft/fudaa-crue/crue-sysdoc/src/main/resources/sydoc.html (from rev 8404, trunk/soft/fudaa-crue/crue-sysdoc/src/main/resources/sysdoc.html)
===================================================================
Deleted: trunk/soft/fudaa-crue/crue-sysdoc/src/main/resources/sysdoc.html
===================================================================
Modified: trunk/soft/fudaa-crue/crue-validation/src/main/java/org/fudaa/dodico/crue/validation/ValidationHelperLoi.java
===================================================================
--- trunk/soft/fudaa-crue/crue-validation/src/main/java/org/fudaa/dodico/crue/validation/ValidationHelperLoi.java 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/crue-validation/src/main/java/org/fudaa/dodico/crue/validation/ValidationHelperLoi.java 2013-07-11 22:03:30 UTC (rev 8436)
@@ -30,23 +30,30 @@
}
public static CtuluLog valideLoi(final Loi in, final CrueConfigMetier props) {
- final CtuluLog res=new CtuluLog(BusinessMessages.RESOURCE_BUNDLE);
+ final CtuluLog res = new CtuluLog(BusinessMessages.RESOURCE_BUNDLE);
valideLoi(in, props, res, null);
return res;
-
+
}
- protected static void valideLoi(final Loi in, final CrueConfigMetier props, final CtuluLog res, final String pref) {
+
+ protected static void valideLoi(final Loi in, final CrueConfigMetier ccm, final CtuluLog res, final String pref) {
final List<PtEvolutionFF> ptEvolutionFF = in.getEvolutionFF().getPtEvolutionFF();
final int size = ptEvolutionFF.size();
- props.getValidator("nbrPtLoi").validateNumber(BusinessMessages.getString("valid.nbrPtEvolutionFF"), size, res);
- if(size==0){
- res.addError("valid.nbrPtEvolutionFF.IsEmpty",in.getNom());
+ ccm.getValidator("nbrPtLoi").validateNumber(BusinessMessages.getString("valid.nbrPtEvolutionFF"), size, res);
+ if (size == 0) {
+ res.addError("valid.nbrPtEvolutionFF.IsEmpty", in.getNom());
+ } else if (LoiDF.class.equals(in.getClass())) {
+ double firstAbs = ptEvolutionFF.get(0).getAbscisse();
+ PropertyEpsilon loiAbscisseEps = ccm.getLoiAbscisseEps(in);
+ if (!loiAbscisseEps.isZero(firstAbs)) {
+ res.addError("valid.firstAbsLoiDf.mustBeZero", in.getNom());
+ }
}
-
- final PropertyValidator abscisseValidator = props.getLoiAbscisseValidator(in);
- validateListPt2d(ptEvolutionFF, abscisseValidator, props.getLoiOrdonneeValidator(in), res, pref);
- ConfigLoi configLoi = props.getConfLoi().get(in.getType());
- validControlLoi(configLoi, props, in, pref, ptEvolutionFF, res);
+
+ final PropertyValidator abscisseValidator = ccm.getLoiAbscisseValidator(in);
+ validateListPt2d(ptEvolutionFF, abscisseValidator, ccm.getLoiOrdonneeValidator(in), res, pref);
+ ConfigLoi configLoi = ccm.getConfLoi().get(in.getType());
+ validControlLoi(configLoi, ccm, in, pref, ptEvolutionFF, res);
}
public static void validControlLoi(ConfigLoi configLoi, final CrueConfigMetier props, final Loi in, final String pref,
@@ -109,11 +116,13 @@
valideLoi(cont.getLoi(), props, res, prefix);
}
- public static CtuluLog validateLoiDF(final LoiDF loi, final CrueConfigMetier map) {
+ public static CtuluLog validateLoiDF(final LoiDF loi, final CrueConfigMetier ccm) {
final CtuluLog res = new CtuluLog();
res.setDefaultResourceBundle(BusinessMessages.RESOURCE_BUNDLE);
res.setDesc(loi.getNom());
- valideLoi(loi, map, res, null);
+ valideLoi(loi, ccm, res, null);
+ final List<PtEvolutionFF> ptEvolutionFF = loi.getEvolutionFF().getPtEvolutionFF();
+
return res;
}
Modified: trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrueDev.conf
===================================================================
--- trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrueDev.conf 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrueDev.conf 2013-07-11 22:03:30 UTC (rev 8436)
@@ -3,7 +3,7 @@
# options used by the launcher by default, can be overridden by explicit
# command line switches
-default_options="-J-Ddev.etcDir="C:\data\Fudaa-Crue\etc" -J-Xmx512m --branding fudaacrue -J-Dsysdoc-admin=true"
+default_options="-J-Ddev.etcDir="C:\data\Fudaa-Crue\etc" -J-Xmx512m --branding fudaacrue -J-Dsydoc-admin=true"
# for development purposes you may wish to append: -J-Dnetbeans.logger.console=true -J-ea
# default location of JDK/JRE, can be overridden by using --jdkhome <dir> switch
Modified: trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/Bundle.properties 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/Bundle.properties 2013-07-11 22:03:30 UTC (rev 8436)
@@ -1,9 +1,9 @@
-currentVersion=Fudaa-Crue {0}
-LBL_splash_window_title=Starting Fudaa-Crue
-SPLASH_HEIGHT=290
-SPLASH_WIDTH=400
-SplashProgressBarBounds=0,237,400,20
-SplashProgressBarColor=0xFF
-SplashRunningTextBounds=6,224,380,10
-SplashRunningTextColor=0xFF
-SplashRunningTextFontSize=12
+currentVersion=Fudaa-Crue {0}
+LBL_splash_window_title=Starting Fudaa-Crue
+SPLASH_HEIGHT=664
+SPLASH_WIDTH=664
+SplashProgressBarBounds=69,294,541,12
+SplashProgressBarColor=0xFF
+SplashRunningTextBounds=31,314,608,23
+SplashRunningTextColor=0xFF
+SplashRunningTextFontSize=7
Modified: trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/splash.gif
===================================================================
(Binary files differ)
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/CopyManagerNodeAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/CopyManagerNodeAction.java 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/CopyManagerNodeAction.java 2013-07-11 22:03:30 UTC (rev 8436)
@@ -85,8 +85,8 @@
NbBundle.getMessage(getClass(), "CopyAction.TypeMessage"),
NbBundle.getMessage(getClass(), "CopyAction.Title"), JOptionPane.YES_NO_CANCEL_OPTION,
JOptionPane.QUESTION_MESSAGE, null, new String[]{NbBundle.getMessage(getClass(),
- "CopyAction.OneButton"), NbBundle.getMessage(
- getClass(), "CopyAction.DeepButton"), NbBundle.getMessage(getClass(), "CopyAction.CancelButton")},
+ "CopyAction.OneButton"), NbBundle.getMessage(
+ getClass(), "CopyAction.DeepButton"), NbBundle.getMessage(getClass(), "CopyAction.CancelButton")},
NbBundle.getMessage(getClass(), "CopyAction.OneButton"));
if (res < 0 || res > 1) {
@@ -315,7 +315,7 @@
if (srcContainer instanceof ManagerEMHScenario) {
final ManagerEMHScenario destScenario = new ManagerEMHScenario(this.infos.containersToCopy.get(srcContainer));
- if (((ManagerEMHScenario) srcContainer).isCrue10()) {
+ if (((ManagerEMHScenario) srcContainer).isCrue10() && infos.project.getCoeurConfig().isCrue9Dependant()) {
destScenario.setLinkedscenarioCrue9(((ManagerEMHScenario) srcContainer).getLinkedscenarioCrue9());
}
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ManagerEMHScenarioNode.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ManagerEMHScenarioNode.java 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ManagerEMHScenarioNode.java 2013-07-11 22:03:30 UTC (rev 8436)
@@ -78,7 +78,7 @@
@Override
public final boolean canDestroy() {
ManagerEMHScenario thisScenario = getManagerEMHScenario();
- if (thisScenario.isCrue9()) {
+ if (thisScenario.isCrue9() && getProjet().getCoeurConfig().isCrue9Dependant()) {
List<ManagerEMHScenario> listeScenarios = getProjet().getListeScenarios();
for (ManagerEMHScenario scenario : listeScenarios) {
if (scenario.isCrue10() && StringUtils.equals(thisScenario.getNom(), scenario.getLinkedscenarioCrue9())) {
Modified: trunk/soft/fudaa-crue/ui-sysdoc/src/main/java/org/fudaa/fudaa/crue/sysdoc/ManagerRoleOptionProcessor.java
===================================================================
--- trunk/soft/fudaa-crue/ui-sysdoc/src/main/java/org/fudaa/fudaa/crue/sysdoc/ManagerRoleOptionProcessor.java 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/ui-sysdoc/src/main/java/org/fudaa/fudaa/crue/sysdoc/ManagerRoleOptionProcessor.java 2013-07-11 22:03:30 UTC (rev 8436)
@@ -20,7 +20,7 @@
@ServiceProvider(service = OptionProcessor.class)
public class ManagerRoleOptionProcessor extends OptionProcessor {
- private Option openAsManager = Option.withoutArgument(Option.NO_SHORT_NAME, "sysdoc-admin");
+ private Option openAsManager = Option.withoutArgument(Option.NO_SHORT_NAME, "sydoc-admin");
@Override
protected Set<Option> getOptions() {
Modified: trunk/soft/fudaa-crue/ui-sysdoc/src/main/java/org/fudaa/fudaa/crue/sysdoc/admin/SysdocAdminUI.java
===================================================================
--- trunk/soft/fudaa-crue/ui-sysdoc/src/main/java/org/fudaa/fudaa/crue/sysdoc/admin/SysdocAdminUI.java 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/ui-sysdoc/src/main/java/org/fudaa/fudaa/crue/sysdoc/admin/SysdocAdminUI.java 2013-07-11 22:03:30 UTC (rev 8436)
@@ -43,7 +43,7 @@
*
* @author Frederic Deniger
*/
-@Messages("CheckMsg.Button=Contr\u00f4ler Sysdoc")
+@Messages("CheckMsg.Button=Contr\u00f4ler Sydoc")
public class SysdocAdminUI {
private ConfigurationManagerService configurationManagerService = Lookup.getDefault().lookup(ConfigurationManagerService.class);
@@ -52,11 +52,11 @@
* permet d'activer le role d'admin sysdoc: utiliser pour le OptionProcessor ManagerRoleOptionProcessor.
*/
public static void activeRole() {
- System.setProperty("sysdoc-admin", "true");
+ System.setProperty("sydoc-admin", "true");
}
public static boolean isRoleActivated() {
- return "true".equals(System.getProperty("sysdoc-admin"));
+ return "true".equals(System.getProperty("sydoc-admin"));
}
SysdocTopComponent sysdocTopComponent;
Modified: trunk/soft/fudaa-crue/ui-sysdoc/src/main/java/org/fudaa/fudaa/crue/sysdoc/services/SysdocService.java
===================================================================
--- trunk/soft/fudaa-crue/ui-sysdoc/src/main/java/org/fudaa/fudaa/crue/sysdoc/services/SysdocService.java 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/ui-sysdoc/src/main/java/org/fudaa/fudaa/crue/sysdoc/services/SysdocService.java 2013-07-11 22:03:30 UTC (rev 8436)
@@ -93,7 +93,7 @@
}
public File getSysdocLocalizedDir() {
- File sysdocBaseDir = new File(configurationManagerService.getCoeurManager().getSiteDir(), "sysdoc");
+ File sysdocBaseDir = new File(configurationManagerService.getCoeurManager().getSiteDir(), "sydoc");
String local = configurationManagerService.getCurrentLocale();
File sysdocLocaleDir = new File(sysdocBaseDir, local);
return sysdocLocaleDir;
Modified: trunk/soft/fudaa-crue/ui-sysdoc/src/main/resources/org/fudaa/fudaa/crue/sysdoc/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-sysdoc/src/main/resources/org/fudaa/fudaa/crue/sysdoc/Bundle.properties 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/ui-sysdoc/src/main/resources/org/fudaa/fudaa/crue/sysdoc/Bundle.properties 2013-07-11 22:03:30 UTC (rev 8436)
@@ -3,12 +3,12 @@
#OpenIDE-Module-Short-Description=
#OpenIDE-Module-Long-Description=
#OpenIDE-Module-Display-Category=
-Menu/Sysdoc=Sysdoc
-CTL_SysdocTopComponent=Sysdoc
+Menu/Sysdoc=Sydoc
+CTL_SysdocTopComponent=Sydoc
HINT_SysdocTopComponent=Aide int\u00e9gr\u00e9e de Fudaa-Crue
FileNotFoundError=Le fichier cible n''existe pas: {0}
OpenDocLink.Error=Le chemin {0} n''est pas d\u00e9fini dans Sysdoc
-BuildToc.Button.Tooltip=Utiliser ce bouton pour charger un page vide et d\u00e9bloquer l'acc\u00e8s aux fichiers de sysdoc
+BuildToc.Button.Tooltip=Utiliser ce bouton pour charger un page vide et d\u00e9bloquer l'acc\u00e8s aux fichiers de Sydoc
SysdocAdmingressMsgTest=Construction de la table des mati\u00e8res
Sysdoc.TocTooltip=Table des mati\u00e8res
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-07-15 07:44:08
|
Revision: 8437
http://sourceforge.net/p/fudaa/svn/8437
Author: deniger
Date: 2013-07-15 07:44:05 +0000 (Mon, 15 Jul 2013)
Log Message:
-----------
CRUE-530
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/coeur/CoeurConfig.java
trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/etude/EMHProjet.java
trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/conf/CrueDaoStructureCONF.java
trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/etu/CrueConverterETU.java
trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/DHReader.java
trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/DHWriter.java
trunk/soft/fudaa-crue/crue-io/src/test/resources/FudaaCrue_Site.xml
trunk/soft/fudaa-crue/crue-io/src/test/resources/FudaaCrue_Site_officiel.xml
trunk/soft/fudaa-crue/crue-validation/src/main/java/org/fudaa/dodico/crue/validation/ValidationHelperLoi.java
trunk/soft/fudaa-crue/crue-validation/src/main/java/org/fudaa/dodico/crue/validation/ValidatorForCrue9Export.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/UsedByScenarioCrue10Builder.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/property/ManagerPropertyFactory.java
Modified: trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/coeur/CoeurConfig.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/coeur/CoeurConfig.java 2013-07-11 22:03:30 UTC (rev 8436)
+++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/coeur/CoeurConfig.java 2013-07-15 07:44:05 UTC (rev 8437)
@@ -27,7 +27,7 @@
private String coeurFolderPath;
private String comment;
private boolean usedByDefault;
- private boolean crue9Dependant;
+ private boolean crue9Dependant = true;
private CrueVersionType crueVersionType;
private CrueConfigMetier crueConfigMetier;
private File baseDir;
@@ -36,6 +36,7 @@
return baseDir;
}
+ @Override
public boolean isCrue9Dependant() {
return crue9Dependant;
}
Modified: trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
===================================================================
--- trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties 2013-07-11 22:03:30 UTC (rev 8436)
+++ trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties 2013-07-15 07:44:05 UTC (rev 8437)
@@ -727,9 +727,10 @@
io.dfrt.frtUnknown=Le frottement {0} contient un type non g\u00e9r\u00e9
reloadRun.copyFailed=La copie du fichier {0} a \u00e9chou\u00e9
reloadRun.runFileNotFound=Le fichier {0} n''existe pas
-repriseDh.error=la reprise de calcul n'est pas compatible avec Crue 9
+repriseDh.error=La reprise de calcul Crue9 n'est pas compatible avec Fudaa-Crue
crue9.compatible.ordCalcTransIniCalcClicheIgnored=Les ordres de calcul OrdCalcTransIniCalcCliche seront ignor\u00e9s lors de la sauvegarde au format Crue9
crue9.compatible.ordCalcPseudoPermIniClicheIgnored=Les ordres de calcul OrdCalcPseudoPermIniCliche seront ignor\u00e9s lors de la sauvegarde au format Crue9
+crue9.compatible.temporalScenarioNotSupported=Le sc\u00e9nario courant est temporel. Il ne peut pas \u00eatre converti en sc\u00e9nario Crue9. Pour ce faire, transformez-le en sc\u00e9nario atemporel (DateDebSce vide dans les Param\u00e8tres de calcul)
export.oldCrue10.containOrdCalcPseudoPermIniCliche.error=La grammaire de version 1.1.1 ne supporte pas les OrdCalcPseudoPermIniCliche
export.oldCrue10.containOrdCalcTransIniCalcCI.error=La grammaire de version 1.1.1 ne supporte pas les OrdCalcTransIniCalcCI
export.oldCrue10.containOrdCalcTransIniCalcCliche.error=La grammaire de version 1.1.1 ne supporte pas les OrdCalcTransIniCalcCliche
Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/etude/EMHProjet.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/etude/EMHProjet.java 2013-07-11 22:03:30 UTC (rev 8436)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/etude/EMHProjet.java 2013-07-15 07:44:05 UTC (rev 8437)
@@ -463,7 +463,7 @@
LOGGER.log(Level.INFO, "not renamed because {0} is already used ", newName.toUpperCase());
return false;
}
- if (EnumCatEMH.SCENARIO.equals(type)) {
+ if (EnumCatEMH.SCENARIO.equals(type) && getCoeurConfig().isCrue9Dependant()) {
ManagerEMHScenario scenario = (ManagerEMHScenario) manager;
if (scenario.isCrue9()) {
Collection<ManagerEMHScenario> values = (Collection<ManagerEMHScenario>) managerByNom.values();
Modified: trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/conf/CrueDaoStructureCONF.java
===================================================================
--- trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/conf/CrueDaoStructureCONF.java 2013-07-11 22:03:30 UTC (rev 8436)
+++ trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/conf/CrueDaoStructureCONF.java 2013-07-15 07:44:05 UTC (rev 8437)
@@ -64,7 +64,7 @@
public String id;
public String Commentaire;
public String VersionGrammaire;
- boolean Crue9Dependant;
+ boolean Crue9Dependant = true;
public boolean CoeurParDefaut;
public String DossierCoeur;
}
Modified: trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/etu/CrueConverterETU.java
===================================================================
--- trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/etu/CrueConverterETU.java 2013-07-11 22:03:30 UTC (rev 8436)
+++ trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/etu/CrueConverterETU.java 2013-07-15 07:44:05 UTC (rev 8437)
@@ -209,7 +209,7 @@
newScenar.addManagerFils(modeleData);
}
} else if (CtuluLibArray.isNotEmpty(scenarPersist.Modeles)) {
- if (scenarPersist.ScenarioScenarioV9 != null) {
+ if (scenarPersist.ScenarioScenarioV9 != null ) {
newScenar.setLinkedscenarioCrue9(scenarPersist.ScenarioScenarioV9.NomRef);
}
for (final Ref reference : scenarPersist.Modeles) {
@@ -286,7 +286,7 @@
scenario.Nom = managerScenario.getNom();
scenario.IsActive = managerScenario.isCrue9() ? null : managerScenario.isActive();
- if (managerScenario.getLinkedscenarioCrue9() != null) {
+ if (managerScenario.getLinkedscenarioCrue9() != null && metier.getCoeurConfig().isCrue9Dependant()) {
scenario.ScenarioScenarioV9 = new Ref();
scenario.ScenarioScenarioV9.NomRef = managerScenario.getLinkedscenarioCrue9();
}
Modified: trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/DHReader.java
===================================================================
--- trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/DHReader.java 2013-07-11 22:03:30 UTC (rev 8436)
+++ trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/DHReader.java 2013-07-15 07:44:05 UTC (rev 8437)
@@ -1040,15 +1040,9 @@
// TDEBH, TDEBM, TDEBS, HDEBJ, HDEBH, HDEBM, HDEBS, NTS, TMAX
reader.readLine();
final Duration pasDeTemps = readDuration(reader);
- final LocalDateTime dateMax = DateDurationConverter.getDateFromZeroDate(readDuration(reader, 4));
- final Duration tDeb = readDuration(reader, 8);
- final Duration hDeb = readDuration(reader, 12);
- final LocalDateTime dateDeb = DateDurationConverter.getDateFromZeroDate(hDeb);
+ Duration transDureeCalc = readDuration(reader, 4);
final int nts = reader.intField(16);
- if (isFine()) {
- LOGGER.log(Level.FINE, "Donn\u00e9es transitoires {0} : dt {1} | tmax {2} | tdeb {3} | hdeb {4} | nts {5}", new Object[]{reader.getCurrent().getLineNumber(), pasDeTemps, dateMax, tDeb, dateDeb, nts});
- }
final ParamNumModeleBase pnum = res.getOrCreatePNUM();
final PdtCst pdtCst = new PdtCst();
@@ -1061,17 +1055,8 @@
trans.setPdt(pdtCst);
// Enregistrement de tMax, hDeb et nts transformé en période dans PCAL
- ParamCalcScenario pcal = res.getOrCreatePCAL();
- if (!DateDurationConverter.ZERO_DATE.equals(dateDeb)) {
- pcal.setDateDebSce(dateDeb);
- }
- Duration transDureeCalc = new Duration(dateDeb.toDateTime(), dateMax.toDateTime());//DureeCalc=DH.tmax-DH.hdeb
//NTS = OCAL.OrdCalcTrans.PdtRes.PdtCst / PNUM.ParamNumCalcTrans.Pdt.PdtCst
Pdt transPdtRes = EMHFactory.createPdtCst(new Duration((pasDeTemps.getMillis() * nts)));
- if (!hDeb.equals(tDeb)) {
- analyze_.addInfo("io.dh.tdeb.notsupported.message");
- }
-
reader.readLine();
// Définition de toutes les conditions limites supportees.
@@ -1217,7 +1202,7 @@
final List<ElemPdt> elementsPdt = new ArrayList<ElemPdt>();
- Duration lastDuration = hDeb;
+ Duration lastDuration = new Duration(0);
Duration currentDuration;
Duration lastStepTime = pasDeTemps;
int nbStepTime = 0;
@@ -1635,6 +1620,9 @@
// TREPM Heures/Minutes/Secondes) (utilisés dans le cas ICAL = 0)
// TREPS
final Duration tempReprise = readDuration(reader, 5);
+ if (tempReprise.getMillis() != 0) {
+ analyze_.addSevereError("repriseDh.error");
+ }
// Enregistrement de "ical" et de "trepr" dans OCAL (seulement s'il vaut 0 ; aucun enregistrement metier pour une
// valeur différente)
Modified: trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/DHWriter.java
===================================================================
--- trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/DHWriter.java 2013-07-11 22:03:30 UTC (rev 8436)
+++ trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/DHWriter.java 2013-07-15 07:44:05 UTC (rev 8437)
@@ -83,20 +83,20 @@
* @author Adrien Hadoux
*/
public class DHWriter extends AbstractCrue9Writer implements CtuluActivity {
-
+
private double tolndz;
-
+
@Override
protected void internalWrite(final CrueIOResu o) {
-
+
initWriter();
-
+
final CrueData data = ((CrueIOResu<CrueData>) o).getMetier();
tolndz = getTolNdZDefaultValue(data);
comparator = new InfoEMHByUserPositionComparator(data.getScenarioData());
-
+
try {
-
+
final Map<String, Double> coeffsRuisParCalcPerm = new HashMap<String, Double>();
writeDonneesGenerales((CrueIOResu<CrueData>) o, coeffsRuisParCalcPerm);
if (aDonneesPerm) {
@@ -105,7 +105,7 @@
if (aDonneesTrans) {
writeDonneesTransitoires(data);
}
-
+
} catch (final IOException e) {
analyze_.manageException(e);
} finally {
@@ -117,14 +117,14 @@
}
}
}
-
+
@Override
protected FortranInterface getFortranInterface() {
return fortranWriter;
}
private boolean aDonneesPerm = false;
private boolean aDonneesTrans = false;
-
+
private boolean isModeLateral(final CrueData data) {
final PropertyEpsilon epsForCoefRus = data.getCrueConfigMetier().getEpsilon("coefRuis");
final List<EMH> allSimpleEMH = data.getAllSimpleEMH();
@@ -147,10 +147,10 @@
}
}
}
-
+
}
return false;
-
+
}
/**
@@ -159,7 +159,7 @@
*/
private void writeDonneesGenerales(final CrueIOResu<CrueData> ioData, final Map coeffsRuisParCalcPerm)
throws IOException {
-
+
writeCom("");
writeCom(" Donnees generales ");
@@ -168,7 +168,7 @@
final CrueData data = ioData.getMetier();
final int ile = getILE(data);
writeRegle(data, ile);
-
+
writeCom("");
writeCom(" ical cru cofqrq isorti ile trepr ");
@@ -176,7 +176,7 @@
int ical = -1;
double cru = 0;
int cofqrq = 0;
-
+
String isorti = "0";
@@ -209,13 +209,13 @@
if (analyze_.containsSevereError()) {
return;
}
-
+
cofqrq = 1;
}
// Valeur par défaut pour l'écriture (on ne tient pas compte de la valeur à la lecture de DH)
}
-
+
if (aDonneesGen && aDonneesPerm && aDonneesTrans) {
ical = 2;
} else if (aDonneesGen && aDonneesPerm) {
@@ -230,7 +230,7 @@
analyze_.addSevereError("repriseDh.error");
return;
}
-
+
boolean use1 = data.getOCAL().getSorties().containsVerbositeStrictlyMoreThan(SeveriteManager.INFO, data.getCrueConfigMetier());
// isorti
isorti = (use1 ? "1" : "0");
@@ -261,7 +261,7 @@
fortranWriter.stringField(0, CrueIODico.DH_MODRU);
fortranWriter.writeFields();
}
-
+
writeCom("");
writeCom(" Debits initiaux dans les branches ");
@@ -273,7 +273,7 @@
final List<DonPrtCIniBranche> dptis = EMHHelper.selectInstanceOf(br.getInfosEMH(), DonPrtCIniBranche.class);
if (dptis != null) {
for (final DonPrtCIniBranche dpti : dptis) {
-
+
branchesDPTI.add(br);
final String nom = br.getNom();
final String valeur = Double.toString(dpti.getQini());
@@ -317,13 +317,13 @@
fortranWriter.stringField(countNbChampWritten++, valeur);
nbCaractWritten += nbCaractToWrite;
}
-
+
}
fortranWriter.writeFields();
}
writeFin();
}
-
+
if (ile == 0) {
// Ecriture lignes E
@@ -340,17 +340,17 @@
final CatEMHBranche brancheDPTI = branchesDPTI.get(i);
final List<RelationEMHSectionDansBranche> sectionsBrancheDPTI = brancheDPTI.getListeSections();
final List<DonPrtCIni> dptis = brancheDPTI.getDPTI();
-
+
if (sectionsBrancheDPTI == null || dptis == null) {
analyze_.addInfoFromFile("io.dh.sections.dpti.error", fortranWriter.getLineNumber(), brancheDPTI.getNom());
} else {
nbCaractWritten = 0;
-
+
final int countSectionsBranche = sectionsBrancheDPTI.size();
int idxOnLine = 0;
for (int j = 0; j < countSectionsBranche; j++) {
-
+
final DonPrtCIniSection dpti = EMHHelper.selectFirstOfClass(sectionsBrancheDPTI.get(j).getEmh().getInfosEMH(), DonPrtCIniSection.class);
double zIniPourProfilJ = 0;
if (dpti != null) {
@@ -367,7 +367,7 @@
nbCaractWritten = 0;
idxOnLine = 0;
}
-
+
fortranWriter.doubleField(idxOnLine++, zIniPourProfilJ);
nbCaractWritten += nbCaractToWrite;
}
@@ -386,9 +386,9 @@
nbCaractWritten = 0;
for (final CatEMHNoeud noeud : noeuds) {
final List<DonPrtCIni> dptis = noeud.getDPTI();
-
+
if (dptis != null) {
-
+
for (int j = 0, dptisSize = dptis.size(); j < dptisSize; j++) {
if (!(dptis.get(j) instanceof DonPrtCIniNoeudNiveauContinu)) {
continue;
@@ -445,7 +445,7 @@
writeFin();
}
}
-
+
private boolean containsDPTI(final List<CatEMHBranche> branches) {
if (branches == null) {
return false;
@@ -487,7 +487,7 @@
crMaxFlu = pseudoPerm.getCrMaxFlu();
crMaxTor = pseudoPerm.getCrMaxTor();
}
-
+
final ParamNumCalcTrans calcTrans = pnum.getParamNumCalcTrans();
if (calcTrans != null) {
final double crMaxFluTrans = calcTrans.getCrMaxFlu();
@@ -508,9 +508,9 @@
if (ile == 2) {
writeCarteValeur(data.getProperty("pm_TolNdZ"), CrueIODico.TOL_Z_INIT, tolndz);
}
-
+
}
-
+
private int getILE(final CrueData data) {
final OrdPrtCIniModeleBase methodesInterpolation = data.getOPTI();
int calcILE = 0;
@@ -527,7 +527,7 @@
}
return calcILE;
}
-
+
private double getTolNdz(final OrdPrtCIniModeleBase methodesInterpolation, final CrueData data) {
final Collection<ValParam> listValParam = methodesInterpolation.getValParam();
if (listValParam != null) {
@@ -540,12 +540,12 @@
}
return getTolNdZDefaultValue(data);
}
-
+
private double getTolNdZDefaultValue(final CrueData data) {
return data.getCrueConfigMetier().getDefaultDoubleValue(
StringUtils.uncapitalize(EnumRegleInterpolation.TOL_ND_Z.getVariableName()));
}
-
+
private double computeQruisQDM(final CrueData data) {
final List<EMHBrancheSaintVenant> branchesSaintVenant = data.getBranchesSaintVenant();
for (final EMHBrancheSaintVenant brancheSaintVenant : branchesSaintVenant) {
@@ -559,14 +559,14 @@
}
return data.getCrueConfigMetier().getDefaultDoubleValue("coefRuisQdm");
}
-
+
private boolean computeQruisIdentique(final Map<String, Double> coeffsRuisParCalcPerm, final List<OrdCalc> ordCalcs,
final CrueConfigMetier props) {
final List<CalcPseudoPerm> calcPseudoPerm = EMHHelper.collectCalcPseudoPerm(ordCalcs);
// Pour déterminer s'il existe un coefficient de ruissellement commun pour un calcul permanent, il faut que le
// coefficient de chaque branche Saint Venant de ce calcul soit le même.
for (int i = 0, imax = calcPseudoPerm.size(); i < imax; i++) {
-
+
final CalcPseudoPerm calcPerm = calcPseudoPerm.get(i);
// Il faut au moins une branche saint venant pour considérer qu'il y a un débit de ruissellement (identique)
final List<CalcPseudoPermBrancheSaintVenantQruis> calcQruis = calcPerm.getCalcPseudoPermBrancheSaintVenantQruisUserActive();
@@ -585,20 +585,19 @@
return true;
}
-
/**
* @param data
* @throws IOException
*/
private void writeDonneesPermanentes(final CrueData data, final Map coeffsRuisParCalcPerm) throws IOException {
-
+
writeCom("");
writeCom(" Donnees pseudo-permanentes");
// Ecriture Ligne A
writeCom("");
writeCom(" dtperm tolz tolq icalmx iprint ndecou ");
-
+
Duration duree = null;
double tolz = -1.0;
double tolq = -1.0;
@@ -606,7 +605,7 @@
// Valeur par défaut, pas stocké à la lecture de DH
final int iprint = 0;
int ndecou = -1;
-
+
final ParamNumModeleBase pnum = data.getPNUM();
PdtVar pdtVar = null;
if (pnum != null) {
@@ -642,7 +641,7 @@
// Ecriture Lignes B
writeCom("");
writeCom(" Definition des types des conditions aux limites ");
-
+
final OrdCalcScenario ocal = data.getOCAL();
if (ocal != null) {
final List<CalcPseudoPerm> calcsPerms = EMHHelper.collectCalcPseudoPerm(ocal.getOrdCalc());
@@ -667,16 +666,16 @@
if (pdtVar != null && CollectionUtils.isNotEmpty(pdtVar.getElemPdt())) {
writeCom("");
writeCom(" Modulation du pas de temps au cours de la procedure de stabilisation ");
-
+
ecritLignesDPermanent(pdtVar);
}
// Ecriture Lignes E
writeCom("");
writeCom(" Valeurs des conditions aux limites (regimes pseudo-permanents) ");
-
+
for (int i = 0, imax = nomsCalcsPerms.size(); i < imax; i++) {
-
+
final String nomCalcPerm = nomsCalcsPerms.get(i);
if (lignesE.containsKey(nomCalcPerm)) {
final TDoubleArrayList valeursCP = lignesE.get(nomCalcPerm);
@@ -684,7 +683,7 @@
for (int j = 0, jmax = size; j < jmax; j++) {
fortranWriter.doubleField(j, valeursCP.get(j));
}
-
+
fortranWriter.writeFields();
}
}
@@ -692,7 +691,7 @@
// Ecriture Ligne F
writeFin();
}
-
+
}
}
private InfoEMHByUserPositionComparator comparator;
@@ -711,7 +710,7 @@
private void afficheLignesBetRecupereDonneesLignesE(final CalcPseudoPerm calcPerm, final int numCalcPerm,
final TObjectIntHashMap typesCL, final Map<String, TDoubleArrayList> lignesE, final List<String> nomsCalcsPerms)
throws IOException {
-
+
final String nomCalcPerm = calcPerm.getNom();
nomsCalcsPerms.add(nomCalcPerm);
//Doit suivre l'ordre:
@@ -721,7 +720,7 @@
// CalcPseudoPermBrancheSaintVenantQruis
// CalcPseudoPermCasierProfilQruis
final TDoubleArrayList valeursCP = new TDoubleArrayList();
-
+
final List<CalcPseudoPermNoeudQapp> listeQapp = new ArrayList<CalcPseudoPermNoeudQapp>(
calcPerm.getCalcPseudoPermNoeudQappUserActive());
Collections.sort(listeQapp, comparator);
@@ -756,17 +755,17 @@
valeursCP.add(nnc.getZimp());
}
}
-
+
final List<CalcPseudoPermBrancheOrificeManoeuvre> listeBranchesOr = new ArrayList<CalcPseudoPermBrancheOrificeManoeuvre>(
calcPerm.getCalcPseudoPermBrancheOrificeManoeuvreUserActive());
Collections.sort(listeBranchesOr, comparator);
for (int i = 0, listeBranchesOrSize = listeBranchesOr.size(); i < listeBranchesOrSize; i++) {
-
+
final CalcPseudoPermBrancheOrificeManoeuvre brancheOr = listeBranchesOr.get(i);
if (brancheOr.getNomCalculParent() != null && brancheOr.getNomCalculParent().equals(nomCalcPerm)) {
-
+
final CalcPseudoPermBrancheOrificeManoeuvre brancheOrMan = brancheOr;
-
+
if (numCalcPerm == 0) {
fortranWriter.stringField(0, brancheOr.getEmh().getNom());
int typeCL = typesCL.get(brancheOr.getClass());
@@ -777,7 +776,7 @@
fortranWriter.intField(1, typeCL);
fortranWriter.writeFields();
}
-
+
valeursCP.add(brancheOrMan.getOuv());
}
}
@@ -795,21 +794,22 @@
* @throws IOException
*/
private void writeDonneesTransitoires(final CrueData data) throws IOException {
-
+
writeCom("");
writeCom(" Donnees transitoires ");
// Ligne A
writeCom("");
writeCom(" dt tmax tdeb hdeb nts ");
-
+
String dt = null;
String tMax = null;
// tdeb plus supporté donc valeur par défaut toujours à 0 0 0 0
final String tDeb = DateDurationConverter.CRUE_ZERO;
- String hDeb = null;
+ // hdeb plus supporté donc valeur par défaut toujours à 0 0 0 0
+ final String hDeb = DateDurationConverter.CRUE_ZERO;
int nts = 0;
-
+
final ParamNumModeleBase pnum = data.getPNUM();
PdtVar pdtVar = null;
Duration duree = null;
@@ -833,7 +833,7 @@
}
}
dt = DateDurationConverter.durationToCrueFormat(duree);
-
+
final ParamCalcScenario pcal = data.getPCAL();
LocalDateTime dateDebSce = pcal.getDateDebSce();
if (dateDebSce == null) {
@@ -845,17 +845,16 @@
//si on est ici on a 1 ord calc trans:
final CalcTrans calcTrans = calcsTrans.get(0);
final OrdCalcTrans ordCalc = ordCalcs.get(0);
-
- tMax = DateDurationConverter.dateToCrueFormat(dateDebSce.plus(ordCalc.getDureeCalc()));
- hDeb = DateDurationConverter.dateToCrueFormat(dateDebSce);
-
+
+ tMax = DateDurationConverter.durationToCrueFormat(ordCalc.getDureeCalc());
+
final long dureeDt = duree == null ? 0 : duree.getMillis();
if (dureeDt == 0) {
analyze_.addError("io.dh.nts.indefini.error");
} else if (ordCalc.getPdtRes() != null) {
nts = (int) (((PdtCst) ordCalc.getPdtRes()).getPdtCst().getMillis() / dureeDt);
}
-
+
fortranWriter.stringField(0, dt);
fortranWriter.stringField(1, tMax);
fortranWriter.stringField(2, tDeb);
@@ -866,9 +865,9 @@
// Lignes B
writeCom("");
writeCom(" Definition des types des conditions aux limites ");
-
-
-
+
+
+
final TObjectIntHashMap typesCL = new TObjectIntHashMap();
typesCL.put(CalcTransNoeudNiveauContinuLimnigramme.class, 1);
typesCL.put(CalcTransNoeudQapp.class, 2);
@@ -886,7 +885,7 @@
if (pdtVar != null && CollectionUtils.isNotEmpty(pdtVar.getElemPdt())) {
writeCom("");
writeCom(" Modulation du pas de temps au cours de la procedure de stabilisation ");
-
+
ecritLignesDTransitoire(pdtVar, dateDebSce);
}
@@ -897,7 +896,7 @@
// Ecriture Lignes F (s'il y a une loi de ruissellement)
final Collection<CalcTransBrancheSaintVenantQruis> listeBranchesSV = calcTrans.getCalcTransBrancheSaintVenantQruisUserActive();
-
+
if (CollectionUtils.isEmpty(listeBranchesSV)) {
return;
}
@@ -915,7 +914,7 @@
// Ligne F3
writeFin();
}
-
+
}
/**
@@ -942,7 +941,7 @@
// Ligne D3
writeFin();
-
+
}
/**
@@ -967,7 +966,7 @@
// Ligne D3
writeFin();
-
+
}
/**
@@ -981,7 +980,7 @@
calcTrans.sort(comparator);
for (final CalcTransNoeudQapp lim : calcTrans.getCalcTransNoeudQappUserActive()) {
manageTranItem(lim, typesCL, lignesE);
-
+
}
for (final CalcTransItem lim : calcTrans.getCalcTransNoeudNiveauContinuLimnigrammeUserActive()) {
manageTranItem(lim, typesCL, lignesE);
@@ -989,13 +988,13 @@
for (final CalcTransNoeudNiveauContinuTarage lim : calcTrans.getCalcTransNoeudNiveauContinuTarageUserActive()) {
manageTranItem(lim, typesCL, lignesE);
}
-
+
for (final CalcTransBrancheOrificeManoeuvre lim : calcTrans.getCalcTransBrancheOrificeManoeuvreUserActive()) {
manageTranItem(lim, typesCL, lignesE);
}
-
+
}
-
+
private void manageTranItem(final CalcTransItem lim, final TObjectIntHashMap typesCL, final List<Loi> lignesE)
throws IOException {
fortranWriter.stringField(0, lim.getEmh().getNom());
@@ -1016,39 +1015,39 @@
* @throws IOException
*/
private void ecritLoi(final CrueData data, final Loi loi) throws IOException {
-
+
if (loi instanceof LoiDF) {
// Valeur par défaut mise à 2
final int ilecam = 2;
-
+
ecritLoiDFIlecam2((LoiDF) loi, ilecam);
-
+
} else if (loi instanceof LoiFF) {
-
+
final EvolutionFF evolFF = loi.getEvolutionFF();
-
+
if (evolFF != null && CollectionUtils.isNotEmpty(evolFF.getPtEvolutionFF())) {
final List<PtEvolutionFF> ptEvolutionFF = evolFF.getPtEvolutionFF();
// Ligne E3-1
writeCom("");
writeCom(" Zbas Dz ");
-
+
PtEvolutionFF ptEvol = ptEvolutionFF.get(0);
final double zbas = ptEvol.getOrdonnee();
double dz = 0.0;
-
+
if (ptEvolutionFF.size() == 1) {
analyze_.addError("io.dh.dz.indefini.error", loi.getNom());
} else {
ptEvol = ptEvolutionFF.get(1);
dz = ptEvol.getOrdonnee() - zbas;
}
-
+
fortranWriter.doubleField(0, zbas);
fortranWriter.doubleField(1, dz);
fortranWriter.writeFields();
-
+
writeCom("");
writeCom(" Valeurs des conditions aux limites pour la loi Q(z) ");
int nbCaractToWrite = 0;
@@ -1092,7 +1091,7 @@
* @throws IOException
*/
private void ecritLoiDF(final LoiDF loi) throws IOException {
-
+
final EvolutionFF evolFF = loi.getEvolutionFF();
if (evolFF != null && CollectionUtils.isNotEmpty(evolFF.getPtEvolutionFF())) {
PtEvolutionFF ptEvol = null;
@@ -1106,7 +1105,7 @@
}
}
}
-
+
private String toCrueFormat(final double nbSec) {
final long nbMillis = (long) (nbSec * 1000L);
final String crueFormat = DateDurationConverter.durationToCrueFormat(new Duration(nbMillis));
@@ -1132,16 +1131,15 @@
writeFin();
}
-
/**
* @throws IOException
*/
private void writeFin() throws IOException {
-
+
fortranWriter.stringField(0, "FIN");
fortranWriter.writeFields();
}
-
+
@Override
public void stop() {
}
Modified: trunk/soft/fudaa-crue/crue-io/src/test/resources/FudaaCrue_Site.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-io/src/test/resources/FudaaCrue_Site.xml 2013-07-11 22:03:30 UTC (rev 8436)
+++ trunk/soft/fudaa-crue/crue-io/src/test/resources/FudaaCrue_Site.xml 2013-07-15 07:44:05 UTC (rev 8437)
@@ -18,6 +18,7 @@
<Coeur id="CRUE10.2b">
<Commentaire>Coeur Crue10.2b</Commentaire>
<VersionGrammaire>1.2</VersionGrammaire>
+ <Crue9Dependant>true</Crue9Dependant>
<CoeurParDefaut>false</CoeurParDefaut>
<DossierCoeur>Crue10.2b</DossierCoeur>
</Coeur>
Modified: trunk/soft/fudaa-crue/crue-io/src/test/resources/FudaaCrue_Site_officiel.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-io/src/test/resources/FudaaCrue_Site_officiel.xml 2013-07-11 22:03:30 UTC (rev 8436)
+++ trunk/soft/fudaa-crue/crue-io/src/test/resources/FudaaCrue_Site_officiel.xml 2013-07-15 07:44:05 UTC (rev 8437)
@@ -5,12 +5,14 @@
<Coeur id="CRUE10.1">
<Commentaire>Coeur grammaire version 1.1.1</Commentaire>
<VersionGrammaire>1.1.1</VersionGrammaire>
+ <Crue9Dependant>true</Crue9Dependant>
<CoeurParDefaut>true</CoeurParDefaut>
<DossierCoeur>coeurs/coeur1.1.1</DossierCoeur>
</Coeur>
<Coeur id="CRUE10.2">
<Commentaire>Coeur grammaire version 1.2</Commentaire>
<VersionGrammaire>1.2</VersionGrammaire>
+ <Crue9Dependant>true</Crue9Dependant>
<CoeurParDefaut>true</CoeurParDefaut>
<DossierCoeur>coeurs/coeur1.2.0</DossierCoeur>
</Coeur>
Modified: trunk/soft/fudaa-crue/crue-validation/src/main/java/org/fudaa/dodico/crue/validation/ValidationHelperLoi.java
===================================================================
--- trunk/soft/fudaa-crue/crue-validation/src/main/java/org/fudaa/dodico/crue/validation/ValidationHelperLoi.java 2013-07-11 22:03:30 UTC (rev 8436)
+++ trunk/soft/fudaa-crue/crue-validation/src/main/java/org/fudaa/dodico/crue/validation/ValidationHelperLoi.java 2013-07-1...
[truncated message content] |
|
From: <de...@us...> - 2013-08-26 14:15:44
|
Revision: 8469
http://sourceforge.net/p/fudaa/svn/8469
Author: deniger
Date: 2013-08-26 14:15:41 +0000 (Mon, 26 Aug 2013)
Log Message:
-----------
CRUE-545
Modified Paths:
--------------
trunk/soft/fudaa-crue/pom.xml
trunk/soft/fudaa-crue/ui-report/pom.xml
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/AbstractReportGrapheBuilder.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/CourbeColorFinder.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalGrapheBuilder.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/multivar/ReportMultiVarGrapheBuilder.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/rptg/ReportRPTGGrapheBuilder.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/temporal/ReportTemporalGrapheBuilder.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/transversal/ReportTransversalGrapheBuilder.java
trunk/soft/fudaa-crue/ui-wrapper/pom.xml
Modified: trunk/soft/fudaa-crue/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/pom.xml 2013-08-23 16:43:43 UTC (rev 8468)
+++ trunk/soft/fudaa-crue/pom.xml 2013-08-26 14:15:41 UTC (rev 8469)
@@ -100,6 +100,11 @@
<version>1.07.00</version>
</dependency>
<dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml</artifactId>
+ <version>3.9</version>
+ </dependency>
+ <dependency>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>crue-io</artifactId>
<version>${project.version}</version>
Modified: trunk/soft/fudaa-crue/ui-report/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-report/pom.xml 2013-08-23 16:43:43 UTC (rev 8468)
+++ trunk/soft/fudaa-crue/ui-report/pom.xml 2013-08-26 14:15:41 UTC (rev 8469)
@@ -44,6 +44,10 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<scope>provided</scope>
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/AbstractReportGrapheBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/AbstractReportGrapheBuilder.java 2013-08-23 16:43:43 UTC (rev 8468)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/AbstractReportGrapheBuilder.java 2013-08-26 14:15:41 UTC (rev 8469)
@@ -239,6 +239,8 @@
}
+ protected abstract Collection<EGCourbePersist> getCachedCourbeConfig(Z content);
+
public void applyChange(Z content) {
List<EGCourbeSimple> internCourbes = getInternCourbes(content);
loadExternFilesAndAllToModel(content, internCourbes);
@@ -255,7 +257,7 @@
}
}
}
- new CourbeColorFinder().findNewColor(uiController.getGraphe());
+ new CourbeColorFinder().findNewColor(uiController.getGraphe(), CourbeColorFinder.createUsedColor(getCachedCourbeConfig(content)));
uiController.getGraphe().restore();
uiController.getGraphe().fullRepaint();
}
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/CourbeColorFinder.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/CourbeColorFinder.java 2013-08-23 16:43:43 UTC (rev 8468)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/CourbeColorFinder.java 2013-08-26 14:15:41 UTC (rev 8469)
@@ -6,20 +6,31 @@
import gnu.trove.TIntHashSet;
import java.awt.Color;
import java.io.File;
+import java.io.FileInputStream;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
+import java.util.Iterator;
import java.util.List;
-import jxl.Cell;
-import jxl.Sheet;
-import jxl.Workbook;
-import jxl.format.Colour;
-import jxl.format.RGB;
+import java.util.Map;
+import org.apache.commons.lang.StringUtils;
+import org.apache.poi.hssf.util.HSSFColor;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.xssf.usermodel.XSSFCellStyle;
+import org.apache.poi.xssf.usermodel.XSSFColor;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.fudaa.ctulu.CtuluLibFile;
import org.fudaa.ebli.courbe.EGCourbe;
+import org.fudaa.ebli.courbe.EGCourbePersist;
import org.fudaa.ebli.courbe.EGGraphe;
+import org.fudaa.ebli.palette.BPalettePlageAbstract;
import org.fudaa.ebli.palette.BPalettePlageDefault;
import org.fudaa.fudaa.crue.options.services.InstallationService;
import org.openide.util.Exceptions;
import org.openide.util.Lookup;
+import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTColor;
/**
*
@@ -29,12 +40,12 @@
public static Color NONE = new Color(255, 255, 255, 0);
public static long colorIndexeslastTimeModified = -1;
- List<Color> siteColors;
+ private static List<Color> siteColors;
InstallationService installationService = Lookup.getDefault().lookup(InstallationService.class);
private List<Color> getSiteColors() {
File siteDir = installationService.getSiteDir();
- File colors = new File(siteDir, "default-colors.xls");
+ File colors = new File(siteDir, "default-colors.xlsx");
if (colors.isFile()) {
if (siteColors != null && colors.lastModified() <= colorIndexeslastTimeModified) {
return siteColors;
@@ -46,9 +57,26 @@
return Collections.emptyList();
}
- public void findNewColor(EGGraphe graphe) {
+ public static TIntHashSet createUsedColor(Collection<EGCourbePersist> courbeConfigs) {
+ TIntHashSet res = new TIntHashSet();
+ if (courbeConfigs != null) {
+ for (EGCourbePersist config : courbeConfigs) {
+ Color couleur = config.getLineModel_().getCouleur();
+ if (couleur != null) {
+ res.add(couleur.getRGB());
+ }
- TIntHashSet usedColors = new TIntHashSet();
+ }
+ }
+ return res;
+ }
+
+ public void findNewColor(EGGraphe graphe, TIntHashSet initUsedColor) {
+
+ TIntHashSet usedColors = initUsedColor;
+ if (usedColors == null) {
+ usedColors = new TIntHashSet();
+ }
List<EGCourbe> toModify = new ArrayList<EGCourbe>();
if (graphe != null) {
EGCourbe[] courbes = graphe.getModel().getCourbes();
@@ -77,41 +105,87 @@
return siteColor;
}
}
+ double dx = 0.1;
+ double v = 0;
+ //200 essais:
for (int i = 0; i < 200; i++) {
- Color color = BPalettePlageDefault.getColor(i);
+ if (v >= 1d) {
+ v = Math.random();
+ }
+ Color color = BPalettePlageAbstract.getCouleur(Color.red, Color.magenta, v);
if (!used.contains(color.getRGB())) {
return color;
}
+ v = v + dx;
}
return null;
}
private List<Color> loadColors(File file) {
List<Color> colors = new ArrayList<Color>();
- Workbook workbook = null;
+ FileInputStream input = null;
+ Map<Integer, HSSFColor> indexedColors = HSSFColor.getIndexHash();
try {
- workbook = Workbook.getWorkbook(file);
- Sheet sheet = workbook.getSheet(0);
- int row = sheet.getRows();
- if (sheet.getColumns() == 0) {
+ input = new FileInputStream(file);
+
+ XSSFWorkbook workbook = new XSSFWorkbook(input);
+ XSSFSheet sheet = workbook.getSheet("Curves");
+ if (sheet == null) {
return colors;
}
- for (int i = 0; i < row; i++) {
- Cell cell = sheet.getCell(0, i);
- Colour backgroundColour = cell.getCellFormat().getBackgroundColour();
- if (backgroundColour != null) {
- final RGB defaultRGB = backgroundColour.getDefaultRGB();
- colors.add(new Color(defaultRGB.getRed(), defaultRGB.getGreen(), defaultRGB.getBlue()));
+ for (Iterator<Row> it = sheet.rowIterator(); it.hasNext();) {
+ Row row = it.next();
+ if (row.getLastCellNum() > 0) {
+ Cell cell = row.getCell(0);
+ if (cell != null) {
+ final XSSFCellStyle cellStyle = (XSSFCellStyle) cell.getCellStyle();
+ XSSFColor xssfColor = cellStyle.getFillForegroundXSSFColor();
+ Color res = null;
+ if (xssfColor != null && xssfColor.getCTColor() != null) {
+ CTColor ctColor = xssfColor.getCTColor();
+ if (ctColor.isSetIndexed()) {
+ HSSFColor hssfColor = indexedColors.get(Integer.valueOf(xssfColor.getIndexed()));
+ if (hssfColor != null) {
+ res = createColor(hssfColor.getTriplet());
+ }
+
+ } else if (ctColor.isSetTheme()) {
+ xssfColor = workbook.getTheme().getThemeColor(xssfColor.getTheme());
+ if (xssfColor != null) {
+ res = createColor(xssfColor.getARGBHex());
+ }
+ } else {
+ res = createColor(xssfColor.getARGBHex());
+ }
+ if (res != null) {
+ colors.add(res);
+ }
+ }
+ }
}
}
} catch (Exception ex) {
Exceptions.printStackTrace(ex);
} finally {
- if (workbook != null) {
- workbook.close();
- }
+ CtuluLibFile.close(input);
}
return colors;
}
+
+ private static Color createColor(short[] rgb) {
+ if (rgb == null) {
+ return null;
+ }
+ return new Color(rgb[0], rgb[1], rgb[2]);
+ }
+
+ private static Color createColor(String argex) {
+ String substring = StringUtils.substring(argex, 2);
+ try {
+ return Color.decode("#" + substring);
+ } catch (NumberFormatException numberFormatException) {
+ }
+ return null;
+ }
}
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalGrapheBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalGrapheBuilder.java 2013-08-23 16:43:43 UTC (rev 8468)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalGrapheBuilder.java 2013-08-26 14:15:41 UTC (rev 8469)
@@ -20,6 +20,7 @@
import org.fudaa.dodico.crue.metier.emh.ResultatTimeKey;
import org.fudaa.ebli.courbe.EGAxeVertical;
import org.fudaa.ebli.courbe.EGCourbe;
+import org.fudaa.ebli.courbe.EGCourbePersist;
import org.fudaa.ebli.courbe.EGCourbeSimple;
import org.fudaa.ebli.courbe.EGGraphe;
import org.fudaa.ebli.courbe.EGGrapheSimpleModel;
@@ -65,6 +66,12 @@
}
@Override
+ protected Collection<EGCourbePersist> getCachedCourbeConfig(ReportLongitudinalConfig content) {
+ return content.courbeconfigs.values();
+ }
+
+
+ @Override
public List<EGCourbeSimple> getInternCourbes(ReportLongitudinalConfig content, ProgressHandle progress) {
ReportLongitudinalGrapheBuilderCourbe courbeBuilder = new ReportLongitudinalGrapheBuilderCourbe(reportService.getCcm(), this, content);
EGAxeVertical axeZ = courbeBuilder.getAxeZ();
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/multivar/ReportMultiVarGrapheBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/multivar/ReportMultiVarGrapheBuilder.java 2013-08-23 16:43:43 UTC (rev 8468)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/multivar/ReportMultiVarGrapheBuilder.java 2013-08-26 14:15:41 UTC (rev 8469)
@@ -5,6 +5,7 @@
import gnu.trove.TDoubleArrayList;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -44,6 +45,11 @@
}
@Override
+ protected Collection<EGCourbePersist> getCachedCourbeConfig(ReportMultiVarConfig content) {
+ return content.courbeconfigs.values();
+ }
+
+ @Override
public List<EGCourbeSimple> getInternCourbes(ReportMultiVarConfig content, ProgressHandle progress) {
if (!reportService.isRunLoaded()) {
return Collections.emptyList();
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/rptg/ReportRPTGGrapheBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/rptg/ReportRPTGGrapheBuilder.java 2013-08-23 16:43:43 UTC (rev 8468)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/rptg/ReportRPTGGrapheBuilder.java 2013-08-26 14:15:41 UTC (rev 8469)
@@ -5,6 +5,7 @@
import java.awt.Color;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -25,6 +26,7 @@
import org.fudaa.fudaa.crue.loi.common.CourbesUiController;
import org.fudaa.fudaa.crue.loi.loiff.SimpleLoiCourbeModel;
import org.fudaa.fudaa.crue.report.config.AbstractReportGrapheBuilder;
+import org.fudaa.fudaa.crue.report.multivar.ReportMultiVarConfig;
import org.netbeans.api.progress.ProgressHandle;
/**
@@ -38,6 +40,11 @@
}
@Override
+ protected Collection<EGCourbePersist> getCachedCourbeConfig(ReportRPTGConfig content) {
+ return content.courbeconfigs.values();
+ }
+
+ @Override
public void applyLabelsConfigChanged(ReportRPTGConfig content) {
super.applyLabelsConfigChanged(content);
}
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/temporal/ReportTemporalGrapheBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/temporal/ReportTemporalGrapheBuilder.java 2013-08-23 16:43:43 UTC (rev 8468)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/temporal/ReportTemporalGrapheBuilder.java 2013-08-26 14:15:41 UTC (rev 8469)
@@ -6,6 +6,7 @@
import gnu.trove.TDoubleArrayList;
import gnu.trove.TIntObjectHashMap;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -18,6 +19,7 @@
import org.fudaa.dodico.crue.metier.emh.ResultatTimeKey;
import org.fudaa.ebli.courbe.EGAxeHorizontal;
import org.fudaa.ebli.courbe.EGAxeVertical;
+import org.fudaa.ebli.courbe.EGCourbePersist;
import org.fudaa.ebli.courbe.EGCourbeSimple;
import org.fudaa.ebli.courbe.EGModel;
import org.fudaa.fudaa.crue.loi.ViewCourbeManager;
@@ -48,6 +50,11 @@
axeX.setSpecificFormat(new ReportTemporalTimeFormater());
}
+
+ @Override
+ protected Collection<EGCourbePersist> getCachedCourbeConfig(ReportTemporalConfig content) {
+ return content.courbeconfigs.values();
+ }
@Override
public void applyLabelsConfigChanged(ReportTemporalConfig content) {
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/transversal/ReportTransversalGrapheBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/transversal/ReportTransversalGrapheBuilder.java 2013-08-23 16:43:43 UTC (rev 8468)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/transversal/ReportTransversalGrapheBuilder.java 2013-08-26 14:15:41 UTC (rev 8469)
@@ -4,6 +4,7 @@
package org.fudaa.fudaa.crue.report.transversal;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import org.apache.commons.lang.StringUtils;
@@ -38,6 +39,7 @@
import org.fudaa.fudaa.crue.report.data.ReportVariableKey;
import org.fudaa.fudaa.crue.report.data.ReportVariableTypeEnum;
import org.fudaa.fudaa.crue.report.helper.ReportProfilHelper;
+import org.fudaa.fudaa.crue.report.temporal.ReportTemporalConfig;
import org.netbeans.api.progress.ProgressHandle;
/**
@@ -52,6 +54,11 @@
super(uiController, loiLabelsManager);
}
+ @Override
+ protected Collection<EGCourbePersist> getCachedCourbeConfig(ReportTransversalConfig content) {
+ return content.courbeconfigs.values();
+ }
+
protected EGAxeVertical getOrCreateAxeVertical() {
return getOrCreateAxeVertical(getVariableZ());
}
Modified: trunk/soft/fudaa-crue/ui-wrapper/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-wrapper/pom.xml 2013-08-23 16:43:43 UTC (rev 8468)
+++ trunk/soft/fudaa-crue/ui-wrapper/pom.xml 2013-08-26 14:15:41 UTC (rev 8469)
@@ -46,6 +46,10 @@
<groupId>org.swinglabs.swingx</groupId>
<artifactId>swingx-all</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml</artifactId>
+ </dependency>
</dependencies>
<build>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-08-29 06:25:31
|
Revision: 8473
http://sourceforge.net/p/fudaa/svn/8473
Author: deniger
Date: 2013-08-29 06:25:19 +0000 (Thu, 29 Aug 2013)
Log Message:
-----------
CRUE-501
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/transformer/TransformerEMHHelper.java
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java
trunk/soft/fudaa-crue/pom.xml
trunk/soft/fudaa-crue/ui-emh/src/main/java/org/fudaa/fudaa/crue/emh/common/EMHManagerBuilder.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ModellingListFrottementTopComponent.java
trunk/soft/fudaa-crue/ui-report/pom.xml
trunk/soft/fudaa-crue/ui-sysdoc/src/main/java/org/fudaa/fudaa/crue/sysdoc/SysdocTopComponent.java
Added Paths:
-----------
trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/transformer/EnumNumberFormatter.java
trunk/soft/fudaa-crue/ui-application/nbactions-dev.xml
trunk/soft/fudaa-crue/ui-sysdoc/nb-configuration.xml
Removed Paths:
-------------
trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/EnumNumberFormatter.java
Modified: trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
===================================================================
--- trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties 2013-08-27 22:22:30 UTC (rev 8472)
+++ trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties 2013-08-29 06:25:19 UTC (rev 8473)
@@ -562,8 +562,9 @@
otfa.launchLine=Traitement de la ligne {0}
otfa.launchRefItem=Op\u00e9rations sur le sc\u00e9nario de r\u00e9f\u00e9rence
otfa.launchCibleItem=Op\u00e9rations sur le sc\u00e9nario cible
+otfa.checkComputeCr=Contr\u00f4le des Compte-Rendus du calcul
+otfa.errorLevelFoundInCr=Une erreur a \u00e9t\u00e9 d\u00e9tect\u00e9e dans le compte-rendu du fichier {0}
-
dont_execute.name=Ne pas ex\u00e9cuter
force_excute.name=Forcer l'ex\u00e9cution
execute_if_needed.name=Ex\u00e9cuter que si n\u00e9cessaire
Copied: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/transformer/EnumNumberFormatter.java (from rev 8404, trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/EnumNumberFormatter.java)
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/transformer/EnumNumberFormatter.java (rev 0)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/transformer/EnumNumberFormatter.java 2013-08-29 06:25:19 UTC (rev 8473)
@@ -0,0 +1,53 @@
+/*
+ GPL 2
+ */
+package org.fudaa.dodico.crue.metier.transformer;
+
+import gnu.trove.TIntObjectHashMap;
+import org.apache.commons.lang.StringUtils;
+import org.fudaa.ctulu.CtuluNumberFormatI;
+import org.fudaa.dodico.crue.config.ccm.ItemEnum;
+import org.fudaa.dodico.crue.config.ccm.ItemVariable;
+import org.fudaa.dodico.crue.config.ccm.PropertyNature;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class EnumNumberFormatter implements CtuluNumberFormatI {
+
+ TIntObjectHashMap<ItemEnum> itemEnumByValue;
+
+ public EnumNumberFormatter(PropertyNature nature) {
+ itemEnumByValue = nature.getItemEnumByValue();
+ }
+
+ public EnumNumberFormatter(ItemVariable variable) {
+ this(variable.getNature());
+ }
+
+ public EnumNumberFormatter(TIntObjectHashMap<ItemEnum> itemEnumByValue) {
+ this.itemEnumByValue = itemEnumByValue;
+ }
+
+ @Override
+ public String format(double _d) {
+ ItemEnum get = itemEnumByValue.get((int) _d);
+ return get == null ? Integer.toString((int) _d) : get.getName();
+ }
+
+ @Override
+ public CtuluNumberFormatI getCopy() {
+ return new EnumNumberFormatter(itemEnumByValue);
+ }
+
+ @Override
+ public String toLocalizedPattern() {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public boolean isDecimal() {
+ return false;
+ }
+}
Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/transformer/TransformerEMHHelper.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/transformer/TransformerEMHHelper.java 2013-08-27 22:22:30 UTC (rev 8472)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/transformer/TransformerEMHHelper.java 2013-08-29 06:25:19 UTC (rev 8473)
@@ -112,6 +112,9 @@
}
private static String doFormatFromNature(final PropertyNature nature, Object value, CrueConfigMetier ccm, DecimalFormatEpsilonEnum type) {
+ if (nature.isEnum()) {
+ return new EnumNumberFormatter(nature).format((Double) value);
+ }
if (nature.isDuration()) {
if (value instanceof DoubleValuable) {
return nature.getFormatter(type).format(((DoubleValuable) value).toDoubleValue());
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java 2013-08-27 22:22:30 UTC (rev 8472)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java 2013-08-29 06:25:19 UTC (rev 8473)
@@ -9,20 +9,26 @@
import org.apache.commons.collections.CollectionUtils;
import org.fudaa.ctulu.CtuluLog;
import org.fudaa.ctulu.CtuluLogGroup;
+import org.fudaa.ctulu.CtuluLogLevel;
import org.fudaa.ctulu.FileDeleteResult;
import org.fudaa.dodico.crue.common.BusinessMessages;
import org.fudaa.dodico.crue.common.ConnexionInformation;
import org.fudaa.dodico.crue.common.CrueOperationResult;
+import org.fudaa.dodico.crue.common.io.CrueIOResu;
import org.fudaa.dodico.crue.comparaison.ComparaisonSelectorEnum;
import org.fudaa.dodico.crue.config.ccm.CrueConfigMetier;
import org.fudaa.dodico.crue.config.coeur.CoeurConfigContrat;
import org.fudaa.dodico.crue.config.coeur.CoeurManager;
import org.fudaa.dodico.crue.config.coeur.CrueVersionType;
+import org.fudaa.dodico.crue.config.cr.CRReader;
import org.fudaa.dodico.crue.io.Crue10FileFormatFactory;
import org.fudaa.dodico.crue.io.Crue10FileFormatFactory.VersionResult;
import org.fudaa.dodico.crue.io.common.FileLocker;
import org.fudaa.dodico.crue.io.rtfa.RTFAResultLines;
import org.fudaa.dodico.crue.io.rtfa.RTFAResultLinesSaver;
+import org.fudaa.dodico.crue.metier.CrueFileType;
+import org.fudaa.dodico.crue.metier.emh.CompteRendu;
+import org.fudaa.dodico.crue.metier.emh.EMHModeleBase;
import org.fudaa.dodico.crue.metier.emh.EMHScenario;
import org.fudaa.dodico.crue.metier.etude.EMHProjet;
import org.fudaa.dodico.crue.metier.etude.EMHRun;
@@ -305,7 +311,30 @@
EMHScenario emhScenario = null;
if (!load.getLogs().containsFatalError()) {
emhScenario = load.getResult();
+ //on cherche les erreurs dans les CR.
+ List<EMHModeleBase> modeles = emhScenario.getModeles();
+ CtuluLogGroup logCheckCr = logs.createGroup("otfa.checkComputeCr");
+ for (EMHModeleBase modele : modeles) {
+ CtuluLog logForModel = logCheckCr.createNewLog(modele.getNom());
+ for (CrueFileType fileType : CrueFileType.values()) {
+ if (fileType.isResultFileType()) {
+ CompteRendu compteRendu = modele.getCompteRendu(fileType);
+ if (compteRendu != null) {
+ File logFile = compteRendu.getLogFile();
+ if (logFile.isFile()) {
+ CRReader reader = new CRReader(0);//pas d'importance
+ CrueIOResu<CtuluLogLevel> higherLevel = reader.getHigherLevel(logFile);
+ if (higherLevel != null && (CtuluLogLevel.SEVERE.equals(higherLevel.getMetier()) || CtuluLogLevel.FATAL.
+ equals(higherLevel.getMetier()))) {
+ logForModel.addRecord(higherLevel.getMetier(), "otfa.errorLevelFoundInCr", logFile.getName());
+ }
+ }
+ }
+ }
+ }
+ }
}
+
return new CrueOperationResult<EMHScenario>(emhScenario, logs.createCleanGroup());
}
Modified: trunk/soft/fudaa-crue/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/pom.xml 2013-08-27 22:22:30 UTC (rev 8472)
+++ trunk/soft/fudaa-crue/pom.xml 2013-08-29 06:25:19 UTC (rev 8473)
@@ -76,7 +76,6 @@
</exclusion>
</exclusions>
</dependency>
-
<!--pour les tests-->
<dependency>
<groupId>junit</groupId>
Added: trunk/soft/fudaa-crue/ui-application/nbactions-dev.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-application/nbactions-dev.xml (rev 0)
+++ trunk/soft/fudaa-crue/ui-application/nbactions-dev.xml 2013-08-29 06:25:19 UTC (rev 8473)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actions>
+ <action>
+ <actionName>run</actionName>
+ <goals>
+ <goal>nbm:cluster-app</goal>
+ <goal>nbm:run-platform</goal>
+ </goals>
+ </action>
+ </actions>
Modified: trunk/soft/fudaa-crue/ui-emh/src/main/java/org/fudaa/fudaa/crue/emh/common/EMHManagerBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/ui-emh/src/main/java/org/fudaa/fudaa/crue/emh/common/EMHManagerBuilder.java 2013-08-27 22:22:30 UTC (rev 8472)
+++ trunk/soft/fudaa-crue/ui-emh/src/main/java/org/fudaa/fudaa/crue/emh/common/EMHManagerBuilder.java 2013-08-29 06:25:19 UTC (rev 8473)
@@ -26,6 +26,7 @@
import org.fudaa.dodico.crue.common.transformer.ToStringTransformer;
import org.fudaa.dodico.crue.config.ccm.CrueConfigMetier;
import org.fudaa.dodico.crue.config.ccm.DecimalFormatEpsilonEnum;
+import org.fudaa.dodico.crue.config.ccm.ItemVariable;
import org.fudaa.dodico.crue.metier.CrueFileType;
import org.fudaa.dodico.crue.metier.emh.Avancement;
import org.fudaa.dodico.crue.metier.emh.Calc;
@@ -478,6 +479,10 @@
return ((ToStringTransformable) entryValue).toString(this.propertyDefinitionContainer, EnumToString.COMPLETE, DecimalFormatEpsilonEnum.COMPARISON);
}
if (propertyDefinitionContainer.isPropertyDefined(key)) {
+ ItemVariable property = propertyDefinitionContainer.getProperty(key);
+ if (property.getNature() != null && property.getNature().isEnum()) {//TODO a voir car faux...
+ return ObjectUtils.toString(entryValue);
+ }
return TransformerEMHHelper.formatFromPropertyName(key, entryValue, propertyDefinitionContainer,DecimalFormatEpsilonEnum.COMPARISON);
}
if (entryValue.getClass().isEnum()) {
Deleted: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/EnumNumberFormatter.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/EnumNumberFormatter.java 2013-08-27 22:22:30 UTC (rev 8472)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/EnumNumberFormatter.java 2013-08-29 06:25:19 UTC (rev 8473)
@@ -1,53 +0,0 @@
-/*
- GPL 2
- */
-package org.fudaa.fudaa.crue.loi.common;
-
-import gnu.trove.TIntObjectHashMap;
-import org.apache.commons.lang.StringUtils;
-import org.fudaa.ctulu.CtuluNumberFormatI;
-import org.fudaa.dodico.crue.config.ccm.ItemEnum;
-import org.fudaa.dodico.crue.config.ccm.ItemVariable;
-import org.fudaa.dodico.crue.config.ccm.PropertyNature;
-
-/**
- *
- * @author Frederic Deniger
- */
-public class EnumNumberFormatter implements CtuluNumberFormatI {
-
- TIntObjectHashMap<ItemEnum> itemEnumByValue;
-
- public EnumNumberFormatter(PropertyNature nature) {
- itemEnumByValue = nature.getItemEnumByValue();
- }
-
- public EnumNumberFormatter(ItemVariable variable) {
- this(variable.getNature());
- }
-
- public EnumNumberFormatter(TIntObjectHashMap<ItemEnum> itemEnumByValue) {
- this.itemEnumByValue = itemEnumByValue;
- }
-
- @Override
- public String format(double _d) {
- ItemEnum get = itemEnumByValue.get((int) _d);
- return get == null ? StringUtils.EMPTY : get.getName();
- }
-
- @Override
- public CtuluNumberFormatI getCopy() {
- return new EnumNumberFormatter(itemEnumByValue);
- }
-
- @Override
- public String toLocalizedPattern() {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- @Override
- public boolean isDecimal() {
- return false;
- }
-}
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ModellingListFrottementTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ModellingListFrottementTopComponent.java 2013-08-27 22:22:30 UTC (rev 8472)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ModellingListFrottementTopComponent.java 2013-08-29 06:25:19 UTC (rev 8473)
@@ -172,6 +172,7 @@
Collections.sort(frtStockage, ObjetNommeByNameComparator.INSTANCE);
DonFrt[] frtStockageArray = (DonFrt[]) frtStockage.toArray(new DonFrt[frtStockage.size()]);
DonFrt[] frtArray = (DonFrt[]) frt.toArray(new DonFrt[frt.size()]);
+ long to = System.currentTimeMillis();
List<LineContent> lines = new ArrayList<LineContent>();
final ObjetNommeCellRenderer objetNommeCellRenderer = new ObjetNommeCellRenderer();
@@ -225,8 +226,13 @@
}
}
gridBuilder.setLines(lines);
+ System.err.println("time create lines= " + (System.currentTimeMillis() - to));
+ to = System.currentTimeMillis();
scrollPane = new JScrollPane(gridBuilder.getPanel());
+ System.err.println("time create panel= " + (System.currentTimeMillis() - to));
+ to = System.currentTimeMillis();
add(scrollPane);
+ System.err.println("time add scrollpane= " + (System.currentTimeMillis() - to));
}
Modified: trunk/soft/fudaa-crue/ui-report/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-report/pom.xml 2013-08-27 22:22:30 UTC (rev 8472)
+++ trunk/soft/fudaa-crue/ui-report/pom.xml 2013-08-29 06:25:19 UTC (rev 8473)
@@ -46,6 +46,7 @@
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
Added: trunk/soft/fudaa-crue/ui-sysdoc/nb-configuration.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-sysdoc/nb-configuration.xml (rev 0)
+++ trunk/soft/fudaa-crue/ui-sysdoc/nb-configuration.xml 2013-08-29 06:25:19 UTC (rev 8473)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-shared-configuration>
+ <!--
+This file contains additional configuration written by modules in the NetBeans IDE.
+The configuration is intended to be shared among all the users of project and
+therefore it is assumed to be part of version control checkout.
+Without this configuration present, some functionality in the IDE may be limited or fail altogether.
+-->
+ <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
+ <!--
+Properties that influence various parts of the IDE, especially code formatting and the like.
+You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
+That way multiple projects can share the same settings (useful for formatting rules for example).
+Any value defined here will override the pom.xml file value but is only applicable to the current project.
+-->
+ <netbeans.hint.jdkPlatform>JDK_1.7</netbeans.hint.jdkPlatform>
+ </properties>
+</project-shared-configuration>
Modified: trunk/soft/fudaa-crue/ui-sysdoc/src/main/java/org/fudaa/fudaa/crue/sysdoc/SysdocTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-sysdoc/src/main/java/org/fudaa/fudaa/crue/sysdoc/SysdocTopComponent.java 2013-08-27 22:22:30 UTC (rev 8472)
+++ trunk/soft/fudaa-crue/ui-sysdoc/src/main/java/org/fudaa/fudaa/crue/sysdoc/SysdocTopComponent.java 2013-08-29 06:25:19 UTC (rev 8473)
@@ -13,6 +13,8 @@
import java.awt.FlowLayout;
import java.awt.Font;
import java.awt.KeyboardFocusManager;
+import java.awt.Label;
+import java.awt.TextField;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
@@ -29,6 +31,7 @@
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
+
import javax.swing.AbstractAction;
import javax.swing.ActionMap;
import javax.swing.DefaultListModel;
@@ -101,7 +104,7 @@
@TopComponent.OpenActionRegistration(displayName = "#CTL_SysdocTopComponent", preferredID = SysdocTopComponent.TOPCOMPONENT_ID)
@ActionReference(path = "Menu/Window/Sysdoc", position = 1)
public final class SysdocTopComponent extends AbstractTopComponent implements ExplorerManager.Provider {
-
+
public static final String TOPCOMPONENT_ID = "SysdocTopComponent";
SysdocService sysdocService = Lookup.getDefault().lookup(SysdocService.class);
private File sysdocLocaleDir;
@@ -116,10 +119,10 @@
private JTextField tf;
private JList listResultat;
protected EditorSearchable editorSearchable;
-
+
public SysdocTopComponent() {
initComponents();
-
+
setName(NbBundle.getMessage(SysdocTopComponent.class, "CTL_SysdocTopComponent"));
setToolTipText(NbBundle.getMessage(SysdocTopComponent.class, "HINT_SysdocTopComponent"));
browser = new HtmlBrowser();
@@ -133,7 +136,7 @@
});
browser.setEnableHome(true);
customizeBrowser();
-
+
txtUrl = getBrowserTextField();
txtUrl.setEditable(false);
treeView = new BeanTreeView();
@@ -181,12 +184,13 @@
}
updateSize();
}
-
+
@Override
protected String getHelpCtxId() {
return null;
}
-
+
+
protected void highlightStateChanged() {
if (btHighlight.isSelected() != this.editorSearchable.isHighlightEnabled()) {
editorSearchable.setHighlightEnabled(btHighlight.isSelected());
@@ -196,7 +200,7 @@
}
}
private boolean fromSearchPanel;
-
+
private JPanel createSearchPanel() {
JPanel pnSearch = new JPanel(new BorderLayout());
tf = new JTextField(10);
@@ -228,7 +232,7 @@
try {
fromSearchPanel = true;
em.setSelectedNodes(new Node[]{resultat.getNode()});
-
+
} catch (PropertyVetoException ex) {
Exceptions.printStackTrace(ex);
}
@@ -240,7 +244,7 @@
pnSearch.add(new JScrollPane(listResultat));
return pnSearch;
}
-
+
protected void search() {
SysdocFolder sysdocFolder = new SysdocFolder(sysdocLocaleDir);
IndexReader reader = null;
@@ -286,12 +290,12 @@
public File getSysdocLocaleDir() {
return sysdocLocaleDir;
}
-
+
public void documentLoaded() {
EventQueue.invokeLater(new Runnable() {
@Override
public void run() {
-
+
if (fromSearchPanel) {
fromSearchPanel = false;
findBar.setText(tf.getText());
@@ -303,7 +307,7 @@
}
});
}
-
+
protected void urlChanged() {
if (sysdocLocaleDir != null && nodeByPath != null && !isUpdating) {
try {
@@ -320,10 +324,10 @@
} catch (Exception exception) {
Logger.getLogger(SysdocTopComponent.class.getName()).log(Level.INFO, "message {0}", exception);
}
-
+
}
}
-
+
protected JTextField getBrowserTextField() {
Component[] components = browser.getComponents();
for (Component component : components) {
@@ -334,7 +338,7 @@
}
return null;
}
-
+
protected JTextField getBrowserTextField(JComponent jc) {
Component[] components = jc.getComponents();
for (Component component : components) {
@@ -345,24 +349,24 @@
if (under != null) {
return under;
}
-
+
}
return null;
}
boolean isUpdating;
-
+
protected void nodeSelectionChanged() {
if (isUpdating) {
return;
}
changeUrlFromNode(null);
}
-
+
@Override
public ExplorerManager getExplorerManager() {
return em;
}
-
+
@Override
protected void componentOpened() {
super.componentOpened();
@@ -397,13 +401,13 @@
if (StringUtils.isNotBlank(position)) {
try {
initPosition = Integer.parseInt(position);
-
+
} catch (NumberFormatException numberFormatException) {
}
updateSize();
}
}
-
+
private void updateSize() {
if (initPosition > 0 && splitPane != null) {
EventQueue.invokeLater(new Runnable() {
@@ -414,16 +418,16 @@
});
}
}
-
+
@Override
public void componentClosedTemporarily() {
browser.getBrowserImpl().stopLoading();
}
-
+
@Override
public void componentClosedDefinitly() {
}
-
+
public void display(String path) {
//test la locale
updateContent();
@@ -433,7 +437,7 @@
containSignet = true;
pathForNode = StringUtils.substringBeforeLast(path, LienDocumentation.SIGNET_SEPARATOR);
}
-
+
Node node = nodeByPath == null ? null : nodeByPath.get(pathForNode);
//selectionne le noeud
if (node == null) {
@@ -455,11 +459,11 @@
Exceptions.printStackTrace(ex);
}
}
-
+
}
private Map<String, Node> nodeByPath;
long timeStampToc;
-
+
private void updateContent() {
File old = sysdocLocaleDir;
sysdocLocaleDir = sysdocService.getSysdocLocalizedDir();
@@ -479,7 +483,7 @@
if (load.getAnalyze().isNotEmpty()) {
LogsDisplayer.displayError(load.getAnalyze(), getDisplayName());
}
-
+
timeStampToc = 0;
if (folder.getTocFile().exists()) {
timeStampToc = folder.getTocFile().lastModified();
@@ -495,7 +499,7 @@
}
}
}
-
+
private void changeUrlFromNode(String signet) {
browser.getBrowserImpl().stopLoading();
Node[] selectedNodes = em.getSelectedNodes();
@@ -523,11 +527,11 @@
}
}
}
-
+
public void reloadToc() {
updateContent();
}
-
+
public void setEmptyPage() {
browser.getBrowserImpl().stopLoading();
try {
@@ -536,11 +540,11 @@
Exceptions.printStackTrace(e);
}
}
-
+
private void customizeBrowser() {
Component[] components = browser.getComponents();
browser.remove(components[1]);
-
+
JButton bt = new JButton(ImageUtilities.loadImageIcon("org/fudaa/fudaa/crue/sysdoc/icons/home.png", false));
bt.setToolTipText(NbBundle.getMessage(SysdocTopComponent.class, "HomeButton.Tooltip"));
configureButton(bt);
@@ -557,7 +561,7 @@
}
}
});
-
+
JButton btPrint = new JButton(ImageUtilities.loadImageIcon("org/fudaa/fudaa/crue/sysdoc/icons/browser.png", false));
btPrint.setToolTipText(NbBundle.getMessage(SysdocTopComponent.class, "PrintButton.Tooltip"));
configureButton(btPrint);
@@ -574,10 +578,10 @@
}
}
});
-
+
final FlowLayout flowLayout = new FlowLayout(FlowLayout.LEFT, 2, 0);
JPanel pnButtons = new JPanel(flowLayout);
-
+
pnButtons.add(btPrint);
pnButtons.add(bt);
JPanel pn = new JPanel(new BuGridLayout(2, 0, 0, true, false));
@@ -585,7 +589,7 @@
pn.add(components[1]);
browser.add(pn, BorderLayout.NORTH);
}
-
+
private void configureButton(JButton button) {
button.setOpaque(false);
button.setBorderPainted(false);
@@ -594,7 +598,7 @@
button.setBorder(BuBorders.EMPTY0000);
}
StyleSheet fontStyleSheet;
-
+
protected final CustomFindBar createFindComponent() {
Component browserComponent = ((JScrollPane) browser.getBrowserComponent()).getViewport().getView();
final JEditorPane editor = (JEditorPane) browserComponent;
@@ -616,12 +620,12 @@
HTMLDocument doc = (HTMLDocument) editor.getDocument();
final Font deriveFont = editor.getFont().deriveFont(editor.getFont().getSize() + 2);
// if (fontStyleSheet == null) {
- fontStyleSheet = new StyleSheet();
- String bodyRule = "body { font-family: " + deriveFont.getFamily() + "; "
- + "font-size: " + (deriveFont.getSize() + 15) + "pt; }";
- fontStyleSheet.addRule(bodyRule);
- doc.getStyleSheet().addStyleSheet(fontStyleSheet);
- doc.getStyleSheet().addRule(bodyRule);
+ fontStyleSheet = new StyleSheet();
+ String bodyRule = "body { font-family: " + deriveFont.getFamily() + "; "
+ + "font-size: " + (deriveFont.getSize() + 15) + "pt; }";
+ fontStyleSheet.addRule(bodyRule);
+ doc.getStyleSheet().addStyleSheet(fontStyleSheet);
+ doc.getStyleSheet().addRule(bodyRule);
// }
editor.setFont(deriveFont);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-08-29 08:50:57
|
Revision: 8474
http://sourceforge.net/p/fudaa/svn/8474
Author: deniger
Date: 2013-08-29 08:50:50 +0000 (Thu, 29 Aug 2013)
Log Message:
-----------
correction r?\195?\169gressions
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/transformer/TransformerEMHHelper.java
trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbesUiController.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingLaunchRunOptionsAction.java
Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/transformer/TransformerEMHHelper.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/transformer/TransformerEMHHelper.java 2013-08-29 06:25:19 UTC (rev 8473)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/transformer/TransformerEMHHelper.java 2013-08-29 08:50:50 UTC (rev 8474)
@@ -113,6 +113,9 @@
private static String doFormatFromNature(final PropertyNature nature, Object value, CrueConfigMetier ccm, DecimalFormatEpsilonEnum type) {
if (nature.isEnum()) {
+ if (value.getClass().isEnum()) {
+ return value.toString();
+ }
return new EnumNumberFormatter(nature).format((Double) value);
}
if (nature.isDuration()) {
Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbesUiController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbesUiController.java 2013-08-29 06:25:19 UTC (rev 8473)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbesUiController.java 2013-08-29 08:50:50 UTC (rev 8474)
@@ -1,5 +1,6 @@
package org.fudaa.fudaa.crue.loi.common;
+import org.fudaa.dodico.crue.metier.transformer.EnumNumberFormatter;
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.Dimension;
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingLaunchRunOptionsAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingLaunchRunOptionsAction.java 2013-08-29 06:25:19 UTC (rev 8473)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingLaunchRunOptionsAction.java 2013-08-29 08:50:50 UTC (rev 8474)
@@ -7,7 +7,6 @@
import javax.swing.Action;
import org.fudaa.dodico.crue.projet.create.RunCreatorOptions;
import org.fudaa.fudaa.crue.common.helper.DialogHelper;
-import org.fudaa.fudaa.crue.common.services.ModellingScenarioService;
import org.fudaa.fudaa.crue.modelling.services.ModellingScenarioModificationService;
import org.fudaa.fudaa.crue.study.actions.RunOptionPanelBuilder;
import org.fudaa.fudaa.crue.study.services.EMHProjetServiceImpl;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-09-02 22:30:14
|
Revision: 8478
http://sourceforge.net/p/fudaa/svn/8478
Author: deniger
Date: 2013-09-02 22:30:07 +0000 (Mon, 02 Sep 2013)
Log Message:
-----------
maj des dicos
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/result/VariableFCVariableNameComparator.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCiniTopComponent.java
trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/config/ModellingGlobalConfiguration.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/AbstractReportGrapheBuilder.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/ExternFileBuilder.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/ExternFileBuilderProcessor.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalGrapheBuilder.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/service/ReportAggregationCacheService.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/service/ReportFormuleService.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/temporal/ReportTemporalTopComponent.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/time/ReportTimeStepSliderPanel.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/transversal/ReportTransversalGrapheBuilder.java
Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/result/VariableFCVariableNameComparator.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/result/VariableFCVariableNameComparator.java 2013-09-02 19:20:26 UTC (rev 8477)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/result/VariableFCVariableNameComparator.java 2013-09-02 22:30:07 UTC (rev 8478)
@@ -27,7 +27,7 @@
@Override
protected int compareSafe(String o1, String o2) {
- return compareComparable(getString(o1), getString(o1));
+ return compareComparable(getString(o1), getString(o2));
}
private String getString(String init) {
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCiniTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCiniTopComponent.java 2013-09-02 19:20:26 UTC (rev 8477)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCiniTopComponent.java 2013-09-02 22:30:07 UTC (rev 8478)
@@ -46,7 +46,7 @@
public static final String TOPCOMPONENT_ACTION_DISPLAYNAME = "#" + TOPCOMPONENT_ACTION;
JTextField jMethodInterpolation;
OutlineView outlineView;
- ExplorerManagerListenerHelper helper;
+ final ExplorerManagerListenerHelper helper;
private boolean editable;
public ModellingListCiniTopComponent() {
@@ -55,8 +55,8 @@
setName(NbBundle.getMessage(ModellingListCiniTopComponent.class, TOPCOMPONENT_ACTION));
setToolTipText(NbBundle.getMessage(ModellingListCiniTopComponent.class, "HINT_" + TOPCOMPONENT_ID));
ActionMap map = getActionMap();
+ helper = new ExplorerManagerListenerHelper(this);
associateLookup(ExplorerUtils.createLookup(getExplorerManager(), map));
- helper = new ExplorerManagerListenerHelper(this);
}
@Override
Modified: trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/config/ModellingGlobalConfiguration.java
===================================================================
--- trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/config/ModellingGlobalConfiguration.java 2013-09-02 19:20:26 UTC (rev 8477)
+++ trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/config/ModellingGlobalConfiguration.java 2013-09-02 22:30:07 UTC (rev 8478)
@@ -63,12 +63,12 @@
props.put(PROP_DEFAULT_LITMINEUR, initValue);
}
initValue = props.get(SEUIL_SIMPLIF_PROFIL_SECTION);
- if (initValue == null) {
+ if (initValue == null && ccm.getDefaultValue(CrueConfigMetierConstants.PROP_DEFAULT_SEUILSIMPLIFPROFILSECTION) != null) {
initValue = ccm.getDefaultValue(CrueConfigMetierConstants.PROP_DEFAULT_SEUILSIMPLIFPROFILSECTION).toString();
props.put(SEUIL_SIMPLIF_PROFIL_SECTION, initValue);
}
initValue = props.get(SEUIL_SIMPLIF_PROFIL_CASIER);
- if (initValue == null) {
+ if (initValue == null && ccm.getDefaultValue(CrueConfigMetierConstants.PROP_DEFAULT_SEUILSIMPLIFPROFILCASIER) != null) {
initValue = ccm.getDefaultValue(CrueConfigMetierConstants.PROP_DEFAULT_SEUILSIMPLIFPROFILCASIER).toString();
props.put(SEUIL_SIMPLIF_PROFIL_CASIER, initValue);
}
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/AbstractReportGrapheBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/AbstractReportGrapheBuilder.java 2013-09-02 19:20:26 UTC (rev 8477)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/AbstractReportGrapheBuilder.java 2013-09-02 22:30:07 UTC (rev 8478)
@@ -58,7 +58,7 @@
protected ReportResultProviderService reportResultProviderService = Lookup.getDefault().lookup(ReportResultProviderService.class);
protected U uiController;
protected ViewCourbeManager loiLabelsManager;
- protected ExternFileBuilder externFileBuilder = new ExternFileBuilder();
+ protected final ExternFileBuilder externFileBuilder = new ExternFileBuilder();
public ExternFileBuilder getExternFileBuilder() {
return externFileBuilder;
@@ -234,7 +234,7 @@
"CourbesBuilder.ProgressTitle"));
} else {
- return getInternCourbesAfterTimeChanged(content, null);
+ return getInternCourbes(content, null);
}
}
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/ExternFileBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/ExternFileBuilder.java 2013-09-02 19:20:26 UTC (rev 8477)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/ExternFileBuilder.java 2013-09-02 22:30:07 UTC (rev 8478)
@@ -47,7 +47,7 @@
final String name = org.openide.util.NbBundle.getMessage(ExternFileBuilder.class, "ExternFile.Loading");
CtuluLogGroup logs = CrueProgressUtils.showProgressDialogAndRun(processor, name);
- if (logs.containsSomething()) {
+ if (logs != null && logs.containsSomething()) {
LogsDisplayer.displayError(logs, name);
}
}
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/ExternFileBuilderProcessor.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/ExternFileBuilderProcessor.java 2013-09-02 19:20:26 UTC (rev 8477)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/ExternFileBuilderProcessor.java 2013-09-02 22:30:07 UTC (rev 8478)
@@ -56,6 +56,9 @@
List<ReadCallable> filesToLoad = new ArrayList<ReadCallable>();
Map<String, ExternContent> newContentsByFilename = new HashMap<String, ExternContent>();
for (String externFile : externFiles) {
+ if (externFile == null) {
+ continue;
+ }
ExternContent content = builder.getContentsByFilename().get(externFile);
if (content != null) {
newContentsByFilename.put(externFile, content);
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalGrapheBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalGrapheBuilder.java 2013-09-02 19:20:26 UTC (rev 8477)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalGrapheBuilder.java 2013-09-02 22:30:07 UTC (rev 8478)
@@ -4,6 +4,7 @@
package org.fudaa.fudaa.crue.report.longitudinal;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
@@ -70,7 +71,6 @@
return content.courbeconfigs.values();
}
-
@Override
public List<EGCourbeSimple> getInternCourbes(ReportLongitudinalConfig content, ProgressHandle progress) {
ReportLongitudinalGrapheBuilderCourbe courbeBuilder = new ReportLongitudinalGrapheBuilderCourbe(reportService.getCcm(), this, content);
@@ -259,7 +259,7 @@
progress.setDisplayName(reportRunVariableKey.getDisplayName());
}
LoiConstanteCourbeModel model = limitBuilder.build(reportRunVariableKey, result.getCartouches());
- if (model != null) {
+ if (model != null && model.getKey() != null && content.courbeconfigs != null) {
EGCourbeSimple courbe = new EGCourbeSimple(axeZ, model);
AbstractReportGrapheBuilder.applyPersistConfig(content.courbeconfigs.get(model.getKey()), courbe);
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/service/ReportAggregationCacheService.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/service/ReportAggregationCacheService.java 2013-09-02 19:20:26 UTC (rev 8477)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/service/ReportAggregationCacheService.java 2013-09-02 22:30:07 UTC (rev 8478)
@@ -24,7 +24,8 @@
@ServiceProvider(service = ReportAggregationCacheServiceContrat.class)})
public class ReportAggregationCacheService implements ReportAggregationCacheServiceContrat {
- private LRUMap map = new LRUMap(100);
+// private LRUMap map = new LRUMap(1000);
+ private LRUMap map = new LRUMap(10000);
private PostRunService postRunService = Lookup.getDefault().lookup(PostRunService.class);
ReportService reportService = Lookup.getDefault().lookup(ReportService.class);
private final Lookup.Result<EMHScenario> resultat;
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/service/ReportFormuleService.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/service/ReportFormuleService.java 2013-09-02 19:20:26 UTC (rev 8477)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/service/ReportFormuleService.java 2013-09-02 22:30:07 UTC (rev 8478)
@@ -141,11 +141,15 @@
}
}
- DialogHelper.showError(NbBundle.getMessage(ReportFormuleService.class, "cycleDetected.Error"), "<li>" + StringUtils.join(cycliqueVar, "</li><li>") + "</li>");
+ DialogHelper.showError(NbBundle.getMessage(ReportFormuleService.class, "cycleDetected.Error"), "<li>" + StringUtils.join(cycliqueVar,
+ "</li><li>") + "</li>");
}
}
private FormuleServiceContent load() {
+ if (!reportService.isRunLoaded()) {
+ return new FormuleServiceContent();
+ }
FormuleSaver saver = new FormuleSaver();
final File targetFile = getTargetFile();
if (targetFile == null || !targetFile.exists()) {
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/temporal/ReportTemporalTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/temporal/ReportTemporalTopComponent.java 2013-09-02 19:20:26 UTC (rev 8477)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/temporal/ReportTemporalTopComponent.java 2013-09-02 22:30:07 UTC (rev 8478)
@@ -124,7 +124,8 @@
addEMH();
}
};
- EbliActionSimple chooseVariables = new EbliActionSimple(NbBundle.getMessage(ReportTemporalTopComponent.class, "ChooseVariable.ButtonName"), null, "CHOOSE_VARIABLES") {
+ EbliActionSimple chooseVariables = new EbliActionSimple(NbBundle.getMessage(ReportTemporalTopComponent.class, "ChooseVariable.ButtonName"), null,
+ "CHOOSE_VARIABLES") {
@Override
public void actionPerformed(ActionEvent _e) {
chooseVariable();
@@ -136,10 +137,16 @@
protected void addEMH() {
List<String> emhs = content.emhs;
+ EnumCatEMH oldUsedCat = ChooseEMHByTypeHelper.getUsedCat(reportService, content.emhs);
List<String> selectedEMH = new ChooseEMHByTypeHelper().chooseEMH(emhs);
if (selectedEMH != null) {
content.emhs = selectedEMH;
Collections.sort(content.emhs);
+ EnumCatEMH usedCat = ChooseEMHByTypeHelper.getUsedCat(reportService, content.emhs);
+ if (usedCat != oldUsedCat) {
+ content.variables.clear();
+ content.temporalVariables.clear();
+ }
propagateChange();
}
}
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/time/ReportTimeStepSliderPanel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/time/ReportTimeStepSliderPanel.java 2013-09-02 19:20:26 UTC (rev 8477)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/time/ReportTimeStepSliderPanel.java 2013-09-02 22:30:07 UTC (rev 8478)
@@ -21,6 +21,7 @@
import javax.swing.JPanel;
import javax.swing.JSlider;
import javax.swing.JToggleButton;
+import javax.swing.SwingConstants;
import javax.swing.Timer;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
@@ -348,8 +349,11 @@
lbMax.setFont(BuLib.deriveFont(lbMax.getFont(), -1));
JPanel pnMinMax = new JPanel(new BorderLayout());
pnMinMax.setBorder(BorderFactory.createEmptyBorder(0, 1, 0, 3));
- pnMinMax.add(lbMin, BorderLayout.WEST);
- pnMinMax.add(lbMax, BorderLayout.EAST);
+ pnMinMax.add(lbMin, BorderLayout.NORTH);
+ pnMinMax.add(lbMax, BorderLayout.SOUTH);
+ lbMin.setHorizontalTextPosition(SwingConstants.LEFT);
+ lbMax.setHorizontalTextPosition(SwingConstants.RIGHT);
+ lbMax.setHorizontalAlignment(SwingConstants.RIGHT);
return pnMinMax;
}
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/transversal/ReportTransversalGrapheBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/transversal/ReportTransversalGrapheBuilder.java 2013-09-02 19:20:26 UTC (rev 8477)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/transversal/ReportTransversalGrapheBuilder.java 2013-09-02 22:30:07 UTC (rev 8478)
@@ -39,7 +39,6 @@
import org.fudaa.fudaa.crue.report.data.ReportVariableKey;
import org.fudaa.fudaa.crue.report.data.ReportVariableTypeEnum;
import org.fudaa.fudaa.crue.report.helper.ReportProfilHelper;
-import org.fudaa.fudaa.crue.report.temporal.ReportTemporalConfig;
import org.netbeans.api.progress.ProgressHandle;
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-09-03 12:51:46
|
Revision: 8480
http://sourceforge.net/p/fudaa/svn/8480
Author: deniger
Date: 2013-09-03 12:51:39 +0000 (Tue, 03 Sep 2013)
Log Message:
-----------
CRUE-572
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingContainersTopComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingEMHTopComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingFilesTopComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingNetworkTopComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ModellingProfilCasierMenuReceiver.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ModellingProfilSectionMenuReceiver.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilCasierEditorTopComponent.java
trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostEmhExplorerTopComponent.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportNetworkTopComponent.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportSelectRunTopComponent.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportVariableTopComponent.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportViewManagerTopComponent.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/ScenariosTopComponent.java
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingContainersTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingContainersTopComponent.java 2013-09-02 22:30:20 UTC (rev 8479)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingContainersTopComponent.java 2013-09-03 12:51:39 UTC (rev 8480)
@@ -1,12 +1,9 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
package org.fudaa.fudaa.crue.modelling;
import javax.swing.ActionMap;
import javax.swing.BorderFactory;
import org.fudaa.dodico.crue.metier.emh.EMHScenario;
+import org.fudaa.fudaa.crue.common.helper.DialogHelper;
import org.fudaa.fudaa.crue.common.node.NodeHelper;
import org.fudaa.fudaa.crue.modelling.global.GlobalActionChildFactory;
import org.fudaa.fudaa.crue.modelling.global.GlobalContainerNode;
@@ -26,15 +23,15 @@
* Top component which displays something.
*/
@ConvertAsProperties(dtd = "-//org.fudaa.fudaa.crue.modelling//ModellingContainersTopComponent//EN",
-autostore = false)
+ autostore = false)
@TopComponent.Description(preferredID = ModellingContainersTopComponent.TOPCOMPONENT_ID,
-iconBase = "org/fudaa/fudaa/crue/modelling/rond-orange_16.png",
-persistenceType = TopComponent.PERSISTENCE_ALWAYS)
+ iconBase = "org/fudaa/fudaa/crue/modelling/rond-orange_16.png",
+ persistenceType = TopComponent.PERSISTENCE_ALWAYS)
@TopComponent.Registration(mode = "modelling-topLeft", openAtStartup = false, position = 1)
@ActionID(category = "Window", id = "org.fudaa.fudaa.crue.modelling.ModellingContainersTopComponent")
@ActionReference(path = "Menu/Window/Modelling", position = 4)
@TopComponent.OpenActionRegistration(displayName = ModellingContainersTopComponent.TOPCOMPONENT_ACTION_DISPLAYNAME,
-preferredID = ModellingContainersTopComponent.TOPCOMPONENT_ID)
+ preferredID = ModellingContainersTopComponent.TOPCOMPONENT_ID)
public final class ModellingContainersTopComponent extends AbstractModellingTopComponent implements LookupListener, ExplorerManager.Provider {
public static final String TOPCOMPONENT_ID = "ModellingContainersTopComponent";
@@ -53,7 +50,8 @@
outlineView.getOutline().setFullyNonEditable(true);
outlineView.getOutline().setFillsViewportHeight(true);
outlineView.getOutline().setColumnHidingAllowed(false);
- outlineView.addPropertyColumn(GlobalContainerNode.PROP_VISIBILITY, NbBundle.getMessage(ModellingContainersTopComponent.class, "ModellingContainersTopComponent.ColumnVisible"));
+ outlineView.addPropertyColumn(GlobalContainerNode.PROP_VISIBILITY, NbBundle.getMessage(ModellingContainersTopComponent.class,
+ "ModellingContainersTopComponent.ColumnVisible"));
add(outlineView);
outlineView.getOutline().getColumnModel().getColumn(1).setWidth(20);
outlineView.getOutline().getColumnModel().getColumn(1).setPreferredWidth(20);
@@ -139,11 +137,10 @@
}
void writeProperties(java.util.Properties p) {
- // better to version settings since initial version as advocated at
- // http://wiki.apidesign.org/wiki/PropertyFiles
- p.setProperty("version", "1.0");
+ DialogHelper.writeProperties(outlineView, "outlineView", p);
}
void readProperties(java.util.Properties p) {
+ DialogHelper.readProperties(outlineView, "outlineView", p);
}
}
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingEMHTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingEMHTopComponent.java 2013-09-02 22:30:20 UTC (rev 8479)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingEMHTopComponent.java 2013-09-03 12:51:39 UTC (rev 8480)
@@ -9,6 +9,7 @@
import javax.swing.event.TreeSelectionListener;
import javax.swing.tree.TreePath;
import org.fudaa.dodico.crue.metier.emh.EMH;
+import org.fudaa.fudaa.crue.common.helper.DialogHelper;
import org.fudaa.fudaa.crue.emh.EMHTreePanel;
import org.fudaa.fudaa.crue.emh.common.TreeNodeEMH;
import org.fudaa.fudaa.crue.modelling.node.ModellingNodeEMHFactory;
@@ -192,6 +193,7 @@
// better to version settings since initial version as advocated at
// http://wiki.apidesign.org/wiki/PropertyFiles
p.setProperty("version", "1.0");
+ emhTreePanel.saveSize();
// TODO store your settings
}
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingFilesTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingFilesTopComponent.java 2013-09-02 22:30:20 UTC (rev 8479)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingFilesTopComponent.java 2013-09-03 12:51:39 UTC (rev 8480)
@@ -14,7 +14,6 @@
import org.fudaa.ebli.calque.BArbreCalque;
import org.fudaa.ebli.calque.BCalque;
import org.fudaa.ebli.calque.ZCalqueImageRaster;
-import org.fudaa.ebli.commun.EbliLib;
import org.fudaa.ebli.controle.BSelecteurCheckBox;
import org.fudaa.fudaa.crue.modelling.services.ModellingScenarioVisuService;
import org.fudaa.fudaa.crue.planimetry.PlanimetryVisuPanel;
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingNetworkTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingNetworkTopComponent.java 2013-09-02 22:30:20 UTC (rev 8479)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingNetworkTopComponent.java 2013-09-03 12:51:39 UTC (rev 8480)
@@ -7,7 +7,6 @@
import java.util.HashSet;
import java.util.Set;
import javax.swing.ActionMap;
-import org.fudaa.dodico.crue.edition.DonPrtGeoProfilSimplifier;
import org.fudaa.dodico.crue.edition.EditionChangeSousModele;
import org.fudaa.dodico.crue.edition.EditionChangeSousModele.ChangeRes;
import org.fudaa.dodico.crue.edition.EditionDelete;
@@ -16,7 +15,6 @@
import org.fudaa.dodico.crue.metier.emh.EMHScenario;
import org.fudaa.dodico.crue.metier.emh.EMHSousModele;
import org.fudaa.dodico.crue.metier.emh.EnumCasierType;
-import org.fudaa.dodico.crue.metier.emh.EnumCatEMH;
import org.fudaa.dodico.crue.metier.emh.EnumSectionType;
import org.fudaa.dodico.crue.metier.transformer.TransformerEMHHelper;
import org.fudaa.fudaa.crue.common.log.LogsDisplayer;
@@ -25,6 +23,7 @@
import org.fudaa.fudaa.crue.emh.node.NodeEMHDefault;
import org.fudaa.dodico.crue.edition.SimplificationProcessor;
import org.fudaa.dodico.crue.edition.SimplificationSeuils;
+import org.fudaa.fudaa.crue.common.helper.DialogHelper;
import org.fudaa.fudaa.crue.modelling.loi.SimplificationSeuilsChooser;
import org.fudaa.fudaa.crue.modelling.node.ModellingNodeEMHFactory;
import org.fudaa.fudaa.crue.modelling.services.ModellingSelectedEMHService;
@@ -311,13 +310,10 @@
}
void writeProperties(java.util.Properties p) {
- // better to version settings since initial version as advocated at
- // http://wiki.apidesign.org/wiki/PropertyFiles
- p.setProperty("version", "1.0");
- // TODO store your settings
+ DialogHelper.writeProperties(outlineView, "outlineView", p);
}
void readProperties(java.util.Properties p) {
- // TODO read your settings according to their version
+ DialogHelper.readProperties(outlineView, "outlineView", p);
}
}
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ModellingProfilCasierMenuReceiver.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ModellingProfilCasierMenuReceiver.java 2013-09-02 22:30:20 UTC (rev 8479)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ModellingProfilCasierMenuReceiver.java 2013-09-03 12:51:39 UTC (rev 8480)
@@ -80,7 +80,7 @@
if (seuil.compareTo(0d) <= 0) {
return;
}
- if (!seuilVariable.getEpsilon().isSame(seuil, initSeuilSimplifProfilCasier)) {
+ if (seuilVariable != null && !seuilVariable.getEpsilon().isSame(seuil, initSeuilSimplifProfilCasier)) {
final ModellingGlobalConfiguration modellingGlobalConfiguration = modellingConfigService.getModellingGlobalConfiguration();
modellingGlobalConfiguration.setSeuilSimplifProfilCasier(seuil);
modellingConfigService.setModellingGlobalConfiguration(modellingGlobalConfiguration);
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ModellingProfilSectionMenuReceiver.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ModellingProfilSectionMenuReceiver.java 2013-09-02 22:30:20 UTC (rev 8479)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ModellingProfilSectionMenuReceiver.java 2013-09-03 12:51:39 UTC (rev 8480)
@@ -13,7 +13,6 @@
import org.fudaa.dodico.crue.config.ccm.ItemVariable;
import org.fudaa.dodico.crue.edition.DonPrtGeoProfilSimplifier;
import org.fudaa.dodico.crue.metier.emh.DonPrtGeoProfilSection;
-import org.fudaa.dodico.crue.metier.emh.EMHSousModele;
import org.fudaa.dodico.crue.metier.algo.DonPrtGeoProfilSectionInverser;
import org.fudaa.ebli.commun.EbliActionSimple;
import org.fudaa.ebli.courbe.EGCourbe;
@@ -103,7 +102,7 @@
if (seuil.compareTo(0d) <= 0) {
return;
}
- if (!seuilVariable.getEpsilon().isSame(seuil, initSeuilSimplifProfilSection)) {
+ if (seuilVariable != null && !seuilVariable.getEpsilon().isSame(seuil, initSeuilSimplifProfilSection)) {
final ModellingGlobalConfiguration modellingGlobalConfiguration = modellingConfigService.getModellingGlobalConfiguration();
modellingGlobalConfiguration.setSeuilSimplifProfilSection(seuil);
modellingConfigService.setModellingGlobalConfiguration(modellingGlobalConfiguration);
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilCasierEditorTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilCasierEditorTopComponent.java 2013-09-02 22:30:20 UTC (rev 8479)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilCasierEditorTopComponent.java 2013-09-03 12:51:39 UTC (rev 8480)
@@ -386,6 +386,8 @@
Collections.sort(profilCasiers, ObjetNommeByNameComparator.INSTANCE);
cbProfils.setModel(new DefaultComboBoxModel(profilCasiers.toArray(new DonPrtGeoProfilCasier[profilCasiers.size()])));
int idx = -1;
+ //pour forcer la sélection a changer.
+ cbProfils.setSelectedIndex(-1);
if (restoreOldProfil) {
idx = findProfilIdx(oldNomSelected);
}
Modified: trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostEmhExplorerTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostEmhExplorerTopComponent.java 2013-09-02 22:30:20 UTC (rev 8479)
+++ trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostEmhExplorerTopComponent.java 2013-09-03 12:51:39 UTC (rev 8480)
@@ -37,12 +37,12 @@
@TopComponent.OpenActionRegistration(displayName = "#CTL_PostEmhExplorerTopComponent",
preferredID = PostEmhExplorerTopComponent.TOPCOMPONENT_ID)
public final class PostEmhExplorerTopComponent extends AbstractTopComponent implements LookupListener {
-
+
public static final String TOPCOMPONENT_ID = "PostEmhExplorerTopComponent";
private PostRunService postService = Lookup.getDefault().lookup(PostRunService.class);
EMHProjetServiceImpl projetService = Lookup.getDefault().lookup(EMHProjetServiceImpl.class);
private Result<EMHScenario> resultat;
-
+
public PostEmhExplorerTopComponent() {
initComponents();
setName(NbBundle.getMessage(PostEmhExplorerTopComponent.class, "CTL_PostEmhExplorerTopComponent"));
@@ -53,12 +53,12 @@
putClientProperty(TopComponent.PROP_UNDOCKING_DISABLED, Boolean.TRUE);
associateLookup(Lookup.EMPTY);
}
-
+
@Override
protected String getHelpCtxId() {
return SysdocUrlBuilder.getTopComponentHelpCtxId("01-vueExploreurEMHs", PerspectiveEnum.POST);
}
-
+
@Override
public void resultChanged(LookupEvent ev) {
if (postService.isRunLoaded()) {
@@ -68,7 +68,7 @@
}
}
EMHTreePanel emhTreePanel;
-
+
private void runLoadedFromCurrentProject() {
//TODO attention on suppose que le run a été chargé depuis le projet courant
emhTreePanel = new EMHTreePanel(projetService.getSelectedProject(), postService.getScenarioLoaded());
@@ -78,7 +78,7 @@
this.revalidate();
this.repaint();
}
-
+
private void runUnloaded() {
if (emhTreePanel != null) {
emhTreePanel.saveSize();
@@ -118,18 +118,19 @@
runUnloaded();
}
}
-
+
@Override
public void componentClosedTemporarily() {
}
-
+
void writeProperties(java.util.Properties p) {
// better to version settings since initial version as advocated at
// http://wiki.apidesign.org/wiki/PropertyFiles
p.setProperty("version", "1.0");
+ emhTreePanel.saveSize();
// TODO store your settings
}
-
+
void readProperties(java.util.Properties p) {
// TODO read your settings according to their version
}
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportNetworkTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportNetworkTopComponent.java 2013-09-02 22:30:20 UTC (rev 8479)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportNetworkTopComponent.java 2013-09-03 12:51:39 UTC (rev 8480)
@@ -8,6 +8,7 @@
import org.fudaa.dodico.crue.metier.emh.EMH;
import org.fudaa.dodico.crue.metier.emh.EMHScenario;
import org.fudaa.fudaa.crue.common.PerspectiveEnum;
+import org.fudaa.fudaa.crue.common.helper.DialogHelper;
import org.fudaa.fudaa.crue.common.services.SysdocUrlBuilder;
import org.fudaa.fudaa.crue.emh.node.HierarchyChildFactory;
import org.fudaa.fudaa.crue.emh.node.LinkedEMHHelper;
@@ -187,13 +188,10 @@
}
void writeProperties(java.util.Properties p) {
- // better to version settings since initial version as advocated at
- // http://wiki.apidesign.org/wiki/PropertyFiles
- p.setProperty("version", "1.0");
- // TODO store your settings
+ DialogHelper.writeProperties(outlineView, "outlineView", p);
}
void readProperties(java.util.Properties p) {
- // TODO read your settings according to their version
+ DialogHelper.readProperties(outlineView, "outlineView", p);
}
}
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportSelectRunTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportSelectRunTopComponent.java 2013-09-02 22:30:20 UTC (rev 8479)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportSelectRunTopComponent.java 2013-09-03 12:51:39 UTC (rev 8480)
@@ -5,6 +5,7 @@
import org.fudaa.dodico.crue.common.transformer.TransformerHelper;
import org.fudaa.dodico.crue.metier.etude.EMHProjet;
import org.fudaa.fudaa.crue.common.PerspectiveEnum;
+import org.fudaa.fudaa.crue.common.helper.DialogHelper;
import org.fudaa.fudaa.crue.common.node.NodeHelper;
import org.fudaa.fudaa.crue.common.services.SysdocUrlBuilder;
import org.fudaa.fudaa.crue.report.data.ReportRunContent;
@@ -173,14 +174,11 @@
// Variables declaration - do not modify//GEN-BEGIN:variables
// End of variables declaration//GEN-END:variables
void writeProperties(java.util.Properties p) {
- // better to version settings since initial version as advocated at
- // http://wiki.apidesign.org/wiki/PropertyFiles
- p.setProperty("version", "1.0");
- // TODO store your settings
+ DialogHelper.writeProperties(outlineView, "outlineView", p);
}
void readProperties(java.util.Properties p) {
- // TODO read your settings according to their version
+ DialogHelper.readProperties(outlineView, "outlineView", p);
}
private void initRootNode() {
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportVariableTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportVariableTopComponent.java 2013-09-02 22:30:20 UTC (rev 8479)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportVariableTopComponent.java 2013-09-03 12:51:39 UTC (rev 8480)
@@ -239,15 +239,12 @@
}
}
- void writeProperties(java.util.Properties p) {
- // better to version settings since initial version as advocated at
- // http://wiki.apidesign.org/wiki/PropertyFiles
- p.setProperty("version", "1.0");
- // TODO store your settings
+ void writeProperties(java.util.Properties p) {
+ DialogHelper.writeProperties(outlineView, "outlineView", p);
}
void readProperties(java.util.Properties p) {
- // TODO read your settings according to their version
+ DialogHelper.readProperties(outlineView, "outlineView", p);
}
public void requestActiveLater() {
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportViewManagerTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportViewManagerTopComponent.java 2013-09-02 22:30:20 UTC (rev 8479)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportViewManagerTopComponent.java 2013-09-03 12:51:39 UTC (rev 8480)
@@ -7,6 +7,7 @@
import java.beans.PropertyVetoException;
import javax.swing.ActionMap;
import org.fudaa.fudaa.crue.common.PerspectiveEnum;
+import org.fudaa.fudaa.crue.common.helper.DialogHelper;
import org.fudaa.fudaa.crue.common.services.SysdocUrlBuilder;
import org.fudaa.fudaa.crue.common.view.ExpandedNodesManager;
import org.fudaa.fudaa.crue.report.view.ReportViewTopComponentListener;
@@ -139,13 +140,10 @@
}
void writeProperties(java.util.Properties p) {
- // better to version settings since initial version as advocated at
- // http://wiki.apidesign.org/wiki/PropertyFiles
- p.setProperty("version", "1.0");
- // TODO store your settings
+ DialogHelper.writeProperties(outlineView, "outlineView", p);
}
void readProperties(java.util.Properties p) {
- // TODO read your settings according to their version
+ DialogHelper.readProperties(outlineView, "outlineView", p);
}
}
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/ScenariosTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/ScenariosTopComponent.java 2013-09-02 22:30:20 UTC (rev 8479)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/ScenariosTopComponent.java 2013-09-03 12:51:39 UTC (rev 8480)
@@ -1,7 +1,3 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
package org.fudaa.fudaa.crue.study;
import java.awt.event.FocusAdapter;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-09-03 19:24:43
|
Revision: 8481
http://sourceforge.net/p/fudaa/svn/8481
Author: deniger
Date: 2013-09-03 19:24:37 +0000 (Tue, 03 Sep 2013)
Log Message:
-----------
CRUE-573
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/view/ItemVariableView.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingNetworkTopComponent.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportNetworkTopComponent.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/service/ReportAggregationCacheService.java
trunk/soft/fudaa-crue/ui-sysdoc/src/main/java/org/fudaa/fudaa/crue/sysdoc/SysdocTopComponent.java
trunk/soft/fudaa-crue/ui-sysdoc/src/main/resources/org/fudaa/fudaa/crue/sysdoc/Bundle.properties
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/view/ItemVariableView.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/view/ItemVariableView.java 2013-09-03 12:51:39 UTC (rev 8480)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/view/ItemVariableView.java 2013-09-03 19:24:37 UTC (rev 8481)
@@ -110,10 +110,16 @@
public TextField(ItemVariable property, DecimalFormatEpsilonEnum formatType) {
super(property);
- txt = new JFormattedTextField(property.getFormatter(formatType));
+ if (property != null) {
+ txt = new JFormattedTextField(property.getFormatter(formatType));
+ } else {
+ txt = new JFormattedTextField();
+ }
txt.setColumns(20);
txt.getDocument().addDocumentListener(this);
- txt.setToolTipText(property.getValidator().getHtmlDesc());
+ if (property != null) {
+ txt.setToolTipText(property.getValidator().getHtmlDesc());
+ }
pn = new JPanel(new BorderLayout(2, 2));
label = new JLabel();
label.setText(" ");
@@ -150,7 +156,9 @@
label.setToolTipText(null);
valid = true;
CtuluLog res = new CtuluLog(BusinessMessages.RESOURCE_BUNDLE);
- property.getValidator().validateNumber(StringUtils.EMPTY, (Number) getValue(), res, false);
+ if (property != null) {
+ property.getValidator().validateNumber(StringUtils.EMPTY, (Number) getValue(), res, false);
+ }
if (res.isNotEmpty()) {
CtuluLogRecord record = res.getRecords().get(0);
BusinessMessages.updateLocalizedMessage(record);
@@ -169,11 +177,13 @@
@Override
public void changedUpdate(DocumentEvent e) {
- String tltip = property.format(getValue(), DecimalFormatEpsilonEnum.COMPARISON);
- if (tltip != null) {
- tltip = org.openide.util.NbBundle.getMessage(ItemVariableView.class, "TooltipValue", tltip);
+ if (property != null) {
+ String tltip = property.format(getValue(), DecimalFormatEpsilonEnum.COMPARISON);
+ if (tltip != null) {
+ tltip = org.openide.util.NbBundle.getMessage(ItemVariableView.class, "TooltipValue", tltip);
+ }
+ txt.setToolTipText(property.getValidator().getHtmlDesc(tltip));
}
- txt.setToolTipText(property.getValidator().getHtmlDesc(tltip));
setChanged();
validateData();
notifyObservers(this);
@@ -193,10 +203,13 @@
if (value == null) {
return null;
}
- if (property.isEntier()) {
+ if (property != null && property.isEntier()) {
return Integer.valueOf(((Number) value).intValue());
}
double val = ((Number) value).doubleValue();
+ if (property == null) {
+ return (Number) value;
+ }
return Double.valueOf(property.getNormalizedValue(val));
}
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingNetworkTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingNetworkTopComponent.java 2013-09-03 12:51:39 UTC (rev 8480)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingNetworkTopComponent.java 2013-09-03 19:24:37 UTC (rev 8481)
@@ -2,6 +2,8 @@
import com.rits.cloning.Cloner;
import java.awt.BorderLayout;
+import java.awt.KeyboardFocusManager;
+import java.awt.Window;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
@@ -226,16 +228,25 @@
private class SelectedEMHLookupListener implements LookupListener {
+ private boolean updating;
+
@Override
public void resultChanged(LookupEvent ev) {
- if (WindowManager.getDefault().getRegistry().getActivated() == ModellingNetworkTopComponent.this) {
+ if (updating) {
return;
}
+ Window activeWindow = KeyboardFocusManager.getCurrentKeyboardFocusManager().
+ getActiveWindow();
+ if (activeWindow == WindowManager.getDefault().getMainWindow() && WindowManager.getDefault().getRegistry().getActivated() == ModellingNetworkTopComponent.this) {
+ return;
+ }
if (modellingSelectedEMHService.isUpdating()) {
return;
}
+ updating = true;
Set<Long> selectedUid = new HashSet<Long>(resultatEMHsSelected.allInstances());
selectEMHs(selectedUid);
+ updating = false;
}
}
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportNetworkTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportNetworkTopComponent.java 2013-09-03 12:51:39 UTC (rev 8480)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportNetworkTopComponent.java 2013-09-03 19:24:37 UTC (rev 8481)
@@ -1,6 +1,8 @@
package org.fudaa.fudaa.crue.report;
import java.awt.BorderLayout;
+import java.awt.KeyboardFocusManager;
+import java.awt.Window;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
@@ -33,15 +35,15 @@
* Top component which displays something.
*/
@ConvertAsProperties(dtd = "-//org.fudaa.fudaa.crue.report//ReportNetworkTopComponent//EN",
-autostore = false)
+ autostore = false)
@TopComponent.Description(preferredID = ReportNetworkTopComponent.TOPCOMPONENT_ID,
-iconBase = "org/fudaa/fudaa/crue/report/rond-orange_16.png",
-persistenceType = TopComponent.PERSISTENCE_ALWAYS)
+ iconBase = "org/fudaa/fudaa/crue/report/rond-orange_16.png",
+ persistenceType = TopComponent.PERSISTENCE_ALWAYS)
@TopComponent.Registration(mode = "report-bottomRight", openAtStartup = false, position = 3)
@ActionID(category = "Window", id = "org.fudaa.fudaa.crue.report.ReportNetworkTopComponent")
@ActionReference(path = "Menu/Window/Report", position = 6)
@TopComponent.OpenActionRegistration(displayName = ReportNetworkTopComponent.TOPCOMPONENT_ACTION_DISPLAYNAME,
-preferredID = ReportNetworkTopComponent.TOPCOMPONENT_ID)
+ preferredID = ReportNetworkTopComponent.TOPCOMPONENT_ID)
public final class ReportNetworkTopComponent extends AbstractReportTopComponent implements LookupListener, ExplorerManager.Provider {
ReportSelectedEMHService reportSelectedEMHService = Lookup.getDefault().lookup(ReportSelectedEMHService.class);
@@ -133,16 +135,22 @@
private class SelectedEMHsLookupListener implements LookupListener {
+ private boolean updating;
+
@Override
public void resultChanged(LookupEvent ev) {
- if (reportSelectedEMHService.isUpdating()) {
+ if (reportSelectedEMHService.isUpdating() || updating) {
return;
}
- //pas de modification si vue active
- if (WindowManager.getDefault().getRegistry().getActivated() != ReportNetworkTopComponent.this) {
+ updating = true;
+ Window activeWindow = KeyboardFocusManager.getCurrentKeyboardFocusManager().
+ getActiveWindow();
+ //pas de modification si vue active et si pas de recherche depuis la fenetre de recherche
+ if (activeWindow != WindowManager.getDefault().getMainWindow() || WindowManager.getDefault().getRegistry().getActivated() != ReportNetworkTopComponent.this) {
Collection<? extends Long> allItems = resultatEMHsSelected.allInstances();
LinkedEMHHelper.selectEMHs(getExplorerManager(), new HashSet<Long>(allItems));
}
+ updating = false;
}
}
@@ -192,6 +200,6 @@
}
void readProperties(java.util.Properties p) {
- DialogHelper.readProperties(outlineView, "outlineView", p);
+ DialogHelper.readProperties(outlineView, "outlineView", p);
}
}
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/service/ReportAggregationCacheService.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/service/ReportAggregationCacheService.java 2013-09-03 12:51:39 UTC (rev 8480)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/service/ReportAggregationCacheService.java 2013-09-03 19:24:37 UTC (rev 8481)
@@ -24,8 +24,7 @@
@ServiceProvider(service = ReportAggregationCacheServiceContrat.class)})
public class ReportAggregationCacheService implements ReportAggregationCacheServiceContrat {
-// private LRUMap map = new LRUMap(1000);
- private LRUMap map = new LRUMap(10000);
+ private LRUMap map = new LRUMap(100000);
private PostRunService postRunService = Lookup.getDefault().lookup(PostRunService.class);
ReportService reportService = Lookup.getDefault().lookup(ReportService.class);
private final Lookup.Result<EMHScenario> resultat;
Modified: trunk/soft/fudaa-crue/ui-sysdoc/src/main/java/org/fudaa/fudaa/crue/sysdoc/SysdocTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-sysdoc/src/main/java/org/fudaa/fudaa/crue/sysdoc/SysdocTopComponent.java 2013-09-03 12:51:39 UTC (rev 8480)
+++ trunk/soft/fudaa-crue/ui-sysdoc/src/main/java/org/fudaa/fudaa/crue/sysdoc/SysdocTopComponent.java 2013-09-03 19:24:37 UTC (rev 8481)
@@ -13,8 +13,6 @@
import java.awt.FlowLayout;
import java.awt.Font;
import java.awt.KeyboardFocusManager;
-import java.awt.Label;
-import java.awt.TextField;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
@@ -46,6 +44,8 @@
import javax.swing.JTextField;
import javax.swing.KeyStroke;
import javax.swing.ListSelectionModel;
+import javax.swing.event.HyperlinkEvent;
+import javax.swing.event.HyperlinkListener;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import javax.swing.text.html.HTMLDocument;
@@ -190,7 +190,6 @@
return null;
}
-
protected void highlightStateChanged() {
if (btHighlight.isSelected() != this.editorSearchable.isHighlightEnabled()) {
editorSearchable.setHighlightEnabled(btHighlight.isSelected());
@@ -311,7 +310,13 @@
protected void urlChanged() {
if (sysdocLocaleDir != null && nodeByPath != null && !isUpdating) {
try {
- String location = URLDecoder.decode(browser.getBrowserImpl().getLocation(), "UTF-8");
+ final String initLocation = browser.getBrowserImpl().getLocation();
+ String location = URLDecoder.decode(initLocation, "UTF-8");
+ if (isExternURL(new URL(location))) {
+ nodeSelectionChanged();
+ return;
+ }
+
String base = sysdocLocaleDir.toURI().toURL().toString();
String path = StringUtils.removeStart(location, base);
path = StringUtils.substringBefore(path, LienDocumentation.SIGNET_SEPARATOR);
@@ -587,9 +592,62 @@
JPanel pn = new JPanel(new BuGridLayout(2, 0, 0, true, false));
pn.add(pnButtons);
pn.add(components[1]);
+ Component browserComponent = browser.getBrowserComponent();
+ if (browserComponent instanceof JScrollPane) {
+ browserComponent = ((JScrollPane) browserComponent).getViewport().getView();
+ }
+ if (browserComponent instanceof JEditorPane) {
+ ((JEditorPane) browserComponent).addHyperlinkListener(new HyperlinkListener() {
+ @Override
+ public void hyperlinkUpdate(HyperlinkEvent e) {
+ if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) {
+ hyperlinkActivated(e);
+ }
+ }
+ });
+ }
browser.add(pn, BorderLayout.NORTH);
}
+ protected boolean isExternURL(final URL url) {
+ if (url == null) {
+ return true;
+ }
+ try {
+ SysdocFolder folder = new SysdocFolder(sysdocLocaleDir);
+ String baseURL = folder.getBaseDir().toURI().toURL().toString().toLowerCase();
+ String targetURL = url.toString().toLowerCase();
+ return !targetURL.startsWith(baseURL);
+ } catch (MalformedURLException malformedURLException) {
+ }
+ return false;
+ }
+
+ protected void hyperlinkActivated(HyperlinkEvent e) {
+ try {
+
+ final URL url = e.getURL();
+ if (url == null) {
+ return;
+ }
+ String targetURL = url.toString().toLowerCase();
+ if (isExternURL(url)) {
+ if (targetURL.startsWith("http") || targetURL.startsWith("mailto")) {
+ Desktop.getDesktop().browse(url.toURI());
+ } else {
+ File targetFile = new File(url.getFile());
+ if (targetFile.exists()) {
+ Desktop.getDesktop().browse(targetFile.toURI());
+ } else {
+ DialogHelper.showWarn(NbBundle.getMessage(SysdocTopComponent.class, "fileNotExist", targetFile.toString()));
+ }
+ }
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+
private void configureButton(JButton button) {
button.setOpaque(false);
button.setBorderPainted(false);
Modified: trunk/soft/fudaa-crue/ui-sysdoc/src/main/resources/org/fudaa/fudaa/crue/sysdoc/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-sysdoc/src/main/resources/org/fudaa/fudaa/crue/sysdoc/Bundle.properties 2013-09-03 12:51:39 UTC (rev 8480)
+++ trunk/soft/fudaa-crue/ui-sysdoc/src/main/resources/org/fudaa/fudaa/crue/sysdoc/Bundle.properties 2013-09-03 19:24:37 UTC (rev 8481)
@@ -18,3 +18,4 @@
HomeButton.Tooltip=Aller \u00e0 la page d'accueil
PrintButton.Tooltip=Afficher la page dans le navigateur syst\u00e8me
highlight.All=Tout surligner
+fileNotExist=Le fichier {0} n''existe pas
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-09-04 11:06:59
|
Revision: 8485
http://sourceforge.net/p/fudaa/svn/8485
Author: deniger
Date: 2013-09-04 11:06:55 +0000 (Wed, 04 Sep 2013)
Log Message:
-----------
maj version
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-compare/pom.xml
trunk/soft/fudaa-crue/crue-config/pom.xml
trunk/soft/fudaa-crue/crue-core/pom.xml
trunk/soft/fudaa-crue/crue-emh/pom.xml
trunk/soft/fudaa-crue/crue-io/pom.xml
trunk/soft/fudaa-crue/crue-otfa/pom.xml
trunk/soft/fudaa-crue/crue-project/pom.xml
trunk/soft/fudaa-crue/crue-sysdoc/pom.xml
trunk/soft/fudaa-crue/crue-test/pom.xml
trunk/soft/fudaa-crue/crue-validation/pom.xml
trunk/soft/fudaa-crue/pom.xml
trunk/soft/fudaa-crue/ui-application/pom.xml
trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf
trunk/soft/fudaa-crue/ui-branding/pom.xml
trunk/soft/fudaa-crue/ui-commandline/pom.xml
trunk/soft/fudaa-crue/ui-common/pom.xml
trunk/soft/fudaa-crue/ui-comparison/pom.xml
trunk/soft/fudaa-crue/ui-emh/pom.xml
trunk/soft/fudaa-crue/ui-loader/pom.xml
trunk/soft/fudaa-crue/ui-loi/pom.xml
trunk/soft/fudaa-crue/ui-modelling/pom.xml
trunk/soft/fudaa-crue/ui-options/pom.xml
trunk/soft/fudaa-crue/ui-otfa/pom.xml
trunk/soft/fudaa-crue/ui-planimetry/pom.xml
trunk/soft/fudaa-crue/ui-post/pom.xml
trunk/soft/fudaa-crue/ui-report/pom.xml
trunk/soft/fudaa-crue/ui-study/pom.xml
trunk/soft/fudaa-crue/ui-sysdoc/pom.xml
trunk/soft/fudaa-crue/ui-views/pom.xml
trunk/soft/fudaa-crue/ui-wrapper/pom.xml
Modified: trunk/soft/fudaa-crue/crue-compare/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/pom.xml 2013-09-03 23:41:06 UTC (rev 8484)
+++ trunk/soft/fudaa-crue/crue-compare/pom.xml 2013-09-04 11:06:55 UTC (rev 8485)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0RC2-SNAPSHOT</version>
+ <version>1.0RC3-SNAPSHOT</version>
</parent>
<artifactId>crue-compare</artifactId>
<name>Crue Compare</name>
Modified: trunk/soft/fudaa-crue/crue-config/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-config/pom.xml 2013-09-03 23:41:06 UTC (rev 8484)
+++ trunk/soft/fudaa-crue/crue-config/pom.xml 2013-09-04 11:06:55 UTC (rev 8485)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0RC2-SNAPSHOT</version>
+ <version>1.0RC3-SNAPSHOT</version>
</parent>
<artifactId>crue-config</artifactId>
<name>Crue Config</name>
Modified: trunk/soft/fudaa-crue/crue-core/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-core/pom.xml 2013-09-03 23:41:06 UTC (rev 8484)
+++ trunk/soft/fudaa-crue/crue-core/pom.xml 2013-09-04 11:06:55 UTC (rev 8485)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0RC2-SNAPSHOT</version>
+ <version>1.0RC3-SNAPSHOT</version>
</parent>
<artifactId>crue-core</artifactId>
<name>Crue Core</name>
Modified: trunk/soft/fudaa-crue/crue-emh/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/pom.xml 2013-09-03 23:41:06 UTC (rev 8484)
+++ trunk/soft/fudaa-crue/crue-emh/pom.xml 2013-09-04 11:06:55 UTC (rev 8485)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0RC2-SNAPSHOT</version>
+ <version>1.0RC3-SNAPSHOT</version>
</parent>
<artifactId>crue-emh</artifactId>
<name>Crue EMH</name>
Modified: trunk/soft/fudaa-crue/crue-io/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-io/pom.xml 2013-09-03 23:41:06 UTC (rev 8484)
+++ trunk/soft/fudaa-crue/crue-io/pom.xml 2013-09-04 11:06:55 UTC (rev 8485)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0RC2-SNAPSHOT</version>
+ <version>1.0RC3-SNAPSHOT</version>
</parent>
<artifactId>crue-io</artifactId>
<name>Crue IO</name>
Modified: trunk/soft/fudaa-crue/crue-otfa/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/pom.xml 2013-09-03 23:41:06 UTC (rev 8484)
+++ trunk/soft/fudaa-crue/crue-otfa/pom.xml 2013-09-04 11:06:55 UTC (rev 8485)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0RC2-SNAPSHOT</version>
+ <version>1.0RC3-SNAPSHOT</version>
</parent>
<artifactId>crue-otfa</artifactId>
<name>Crue OTFA</name>
Modified: trunk/soft/fudaa-crue/crue-project/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-project/pom.xml 2013-09-03 23:41:06 UTC (rev 8484)
+++ trunk/soft/fudaa-crue/crue-project/pom.xml 2013-09-04 11:06:55 UTC (rev 8485)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0RC2-SNAPSHOT</version>
+ <version>1.0RC3-SNAPSHOT</version>
</parent>
<artifactId>crue-project</artifactId>
<name>Crue Project</name>
Modified: trunk/soft/fudaa-crue/crue-sysdoc/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-sysdoc/pom.xml 2013-09-03 23:41:06 UTC (rev 8484)
+++ trunk/soft/fudaa-crue/crue-sysdoc/pom.xml 2013-09-04 11:06:55 UTC (rev 8485)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0RC2-SNAPSHOT</version>
+ <version>1.0RC3-SNAPSHOT</version>
</parent>
<artifactId>crue-sysdoc</artifactId>
<name>Crue Sysdoc</name>
Modified: trunk/soft/fudaa-crue/crue-test/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-test/pom.xml 2013-09-03 23:41:06 UTC (rev 8484)
+++ trunk/soft/fudaa-crue/crue-test/pom.xml 2013-09-04 11:06:55 UTC (rev 8485)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0RC2-SNAPSHOT</version>
+ <version>1.0RC3-SNAPSHOT</version>
</parent>
<artifactId>crue-test</artifactId>
Modified: trunk/soft/fudaa-crue/crue-validation/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-validation/pom.xml 2013-09-03 23:41:06 UTC (rev 8484)
+++ trunk/soft/fudaa-crue/crue-validation/pom.xml 2013-09-04 11:06:55 UTC (rev 8485)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0RC2-SNAPSHOT</version>
+ <version>1.0RC3-SNAPSHOT</version>
</parent>
<artifactId>crue-validation</artifactId>
<name>Crue Validation</name>
Modified: trunk/soft/fudaa-crue/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/pom.xml 2013-09-03 23:41:06 UTC (rev 8484)
+++ trunk/soft/fudaa-crue/pom.xml 2013-09-04 11:06:55 UTC (rev 8485)
@@ -8,7 +8,7 @@
</parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0RC2-SNAPSHOT</version>
+ <version>1.0RC3-SNAPSHOT</version>
<name>Fudaa-Crue</name>
<packaging>pom</packaging>
<ciManagement>
Modified: trunk/soft/fudaa-crue/ui-application/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-application/pom.xml 2013-09-03 23:41:06 UTC (rev 8484)
+++ trunk/soft/fudaa-crue/ui-application/pom.xml 2013-09-04 11:06:55 UTC (rev 8485)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0RC2-SNAPSHOT</version>
+ <version>1.0RC3-SNAPSHOT</version>
</parent>
<artifactId>application</artifactId>
Modified: trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf
===================================================================
--- trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf 2013-09-03 23:41:06 UTC (rev 8484)
+++ trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf 2013-09-04 11:06:55 UTC (rev 8485)
@@ -1,8 +1,8 @@
# ${HOME} will be replaced by user home directory according to platform
#default_userdir="${DEFAULT_USERDIR_ROOT}/0.62"
#default_cachedir="${DEFAULT_CACHEDIR_ROOT}/0.62"
-default_userdir="${HOME}\.${APPNAME}\1.0RC2"
-default_mac_userdir="${HOME}/Library/Application Support/${APPNAME}/1.0RC2/"
+default_userdir="${HOME}\.${APPNAME}\1.0"
+default_mac_userdir="${HOME}/Library/Application Support/${APPNAME}/1.0/"
# options used by the launcher by default, can be overridden by explicit
# command line switches
default_options="--branding fudaacrue -J-Xms24m -J-Xmx512m --multi-instances"
Modified: trunk/soft/fudaa-crue/ui-branding/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/pom.xml 2013-09-03 23:41:06 UTC (rev 8484)
+++ trunk/soft/fudaa-crue/ui-branding/pom.xml 2013-09-04 11:06:55 UTC (rev 8485)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0RC2-SNAPSHOT</version>
+ <version>1.0RC3-SNAPSHOT</version>
</parent>
<artifactId>ui-branding</artifactId>
Modified: trunk/soft/fudaa-crue/ui-commandline/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-commandline/pom.xml 2013-09-03 23:41:06 UTC (rev 8484)
+++ trunk/soft/fudaa-crue/ui-commandline/pom.xml 2013-09-04 11:06:55 UTC (rev 8485)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0RC2-SNAPSHOT</version>
+ <version>1.0RC3-SNAPSHOT</version>
</parent>
<artifactId>ui-commandline</artifactId>
<packaging>nbm</packaging>
Modified: trunk/soft/fudaa-crue/ui-common/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-common/pom.xml 2013-09-03 23:41:06 UTC (rev 8484)
+++ trunk/soft/fudaa-crue/ui-common/pom.xml 2013-09-04 11:06:55 UTC (rev 8485)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0RC2-SNAPSHOT</version>
+ <version>1.0RC3-SNAPSHOT</version>
</parent>
<artifactId>ui-common</artifactId>
Modified: trunk/soft/fudaa-crue/ui-comparison/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-comparison/pom.xml 2013-09-03 23:41:06 UTC (rev 8484)
+++ trunk/soft/fudaa-crue/ui-comparison/pom.xml 2013-09-04 11:06:55 UTC (rev 8485)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0RC2-SNAPSHOT</version>
+ <version>1.0RC3-SNAPSHOT</version>
</parent>
<artifactId>ui-comparison</artifactId>
<packaging>nbm</packaging>
Modified: trunk/soft/fudaa-crue/ui-emh/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-emh/pom.xml 2013-09-03 23:41:06 UTC (rev 8484)
+++ trunk/soft/fudaa-crue/ui-emh/pom.xml 2013-09-04 11:06:55 UTC (rev 8485)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0RC2-SNAPSHOT</version>
+ <version>1.0RC3-SNAPSHOT</version>
</parent>
<artifactId>ui-emh</artifactId>
<packaging>nbm</packaging>
Modified: trunk/soft/fudaa-crue/ui-loader/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-loader/pom.xml 2013-09-03 23:41:06 UTC (rev 8484)
+++ trunk/soft/fudaa-crue/ui-loader/pom.xml 2013-09-04 11:06:55 UTC (rev 8485)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0RC2-SNAPSHOT</version>
+ <version>1.0RC3-SNAPSHOT</version>
</parent>
<artifactId>ui-loader</artifactId>
<packaging>nbm</packaging>
Modified: trunk/soft/fudaa-crue/ui-loi/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/pom.xml 2013-09-03 23:41:06 UTC (rev 8484)
+++ trunk/soft/fudaa-crue/ui-loi/pom.xml 2013-09-04 11:06:55 UTC (rev 8485)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0RC2-SNAPSHOT</version>
+ <version>1.0RC3-SNAPSHOT</version>
</parent>
<artifactId>ui-loi</artifactId>
Modified: trunk/soft/fudaa-crue/ui-modelling/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/pom.xml 2013-09-03 23:41:06 UTC (rev 8484)
+++ trunk/soft/fudaa-crue/ui-modelling/pom.xml 2013-09-04 11:06:55 UTC (rev 8485)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0RC2-SNAPSHOT</version>
+ <version>1.0RC3-SNAPSHOT</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-modelling</artifactId>
Modified: trunk/soft/fudaa-crue/ui-options/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-options/pom.xml 2013-09-03 23:41:06 UTC (rev 8484)
+++ trunk/soft/fudaa-crue/ui-options/pom.xml 2013-09-04 11:06:55 UTC (rev 8485)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0RC2-SNAPSHOT</version>
+ <version>1.0RC3-SNAPSHOT</version>
</parent>
<artifactId>ui-options</artifactId>
<name>Crue UI Options</name>
Modified: trunk/soft/fudaa-crue/ui-otfa/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/pom.xml 2013-09-03 23:41:06 UTC (rev 8484)
+++ trunk/soft/fudaa-crue/ui-otfa/pom.xml 2013-09-04 11:06:55 UTC (rev 8485)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0RC2-SNAPSHOT</version>
+ <version>1.0RC3-SNAPSHOT</version>
</parent>
<artifactId>ui-otfa</artifactId>
Modified: trunk/soft/fudaa-crue/ui-planimetry/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/pom.xml 2013-09-03 23:41:06 UTC (rev 8484)
+++ trunk/soft/fudaa-crue/ui-planimetry/pom.xml 2013-09-04 11:06:55 UTC (rev 8485)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0RC2-SNAPSHOT</version>
+ <version>1.0RC3-SNAPSHOT</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-planimetry</artifactId>
Modified: trunk/soft/fudaa-crue/ui-post/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-post/pom.xml 2013-09-03 23:41:06 UTC (rev 8484)
+++ trunk/soft/fudaa-crue/ui-post/pom.xml 2013-09-04 11:06:55 UTC (rev 8485)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0RC2-SNAPSHOT</version>
+ <version>1.0RC3-SNAPSHOT</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-post</artifactId>
Modified: trunk/soft/fudaa-crue/ui-report/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-report/pom.xml 2013-09-03 23:41:06 UTC (rev 8484)
+++ trunk/soft/fudaa-crue/ui-report/pom.xml 2013-09-04 11:06:55 UTC (rev 8485)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0RC2-SNAPSHOT</version>
+ <version>1.0RC3-SNAPSHOT</version>
</parent>
<artifactId>ui-report</artifactId>
Modified: trunk/soft/fudaa-crue/ui-study/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-study/pom.xml 2013-09-03 23:41:06 UTC (rev 8484)
+++ trunk/soft/fudaa-crue/ui-study/pom.xml 2013-09-04 11:06:55 UTC (rev 8485)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0RC2-SNAPSHOT</version>
+ <version>1.0RC3-SNAPSHOT</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-study</artifactId>
Modified: trunk/soft/fudaa-crue/ui-sysdoc/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-sysdoc/pom.xml 2013-09-03 23:41:06 UTC (rev 8484)
+++ trunk/soft/fudaa-crue/ui-sysdoc/pom.xml 2013-09-04 11:06:55 UTC (rev 8485)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0RC2-SNAPSHOT</version>
+ <version>1.0RC3-SNAPSHOT</version>
</parent>
<artifactId>ui-sysdoc</artifactId>
Modified: trunk/soft/fudaa-crue/ui-views/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-views/pom.xml 2013-09-03 23:41:06 UTC (rev 8484)
+++ trunk/soft/fudaa-crue/ui-views/pom.xml 2013-09-04 11:06:55 UTC (rev 8485)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0RC2-SNAPSHOT</version>
+ <version>1.0RC3-SNAPSHOT</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-views</artifactId>
Modified: trunk/soft/fudaa-crue/ui-wrapper/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-wrapper/pom.xml 2013-09-03 23:41:06 UTC (rev 8484)
+++ trunk/soft/fudaa-crue/ui-wrapper/pom.xml 2013-09-04 11:06:55 UTC (rev 8485)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0RC2-SNAPSHOT</version>
+ <version>1.0RC3-SNAPSHOT</version>
</parent>
<artifactId>ui-wrapper</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-09-06 13:35:59
|
Revision: 8489
http://sourceforge.net/p/fudaa/svn/8489
Author: deniger
Date: 2013-09-06 13:35:50 +0000 (Fri, 06 Sep 2013)
Log Message:
-----------
maj bug
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/perspective/PerspectiveServiceModelling.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportLayersTreeComponent.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportViewManagerTopComponent.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/data/ReportKeyContratCleaner.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/helper/ChooseEMHByTypeHelper.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/perspective/PerspectiveServiceReport.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/temporal/ReportTemporalTopComponent.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/transversal/ReportTransversalGrapheBuilder.java
trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/Bundle.properties
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/perspective/PerspectiveServiceModelling.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/perspective/PerspectiveServiceModelling.java 2013-09-05 13:30:56 UTC (rev 8488)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/perspective/PerspectiveServiceModelling.java 2013-09-06 13:35:50 UTC (rev 8489)
@@ -2,7 +2,7 @@
import java.util.Arrays;
import java.util.Collections;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
import java.util.Set;
import org.fudaa.dodico.crue.edition.EditionChecker;
import org.fudaa.dodico.crue.metier.etude.EMHProjet;
@@ -42,11 +42,11 @@
@ServiceProvider(service = PerspectiveService.class)})
public class PerspectiveServiceModelling extends AbstractPerspectiveService {
- private final Set<String> components = Collections.unmodifiableSet(new HashSet<String>(Arrays.asList(
+ private final Set<String> components = Collections.unmodifiableSet(new LinkedHashSet<String>(Arrays.asList(
+ ModellingPropertiesTopComponent.TOPCOMPONENT_ID,
ModellingContainersTopComponent.TOPCOMPONENT_ID,
ModellingComputeDataTopComponent.TOPCOMPONENT_ID,
ModellingFilesTopComponent.TOPCOMPONENT_ID,
- ModellingPropertiesTopComponent.TOPCOMPONENT_ID,
ModellingNetworkTopComponent.TOPCOMPONENT_ID,
ModellingVisualTopComponent.TOPCOMPONENT_ID,
ModellingCtuluLogTopComponent.TOPCOMPONENT_ID)));
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportLayersTreeComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportLayersTreeComponent.java 2013-09-05 13:30:56 UTC (rev 8488)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportLayersTreeComponent.java 2013-09-06 13:35:50 UTC (rev 8489)
@@ -45,7 +45,7 @@
@TopComponent.Description(preferredID = ReportLayersTreeComponent.TOPCOMPONENT_ID,
iconBase = "org/fudaa/fudaa/crue/report/rond-orange_16.png",
persistenceType = TopComponent.PERSISTENCE_ALWAYS)
-@TopComponent.Registration(mode = "report-bottomLeft", openAtStartup = false, position = 2)
+@TopComponent.Registration(mode = "report-bottomLeft", openAtStartup = false, position = 1)
@ActionReference(path = "Menu/Window/Report", position = 1)
@ActionID(category = "Window", id = "org.fudaa.fudaa.crue.report.ReportLayersTreeComponent")
@TopComponent.OpenActionRegistration(displayName = ReportLayersTreeComponent.TOPCOMPONENT_ACTION_DISPLAYNAME,
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportViewManagerTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportViewManagerTopComponent.java 2013-09-05 13:30:56 UTC (rev 8488)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportViewManagerTopComponent.java 2013-09-06 13:35:50 UTC (rev 8489)
@@ -60,7 +60,7 @@
initComponents();
setName(NbBundle.getMessage(ReportViewManagerTopComponent.class, TOPCOMPONENT_ACTION));
setToolTipText(NbBundle.getMessage(ReportViewManagerTopComponent.class, "HINT_" + TOPCOMPONENT_ID));
- outlineView = new OutlineView();
+ outlineView = new OutlineView(NbBundle.getMessage(ReportViewManagerTopComponent.class, "viewManager.columnName"));
outlineView.getOutline().setColumnHidingAllowed(false);
outlineView.getOutline().setRootVisible(false);
add(outlineView);
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/data/ReportKeyContratCleaner.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/data/ReportKeyContratCleaner.java 2013-09-05 13:30:56 UTC (rev 8488)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/data/ReportKeyContratCleaner.java 2013-09-06 13:35:50 UTC (rev 8489)
@@ -6,7 +6,6 @@
import java.util.Collection;
import java.util.Iterator;
import java.util.Map;
-import java.util.Set;
/**
*
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/helper/ChooseEMHByTypeHelper.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/helper/ChooseEMHByTypeHelper.java 2013-09-05 13:30:56 UTC (rev 8488)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/helper/ChooseEMHByTypeHelper.java 2013-09-06 13:35:50 UTC (rev 8489)
@@ -73,8 +73,7 @@
cb.setSelectedItem(null);
- final List<EMH> allSimpleEMH = reportService.getModele().getAllSimpleEMH();
- Collections.sort(allSimpleEMH, ObjetNommeByNameComparator.INSTANCE);
+ final List<EMH> allSimpleEMH = reportService.getModele().getAllSimpleEMHinUserOrder();
final Set<String> toSelect = new HashSet<String>(emhs);
cb.addItemListener(new ItemListener() {
@Override
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/perspective/PerspectiveServiceReport.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/perspective/PerspectiveServiceReport.java 2013-09-05 13:30:56 UTC (rev 8488)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/perspective/PerspectiveServiceReport.java 2013-09-06 13:35:50 UTC (rev 8489)
@@ -45,8 +45,8 @@
ReportTimeTopComponent.TOPCOMPONENT_ID,
ReportVariableTopComponent.TOPCOMPONENT_ID,
ReportVisualTopComponent.TOPCOMPONENT_ID,
+ ReportPropertiesTopComponent.TOPCOMPONENT_ID,
ReportLayersTreeComponent.TOPCOMPONENT_ID,
- ReportPropertiesTopComponent.TOPCOMPONENT_ID,
ReportNetworkTopComponent.TOPCOMPONENT_ID,
ReportViewManagerTopComponent.TOPCOMPONENT_ID)));
/**
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/temporal/ReportTemporalTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/temporal/ReportTemporalTopComponent.java 2013-09-05 13:30:56 UTC (rev 8488)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/temporal/ReportTemporalTopComponent.java 2013-09-06 13:35:50 UTC (rev 8489)
@@ -141,7 +141,6 @@
List<String> selectedEMH = new ChooseEMHByTypeHelper().chooseEMH(emhs);
if (selectedEMH != null) {
content.emhs = selectedEMH;
- Collections.sort(content.emhs);
EnumCatEMH usedCat = ChooseEMHByTypeHelper.getUsedCat(reportService, content.emhs);
if (usedCat != oldUsedCat) {
content.variables.clear();
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/transversal/ReportTransversalGrapheBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/transversal/ReportTransversalGrapheBuilder.java 2013-09-05 13:30:56 UTC (rev 8488)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/transversal/ReportTransversalGrapheBuilder.java 2013-09-06 13:35:50 UTC (rev 8489)
@@ -164,9 +164,11 @@
}
uiController.setProfilSection(DonPrtHelper.getProfilSection(sectionProfil), reportService.getCcm(), sectionProfil.getParent(), name);
ReportRunVariableKey key = createXtZKey(runCourant.getRunKey());
- AbstractReportGrapheBuilder.applyPersistConfig(content.courbeconfigs.get(key), uiController.getCourbe());
AbstractLoiCourbeModel withKey = (AbstractLoiCourbeModel) uiController.getCourbe().getModel();
withKey.setKey(key);
+ uiController.getCourbe().setSilent(true);
+ AbstractReportGrapheBuilder.applyPersistConfig(content.courbeconfigs.get(key), uiController.getCourbe());
+ uiController.getCourbe().setSilent(false);
courbes.add(uiController.getCourbe());
}
final ItemVariable variableZ = getVariableZ();
Modified: trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/Bundle.properties 2013-09-05 13:30:56 UTC (rev 8488)
+++ trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/Bundle.properties 2013-09-06 13:35:50 UTC (rev 8489)
@@ -50,3 +50,4 @@
ValidationVue.DialogMessage=La vue est modifi\u00e9e. Voulez-vous valider les donn\u00e9es ?
formuleCyclesDetected.error=<html><body>La vue n''a pas \u00e9t\u00e9 valid\u00e9e. Des cycles ont \u00e9t\u00e9 d\u00e9tect\u00e9s pour:<ul>{0}</ul></body></html>
button.export.name=Exporter
+viewManager.columnName=Rapports
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-09-09 22:20:45
|
Revision: 8496
http://sourceforge.net/p/fudaa/svn/8496
Author: deniger
Date: 2013-09-09 22:20:42 +0000 (Mon, 09 Sep 2013)
Log Message:
-----------
maj librairie de graph
Modified Paths:
--------------
trunk/soft/fudaa-crue/pom.xml
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/services/ModellingScenarioVisuService.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layout/NetworkBuilder.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layout/NetworkGisPositionnerResult.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/save/VisuLoadingResult.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/service/ReportVisuPanelService.java
Added Paths:
-----------
trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/layout/
trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/layout/Bundle.properties
Modified: trunk/soft/fudaa-crue/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/pom.xml 2013-09-09 06:48:43 UTC (rev 8495)
+++ trunk/soft/fudaa-crue/pom.xml 2013-09-09 22:20:42 UTC (rev 8496)
@@ -8,7 +8,7 @@
</parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0RC3-SNAPSHOT</version>
+ <version>1.0RC4-SNAPSHOT</version>
<name>Fudaa-Crue</name>
<packaging>pom</packaging>
<ciManagement>
@@ -331,7 +331,8 @@
<dependency>
<groupId>jgraphx</groupId>
<artifactId>jgraphx</artifactId>
- <version>1.10.0.5</version>
+ <!--<version>1.10.0.5</version>-->
+ <version>2.1.1.2</version>
</dependency>
</dependencies>
</dependencyManagement>
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/services/ModellingScenarioVisuService.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/services/ModellingScenarioVisuService.java 2013-09-09 06:48:43 UTC (rev 8495)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/services/ModellingScenarioVisuService.java 2013-09-09 22:20:42 UTC (rev 8496)
@@ -7,6 +7,7 @@
import org.fudaa.dodico.crue.metier.etude.EMHProjet;
import org.fudaa.fudaa.crue.common.helper.CtuluUIForNetbeans;
import org.fudaa.fudaa.crue.common.helper.DialogHelper;
+import org.fudaa.fudaa.crue.common.log.LogsDisplayer;
import org.fudaa.fudaa.crue.common.services.ModellingScenarioService;
import org.fudaa.fudaa.crue.modelling.emh.ModellingOpenEMHPlanimetryAdapter;
import org.fudaa.fudaa.crue.modelling.loi.SimplificationSeuilsChooser;
@@ -37,31 +38,31 @@
*/
@ServiceProvider(service = ModellingScenarioVisuService.class)
public class ModellingScenarioVisuService implements LookupListener, Lookup.Provider, AdditionalLayerSaveStateListener {
-
+
protected InstanceContent dynamicContent = new InstanceContent();
protected Lookup lookup = new AbstractLookup(dynamicContent);
ModellingScenarioService modellingScenarioService = Lookup.getDefault().lookup(ModellingScenarioService.class);
ConfigurationManagerService configurationManagerService = Lookup.getDefault().lookup(ConfigurationManagerService.class);
AdditionalLayersSaveServices additionalLayersSaveServices = Lookup.getDefault().lookup(AdditionalLayersSaveServices.class);
private final Result<EMHScenario> resultat;
-
+
public ModellingScenarioVisuService() {
resultat = modellingScenarioService.getLookup().lookupResult(
EMHScenario.class);
resultat.addLookupListener(this);
}
-
+
public ModellingScenarioService getModellingScenarioService() {
return modellingScenarioService;
}
-
+
@Override
public void additionalLayerSavedBy(Object source, PlanimetryController controller) {
if (getPlanimetryVisuPanel() != null && !AdditionalLayerSaveStateListener.FROM_MODELLING.equals(source)) {
getPlanimetryVisuPanel().getPlanimetryController().reloadAdditionLayersFrom(controller);
}
}
-
+
@Override
public void resultChanged(LookupEvent ev) {
//changement massif: on ne fait rien
@@ -74,12 +75,12 @@
unloadScenario();
}
}
-
+
@Override
public Lookup getLookup() {
return lookup;
}
-
+
void load(final EMHScenario scenarioLoaded) {
ContainerActivityVisibility activity = new ContainerActivityVisibility();
activity.initialize(scenarioLoaded);
@@ -87,11 +88,11 @@
SwingWorker loader = new VisuPanelLoader(scenarioLoaded);
loader.execute();
}
-
+
public void activityChanged() {
activityChanged(getContainerActivityVisibility());
}
-
+
public void activityChanged(ContainerActivityVisibility visibility) {
if (modellingScenarioService.isScenarioLoaded()) {
ContainerActivityVisibility old = getContainerActivityVisibility();
@@ -105,7 +106,7 @@
planimetryVisuPanel.getPlanimetryController().setContainerActivityVisibility(visibility);
}
}
-
+
public void unloadScenario() {
PlanimetryVisuPanel old = getPlanimetryVisuPanel();
if (old != null) {
@@ -117,7 +118,7 @@
dynamicContent.remove(containerActivityVisibility);
}
}
-
+
private void loadScenario() {
unloadScenario();
boolean dirOfConfigDefined = modellingScenarioService.getSelectedProjet().getInfos().isDirOfConfigDefined();
@@ -132,35 +133,35 @@
});
}
}
-
+
public PlanimetryVisuPanel getPlanimetryVisuPanel() {
return lookup.lookup(PlanimetryVisuPanel.class);
}
-
+
public ContainerActivityVisibility getContainerActivityVisibility() {
return lookup.lookup(ContainerActivityVisibility.class);
}
-
+
private class VisuPanelLoader extends SwingWorker<VisuLoadingResult, Object> {
-
+
private final EMHScenario scenarioLoaded;
final ProgressHandle ph = ProgressHandleFactory.createHandle(NbBundle.getMessage(ModellingScenarioVisuService.class,
"gisDataLoad.Task.Name"));
-
+
public VisuPanelLoader(EMHScenario scenarioLoaded) {
this.scenarioLoaded = scenarioLoaded;
}
-
+
@Override
protected VisuLoadingResult doInBackground() throws Exception {
ph.start();
ph.switchToIndeterminate();
final EMHProjet selectedProjet = modellingScenarioService.getSelectedProjet();
final EMHScenario scenario = scenarioLoaded;
-
+
return VisuLoadingResult.loadVisuConfig(selectedProjet, scenario);
}
-
+
@Override
protected void done() {
try {
@@ -182,6 +183,10 @@
}
dynamicContent.add(panel);
additionalLayersSaveServices.removeListener(ModellingScenarioVisuService.this);
+ if (result.log != null && result.log.containsErrorOrSevereError()) {
+ LogsDisplayer.displayError(result.log, NbBundle.getMessage(ModellingScenarioVisuService.class,
+ "gisDataLoad.Task.Name"));
+ }
} catch (Exception exception) {
Exceptions.printStackTrace(exception);
} finally {
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layout/NetworkBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layout/NetworkBuilder.java 2013-09-09 06:48:43 UTC (rev 8495)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layout/NetworkBuilder.java 2013-09-09 22:20:42 UTC (rev 8496)
@@ -18,6 +18,8 @@
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.swing.SwingConstants;
import org.fudaa.ctulu.CtuluTroveProcedure;
import org.fudaa.ctulu.CtuluUI;
@@ -119,7 +121,12 @@
int bigger = graphesBuilder.getBigger();
if (graphesBuilder.getNb() > 0) {
DirectedWeightedMultigraph<Long, BrancheEdge> graph = graphesBuilder.getGraph(bigger);
- buildGisData(graph, res, initX, initY, configuration);
+ Exception ex = buildGisData(graph, res, initX, initY, configuration);
+ if (ex != null) {
+ res.getError().addError(org.openide.util.NbBundle.getMessage(NetworkBuilder.class, "buildNetworkFail"));
+ Logger.getLogger(NetworkBuilder.class.getName()).log(Level.INFO, "Error while layout", ex);
+ }
+
int nb = graphesBuilder.getNb();
for (int i = 0; i < nb; i++) {
if (i == bigger) {
@@ -127,7 +134,12 @@
}
Envelope envelopeInternal = res.edges.getEnvelopeInternal();
double xOffset = envelopeInternal.getMaxX() + configuration.getMinimalDistanceBeetweenParallelEdges();
- buildGisData(graphesBuilder.getGraph(i), res, xOffset, 0, configuration);
+ ex = buildGisData(graphesBuilder.getGraph(i), res, xOffset, 0, configuration);
+ if (ex != null) {
+ res.getError().addError(org.openide.util.NbBundle.getMessage(NetworkBuilder.class, "buildNetworkFail"));
+ Logger.getLogger(NetworkBuilder.class.getName()).log(Level.INFO, "Error while layout", ex);
+ }
+
}
}
//les
@@ -278,10 +290,11 @@
return modified;
}
- private void buildGisData(DirectedWeightedMultigraph<Long, BrancheEdge> graph, NetworkGisPositionnerResult res,
+ private Exception buildGisData(DirectedWeightedMultigraph<Long, BrancheEdge> graph, NetworkGisPositionnerResult res,
double globalXOffset,
double globalYOffset, VisuConfiguration configuration) {
//on construit un mxGraph pour lui faire faire le layout:
+ Exception exceptionCaught = null;
mxGraph mxGraphe = new mxGraph();
NodeYFinder ys = new NodeYFinder();
TObjectDoubleHashMap<Long> findYs = ys.findYs(graph);
@@ -314,8 +327,11 @@
layout.setIntraCellSpacing(configuration.getMinimalDistanceBetweenNode());
layout.setInterRankCellSpacing(configuration.getMinimalDistanceBetweenNode());
layout.setResizeParent(true);
- layout.setLayoutFromSinks(true);
- layout.execute(mxGraphe.getDefaultParent());
+ try {
+ layout.execute(mxGraphe.getDefaultParent());
+ } catch (Exception ex) {
+ exceptionCaught = ex;
+ }
CtuluTroveProcedure.DoubleMaxValue procedure = new CtuluTroveProcedure.DoubleMaxValue();
@@ -335,23 +351,26 @@
Long sourceVertex = graph.getEdgeSource(brancheEdge);
Long targetVertex = graph.getEdgeTarget(brancheEdge);
final mxGeometry geometry = brancheCell.getGeometry();
- List<mxPoint> points = geometry.getPoints();
List<Coordinate> finalCoordinate = new ArrayList<Coordinate>();
final Coordinate amontRealCoordinate = node.get(sourceVertex).getCoordinate();
- final mxPoint sourcePoint = points.get(0);
final Coordinate avalRealCoordinate = node.get(targetVertex).getCoordinate();
- final mxPoint targetPoint = points.get(points.size() - 1);
- double yRatio = (avalRealCoordinate.y - amontRealCoordinate.y) / (targetPoint.getY() - sourcePoint.getY());
finalCoordinate.add(amontRealCoordinate);
- for (int i = 1; i < points.size() - 1; i++) {
- mxPoint pt = points.get(i);
- double y = amontRealCoordinate.y + (pt.getY() - sourcePoint.getY()) * yRatio;
- Coordinate c = new Coordinate(pt.getX(), y);
- finalCoordinate.add(c);
+ List<mxPoint> points = geometry.getPoints();
+ if (points != null) {
+ final mxPoint targetPoint = points.get(points.size() - 1);
+ final mxPoint sourcePoint = points.get(0);
+ double yRatio = (avalRealCoordinate.y - amontRealCoordinate.y) / (targetPoint.getY() - sourcePoint.getY());
+ for (int i = 1; i < points.size() - 1; i++) {
+ mxPoint pt = points.get(i);
+ double y = amontRealCoordinate.y + (pt.getY() - sourcePoint.getY()) * yRatio;
+ Coordinate c = new Coordinate(pt.getX(), y);
+ finalCoordinate.add(c);
+ }
}
finalCoordinate.add(avalRealCoordinate);
res.addEdge(finalCoordinate, (CatEMHBranche) res.idRegistry.getEmh(id));
}
+ return exceptionCaught;
}
private static class ConnectedGraphBuilder {
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layout/NetworkGisPositionnerResult.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layout/NetworkGisPositionnerResult.java 2013-09-09 06:48:43 UTC (rev 8495)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layout/NetworkGisPositionnerResult.java 2013-09-09 22:20:42 UTC (rev 8496)
@@ -10,6 +10,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.fudaa.ctulu.CtuluLog;
import org.fudaa.ctulu.gis.GISAttributeModel;
import org.fudaa.ctulu.gis.GISGeometryFactory;
import org.fudaa.ctulu.gis.GISPoint;
@@ -45,7 +46,12 @@
VisuConfiguration visuConfiguration;
LayerVisibility layerVisibility;
CrueConfigMetier ccm;
+ CtuluLog error = new CtuluLog();
+ public CtuluLog getError() {
+ return error;
+ }
+
public NetworkGisPositionnerResult(PlanimetryGisModelContainer container, GISZoneCollectionPoint nodes,
GISZoneCollectionLigneBrisee edges, GISZoneCollectionLigneBrisee casiers) {
this.context = container;
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/save/VisuLoadingResult.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/save/VisuLoadingResult.java 2013-09-09 06:48:43 UTC (rev 8495)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/save/VisuLoadingResult.java 2013-09-09 22:20:42 UTC (rev 8496)
@@ -5,6 +5,7 @@
import java.io.File;
import java.util.List;
+import org.fudaa.ctulu.CtuluLog;
import org.fudaa.dodico.crue.config.ccm.CrueConfigMetier;
import org.fudaa.dodico.crue.metier.emh.EMHScenario;
import org.fudaa.dodico.crue.metier.etude.EMHProjet;
@@ -39,20 +40,25 @@
NetworkBuilder builder = new NetworkBuilder();
final File dirOfConfig = selectedProjet.getInfos().getDirOfConfig();
NetworkGisPositionnerResult load = loader.load(dirOfConfig, scenario);
+ VisuLoadingResult result = new VisuLoadingResult();
if (load == null) {
load = builder.buildNewGisData(scenario, visuConfiguration, crueConfigMetier, 0, 0);
}
+ if (load == null) {
+ load = new NetworkGisPositionnerResult(scenario);
+ }
load.setLayerVisibility(visibility);
load.setVisuConfiguration(visuConfiguration);
load.setCcm(crueConfigMetier);
- VisuLoadingResult result = new VisuLoadingResult();
result.networkGisPositionnerResult = load;
ConfigLoaderExtern.ResultExtern loadConfigEtudeExtern = ConfigLoaderExtern.loadConfigEtudeExtern(selectedProjet);
if (loadConfigEtudeExtern != null) {
result.additionnalLayer = loadConfigEtudeExtern.additionnalLayers;
}
+ result.log = load.getError();
return result;
}
public NetworkGisPositionnerResult networkGisPositionnerResult;
public List<PlanimetryAdditionalLayerContrat> additionnalLayer;
+ public CtuluLog log;
}
Copied: trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/layout/Bundle.properties (from rev 8404, trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/Bundle.properties)
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/layout/Bundle.properties (rev 0)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/layout/Bundle.properties 2013-09-09 22:20:42 UTC (rev 8496)
@@ -0,0 +1 @@
+buildNetworkFail=Impossible de construire compl\u00e8tement le r\u00e9seau par d\u00e9faut
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/service/ReportVisuPanelService.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/service/ReportVisuPanelService.java 2013-09-09 06:48:43 UTC (rev 8495)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/service/ReportVisuPanelService.java 2013-09-09 22:20:42 UTC (rev 8496)
@@ -9,6 +9,7 @@
import org.fudaa.ebli.calque.BCalqueLegende;
import org.fudaa.ebli.commun.EbliLib;
import org.fudaa.fudaa.crue.common.helper.CtuluUIForNetbeans;
+import org.fudaa.fudaa.crue.common.log.LogsDisplayer;
import org.fudaa.fudaa.crue.options.services.ConfigurationManagerService;
import org.fudaa.fudaa.crue.planimetry.PlanimetryVisuPanel;
import org.fudaa.fudaa.crue.planimetry.controller.PlanimetryController;
@@ -152,6 +153,10 @@
}
dynamicContent.add(panel);
additionalLayersSaveServices.addListener(ReportVisuPanelService.this);
+ if (result.log != null && result.log.containsErrorOrSevereError()) {
+ LogsDisplayer.displayError(result.log, NbBundle.getMessage(ReportVisuPanelService.class,
+ "gisDataLoad.Task.Name"));
+ }
} catch (Exception exception) {
Exceptions.printStackTrace(exception);
} finally {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-09-13 09:53:15
|
Revision: 8503
http://sourceforge.net/p/fudaa/svn/8503
Author: deniger
Date: 2013-09-13 09:53:08 +0000 (Fri, 13 Sep 2013)
Log Message:
-----------
corrections minor bugs
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-compare/pom.xml
trunk/soft/fudaa-crue/crue-config/pom.xml
trunk/soft/fudaa-crue/crue-core/pom.xml
trunk/soft/fudaa-crue/crue-emh/pom.xml
trunk/soft/fudaa-crue/crue-io/pom.xml
trunk/soft/fudaa-crue/crue-otfa/pom.xml
trunk/soft/fudaa-crue/crue-project/pom.xml
trunk/soft/fudaa-crue/crue-sysdoc/pom.xml
trunk/soft/fudaa-crue/crue-test/pom.xml
trunk/soft/fudaa-crue/crue-validation/pom.xml
trunk/soft/fudaa-crue/pom.xml
trunk/soft/fudaa-crue/ui-application/pom.xml
trunk/soft/fudaa-crue/ui-branding/pom.xml
trunk/soft/fudaa-crue/ui-commandline/pom.xml
trunk/soft/fudaa-crue/ui-common/pom.xml
trunk/soft/fudaa-crue/ui-comparison/pom.xml
trunk/soft/fudaa-crue/ui-emh/pom.xml
trunk/soft/fudaa-crue/ui-loader/pom.xml
trunk/soft/fudaa-crue/ui-loi/pom.xml
trunk/soft/fudaa-crue/ui-modelling/pom.xml
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/AbstractModellingTopComponent.java
trunk/soft/fudaa-crue/ui-options/pom.xml
trunk/soft/fudaa-crue/ui-otfa/pom.xml
trunk/soft/fudaa-crue/ui-planimetry/pom.xml
trunk/soft/fudaa-crue/ui-post/pom.xml
trunk/soft/fudaa-crue/ui-report/pom.xml
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/AbstractReportTopComponent.java
trunk/soft/fudaa-crue/ui-study/pom.xml
trunk/soft/fudaa-crue/ui-sysdoc/pom.xml
trunk/soft/fudaa-crue/ui-views/pom.xml
trunk/soft/fudaa-crue/ui-wrapper/pom.xml
Modified: trunk/soft/fudaa-crue/crue-compare/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/pom.xml 2013-09-13 09:40:30 UTC (rev 8502)
+++ trunk/soft/fudaa-crue/crue-compare/pom.xml 2013-09-13 09:53:08 UTC (rev 8503)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0RC5-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<artifactId>crue-compare</artifactId>
<name>Crue Compare</name>
Modified: trunk/soft/fudaa-crue/crue-config/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-config/pom.xml 2013-09-13 09:40:30 UTC (rev 8502)
+++ trunk/soft/fudaa-crue/crue-config/pom.xml 2013-09-13 09:53:08 UTC (rev 8503)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0RC5-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<artifactId>crue-config</artifactId>
<name>Crue Config</name>
Modified: trunk/soft/fudaa-crue/crue-core/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-core/pom.xml 2013-09-13 09:40:30 UTC (rev 8502)
+++ trunk/soft/fudaa-crue/crue-core/pom.xml 2013-09-13 09:53:08 UTC (rev 8503)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0RC5-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<artifactId>crue-core</artifactId>
<name>Crue Core</name>
Modified: trunk/soft/fudaa-crue/crue-emh/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/pom.xml 2013-09-13 09:40:30 UTC (rev 8502)
+++ trunk/soft/fudaa-crue/crue-emh/pom.xml 2013-09-13 09:53:08 UTC (rev 8503)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0RC5-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<artifactId>crue-emh</artifactId>
<name>Crue EMH</name>
Modified: trunk/soft/fudaa-crue/crue-io/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-io/pom.xml 2013-09-13 09:40:30 UTC (rev 8502)
+++ trunk/soft/fudaa-crue/crue-io/pom.xml 2013-09-13 09:53:08 UTC (rev 8503)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0RC5-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<artifactId>crue-io</artifactId>
<name>Crue IO</name>
Modified: trunk/soft/fudaa-crue/crue-otfa/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/pom.xml 2013-09-13 09:40:30 UTC (rev 8502)
+++ trunk/soft/fudaa-crue/crue-otfa/pom.xml 2013-09-13 09:53:08 UTC (rev 8503)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0RC5-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<artifactId>crue-otfa</artifactId>
<name>Crue OTFA</name>
Modified: trunk/soft/fudaa-crue/crue-project/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-project/pom.xml 2013-09-13 09:40:30 UTC (rev 8502)
+++ trunk/soft/fudaa-crue/crue-project/pom.xml 2013-09-13 09:53:08 UTC (rev 8503)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0RC5-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<artifactId>crue-project</artifactId>
<name>Crue Project</name>
Modified: trunk/soft/fudaa-crue/crue-sysdoc/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-sysdoc/pom.xml 2013-09-13 09:40:30 UTC (rev 8502)
+++ trunk/soft/fudaa-crue/crue-sysdoc/pom.xml 2013-09-13 09:53:08 UTC (rev 8503)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0RC5-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<artifactId>crue-sysdoc</artifactId>
<name>Crue Sysdoc</name>
Modified: trunk/soft/fudaa-crue/crue-test/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-test/pom.xml 2013-09-13 09:40:30 UTC (rev 8502)
+++ trunk/soft/fudaa-crue/crue-test/pom.xml 2013-09-13 09:53:08 UTC (rev 8503)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0RC5-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<artifactId>crue-test</artifactId>
Modified: trunk/soft/fudaa-crue/crue-validation/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-validation/pom.xml 2013-09-13 09:40:30 UTC (rev 8502)
+++ trunk/soft/fudaa-crue/crue-validation/pom.xml 2013-09-13 09:53:08 UTC (rev 8503)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0RC5-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<artifactId>crue-validation</artifactId>
<name>Crue Validation</name>
Modified: trunk/soft/fudaa-crue/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/pom.xml 2013-09-13 09:40:30 UTC (rev 8502)
+++ trunk/soft/fudaa-crue/pom.xml 2013-09-13 09:53:08 UTC (rev 8503)
@@ -8,7 +8,7 @@
</parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0RC5-SNAPSHOT</version>
+ <version>1.0</version>
<name>Fudaa-Crue</name>
<packaging>pom</packaging>
<ciManagement>
Modified: trunk/soft/fudaa-crue/ui-application/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-application/pom.xml 2013-09-13 09:40:30 UTC (rev 8502)
+++ trunk/soft/fudaa-crue/ui-application/pom.xml 2013-09-13 09:53:08 UTC (rev 8503)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0RC5-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<artifactId>application</artifactId>
Modified: trunk/soft/fudaa-crue/ui-branding/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/pom.xml 2013-09-13 09:40:30 UTC (rev 8502)
+++ trunk/soft/fudaa-crue/ui-branding/pom.xml 2013-09-13 09:53:08 UTC (rev 8503)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0RC5-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<artifactId>ui-branding</artifactId>
Modified: trunk/soft/fudaa-crue/ui-commandline/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-commandline/pom.xml 2013-09-13 09:40:30 UTC (rev 8502)
+++ trunk/soft/fudaa-crue/ui-commandline/pom.xml 2013-09-13 09:53:08 UTC (rev 8503)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0RC5-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<artifactId>ui-commandline</artifactId>
<packaging>nbm</packaging>
Modified: trunk/soft/fudaa-crue/ui-common/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-common/pom.xml 2013-09-13 09:40:30 UTC (rev 8502)
+++ trunk/soft/fudaa-crue/ui-common/pom.xml 2013-09-13 09:53:08 UTC (rev 8503)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0RC5-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<artifactId>ui-common</artifactId>
Modified: trunk/soft/fudaa-crue/ui-comparison/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-comparison/pom.xml 2013-09-13 09:40:30 UTC (rev 8502)
+++ trunk/soft/fudaa-crue/ui-comparison/pom.xml 2013-09-13 09:53:08 UTC (rev 8503)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0RC5-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<artifactId>ui-comparison</artifactId>
<packaging>nbm</packaging>
Modified: trunk/soft/fudaa-crue/ui-emh/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-emh/pom.xml 2013-09-13 09:40:30 UTC (rev 8502)
+++ trunk/soft/fudaa-crue/ui-emh/pom.xml 2013-09-13 09:53:08 UTC (rev 8503)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0RC5-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<artifactId>ui-emh</artifactId>
<packaging>nbm</packaging>
Modified: trunk/soft/fudaa-crue/ui-loader/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-loader/pom.xml 2013-09-13 09:40:30 UTC (rev 8502)
+++ trunk/soft/fudaa-crue/ui-loader/pom.xml 2013-09-13 09:53:08 UTC (rev 8503)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0RC5-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<artifactId>ui-loader</artifactId>
<packaging>nbm</packaging>
Modified: trunk/soft/fudaa-crue/ui-loi/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/pom.xml 2013-09-13 09:40:30 UTC (rev 8502)
+++ trunk/soft/fudaa-crue/ui-loi/pom.xml 2013-09-13 09:53:08 UTC (rev 8503)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0RC5-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<artifactId>ui-loi</artifactId>
Modified: trunk/soft/fudaa-crue/ui-modelling/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/pom.xml 2013-09-13 09:40:30 UTC (rev 8502)
+++ trunk/soft/fudaa-crue/ui-modelling/pom.xml 2013-09-13 09:53:08 UTC (rev 8503)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0RC5-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-modelling</artifactId>
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/AbstractModellingTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/AbstractModellingTopComponent.java 2013-09-13 09:40:30 UTC (rev 8502)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/AbstractModellingTopComponent.java 2013-09-13 09:53:08 UTC (rev 8503)
@@ -229,8 +229,8 @@
if (first != null) {
cancelSavePanel.add(first);
}
+ cancelSavePanel.add(buttonSave);
cancelSavePanel.add(buttonCancel);
- cancelSavePanel.add(buttonSave);
buttonCancel.setEnabled(modified);
buttonSave.setEnabled(modified);
}
Modified: trunk/soft/fudaa-crue/ui-options/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-options/pom.xml 2013-09-13 09:40:30 UTC (rev 8502)
+++ trunk/soft/fudaa-crue/ui-options/pom.xml 2013-09-13 09:53:08 UTC (rev 8503)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0RC5-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<artifactId>ui-options</artifactId>
<name>Crue UI Options</name>
Modified: trunk/soft/fudaa-crue/ui-otfa/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/pom.xml 2013-09-13 09:40:30 UTC (rev 8502)
+++ trunk/soft/fudaa-crue/ui-otfa/pom.xml 2013-09-13 09:53:08 UTC (rev 8503)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0RC5-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<artifactId>ui-otfa</artifactId>
Modified: trunk/soft/fudaa-crue/ui-planimetry/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/pom.xml 2013-09-13 09:40:30 UTC (rev 8502)
+++ trunk/soft/fudaa-crue/ui-planimetry/pom.xml 2013-09-13 09:53:08 UTC (rev 8503)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0RC5-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-planimetry</artifactId>
Modified: trunk/soft/fudaa-crue/ui-post/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-post/pom.xml 2013-09-13 09:40:30 UTC (rev 8502)
+++ trunk/soft/fudaa-crue/ui-post/pom.xml 2013-09-13 09:53:08 UTC (rev 8503)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0RC5-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-post</artifactId>
Modified: trunk/soft/fudaa-crue/ui-report/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-report/pom.xml 2013-09-13 09:40:30 UTC (rev 8502)
+++ trunk/soft/fudaa-crue/ui-report/pom.xml 2013-09-13 09:53:08 UTC (rev 8503)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0RC5-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<artifactId>ui-report</artifactId>
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/AbstractReportTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/AbstractReportTopComponent.java 2013-09-13 09:40:30 UTC (rev 8502)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/AbstractReportTopComponent.java 2013-09-13 09:53:08 UTC (rev 8503)
@@ -116,8 +116,8 @@
if (first != null) {
cancelSavePanel.add(first);
}
+ cancelSavePanel.add(buttonSave);
cancelSavePanel.add(buttonCancel);
- cancelSavePanel.add(buttonSave);
buttonCancel.setEnabled(modified);
buttonSave.setEnabled(modified);
}
Modified: trunk/soft/fudaa-crue/ui-study/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-study/pom.xml 2013-09-13 09:40:30 UTC (rev 8502)
+++ trunk/soft/fudaa-crue/ui-study/pom.xml 2013-09-13 09:53:08 UTC (rev 8503)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0RC5-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-study</artifactId>
Modified: trunk/soft/fudaa-crue/ui-sysdoc/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-sysdoc/pom.xml 2013-09-13 09:40:30 UTC (rev 8502)
+++ trunk/soft/fudaa-crue/ui-sysdoc/pom.xml 2013-09-13 09:53:08 UTC (rev 8503)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0RC5-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<artifactId>ui-sysdoc</artifactId>
Modified: trunk/soft/fudaa-crue/ui-views/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-views/pom.xml 2013-09-13 09:40:30 UTC (rev 8502)
+++ trunk/soft/fudaa-crue/ui-views/pom.xml 2013-09-13 09:53:08 UTC (rev 8503)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0RC5-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-views</artifactId>
Modified: trunk/soft/fudaa-crue/ui-wrapper/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-wrapper/pom.xml 2013-09-13 09:40:30 UTC (rev 8502)
+++ trunk/soft/fudaa-crue/ui-wrapper/pom.xml 2013-09-13 09:53:08 UTC (rev 8503)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0RC5-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<artifactId>ui-wrapper</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-09-13 10:16:10
|
Revision: 8505
http://sourceforge.net/p/fudaa/svn/8505
Author: deniger
Date: 2013-09-13 10:16:07 +0000 (Fri, 13 Sep 2013)
Log Message:
-----------
corrections minor bugs
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-application/pom.xml
trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/layer.xml
Modified: trunk/soft/fudaa-crue/ui-application/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-application/pom.xml 2013-09-13 10:02:48 UTC (rev 8504)
+++ trunk/soft/fudaa-crue/ui-application/pom.xml 2013-09-13 10:16:07 UTC (rev 8505)
@@ -248,14 +248,7 @@
<zipfileset dir="target/${brandingToken}/bin"
includes="${brandingToken}.exe" prefix="${brandingToken}/bin" />
</zip>
- <!--on enleve .lastModifed-->
- <unzip src="${project.build.directory}/Fudaa-Crue-${project.version}.zip" dest="${project.build.directory}/temp-zip"/>
- <zip destfile="${project.build.directory}/Fudaa-Crue-${project.version}.zip"
- basedir="${project.build.directory}/temp-zip/"
- includes="**/*"
- excludes="**/.lastModified"
- />
- <delete dir="${project.build.directory}/temp-zip"/>
+
</target>
</configuration>
<goals>
Modified: trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/layer.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/layer.xml 2013-09-13 10:02:48 UTC (rev 8504)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/layer.xml 2013-09-13 10:16:07 UTC (rev 8505)
@@ -92,7 +92,6 @@
<file name="ReportSelectRunTopComponent.settings" url="ReportSelectRunTopComponentSettings.xml"/>
<file name="ReportVariableTopComponent.settings" url="ReportVariableTopComponentSettings.xml"/>
<file name="ReportViewManagerTopComponent.settings" url="ReportViewManagerTopComponentSettings.xml"/>
- <file name="ScenariosTopComponent.settings" url="ScenariosTopComponentSettings_1.xml"/>
<file name="SysdocTopComponent.settings" url="SysdocTopComponentSettings.xml"/>
<file name="properties.settings_hidden"/>
</folder>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-10-23 14:02:30
|
Revision: 8531
http://sourceforge.net/p/fudaa/svn/8531
Author: deniger
Date: 2013-10-23 14:02:26 +0000 (Wed, 23 Oct 2013)
Log Message:
-----------
corrections mineurs export tableau csv
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-compare/src/main/resources/org/fudaa/dodico/crue/comparaison/io/default-comparaison.xml
trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java
trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/LoiPopupMenuReceiver.java
trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/loiff/LoiTimeExportDecorator.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DFRTTopComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DLHYTopComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DcspEditorLoiTopComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilCasierEditorTopComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionTopComponent.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/AbstractReportTimeViewTopComponent.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportDFRTTopComponent.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportDLHYTopComponent.java
Modified: trunk/soft/fudaa-crue/crue-compare/src/main/resources/org/fudaa/dodico/crue/comparaison/io/default-comparaison.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/src/main/resources/org/fudaa/dodico/crue/comparaison/io/default-comparaison.xml 2013-10-23 12:53:17 UTC (rev 8530)
+++ trunk/soft/fudaa-crue/crue-compare/src/main/resources/org/fudaa/dodico/crue/comparaison/io/default-comparaison.xml 2013-10-23 14:02:26 UTC (rev 8531)
@@ -10,15 +10,15 @@
<Nom>Quelle EMH, présente (et active) dans A, est absente (ou inactive) dans B</Nom>
<Selection>
<!--
- allSimpleEMH donne la liste des tous les EMH simple (non conteneur)
+ allSimpleEMHinUserOrder donne la liste des tous les EMH simple (non conteneur)
contenu par les sous-modeles du scenario
-->
<!--
- allSimpleEMH[actuallyActive='true'] signifie que l'on ne recupere que les EMH qui sont
+ allSimpleEMHinUserOrder[actuallyActive='true'] signifie que l'on ne recupere que les EMH qui sont
actives
-->
<Requete Description="EMH active">
- allSimpleEMH[actuallyActive='true']
+ allSimpleEMHinUserOrder[actuallyActive='true']
</Requete>
</Selection>
<!--
@@ -33,7 +33,7 @@
<Nom>Quelle EMH, présente et inactive dans A, est absente ou active dans B</Nom>
<Selection>
<Requete Description="EMH active">
- allSimpleEMH[actuallyActive='false']
+ allSimpleEMHinUserOrder[actuallyActive='false']
</Requete>
</Selection>
<Compare-Liste Bidirect="true" Attribut="id" />
@@ -47,7 +47,7 @@
EMH qui ont même id
-->
<Merge Attribut="id" Description="EMH présente dans A et B de même Id">
- <Requete Description="Toutes les EMH">allSimpleEMH[actuallyActive='true']
+ <Requete Description="Toutes les EMH">allSimpleEMHinUserOrder[actuallyActive='true']
</Requete>
</Merge>
</Selection>
@@ -207,7 +207,7 @@
<Nom>Quelle EMH, présente dans A et B, possède des listes de DonPrtGeo* différentes</Nom>
<Selection>
<Merge Attribut="id" Description="EMH présente dans A et B de même Id">
- <Requete Description="Toutes les EMH">allSimpleEMH
+ <Requete Description="Toutes les EMH">allSimpleEMHinUserOrder
</Requete>
</Merge>
<!--
@@ -224,7 +224,7 @@
<Nom>Quelle EMH, présente dans A et B, a des différences sur ses DonPrtGeo* de même nom (attributs premier niveau)</Nom>
<Selection>
<Merge Attribut="id" Description="EMH présente dans A et B de même Id">
- <Requete Description="Toutes les EMH">allSimpleEMH
+ <Requete Description="Toutes les EMH">allSimpleEMHinUserOrder
</Requete>
</Merge>
<Merge Attribut="id" Description="dptg de même nom">
@@ -276,7 +276,7 @@
<Selection>
<Merge Attribut="id">
<Requete Description="Les DonPrtGeoProfilSection de même id">
- allSimpleEMH/DPTGNommes[type="DonPrtGeoProfilSection"]
+ allSimpleEMHinUserOrder/DPTGNommes[type="DonPrtGeoProfilSection"]
</Requete>
</Merge>
<Requete Description="les litNommes">
@@ -294,7 +294,7 @@
<Selection>
<Merge Attribut="id">
<Requete Description="Les DonPrtGeoProfilSection de même id">
- allSimpleEMH/DPTGNommes[type="DonPrtGeoProfilSection"]
+ allSimpleEMHinUserOrder/DPTGNommes[type="DonPrtGeoProfilSection"]
</Requete>
</Merge>
</Selection>
@@ -309,7 +309,7 @@
<Selection>
<Merge Attribut="id,litNumerote.size">
<Requete Description="Les DonPrtGeoProfilSection de même id et ayant le même nombre de lit">
- allSimpleEMH/DPTGNommes[type="DonPrtGeoProfilSection"]
+ allSimpleEMHinUserOrder/DPTGNommes[type="DonPrtGeoProfilSection"]
</Requete>
</Merge>
<Requete Description="Les LitNumerote">litNumerote</Requete>
@@ -325,7 +325,7 @@
<Selection>
<Merge Attribut="id,litNumerote.size">
<Requete Description="Les DonPrtGeoProfilSection de même id et ayant le même nombre de lit">
- allSimpleEMH/DPTGNommes[type="DonPrtGeoProfilSection"]
+ allSimpleEMHinUserOrder/DPTGNommes[type="DonPrtGeoProfilSection"]
</Requete>
</Merge>
<Requete Description="Les LitNumerote">litNumerote</Requete>
@@ -341,7 +341,7 @@
<Selection>
<Merge Attribut="id,litNumerote.size">
<Requete Description="Les DonPrtGeoProfilSection de même id et ayant le même nombre de lit">
- allSimpleEMH/DPTGNommes[type="DonPrtGeoProfilSection"]
+ allSimpleEMHinUserOrder/DPTGNommes[type="DonPrtGeoProfilSection"]
</Requete>
</Merge>
<Requete Description="Les LitNumerote">litNumerote</Requete>
@@ -366,7 +366,7 @@
<Selection>
<Merge Attribut="id">
<Requete Description="Les DonPrtGeoProfilSection de même id">
- allSimpleEMH/DPTGNommes[type="DonPrtGeoProfilSection"]
+ allSimpleEMHinUserOrder/DPTGNommes[type="DonPrtGeoProfilSection"]
</Requete>
</Merge>
</Selection>
@@ -380,7 +380,7 @@
<Selection>
<Merge Attribut="id">
<Requete Description="Les DonPrtGeoProfilSection de même id">
- allSimpleEMH/DPTGNommes[type="DonPrtGeoProfilSection"]
+ allSimpleEMHinUserOrder/DPTGNommes[type="DonPrtGeoProfilSection"]
</Requete>
</Merge>
</Selection>
@@ -394,7 +394,7 @@
<Selection>
<Merge Attribut="id">
<Requete Description="Les DonPrtGeoProfilCasier de même id">
- allSimpleEMH/DPTGNommes[type="DonPrtGeoProfilCasier"]
+ allSimpleEMHinUserOrder/DPTGNommes[type="DonPrtGeoProfilCasier"]
</Requete>
</Merge>
</Selection>
@@ -408,7 +408,7 @@
<Selection>
<Merge Attribut="id">
<Requete Description="Les DonPrtGeoProfilCasier de même id">
- allSimpleEMH/DPTGNommes[type="DonPrtGeoProfilCasier"]
+ allSimpleEMHinUserOrder/DPTGNommes[type="DonPrtGeoProfilCasier"]
</Requete>
</Merge>
</Selection>
@@ -422,7 +422,7 @@
<Selection>
<Merge Attribut="id">
<Requete Description="Les DonPrtGeoProfilCasier de même id">
- allSimpleEMH/DPTGNommes[type="DonPrtGeoProfilCasier"]
+ allSimpleEMHinUserOrder/DPTGNommes[type="DonPrtGeoProfilCasier"]
</Requete>
</Merge>
</Selection>
@@ -436,7 +436,7 @@
<Selection>
<Merge Attribut="id">
<Requete Description="Les DonPrtGeoProfilCasier de même id">
- allSimpleEMH/DPTGNommes[type="DonPrtGeoProfilCasier"]
+ allSimpleEMHinUserOrder/DPTGNommes[type="DonPrtGeoProfilCasier"]
</Requete>
</Merge>
</Selection>
@@ -449,7 +449,7 @@
<Nom>Quel LitNomme, présent dans A, est absent dans B</Nom>
<Selection>
<Requete Description="Les lit nommmes">
- allSimpleEMH/DPTGNommes[type="DonPrtGeoProfilSection"]/litNumerote/nomLit
+ allSimpleEMHinUserOrder/DPTGNommes[type="DonPrtGeoProfilSection"]/litNumerote/nomLit
</Requete>
</Selection>
<Compare-Liste Attribut="id" Bidirect="true" />
@@ -459,7 +459,7 @@
<Nom>Quel DonFrt, présent (et utilisé) dans A, est absent (ou inutilisé) dans B</Nom>
<Selection>
<Requete Description="Les frottements utilisés">
- allSimpleEMH[actuallyActive='true']/DPTGNommes[type="DonPrtGeoProfilSection"]/litNumerote/frot
+ allSimpleEMHinUserOrder[actuallyActive='true']/DPTGNommes[type="DonPrtGeoProfilSection"]/litNumerote/frot
</Requete>
</Selection>
<Compare-Liste Attribut="id" Bidirect="true" />
@@ -515,7 +515,7 @@
<Nom>Quelle EMH, présente dans A et B, possédant des DonPrtCIni, a des attributs différents</Nom>
<Selection>
<Merge Attribut="id" Description="EMH présente dans A et B de même Id">
- <Requete Description="Toutes les EMH">allSimpleEMH
+ <Requete Description="Toutes les EMH">allSimpleEMHinUserOrder
</Requete>
</Merge>
<Requete Description="Les DPTI de l'EMH">DPTI</Requete>
@@ -529,7 +529,7 @@
<Selection>
<Merge Attribut="id" Description="EMH présente dans A et B de même Id">
<Requete Description="Toutes les branches">
- allSimpleEMH
+ allSimpleEMHinUserOrder
</Requete>
</Merge>
<Merge Attribut="type" Description="DCSP de même type">
@@ -1374,7 +1374,7 @@
<Nom>Quelle EMH, présente dans A et dans B, comporte des résultat différents (Epsilon absolu)</Nom>
<Selection>
<Merge Attribut="id" Description="EMH présente dans A et B de même Id">
- <Requete Description="Toutes les EMH">allSimpleEMH[actuallyActive='true']
+ <Requete Description="Toutes les EMH">allSimpleEMHinUserOrder[actuallyActive='true']
</Requete>
</Merge>
<Requete Description="Les résultats">resultatCalcul</Requete>
@@ -1386,7 +1386,7 @@
<Nom>Quelle EMH, présente dans A et dans B, comporte des résultat différents (Epsilon absolu + relatif)</Nom>
<Selection>
<Merge Attribut="id" Description="EMH présente dans A et B de même Id">
- <Requete Description="Toutes les EMH">allSimpleEMH[actuallyActive='true']
+ <Requete Description="Toutes les EMH">allSimpleEMHinUserOrder[actuallyActive='true']
</Requete>
</Merge>
<Requete Description="Les résultats">resultatCalcul</Requete>
Modified: trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
===================================================================
--- trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties 2013-10-23 12:53:17 UTC (rev 8530)
+++ trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties 2013-10-23 14:02:26 UTC (rev 8531)
@@ -1,6 +1,8 @@
#Par convention, les fichiers de traduction sont en ISO-8859-1
otfa.validator.cibleEtuFileNotFound=Le fichier etu cible {0} n''existe pas
+otfa.scenarionNotFound.detail=Le sc\u00e9nario {0} n''a pas \u00e9t\u00e9 trouv\u00e9
+otfa.scenarioNotFound=Sc\u00e9nario introuvable
migrate.isChildrenFilesTester.isNotChild=Le fichier {0} n''est pas contenu dans le r\u00e9pertoire de l''\u00e9tude initiale
io.emptyEMH.error=Pas d'EMH lue.
@@ -636,7 +638,7 @@
option.crue10.rcal.exeOption.name=Option pour demande de calcul
option.crue10.rcal.exeOption.comment=Option pour demande de calcul
-validation.name.pattern.error=Le nom respecte pas le format (uniquement des lettres)
+validation.name.pattern.error=Le nom ne respecte pas le format (commencer par une lettre, pas d'accent...)
validation.name.isBlank.error=Le nom est vide
validation.name.prefix.error=Le nom ne commence pas par le pr\u00e9fixe {0}
validation.contentInvalid.error=Le nom ne doit pas contenir de caract\u00e8res interdits (:, #,...)
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java 2013-10-23 12:53:17 UTC (rev 8530)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java 2013-10-23 14:02:26 UTC (rev 8531)
@@ -268,9 +268,10 @@
logs.addGroup(conversionResult.getLogs().createCleanGroup());
EMHProjetController.writeProjet(etuFile, projet, logs, user);
projetResult = this.loadProjet(etuFile, getCoeurForItem(campagne, item));
+ final CtuluLogGroup cleanLogGroup = projetResult.getLogs().createCleanGroup();
- logs.addGroup(projetResult.getLogs().createCleanGroup());
- if (projetResult.getResult() == null) {
+ logs.addGroup(cleanLogGroup);
+ if (projetResult.getResult() == null || cleanLogGroup.containsFatalError()) {
return new CrueOperationResult<EMHScenario>(null, (CtuluLog) null);
}
//on reprend les données:
@@ -278,6 +279,10 @@
managerScenario = projet.getScenario(item.getScenarioNom());
controller = new EMHProjetController(projet, user);//important de faire cela pour la reference a projet.
}
+ if (managerScenario == null) {
+ logs.createNewLog("otfa.scenarioNotFound").addError("otfa.scenarionNotFound.detail", item.getScenarioNom());
+ return new CrueOperationResult<EMHScenario>(null, logs.createCleanGroup());
+ }
if (item.isLaunchCompute()) {
// Création du run et sauvegarde dans l'étude
Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/LoiPopupMenuReceiver.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/LoiPopupMenuReceiver.java 2013-10-23 12:53:17 UTC (rev 8530)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/LoiPopupMenuReceiver.java 2013-10-23 14:02:26 UTC (rev 8531)
@@ -5,6 +5,7 @@
import javax.swing.JSeparator;
import org.fudaa.ctulu.CtuluUI;
import org.fudaa.ctulu.gui.PopupMenuReceiver;
+import org.fudaa.ctulu.gui.ExportTableCommentSupplier;
import org.fudaa.ebli.courbe.EGFillePanel;
/**
@@ -27,7 +28,6 @@
return panel;
}
-
@Override
public void install(JComponent component, CtuluUI ui) {
super.install(component, ui);
@@ -71,5 +71,9 @@
refinedMenuItem.setEnabled(panel.isSelectionRefinable());
alignPointMenuItem.setEnabled(panel.isSelectionAlignable());
removeMenuItem.setEnabled(panel.isSelectionRemovable());
+ ExportTableCommentSupplier exportTableCommentSupplier = panel.getGraphe().getExportTableCommentSupplier();
+ if (exportTableCommentSupplier != null && ctuluTableExportAction != null) {
+ super.ctuluTableExportAction.setExportTableCommentSupplier(exportTableCommentSupplier);
+ }
}
}
Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/loiff/LoiTimeExportDecorator.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/loiff/LoiTimeExportDecorator.java 2013-10-23 12:53:17 UTC (rev 8530)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/loiff/LoiTimeExportDecorator.java 2013-10-23 14:02:26 UTC (rev 8531)
@@ -7,7 +7,6 @@
import org.fudaa.ctulu.table.CtuluTableModelExportDecorator;
import org.fudaa.dodico.crue.config.ccm.DecimalFormatEpsilonEnum;
import org.fudaa.dodico.crue.config.ccm.ItemVariable;
-import org.fudaa.ebli.courbe.EGModel;
import org.fudaa.fudaa.crue.loi.common.AbstractLoiCourbeModel;
import org.fudaa.fudaa.crue.loi.common.DefaultLoiTableModel;
@@ -26,7 +25,7 @@
@Override
public boolean hasSpecificExportValue(int col) {
- if (col == 1) {
+ if (col == 1 && table.getModel() instanceof DefaultLoiTableModel) {
DefaultLoiTableModel model = (DefaultLoiTableModel) table.getModel();
AbstractLoiCourbeModel loiCourbeModel = (AbstractLoiCourbeModel) model.getCourbe().getModel();
ItemVariable varAbscisse = loiCourbeModel.getConfigLoi().getVarAbscisse();
@@ -40,7 +39,7 @@
@Override
public Object getValue(int row, int col) {
- if (col == 1) {
+ if (col == 1 && table.getModel() instanceof DefaultLoiTableModel) {
DefaultLoiTableModel model = (DefaultLoiTableModel) table.getModel();
AbstractLoiCourbeModel loiCourbeModel = (AbstractLoiCourbeModel) model.getCourbe().getModel();
ItemVariable varAbscisse = loiCourbeModel.getConfigLoi().getVarAbscisse();
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DFRTTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DFRTTopComponent.java 2013-10-23 12:53:17 UTC (rev 8530)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DFRTTopComponent.java 2013-10-23 14:02:26 UTC (rev 8531)
@@ -30,7 +30,7 @@
import org.fudaa.dodico.crue.validation.ValidationHelperLoi;
import org.fudaa.dodico.crue.validation.ValidationPatternHelper;
import org.fudaa.ebli.commun.EbliActionSimple;
-import org.fudaa.ebli.commun.ExportTableCommentSupplier;
+import org.fudaa.ctulu.gui.ExportTableCommentSupplier;
import org.fudaa.fudaa.crue.common.helper.DialogHelper;
import org.fudaa.fudaa.crue.common.helper.ObjetNommeCellRenderer;
import org.fudaa.fudaa.crue.common.helper.ObjetWithIdCellRenderer;
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DLHYTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DLHYTopComponent.java 2013-10-23 12:53:17 UTC (rev 8530)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DLHYTopComponent.java 2013-10-23 14:02:26 UTC (rev 8531)
@@ -30,7 +30,7 @@
import org.fudaa.dodico.crue.validation.ValidationHelperLoi;
import org.fudaa.dodico.crue.validation.ValidationPatternHelper;
import org.fudaa.ebli.commun.EbliActionSimple;
-import org.fudaa.ebli.commun.ExportTableCommentSupplier;
+import org.fudaa.ctulu.gui.ExportTableCommentSupplier;
import org.fudaa.fudaa.crue.common.PerspectiveEnum;
import org.fudaa.fudaa.crue.common.editor.LocalDateTimePanel;
import org.fudaa.fudaa.crue.common.helper.DialogHelper;
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DcspEditorLoiTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DcspEditorLoiTopComponent.java 2013-10-23 12:53:17 UTC (rev 8530)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DcspEditorLoiTopComponent.java 2013-10-23 14:02:26 UTC (rev 8531)
@@ -15,7 +15,7 @@
import org.fudaa.dodico.crue.config.loi.EnumTypeLoi;
import org.fudaa.dodico.crue.metier.emh.*;
import org.fudaa.dodico.crue.validation.ValidationHelperLoi;
-import org.fudaa.ebli.commun.ExportTableCommentSupplier;
+import org.fudaa.ctulu.gui.ExportTableCommentSupplier;
import org.fudaa.fudaa.crue.common.log.LogsDisplayer;
import org.fudaa.fudaa.crue.loi.loiff.LoiUiController;
import org.fudaa.fudaa.crue.modelling.services.EnumModification;
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilCasierEditorTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilCasierEditorTopComponent.java 2013-10-23 12:53:17 UTC (rev 8530)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilCasierEditorTopComponent.java 2013-10-23 14:02:26 UTC (rev 8531)
@@ -30,7 +30,7 @@
import org.fudaa.dodico.crue.validation.ValidateAndRebuildProfilSection;
import org.fudaa.dodico.crue.validation.ValidatorNomProfilCasierContent;
import org.fudaa.ebli.commun.EbliActionSimple;
-import org.fudaa.ebli.commun.ExportTableCommentSupplier;
+import org.fudaa.ctulu.gui.ExportTableCommentSupplier;
import org.fudaa.fudaa.crue.common.helper.DialogHelper;
import org.fudaa.fudaa.crue.common.helper.ObjetNommeCellRenderer;
import org.fudaa.fudaa.crue.common.log.LogIconTranslationProvider;
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionTopComponent.java 2013-10-23 12:53:17 UTC (rev 8530)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionTopComponent.java 2013-10-23 14:02:26 UTC (rev 8531)
@@ -36,7 +36,7 @@
import org.fudaa.dodico.crue.validation.ValidationPatternHelper;
import org.fudaa.ebli.commun.EbliActionSimple;
import org.fudaa.ebli.commun.EbliComponentFactory;
-import org.fudaa.ebli.commun.ExportTableCommentSupplier;
+import org.fudaa.ctulu.gui.ExportTableCommentSupplier;
import org.fudaa.fudaa.crue.common.action.ExportImageAction;
import org.fudaa.fudaa.crue.common.action.ExportImageToClipboardAction;
import org.fudaa.fudaa.crue.common.helper.ComboBoxHelper;
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/AbstractReportTimeViewTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/AbstractReportTimeViewTopComponent.java 2013-10-23 12:53:17 UTC (rev 8530)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/AbstractReportTimeViewTopComponent.java 2013-10-23 14:02:26 UTC (rev 8531)
@@ -21,7 +21,7 @@
import org.fudaa.ebli.commun.EbliActionInterface;
import org.fudaa.ebli.commun.EbliActionSimple;
import org.fudaa.ebli.commun.EbliComponentFactory;
-import org.fudaa.ebli.commun.ExportTableCommentSupplier;
+import org.fudaa.ctulu.gui.ExportTableCommentSupplier;
import org.fudaa.ebli.courbe.EGAxe;
import org.fudaa.ebli.courbe.EGAxeHorizontal;
import org.fudaa.ebli.courbe.EGAxeHorizontalPersist;
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportDFRTTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportDFRTTopComponent.java 2013-10-23 12:53:17 UTC (rev 8530)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportDFRTTopComponent.java 2013-10-23 14:02:26 UTC (rev 8531)
@@ -11,7 +11,7 @@
import org.fudaa.dodico.crue.metier.comparator.ObjetNommeByNameComparator;
import org.fudaa.dodico.crue.metier.emh.*;
import org.fudaa.dodico.crue.metier.helper.EMHHelper;
-import org.fudaa.ebli.commun.ExportTableCommentSupplier;
+import org.fudaa.ctulu.gui.ExportTableCommentSupplier;
import org.fudaa.fudaa.crue.common.AbstractTopComponent;
import org.fudaa.fudaa.crue.common.PerspectiveEnum;
import org.fudaa.fudaa.crue.common.helper.ObjetNommeCellRenderer;
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportDLHYTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportDLHYTopComponent.java 2013-10-23 12:53:17 UTC (rev 8530)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportDLHYTopComponent.java 2013-10-23 14:02:26 UTC (rev 8531)
@@ -11,7 +11,7 @@
import org.apache.commons.lang.StringUtils;
import org.fudaa.dodico.crue.metier.comparator.ObjetNommeByNameComparator;
import org.fudaa.dodico.crue.metier.emh.*;
-import org.fudaa.ebli.commun.ExportTableCommentSupplier;
+import org.fudaa.ctulu.gui.ExportTableCommentSupplier;
import org.fudaa.fudaa.crue.common.editor.LocalDateTimePanel;
import org.fudaa.fudaa.crue.common.helper.ObjetNommeCellRenderer;
import org.fudaa.fudaa.crue.loi.loiff.LoiUiController;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-01-06 20:52:44
|
Revision: 8557
http://sourceforge.net/p/fudaa/svn/8557
Author: deniger
Date: 2014-01-06 20:52:41 +0000 (Mon, 06 Jan 2014)
Log Message:
-----------
CRUE-595: la fenetre param?\195?\168tres num?\195?\169rique ?\195?\169taient affich?\195?\169es dans les x n?\195?\169gatifs.
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf
trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrueDev.conf
trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/modelling-pnumWsmode.xml
Modified: trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf
===================================================================
--- trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf 2014-01-06 15:51:43 UTC (rev 8556)
+++ trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf 2014-01-06 20:52:41 UTC (rev 8557)
@@ -1,7 +1,7 @@
# ${HOME} will be replaced by user home directory according to platform
#default_userdir="${DEFAULT_USERDIR_ROOT}/0.62"
#default_cachedir="${DEFAULT_CACHEDIR_ROOT}/0.62"
-default_userdir="${HOME}\.${APPNAME}\1.0"
+default_userdir="${HOME}\.${APPNAME}\1.1"
default_mac_userdir="${HOME}/Library/Application Support/${APPNAME}/1.0/"
# options used by the launcher by default, can be overridden by explicit
# command line switches
Modified: trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrueDev.conf
===================================================================
--- trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrueDev.conf 2014-01-06 15:51:43 UTC (rev 8556)
+++ trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrueDev.conf 2014-01-06 20:52:41 UTC (rev 8557)
@@ -1,5 +1,5 @@
# ${HOME} will be replaced by user home directory according to platform
-default_userdir="${HOME}\.${APPNAME}\1.0RC2"
+default_userdir="${HOME}\.${APPNAME}\1.1"
# options used by the launcher by default, can be overridden by explicit
# command line switches
Modified: trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/modelling-pnumWsmode.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/modelling-pnumWsmode.xml 2014-01-06 15:51:43 UTC (rev 8556)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/modelling-pnumWsmode.xml 2014-01-06 20:52:41 UTC (rev 8557)
@@ -6,7 +6,7 @@
<constraints>
<path orientation="horizontal" number="226" weight="0.5"/>
</constraints>
- <bounds x="-778" y="95" width="536" height="436" />
+ <bounds x="250" y="95" width="536" height="436" />
<frame state="0"/>
<empty-behavior permanent="true"/>
</mode>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-01-07 20:14:42
|
Revision: 8559
http://sourceforge.net/p/fudaa/svn/8559
Author: deniger
Date: 2014-01-07 20:14:39 +0000 (Tue, 07 Jan 2014)
Log Message:
-----------
CRUE-609 lors de l'export d'un shapefile, les identifiants sont utilis?\195?\169es et plus les noms complets. Cela occasionne des conflits ?\195?\160 l'import.
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/CtuluUIForNetbeans.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryGisEditor.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/AbstractSigLoaderAction.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/SigLoaderAction.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/action/Bundle.properties
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/CtuluUIForNetbeans.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/CtuluUIForNetbeans.java 2014-01-06 22:29:59 UTC (rev 8558)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/CtuluUIForNetbeans.java 2014-01-07 20:14:39 UTC (rev 8559)
@@ -2,6 +2,7 @@
import java.awt.Component;
import java.util.Collection;
+import java.util.logging.Level;
import java.util.logging.LogRecord;
import org.apache.commons.lang.StringUtils;
import org.fudaa.ctulu.CtuluAnalyze;
@@ -72,7 +73,8 @@
@Override
public void error(String _titre, String _msg, boolean _tempo) {
if (_tempo) {
- NotificationDisplayer.getDefault().notify(_titre, CrueIconsProvider.getIcon("org/fudaa/fudaa/crue/common/icons/erreur-non-bloquante.png"), _msg, null);
+ NotificationDisplayer.getDefault().notify(_titre, CrueIconsProvider.getIcon("org/fudaa/fudaa/crue/common/icons/erreur-non-bloquante.png"), _msg,
+ null);
} else {
DialogHelper.showError(_titre, _msg);
}
@@ -104,7 +106,16 @@
log.setDesc(_analyze.getDesci18n());
Collection<LogRecord> records = _analyze.getRecords();
for (LogRecord logRecord : records) {
- log.addRecord(CtuluLogLevel.WARNING, logRecord.getMessage());
+ Level level = logRecord.getLevel();
+ CtuluLogLevel targetLevel = CtuluLogLevel.ERROR;
+ if (level.equals(Level.WARNING)) {
+ targetLevel = CtuluLogLevel.WARNING;
+ } else if (level.equals(CtuluAnalyze.FATAL)) {
+ targetLevel = CtuluLogLevel.FATAL;
+ } else if (level.equals(Level.INFO)) {
+ targetLevel = CtuluLogLevel.INFO;
+ }
+ log.addRecord(targetLevel, logRecord.getMessage());
}
LogsDisplayer.displayError(log, _analyze.getDesci18n());
return _analyze.containsFatalError();
@@ -136,9 +147,11 @@
public void message(String _titre, String _msg, boolean _tempo) {
if (_tempo) {
if (_titre == null && _msg != null) {
- NotificationDisplayer.getDefault().notify(_msg, CrueIconsProvider.getIcon("org/fudaa/fudaa/crue/common/icons/information.png"), StringUtils.EMPTY, null);
+ NotificationDisplayer.getDefault().notify(_msg, CrueIconsProvider.getIcon("org/fudaa/fudaa/crue/common/icons/information.png"),
+ StringUtils.EMPTY, null);
} else {
- NotificationDisplayer.getDefault().notify(StringUtils.defaultString(_titre), CrueIconsProvider.getIcon("org/fudaa/fudaa/crue/common/icons/information.png"), StringUtils.defaultString(_msg), null);
+ NotificationDisplayer.getDefault().notify(StringUtils.defaultString(_titre), CrueIconsProvider.getIcon(
+ "org/fudaa/fudaa/crue/common/icons/information.png"), StringUtils.defaultString(_msg), null);
}
} else {
DialogHelper.showInfo(_titre, _msg);
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryGisEditor.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryGisEditor.java 2014-01-06 22:29:59 UTC (rev 8558)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryGisEditor.java 2014-01-07 20:14:39 UTC (rev 8559)
@@ -14,5 +14,6 @@
public PlanimetryGisEditor(ZEbliCalquesPanel _panel) {
super(_panel, new PlanimetrySceneEditor(_panel.getScene(), _panel));
+ setExportWithId(true);
}
}
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/AbstractSigLoaderAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/AbstractSigLoaderAction.java 2014-01-06 22:29:59 UTC (rev 8558)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/AbstractSigLoaderAction.java 2014-01-07 20:14:39 UTC (rev 8559)
@@ -32,7 +32,7 @@
*/
public abstract class AbstractSigLoaderAction extends EbliActionSimple {
- final PlanimetryController controller;
+ final PlanimetryController controller;
public AbstractSigLoaderAction(String name, PlanimetryController controller) {
super(name, null, name.toUpperCase());
@@ -67,15 +67,19 @@
protected final void loadData(final FSigFileLoaderI loader,
final Pair<File, BuFileFilter> file, final EnumFormat fmt) {
-
ProgressRunnable<Pair<GISZoneCollectionPoint, GISZoneCollectionLigneBrisee>> worker = new ProgressRunnable<Pair<GISZoneCollectionPoint, GISZoneCollectionLigneBrisee>>() {
@Override
public Pair<GISZoneCollectionPoint, GISZoneCollectionLigneBrisee> run(ProgressHandle ph) {
ph.switchToIndeterminate();
FSigFileLoadResult result = new FSigFileLoadResult();
CtuluAnalyze analyse = new CtuluAnalyze();
- loader.setInResult(result, file.first, file.first.getAbsolutePath(), CtuluUIForNetbeans.DEFAULT.getMainProgression(),
- analyse);
+ try {
+ loader.setInResult(result, file.first, file.first.getAbsolutePath(), CtuluUIForNetbeans.DEFAULT.getMainProgression(),
+ analyse);
+ } catch (IllegalArgumentException ex) {
+ analyse.addFatalError(org.openide.util.NbBundle.getMessage(AbstractSigLoaderAction.class, "sig.import.error", ex.getMessage()));
+ }
+
if (CtuluUIForNetbeans.DEFAULT.manageAnalyzeAndIsFatal(analyse)) {
return null;
}
@@ -93,7 +97,8 @@
return new Pair<GISZoneCollectionPoint, GISZoneCollectionLigneBrisee>(pt, lignes);
}
};
- Pair<GISZoneCollectionPoint, GISZoneCollectionLigneBrisee> showProgressDialogAndRun = CrueProgressUtils.showProgressDialogAndRun(worker, getTitle());
+ Pair<GISZoneCollectionPoint, GISZoneCollectionLigneBrisee> showProgressDialogAndRun = CrueProgressUtils.showProgressDialogAndRun(worker,
+ getTitle());
finishImportData(showProgressDialogAndRun, file.first, fmt);
}
@@ -127,5 +132,6 @@
}
}
- protected abstract void finishImportData(Pair<GISZoneCollectionPoint, GISZoneCollectionLigneBrisee> showProgressDialogAndRun, File file, EnumFormat fmt);
+ protected abstract void finishImportData(Pair<GISZoneCollectionPoint, GISZoneCollectionLigneBrisee> showProgressDialogAndRun, File file,
+ EnumFormat fmt);
}
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/SigLoaderAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/SigLoaderAction.java 2014-01-06 22:29:59 UTC (rev 8558)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/SigLoaderAction.java 2014-01-07 20:14:39 UTC (rev 8559)
@@ -5,6 +5,10 @@
import javax.swing.Action;
import javax.swing.JCheckBox;
import javax.swing.JPanel;
+import org.fudaa.ctulu.editor.CtuluValueEditorDouble;
+import org.fudaa.ctulu.gis.GISAttribute;
+import org.fudaa.ctulu.gis.GISAttributeDouble;
+import org.fudaa.ctulu.gis.GISAttributeInterface;
import org.fudaa.ctulu.gis.GISZoneCollectionLigneBrisee;
import org.fudaa.ctulu.gis.GISZoneCollectionPoint;
import org.fudaa.dodico.crue.common.Pair;
@@ -70,12 +74,29 @@
}
if (importPoint) {
+ GISAttributeInterface[] attributes = points.getAttributes();
+ setNotEditable(attributes);
controller.getGroupExternController().addLayerPointUnmodifiable(points, file, fmt, type);
}
if (importLigne) {
+ GISAttributeInterface[] attributes = lignes.getAttributes();
+ setNotEditable(attributes);
controller.getGroupExternController().addLayerLignesUnmodifiable(lignes, file, fmt, type);
}
}
-
+ protected void setNotEditable(GISAttributeInterface[] attributes) {
+ if (attributes != null) {
+ for (GISAttributeInterface attribute : attributes) {
+ if (attribute != null) {
+ if (Double.class.equals(attribute.getDataClass())) {
+ ((GISAttribute) attribute).setInternEditor(new CtuluValueEditorDouble(false));
+ }
+ attribute.getEditor().setEditable(false);
+ }
+
+ }
+ }
+ }
+
}
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/action/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/action/Bundle.properties 2014-01-06 22:29:59 UTC (rev 8558)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/action/Bundle.properties 2014-01-07 20:14:39 UTC (rev 8559)
@@ -34,3 +34,4 @@
SimplifyProfils.Name=Simplifier les profils
importJGW.action=Importer une image g\u00e9or\u00e9f\u00e9renc\u00e9e (JGW)
jgwFileNotFound.text=Le fichier de g\u00e9or\u00e9f\u00e9rencement {0} n''a pas \u00e9t\u00e9 trouv\u00e9
+sig.import.error=Erreur lors de l''import: {0}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-01-10 23:00:42
|
Revision: 8566
http://sourceforge.net/p/fudaa/svn/8566
Author: deniger
Date: 2014-01-10 23:00:37 +0000 (Fri, 10 Jan 2014)
Log Message:
-----------
CRUE-619
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/EMHProjetController.java
trunk/soft/fudaa-crue/crue-project/src/test/resources/remover/Etu3-0_1.1.2.zip
trunk/soft/fudaa-crue/pom.xml
trunk/soft/fudaa-crue/ui-modelling/pom.xml
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingOpenListeCLimMsAction.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCLimMsProgressRunnable.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCLimMsTopExportImportPopupBuilder.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/importer/CLimMsImporter.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/AbstractOpenProjectAction.java
trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/actions/Bundle.properties
trunk/soft/fudaa-crue/ui-wrapper/pom.xml
Added Paths:
-----------
trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/ScenarioRunCleaner.java
trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/projet/ScenarioRunCleanerTest.java
Removed Paths:
-------------
trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/RunRemover.java
trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/projet/RunRemoverTest.java
Modified: trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/EMHProjetController.java
===================================================================
--- trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/EMHProjetController.java 2014-01-10 21:56:47 UTC (rev 8565)
+++ trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/EMHProjetController.java 2014-01-10 23:00:37 UTC (rev 8566)
@@ -332,17 +332,8 @@
return new CrueOperationResult<EMHRun>(run, errors);
}
- public CtuluLogGroup removeAllRun(File etuFile) {
- final RunRemover remover = new RunRemover(projet);
- final CtuluLogGroup errors = new CtuluLogGroup(BusinessMessages.RESOURCE_BUNDLE);
+
- remover.remove();
-
- this.saveProjet(etuFile, errors);
-
- return errors;
- }
-
public static CrueOperationResult<EMHProjet> readProjet(File fichier, CoeurConfigContrat config) {
return readProjet(fichier, config, true);
}
Deleted: trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/RunRemover.java
===================================================================
--- trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/RunRemover.java 2014-01-10 21:56:47 UTC (rev 8565)
+++ trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/RunRemover.java 2014-01-10 23:00:37 UTC (rev 8566)
@@ -1,60 +0,0 @@
-/**
- * License GPL v2
- */
-package org.fudaa.dodico.crue.projet;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import org.fudaa.ctulu.CtuluLibFile;
-import org.fudaa.ctulu.CtuluLog;
-import org.fudaa.dodico.crue.common.BusinessMessages;
-import org.fudaa.dodico.crue.metier.etude.EMHProjet;
-import org.fudaa.dodico.crue.metier.etude.EMHRun;
-import org.fudaa.dodico.crue.metier.etude.ManagerEMHScenario;
-
-/**
- * @author CANEL Christophe (Genesis)
- *
- */
-public class RunRemover {
- private final EMHProjet projet;
-
- public RunRemover(EMHProjet projet) {
- super();
- this.projet = projet;
- }
-
- public CtuluLog remove()
- {
- final List<ManagerEMHScenario> scenarios = this.projet.getListeScenarios();
- final CtuluLog log = new CtuluLog(BusinessMessages.RESOURCE_BUNDLE);
-
- for (ManagerEMHScenario scenario : scenarios)
- {
- scenario.setRunCourant(null);
-
- final List<EMHRun> runs = scenario.getListeRuns();
-
- if (runs != null)
- {
- for (EMHRun run : runs)
- {
- File runDir = this.projet.getDirForRun(scenario, run);
-
- if (runDir.isDirectory())
- {
- if (!CtuluLibFile.deleteDir(runDir))
- {
- log.addSevereError("run.runRemover.cannotDeleteFile", runDir.getName());
- }
- }
- }
- }
-
- scenario.setListeRuns(new ArrayList<EMHRun>());
- }
-
- return log;
- }
-}
Added: trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/ScenarioRunCleaner.java
===================================================================
--- trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/ScenarioRunCleaner.java (rev 0)
+++ trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/ScenarioRunCleaner.java 2014-01-10 23:00:37 UTC (rev 8566)
@@ -0,0 +1,89 @@
+/*
+ GPL 2
+ */
+package org.fudaa.dodico.crue.projet;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.fudaa.ctulu.CtuluLibFile;
+import org.fudaa.ctulu.FileDeleteResult;
+import org.fudaa.dodico.crue.metier.etude.EMHProjet;
+import org.fudaa.dodico.crue.metier.etude.EMHRun;
+import org.fudaa.dodico.crue.metier.etude.ManagerEMHScenario;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class ScenarioRunCleaner {
+
+ private final EMHProjet projet;
+
+ public ScenarioRunCleaner(EMHProjet projet) {
+ this.projet = projet;
+ }
+
+ public FileDeleteResult deleteUnusedDir() {
+ List<File> dirToDelete = getDirToDelete();
+ FileDeleteResult result = new FileDeleteResult();
+ for (File file : dirToDelete) {
+ CtuluLibFile.deleteDir(file, result);
+ }
+ return result;
+ }
+
+ public List<File> getDirToDelete() {
+ List<File> toDelete = new ArrayList<File>();
+ Set<String> expectedScenarioDir = new HashSet<String>();
+ Set<String> expectedRunDir = new HashSet<String>();
+ try {
+ fillWithExpectedDir(expectedScenarioDir, expectedRunDir);
+ } catch (IOException ex) {
+ Logger.getLogger(ScenarioRunCleaner.class.getName()).log(Level.SEVERE, null, ex);
+ return toDelete;
+ }
+ File dirOfRuns = projet.getInfos().getDirOfRuns();
+ File[] listFilesScenarios = dirOfRuns.listFiles();
+ for (File scenarioFile : listFilesScenarios) {
+ if (scenarioFile.isDirectory()) {
+ if (expectedScenarioDir.contains(scenarioFile.getAbsolutePath())) {
+ File[] listFilesRuns = scenarioFile.listFiles();
+ for (File dirRun : listFilesRuns) {
+ if (dirRun.isDirectory()) {
+ if (!expectedRunDir.contains(dirRun.getAbsolutePath())) {
+ toDelete.add(dirRun);
+ }
+ }
+ }
+ } else {
+ toDelete.add(scenarioFile);
+ }
+
+ }
+ }
+
+ return toDelete;
+
+ }
+
+ private void fillWithExpectedDir(Set<String> expectedScenarioDir, Set<String> expectedRunDir) throws IOException {
+ List<ManagerEMHScenario> listeScenarios = projet.getListeScenarios();
+ for (ManagerEMHScenario managerEMHScenario : listeScenarios) {
+ if (managerEMHScenario.hasRun()) {
+ expectedScenarioDir.add(projet.getMainDirOfRuns(managerEMHScenario).getCanonicalPath());
+ List<EMHRun> listeRuns = managerEMHScenario.getListeRuns();
+ for (EMHRun eMHRun : listeRuns) {
+ expectedRunDir.add(projet.getDirForRun(managerEMHScenario, eMHRun).getCanonicalPath());
+
+ }
+ }
+ }
+ }
+
+}
Deleted: trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/projet/RunRemoverTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/projet/RunRemoverTest.java 2014-01-10 21:56:47 UTC (rev 8565)
+++ trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/projet/RunRemoverTest.java 2014-01-10 23:00:37 UTC (rev 8566)
@@ -1,43 +0,0 @@
-/**
- * License GPL v2
- */
-package org.fudaa.dodico.crue.projet;
-
-import java.io.File;
-import org.fudaa.ctulu.CtuluLog;
-import org.fudaa.dodico.crue.config.coeur.TestCoeurConfig;
-import org.fudaa.dodico.crue.io.etu.CrueETUFileTest;
-import org.fudaa.dodico.crue.metier.etude.EMHProjet;
-import org.fudaa.dodico.crue.metier.etude.ManagerEMHScenario;
-import org.fudaa.dodico.crue.test.AbstractTestCase;
-
-/**
- * @author CANEL Christophe (Genesis)
- *
- */
-public class RunRemoverTest extends AbstractTestCase {
- public void testRunRemover()
- {
- File exportZipInTempDir = exportZipInTempDir("/remover/Etu3-0_1.1.2.zip");
- File etuFile = getEtuFileUpdated("etu3-0", exportZipInTempDir);
- assertNotNull(etuFile);
- assertTrue(etuFile.exists());
-
- EMHProjet projet = CrueETUFileTest.readData(etuFile, TestCoeurConfig.INSTANCE);
- assertNotNull(projet);
-
- RunRemover remover = new RunRemover(projet);
- final CtuluLog log = remover.remove();
-
- assertFalse(log.containsSevereError());
-
- assertEquals(0, new File(exportZipInTempDir, "Sc_M3_c9").list().length);
- assertEquals(0, new File(exportZipInTempDir, "Sc_M3-0_c10").list().length);
-
- for (ManagerEMHScenario scenario : projet.getListeScenarios())
- {
- assertNull(scenario.getRunCourant());
- assertEquals(0, scenario.getListeRuns().size());
- }
- }
-}
Copied: trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/projet/ScenarioRunCleanerTest.java (from rev 8404, trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/projet/RunRemoverTest.java)
===================================================================
--- trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/projet/ScenarioRunCleanerTest.java (rev 0)
+++ trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/projet/ScenarioRunCleanerTest.java 2014-01-10 23:00:37 UTC (rev 8566)
@@ -0,0 +1,43 @@
+/**
+ * License GPL v2
+ */
+package org.fudaa.dodico.crue.projet;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+import org.fudaa.ctulu.FileDeleteResult;
+import org.fudaa.dodico.crue.config.coeur.TestCoeurConfig;
+import org.fudaa.dodico.crue.io.etu.CrueETUFileTest;
+import org.fudaa.dodico.crue.metier.etude.EMHProjet;
+import org.fudaa.dodico.crue.test.AbstractTestCase;
+
+/**
+ * @author CANEL Christophe (Genesis)
+ *
+ */
+public class ScenarioRunCleanerTest extends AbstractTestCase {
+
+ public void testRunRemover() throws IOException {
+ File exportZipInTempDir = exportZipInTempDir("/remover/Etu3-0_1.1.2.zip");
+ File etuFile = getEtuFileUpdated("etu3-0", exportZipInTempDir);
+ assertNotNull(etuFile);
+ assertTrue(etuFile.exists());
+
+ EMHProjet projet = CrueETUFileTest.readData(etuFile, TestCoeurConfig.INSTANCE);
+ assertNotNull(projet);
+
+ ScenarioRunCleaner remover = new ScenarioRunCleaner(projet);
+ List<File> dirToDelete = remover.getDirToDelete();
+ assertEquals(2, dirToDelete.size());
+ File d1 = new File(exportZipInTempDir, "To_DeleteScenario").getCanonicalFile();
+ File d2 = new File(new File(exportZipInTempDir, "Sc_M3-0_c10"), "To_DeleteRun").getCanonicalFile();
+ assertTrue(dirToDelete.contains(d1));
+ assertTrue(dirToDelete.contains(d2));
+ //
+ FileDeleteResult deleteUnusedDir = remover.deleteUnusedDir();
+ assertTrue(deleteUnusedDir.isEmpty());
+ assertFalse(d1.exists());
+ assertFalse(d2.exists());
+ }
+}
Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/remover/Etu3-0_1.1.2.zip
===================================================================
(Binary files differ)
Modified: trunk/soft/fudaa-crue/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/pom.xml 2014-01-10 21:56:47 UTC (rev 8565)
+++ trunk/soft/fudaa-crue/pom.xml 2014-01-10 23:00:37 UTC (rev 8566)
@@ -98,12 +98,8 @@
<artifactId>utils</artifactId>
<version>1.07.00</version>
</dependency>
+
<dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml</artifactId>
- <version>3.9</version>
- </dependency>
- <dependency>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>crue-io</artifactId>
<version>${project.version}</version>
Modified: trunk/soft/fudaa-crue/ui-modelling/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/pom.xml 2014-01-10 21:56:47 UTC (rev 8565)
+++ trunk/soft/fudaa-crue/ui-modelling/pom.xml 2014-01-10 23:00:37 UTC (rev 8566)
@@ -50,6 +50,11 @@
<artifactId>ctulu-common</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>crue-io</artifactId>
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingOpenListeCLimMsAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingOpenListeCLimMsAction.java 2014-01-10 21:56:47 UTC (rev 8565)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingOpenListeCLimMsAction.java 2014-01-10 23:00:37 UTC (rev 8566)
@@ -1,7 +1,3 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
package org.fudaa.fudaa.crue.modelling.action;
import javax.swing.Action;
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCLimMsProgressRunnable.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCLimMsProgressRunnable.java 2014-01-10 21:56:47 UTC (rev 8565)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCLimMsProgressRunnable.java 2014-01-10 23:00:37 UTC (rev 8566)
@@ -8,6 +8,17 @@
import java.io.File;
import java.io.FileReader;
import java.io.Reader;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.apache.commons.lang.StringUtils;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.DateUtil;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.WorkbookFactory;
import org.fudaa.ctulu.CtuluLibFile;
import org.fudaa.fudaa.crue.modelling.calcul.importer.CLimMsImporter;
import org.netbeans.api.progress.ProgressHandle;
@@ -45,14 +56,7 @@
}
values = CSVParser.parse(initValues, sep);
} else if (file != null) {
- try {
- reader = new FileReader(file);
- values = new CSVParser(new BufferedReader(reader), ';').getAllValues();
- } catch (Exception ex) {
- Exceptions.printStackTrace(ex);
- } finally {
- CtuluLibFile.close(reader);
- }
+ values = readFile(values);
}
if (values == null) {
return null;
@@ -62,4 +66,64 @@
importer.importData();
return null;
}
+
+ protected String getValue(Cell cell) {
+ switch (cell.getCellType()) {
+ case Cell.CELL_TYPE_NUMERIC:
+ return Double.toString(cell.getNumericCellValue());
+ case Cell.CELL_TYPE_STRING:
+ return cell.getStringCellValue();
+ default:
+ try {
+ return Double.toString(cell.getNumericCellValue());
+ } catch (Exception ex) {
+ Logger.getLogger(ModellingListCLimMsProgressRunnable.class.getName()).log(Level.INFO, "message {0}", ex);
+ try {
+ return cell.getStringCellValue();
+ } catch (Exception ex1) {
+ Logger.getLogger(ModellingListCLimMsProgressRunnable.class.getName()).log(Level.INFO, "message {0}", ex1);
+
+ }
+ }
+ }
+ return StringUtils.EMPTY;
+ }
+
+ protected String[][] readFile(String[][] values) {
+ final String nameToLowerCase = file.getName().toLowerCase();
+ if (nameToLowerCase.endsWith("xlsx") || nameToLowerCase.endsWith("xls")) {
+ List<String[]> rows = new ArrayList<String[]>();
+ try {
+ Workbook wb = WorkbookFactory.create(file);
+ Sheet sheetAt = wb.getSheetAt(0);
+ for (Row row : sheetAt) {
+ List<String> cols = new ArrayList<String>();
+ for (Cell cell : row) {
+ cols.add(getValue(cell));
+ }
+ rows.add(cols.toArray(new String[cols.size()]));
+ }
+ } catch (Exception ex) {
+ Exceptions.printStackTrace(ex);
+ }
+ final String[][] toArray = rows.toArray(new String[rows.size()][]);
+ return toArray;
+
+ } else {
+ return readCsv(values);
+ }
+ }
+
+ protected String[][] readCsv(String[][] values) {
+ Reader reader = null;
+ try {
+ reader = new FileReader(file);
+ values = new CSVParser(new BufferedReader(reader), ';').getAllValues();
+ } catch (Exception ex) {
+ Exceptions.printStackTrace(ex);
+ } finally {
+ CtuluLibFile.close(reader);
+ }
+ return values;
+ }
}
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCLimMsTopExportImportPopupBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCLimMsTopExportImportPopupBuilder.java 2014-01-10 21:56:47 UTC (rev 8565)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCLimMsTopExportImportPopupBuilder.java 2014-01-10 23:00:37 UTC (rev 8566)
@@ -52,11 +52,17 @@
if (!tc.isEditable()) {
return;
}
- final BuFileFilter ftCsv = new BuFileFilter(new String[]{"txt", "csv"}, CtuluResource.CTULU.getString("Texte CSV"));
+ final BuFileFilter ftCsv = new BuFileFilter(new String[]{"csv", "txt"}, CtuluResource.CTULU.getString("Texte CSV"));
+ final BuFileFilter ftXsl = new BuFileFilter(new String[]{"xls"}, CtuluResource.CTULU.getString("Fichier Excel 97-2003"));
+ final BuFileFilter ftXslx = new BuFileFilter(new String[]{"xlsx"}, CtuluResource.CTULU.getString("Fichier Excel"));
ftCsv.setExtensionListInDescription(true);
+ ftXsl.setExtensionListInDescription(true);
+ ftXslx.setExtensionListInDescription(true);
CtuluFileChooser fileChooser = new CtuluFileChooser(true);
fileChooser.addChoosableFileFilter(ftCsv);
- fileChooser.setFileFilter(ftCsv);
+ fileChooser.addChoosableFileFilter(ftXsl);
+ fileChooser.addChoosableFileFilter(ftXslx);
+ fileChooser.setFileFilter(ftXslx);
fileChooser.setAcceptAllFileFilterUsed(false);
fileChooser.setMultiSelectionEnabled(false);
fileChooser.setDialogType(JFileChooser.SAVE_DIALOG);
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/importer/CLimMsImporter.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/importer/CLimMsImporter.java 2014-01-10 21:56:47 UTC (rev 8565)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/importer/CLimMsImporter.java 2014-01-10 23:00:37 UTC (rev 8566)
@@ -40,7 +40,7 @@
public static final String PROP_VALUE = "value";
private final String[][] values;
private final CrueConfigMetier ccm;
- private DonLoiHYConteneur loiConteneur;
+ private final DonLoiHYConteneur loiConteneur;
public CLimMsImporter(CrueConfigMetier ccm, DonLoiHYConteneur loiConteneur, String[][] values) {
this.values = values;
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/AbstractOpenProjectAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/AbstractOpenProjectAction.java 2014-01-10 21:56:47 UTC (rev 8565)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/AbstractOpenProjectAction.java 2014-01-10 23:00:37 UTC (rev 8566)
@@ -5,12 +5,20 @@
package org.fudaa.fudaa.crue.study.actions;
import java.awt.event.ActionEvent;
+import java.io.File;
+import java.util.List;
import java.util.MissingResourceException;
+import org.apache.commons.collections.CollectionUtils;
+import org.fudaa.ctulu.CtuluLog;
+import org.fudaa.ctulu.CtuluLogGroup;
+import org.fudaa.ctulu.FileDeleteResult;
import org.fudaa.dodico.crue.metier.etude.EMHProjet;
import org.fudaa.dodico.crue.metier.etude.ManagerEMHScenario;
+import org.fudaa.dodico.crue.projet.ScenarioRunCleaner;
import org.fudaa.fudaa.crue.common.PerspectiveEnum;
import org.fudaa.fudaa.crue.common.action.AbstractPerspectiveAwareAction;
import org.fudaa.fudaa.crue.common.helper.DialogHelper;
+import org.fudaa.fudaa.crue.common.log.LogsDisplayer;
import org.fudaa.fudaa.crue.common.services.ModellingScenarioService;
import org.fudaa.fudaa.crue.common.services.PerspectiveState;
import org.fudaa.fudaa.crue.options.services.ConfigurationManagerService;
@@ -18,6 +26,7 @@
import org.fudaa.fudaa.crue.study.services.CrueService;
import org.fudaa.fudaa.crue.study.services.EMHProjetServiceImpl;
import org.openide.util.Lookup;
+import org.openide.util.NbBundle;
public abstract class AbstractOpenProjectAction extends AbstractPerspectiveAwareAction {
@@ -29,27 +38,77 @@
private final boolean readOnly;
public AbstractOpenProjectAction(boolean readOnly) {
- super(PerspectiveEnum.STUDY,false);
- this.readOnly=readOnly;
+ super(PerspectiveEnum.STUDY, false);
+ this.readOnly = readOnly;
}
@Override
public void actionPerformed(ActionEvent e) {
perspectiveServiceStudy.setState(PerspectiveState.MODE_READ);
- //TODO verification ici ?
crueService.closeAll();
if (configurationManagerService.isConfigValidShowMessage()) {
service.load(readOnly);
EMHProjet selectedProject = service.getSelectedProject();
+ cleanUnusedRunDir(selectedProject);
openCurrentScenario(modellingScenarioService, selectedProject);
}
}
+ protected void cleanUnusedRunDir(EMHProjet selectedProject) {
+ if (selectedProject != null && !readOnly) {
+ ScenarioRunCleaner cleaner = new ScenarioRunCleaner(selectedProject);
+ List<File> dirToDelete = cleaner.getDirToDelete();
+ if (CollectionUtils.isNotEmpty(dirToDelete)) {
+ String filesAsString = getFilesAsString(dirToDelete);
+ String question = NbBundle.getMessage(AbstractOpenProjectAction.class, "unusedDirFound.deleteAction", filesAsString);
+ boolean showQuestion = DialogHelper.showQuestion(question);
+ if (showQuestion) {
+ FileDeleteResult deleteUnusedDir = cleaner.deleteUnusedDir();
+ if (deleteUnusedDir.isNotEmpty()) {
+ CtuluLogGroup gr = new CtuluLogGroup(null);
+ gr.setDescription(NbBundle.getMessage(AbstractOpenProjectAction.class, "deleteNotComplete.Title"));
+ if (!deleteUnusedDir.getFilesNotDeleted().isEmpty()) {
+ CtuluLog log = gr.createLog();
+ log.setDesc(NbBundle.getMessage(AbstractOpenProjectAction.class, "deleteFileNotComplete.Title"));
+ for (File file : deleteUnusedDir.getFilesNotDeleted()) {
+ log.addWarn(file.getAbsolutePath());
+ }
+ }
+ if (!deleteUnusedDir.getDirNotDeleted().isEmpty()) {
+ CtuluLog log = gr.createLog();
+ log.setDesc(NbBundle.getMessage(AbstractOpenProjectAction.class, "deleteDirNotComplete.Title"));
+ for (File file : deleteUnusedDir.getDirNotDeleted()) {
+ log.addWarn(file.getAbsolutePath());
+ }
+ }
+ LogsDisplayer.displayError(gr, gr.getDescription());
+ }
+ }
+ }
+ }
+ }
+
+ protected String getFilesAsString(List<File> dirToDelete) {
+ int max = Math.min(10, dirToDelete.size());
+ StringBuilder builder = new StringBuilder();
+ builder.append("<ul>");
+ for (int i = 0; i < max; i++) {
+ builder.append("<li>").append(dirToDelete.get(i).getAbsolutePath()).append("</li>");
+ }
+ if (max < dirToDelete.size()) {
+ builder.append("<li>...</li>");
+ }
+ builder.append("</ul>");
+ String filesAsString = builder.toString();
+ return filesAsString;
+ }
+
public static void openCurrentScenario(ModellingScenarioService modellingScenarioService, EMHProjet selectedProject) throws MissingResourceException {
if (selectedProject != null) {
ManagerEMHScenario scenarioCourant = selectedProject.getScenarioCourant();
if (scenarioCourant != null) {
- boolean accepted = DialogHelper.showQuestion(org.openide.util.NbBundle.getMessage(AbstractOpenProjectAction.class, "OpenScenarioCourantAtStartup", scenarioCourant.getNom()));
+ boolean accepted = DialogHelper.showQuestion(org.openide.util.NbBundle.getMessage(AbstractOpenProjectAction.class,
+ "OpenScenarioCourantAtStartup", scenarioCourant.getNom()));
if (accepted) {
modellingScenarioService.loadScenario(selectedProject, scenarioCourant);
}
@@ -59,5 +118,4 @@
}
}
-
}
Modified: trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/actions/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/actions/Bundle.properties 2014-01-10 21:56:47 UTC (rev 8565)
+++ trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/actions/Bundle.properties 2014-01-10 23:00:37 UTC (rev 8566)
@@ -152,3 +152,7 @@
penFichier.EditorFileIsNotConfigured=L'ex\u00e9cutable vers l'\u00e9diteur externe n'est pas configur\u00e9
CTL_StudyHelpAction=Aide sur la perspective \u00c9tude
CompareTwoScenario.LoadingScenario=Chargement des sc\u00e9narios/runs
+unusedDirFound.deleteAction=<html><body>Des dossiers de runs sont pr\u00e9sents dans l''arborescence mais ne correspondent plus \u00e0 des runs. <b>Voulez-vous les supprimer ?</b> :<br>{0}</body></html>
+deleteNotComplete.Title=Suppression des dossiers non termin\u00e9e
+deleteDirNotComplete.Title=Des dossiers n'ont pas pu \u00eatre supprim\u00e9s
+deleteFileNotComplete.Title=Des fichiers n'ont pas pu \u00eatre supprim\u00e9s (en cours d'utilisation ?)
Modified: trunk/soft/fudaa-crue/ui-wrapper/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-wrapper/pom.xml 2014-01-10 21:56:47 UTC (rev 8565)
+++ trunk/soft/fudaa-crue/ui-wrapper/pom.xml 2014-01-10 23:00:37 UTC (rev 8566)
@@ -46,10 +46,6 @@
<groupId>org.swinglabs.swingx</groupId>
<artifactId>swingx-all</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml</artifactId>
- </dependency>
</dependencies>
<build>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-01-20 22:30:31
|
Revision: 8579
http://sourceforge.net/p/fudaa/svn/8579
Author: deniger
Date: 2014-01-20 22:30:26 +0000 (Mon, 20 Jan 2014)
Log Message:
-----------
CRUE-627
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-compare/pom.xml
trunk/soft/fudaa-crue/crue-config/pom.xml
trunk/soft/fudaa-crue/crue-core/pom.xml
trunk/soft/fudaa-crue/crue-emh/pom.xml
trunk/soft/fudaa-crue/crue-io/pom.xml
trunk/soft/fudaa-crue/crue-otfa/pom.xml
trunk/soft/fudaa-crue/crue-project/pom.xml
trunk/soft/fudaa-crue/crue-sysdoc/pom.xml
trunk/soft/fudaa-crue/crue-test/pom.xml
trunk/soft/fudaa-crue/crue-validation/pom.xml
trunk/soft/fudaa-crue/pom.xml
trunk/soft/fudaa-crue/ui-application/pom.xml
trunk/soft/fudaa-crue/ui-branding/pom.xml
trunk/soft/fudaa-crue/ui-commandline/pom.xml
trunk/soft/fudaa-crue/ui-common/pom.xml
trunk/soft/fudaa-crue/ui-comparison/pom.xml
trunk/soft/fudaa-crue/ui-emh/pom.xml
trunk/soft/fudaa-crue/ui-loader/pom.xml
trunk/soft/fudaa-crue/ui-loi/pom.xml
trunk/soft/fudaa-crue/ui-modelling/nb-configuration.xml
trunk/soft/fudaa-crue/ui-modelling/pom.xml
trunk/soft/fudaa-crue/ui-options/pom.xml
trunk/soft/fudaa-crue/ui-otfa/pom.xml
trunk/soft/fudaa-crue/ui-planimetry/pom.xml
trunk/soft/fudaa-crue/ui-post/pom.xml
trunk/soft/fudaa-crue/ui-report/pom.xml
trunk/soft/fudaa-crue/ui-study/pom.xml
trunk/soft/fudaa-crue/ui-sysdoc/pom.xml
trunk/soft/fudaa-crue/ui-views/pom.xml
trunk/soft/fudaa-crue/ui-wrapper/pom.xml
Modified: trunk/soft/fudaa-crue/crue-compare/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/pom.xml 2014-01-20 22:19:03 UTC (rev 8578)
+++ trunk/soft/fudaa-crue/crue-compare/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<artifactId>crue-compare</artifactId>
<name>Crue Compare</name>
Modified: trunk/soft/fudaa-crue/crue-config/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-config/pom.xml 2014-01-20 22:19:03 UTC (rev 8578)
+++ trunk/soft/fudaa-crue/crue-config/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<artifactId>crue-config</artifactId>
<name>Crue Config</name>
Modified: trunk/soft/fudaa-crue/crue-core/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-core/pom.xml 2014-01-20 22:19:03 UTC (rev 8578)
+++ trunk/soft/fudaa-crue/crue-core/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<artifactId>crue-core</artifactId>
<name>Crue Core</name>
Modified: trunk/soft/fudaa-crue/crue-emh/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/pom.xml 2014-01-20 22:19:03 UTC (rev 8578)
+++ trunk/soft/fudaa-crue/crue-emh/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<artifactId>crue-emh</artifactId>
<name>Crue EMH</name>
Modified: trunk/soft/fudaa-crue/crue-io/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-io/pom.xml 2014-01-20 22:19:03 UTC (rev 8578)
+++ trunk/soft/fudaa-crue/crue-io/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<artifactId>crue-io</artifactId>
<name>Crue IO</name>
Modified: trunk/soft/fudaa-crue/crue-otfa/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/pom.xml 2014-01-20 22:19:03 UTC (rev 8578)
+++ trunk/soft/fudaa-crue/crue-otfa/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<artifactId>crue-otfa</artifactId>
<name>Crue OTFA</name>
Modified: trunk/soft/fudaa-crue/crue-project/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-project/pom.xml 2014-01-20 22:19:03 UTC (rev 8578)
+++ trunk/soft/fudaa-crue/crue-project/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<artifactId>crue-project</artifactId>
<name>Crue Project</name>
Modified: trunk/soft/fudaa-crue/crue-sysdoc/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-sysdoc/pom.xml 2014-01-20 22:19:03 UTC (rev 8578)
+++ trunk/soft/fudaa-crue/crue-sysdoc/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<artifactId>crue-sysdoc</artifactId>
<name>Crue Sysdoc</name>
Modified: trunk/soft/fudaa-crue/crue-test/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-test/pom.xml 2014-01-20 22:19:03 UTC (rev 8578)
+++ trunk/soft/fudaa-crue/crue-test/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<artifactId>crue-test</artifactId>
Modified: trunk/soft/fudaa-crue/crue-validation/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-validation/pom.xml 2014-01-20 22:19:03 UTC (rev 8578)
+++ trunk/soft/fudaa-crue/crue-validation/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<artifactId>crue-validation</artifactId>
<name>Crue Validation</name>
Modified: trunk/soft/fudaa-crue/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/pom.xml 2014-01-20 22:19:03 UTC (rev 8578)
+++ trunk/soft/fudaa-crue/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
@@ -8,7 +8,7 @@
</parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
<name>Fudaa-Crue</name>
<packaging>pom</packaging>
<ciManagement>
Modified: trunk/soft/fudaa-crue/ui-application/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-application/pom.xml 2014-01-20 22:19:03 UTC (rev 8578)
+++ trunk/soft/fudaa-crue/ui-application/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<artifactId>application</artifactId>
Modified: trunk/soft/fudaa-crue/ui-branding/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/pom.xml 2014-01-20 22:19:03 UTC (rev 8578)
+++ trunk/soft/fudaa-crue/ui-branding/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<artifactId>ui-branding</artifactId>
Modified: trunk/soft/fudaa-crue/ui-commandline/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-commandline/pom.xml 2014-01-20 22:19:03 UTC (rev 8578)
+++ trunk/soft/fudaa-crue/ui-commandline/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<artifactId>ui-commandline</artifactId>
<packaging>nbm</packaging>
Modified: trunk/soft/fudaa-crue/ui-common/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-common/pom.xml 2014-01-20 22:19:03 UTC (rev 8578)
+++ trunk/soft/fudaa-crue/ui-common/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<artifactId>ui-common</artifactId>
Modified: trunk/soft/fudaa-crue/ui-comparison/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-comparison/pom.xml 2014-01-20 22:19:03 UTC (rev 8578)
+++ trunk/soft/fudaa-crue/ui-comparison/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<artifactId>ui-comparison</artifactId>
<packaging>nbm</packaging>
Modified: trunk/soft/fudaa-crue/ui-emh/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-emh/pom.xml 2014-01-20 22:19:03 UTC (rev 8578)
+++ trunk/soft/fudaa-crue/ui-emh/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<artifactId>ui-emh</artifactId>
<packaging>nbm</packaging>
Modified: trunk/soft/fudaa-crue/ui-loader/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-loader/pom.xml 2014-01-20 22:19:03 UTC (rev 8578)
+++ trunk/soft/fudaa-crue/ui-loader/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<artifactId>ui-loader</artifactId>
<packaging>nbm</packaging>
Modified: trunk/soft/fudaa-crue/ui-loi/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/pom.xml 2014-01-20 22:19:03 UTC (rev 8578)
+++ trunk/soft/fudaa-crue/ui-loi/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<artifactId>ui-loi</artifactId>
Modified: trunk/soft/fudaa-crue/ui-modelling/nb-configuration.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/nb-configuration.xml 2014-01-20 22:19:03 UTC (rev 8578)
+++ trunk/soft/fudaa-crue/ui-modelling/nb-configuration.xml 2014-01-20 22:30:26 UTC (rev 8579)
@@ -14,5 +14,6 @@
Any value defined here will override the pom.xml file value but is only applicable to the current project.
-->
<netbeans.compile.on.save>none</netbeans.compile.on.save>
+ <netbeans.hint.jdkPlatform>JDK_1.7_051</netbeans.hint.jdkPlatform>
</properties>
</project-shared-configuration>
Modified: trunk/soft/fudaa-crue/ui-modelling/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/pom.xml 2014-01-20 22:19:03 UTC (rev 8578)
+++ trunk/soft/fudaa-crue/ui-modelling/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-modelling</artifactId>
Modified: trunk/soft/fudaa-crue/ui-options/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-options/pom.xml 2014-01-20 22:19:03 UTC (rev 8578)
+++ trunk/soft/fudaa-crue/ui-options/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<artifactId>ui-options</artifactId>
<name>Crue UI Options</name>
Modified: trunk/soft/fudaa-crue/ui-otfa/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/pom.xml 2014-01-20 22:19:03 UTC (rev 8578)
+++ trunk/soft/fudaa-crue/ui-otfa/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<artifactId>ui-otfa</artifactId>
Modified: trunk/soft/fudaa-crue/ui-planimetry/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/pom.xml 2014-01-20 22:19:03 UTC (rev 8578)
+++ trunk/soft/fudaa-crue/ui-planimetry/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-planimetry</artifactId>
Modified: trunk/soft/fudaa-crue/ui-post/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-post/pom.xml 2014-01-20 22:19:03 UTC (rev 8578)
+++ trunk/soft/fudaa-crue/ui-post/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-post</artifactId>
Modified: trunk/soft/fudaa-crue/ui-report/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-report/pom.xml 2014-01-20 22:19:03 UTC (rev 8578)
+++ trunk/soft/fudaa-crue/ui-report/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<artifactId>ui-report</artifactId>
Modified: trunk/soft/fudaa-crue/ui-study/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-study/pom.xml 2014-01-20 22:19:03 UTC (rev 8578)
+++ trunk/soft/fudaa-crue/ui-study/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-study</artifactId>
Modified: trunk/soft/fudaa-crue/ui-sysdoc/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-sysdoc/pom.xml 2014-01-20 22:19:03 UTC (rev 8578)
+++ trunk/soft/fudaa-crue/ui-sysdoc/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<artifactId>ui-sysdoc</artifactId>
Modified: trunk/soft/fudaa-crue/ui-views/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-views/pom.xml 2014-01-20 22:19:03 UTC (rev 8578)
+++ trunk/soft/fudaa-crue/ui-views/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-views</artifactId>
Modified: trunk/soft/fudaa-crue/ui-wrapper/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-wrapper/pom.xml 2014-01-20 22:19:03 UTC (rev 8578)
+++ trunk/soft/fudaa-crue/ui-wrapper/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<artifactId>ui-wrapper</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-01-31 18:19:19
|
Revision: 8593
http://sourceforge.net/p/fudaa/svn/8593
Author: deniger
Date: 2014-01-31 18:19:15 +0000 (Fri, 31 Jan 2014)
Log Message:
-----------
CRUE-599
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/AbstractLoiCourbeModel.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilCasierEditorTopComponent.java
Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/AbstractLoiCourbeModel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/AbstractLoiCourbeModel.java 2014-01-31 18:18:49 UTC (rev 8592)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/AbstractLoiCourbeModel.java 2014-01-31 18:19:15 UTC (rev 8593)
@@ -551,7 +551,7 @@
double oldX = ptEvol.getPtEvolutionFF().getAbscisse();
double oldY = ptEvol.getPtEvolutionFF().getOrdonnee();
if (configLoi.getVarAbscisse().getEpsilon().isSame(oldX, newX)
- && configLoi.getVarAbscisse().getEpsilon().isSame(oldY, newY)) {
+ && configLoi.getVarOrdonnee().getEpsilon().isSame(oldY, newY)) {
return false;
}
if (!isRangeValid(newX, newY)) {
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilCasierEditorTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilCasierEditorTopComponent.java 2014-01-31 18:18:49 UTC (rev 8592)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilCasierEditorTopComponent.java 2014-01-31 18:19:15 UTC (rev 8593)
@@ -31,6 +31,7 @@
import org.fudaa.dodico.crue.validation.ValidatorNomProfilCasierContent;
import org.fudaa.ebli.commun.EbliActionSimple;
import org.fudaa.ctulu.gui.ExportTableCommentSupplier;
+import org.fudaa.dodico.crue.config.ccm.CrueConfigMetierConstants;
import org.fudaa.fudaa.crue.common.helper.DialogHelper;
import org.fudaa.fudaa.crue.common.helper.ObjetNommeCellRenderer;
import org.fudaa.fudaa.crue.common.log.LogIconTranslationProvider;
@@ -205,7 +206,6 @@
cbProfils.setRenderer(cellRenderer);
//boutons
-
btDown = new JButton(ImageUtilities.loadImageIcon("org/fudaa/fudaa/crue/modelling/icons/down.png", false));
btUp = new JButton(ImageUtilities.loadImageIcon("org/fudaa/fudaa/crue/modelling/icons/up.png", false));
btDown.setToolTipText(NbBundle.getMessage(ProfilSectionTopComponent.class, "ProfilSection.SelectNext.Tooltip"));
@@ -263,7 +263,7 @@
return null;
}
try {
- return Double.parseDouble(text);
+ return getCcm().getProperty(CrueConfigMetierConstants.PROP_DISTANCE).getNormalizedValue(Double.parseDouble(text));
} catch (NumberFormatException numberFormatException) {
}
return null;
@@ -297,29 +297,29 @@
private void createActions() {
delete = new EbliActionSimple(NbBundle.getMessage(ProfilCasierEditorTopComponent.class, "Delete.DisplayName"), BuResource.BU.getIcon("enlever"),
"DELETE") {
- @Override
- public void actionPerformed(ActionEvent _e) {
- delete();
- }
- };
+ @Override
+ public void actionPerformed(ActionEvent _e) {
+ delete();
+ }
+ };
delete.putValue(Action.SHORT_DESCRIPTION, NbBundle.getMessage(ProfilCasierEditorTopComponent.class, "Delete.Description"));
duplicate = new EbliActionSimple(NbBundle.getMessage(ProfilCasierEditorTopComponent.class, "Duplicate.DisplayName"), BuResource.BU.getIcon(
"dupliquer"), "DUPLICATE") {
- @Override
- public void actionPerformed(ActionEvent _e) {
- duplicate();
- }
- };
+ @Override
+ public void actionPerformed(ActionEvent _e) {
+ duplicate();
+ }
+ };
duplicate.putValue(Action.SHORT_DESCRIPTION, NbBundle.getMessage(ProfilCasierEditorTopComponent.class, "Duplicate.Description"));
create = new EbliActionSimple(NbBundle.getMessage(ProfilCasierEditorTopComponent.class, "Create.DisplayName"), BuResource.BU.getIcon("creer"),
"CREATE") {
- @Override
- public void actionPerformed(ActionEvent _e) {
- create();
- }
- };
+ @Override
+ public void actionPerformed(ActionEvent _e) {
+ create();
+ }
+ };
create.putValue(Action.SHORT_DESCRIPTION, NbBundle.getMessage(ProfilCasierEditorTopComponent.class, "Create.Description"));
}
@@ -606,6 +606,7 @@
newProfilCasier.setNom(getEditingNom());
final Double longueur = getLongueur();
if (longueur != null) {
+
newProfilCasier.setDistance(longueur);
}
return newProfilCasier;
@@ -725,7 +726,7 @@
txtNomProfilCasier.setText(StringUtils.EMPTY);
if (profilCasier != null) {
txtCommentaire.setText(profilCasier.getCommentaire());
- txtLongeur.setText(TransformerEMHHelper.formatFromPropertyName("longeur", profilCasier.getDistance(), getCcm(),
+ txtLongeur.setText(getCcm().getProperty(CrueConfigMetierConstants.PROP_DISTANCE).format(profilCasier.getDistance(),
DecimalFormatEpsilonEnum.COMPARISON));
uptateTxtLongueurTooltip();
String desc = StringUtils.defaultString(profilCasier.getNom());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-01-31 20:53:35
|
Revision: 8594
http://sourceforge.net/p/fudaa/svn/8594
Author: deniger
Date: 2014-01-31 20:53:28 +0000 (Fri, 31 Jan 2014)
Log Message:
-----------
CRUE-626
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/transformer/DateDurationConverter.java
trunk/soft/fudaa-crue/crue-core/src/test/java/org/fudaa/dodico/crue/common/DateDurationConverterTest.java
trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/ResultatTimeKey.java
trunk/soft/fudaa-crue/crue-emh/src/test/java/org/fudaa/dodico/crue/metier/emh/ResultatPasDeTempsTest.java
trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/DHReader.java
trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBReader.java
trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/res/RCalTimeStepBuilder.java
trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-0.zip
trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-1.zip
trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-2.zip
trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-3.zip
trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-4.zip
trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-5.zip
trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu4-0.zip
trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu4-1.zip
trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu5-0.zip
trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu6-0.zip
trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu7-0.zip
trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu7-1.zip
trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu7-2.zip
Modified: trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/transformer/DateDurationConverter.java
===================================================================
--- trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/transformer/DateDurationConverter.java 2014-01-31 18:19:15 UTC (rev 8593)
+++ trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/transformer/DateDurationConverter.java 2014-01-31 20:53:28 UTC (rev 8594)
@@ -25,16 +25,26 @@
*/
public final static LocalDateTime ZERO_DATE = new LocalDateTime(01, 01, 01, 0, 0, 0, 0);
public final static DateTimeFormatter MEDIUM_DATE_TIME = DateTimeFormat.mediumDateTime();
+ private static final PeriodFormatter JJHHMMSS = new PeriodFormatterBuilder().printZeroAlways().minimumPrintedDigits(2).appendDays().
+ appendLiteral(":").
+ appendHours().appendLiteral(":").
+ appendMinutes().appendLiteral(":")
+ .appendSecondsWithOptionalMillis().toFormatter();
+ private static final PeriodFormatter HHMMSS = new PeriodFormatterBuilder().printZeroAlways().minimumPrintedDigits(2).
+ appendHours().appendLiteral(":").
+ appendMinutes().appendLiteral(":")
+ .appendSecondsWithOptionalMillis().toFormatter();
private static final PeriodFormatter XSD_DURATION_FORMATTER = new PeriodFormatterBuilder().printZeroAlways().appendLiteral(
"P0Y0M").appendDays().appendSuffix(
- "D").appendSeparatorIfFieldsAfter("T").appendHours().appendSuffix("H").appendMinutes().appendSuffix("M").appendSecondsWithOptionalMillis().
+ "D").appendSeparatorIfFieldsAfter("T").appendHours().appendSuffix("H").appendMinutes().appendSuffix("M").
+ appendSecondsWithOptionalMillis().
appendSuffix(
- "S").toFormatter();
+ "S").toFormatter();
private static final PeriodFormatter CRUE_DURATION_FORMATTER = new PeriodFormatterBuilder().printZeroAlways().appendDays().appendLiteral(
" ").appendHours().appendLiteral(" ").appendMinutes().appendLiteral(" ").appendSecondsWithOptionalMillis().toFormatter();
private static final DateTimeFormatter XSD_DATE_FORMATTER = ISODateTimeFormat.dateHourMinuteSecondMillis();
- public static final DateTimeFormatter XSD_DATE_FORMATTER_UI =
- new DateTimeFormatterBuilder()
+ public static final DateTimeFormatter XSD_DATE_FORMATTER_UI
+ = new DateTimeFormatterBuilder()
.append(ISODateTimeFormat.date())
.appendLiteral(' ')
.append(ISODateTimeFormat.hourMinuteSecondMillis())
@@ -196,6 +206,10 @@
return CRUE_DURATION_FORMATTER.print(durationToDaysHourMinSecPeriod(d));
}
+ public static boolean isGreaterThanDay(long millis) {
+ return millis > 1000 * 3600 * 24;
+ }
+
/**
* @param d la duration a traiter
* @return la period avec les jour/heures/minutes/secondes
@@ -207,6 +221,21 @@
return d.toPeriod(PeriodType.dayTime(), ISOChronology.getInstanceUTC());
}
+ public static String durationToDDHHMMSS(final Duration d, boolean useDay) {
+ if (useDay) {
+ return durationToDDHHMMSS(d);
+ }
+ return durationToHHMMSS(d);
+ }
+
+ public static String durationToDDHHMMSS(final Duration d) {
+ return JJHHMMSS.print(durationToDaysHourMinSecPeriod(d));
+ }
+
+ public static String durationToHHMMSS(final Duration d) {
+ return HHMMSS.print(d.toPeriod(PeriodType.time()));
+ }
+
/**
* @param d
* @return le format xsd en transformant les mois/années en nombre de jour
Modified: trunk/soft/fudaa-crue/crue-core/src/test/java/org/fudaa/dodico/crue/common/DateDurationConverterTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-core/src/test/java/org/fudaa/dodico/crue/common/DateDurationConverterTest.java 2014-01-31 18:19:15 UTC (rev 8593)
+++ trunk/soft/fudaa-crue/crue-core/src/test/java/org/fudaa/dodico/crue/common/DateDurationConverterTest.java 2014-01-31 20:53:28 UTC (rev 8594)
@@ -9,7 +9,6 @@
import org.joda.time.LocalDateTime;
import org.joda.time.Period;
-
/**
* @author deniger
*/
@@ -17,6 +16,20 @@
private static final long NB_MILLIS_BY_HOUR = 3600000;
+ public void testFormatter() {
+ Duration d = DateDurationConverter.getDuration(1, 2, 3, 64);
+ assertEquals("01:02:04:04",
+ DateDurationConverter.durationToDDHHMMSS(d));
+ assertEquals("26:04:04",
+ DateDurationConverter.durationToHHMMSS(d));
+ d = DateDurationConverter.getDuration(3, 0, 0, 1);
+ assertEquals("72:00:01",
+ DateDurationConverter.durationToHHMMSS(d));
+ assertEquals("03:00:00:01",
+ DateDurationConverter.durationToDDHHMMSS(d));
+
+ }
+
/**
* Test la conversion {@link DateDurationConverter#getPeriod(int, int, int, int)}.
*/
@@ -32,7 +45,7 @@
final long expected = 1 * 24 * NB_MILLIS_BY_HOUR + 25 * NB_MILLIS_BY_HOUR + 3 * 60000 + 62000;
assertEquals(expected, DateDurationConverter.getDuration(1, 25, 3, 62).getMillis());
}
-
+
public void testMillis() {
String res = DateDurationConverter.durationToXsd(new Duration(123L));
assertEquals("P0Y0M0DT0H0M0.123S", res);
Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/ResultatTimeKey.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/ResultatTimeKey.java 2014-01-31 18:19:15 UTC (rev 8593)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/ResultatTimeKey.java 2014-01-31 20:53:28 UTC (rev 8594)
@@ -29,10 +29,10 @@
transitoire = false;
}
- public ResultatTimeKey(String nomCalcul, long duree) {
+ public ResultatTimeKey(String nomCalcul, long duree, boolean useDay) {
this.nomCalcul = nomCalcul;
this.duree = duree;
- temps = DateDurationConverter.durationToXsd(new Duration(duree));
+ temps = DateDurationConverter.durationToDDHHMMSS(new Duration(duree), useDay);
transitoire = true;
}
Modified: trunk/soft/fudaa-crue/crue-emh/src/test/java/org/fudaa/dodico/crue/metier/emh/ResultatPasDeTempsTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/test/java/org/fudaa/dodico/crue/metier/emh/ResultatPasDeTempsTest.java 2014-01-31 18:19:15 UTC (rev 8593)
+++ trunk/soft/fudaa-crue/crue-emh/src/test/java/org/fudaa/dodico/crue/metier/emh/ResultatPasDeTempsTest.java 2014-01-31 20:53:28 UTC (rev 8594)
@@ -44,7 +44,8 @@
@Test
public void testEquivalence() {
- List<ResultatTimeKey> times = Arrays.asList(new ResultatTimeKey("CC"), new ResultatTimeKey("CC_T1", 0), new ResultatTimeKey("CC_T1", 10), new ResultatTimeKey("CC_T2", 10), new ResultatTimeKey("CC_T2", 20));
+ List<ResultatTimeKey> times = Arrays.asList(new ResultatTimeKey("CC"), new ResultatTimeKey("CC_T1", 0, false), new ResultatTimeKey("CC_T1", 10,
+ false), new ResultatTimeKey("CC_T2", 10, false), new ResultatTimeKey("CC_T2", 20, false));
ResultatPasDeTempsDelegate delegate = new DefaultDelegate(times);
ResultatPasDeTemps res = new ResultatPasDeTemps(delegate);
ResultatTimeKey in = new ResultatTimeKey("CQ");
@@ -52,12 +53,12 @@
for (ResultatTimeKey resultatTimeKey : times) {
assertEquals(resultatTimeKey, res.getEquivalentTempsSimu(resultatTimeKey));
}
- in = new ResultatTimeKey("CT_T1Bis", 0);
+ in = new ResultatTimeKey("CT_T1Bis", 0, false);
assertEquals(times.get(1), res.getEquivalentTempsSimu(in));
- in = new ResultatTimeKey("CT_T1Bis", 10);
+ in = new ResultatTimeKey("CT_T1Bis", 10, false);
assertEquals(times.get(2), res.getEquivalentTempsSimu(in));
- in = new ResultatTimeKey("CT_T2Bis", 20);
+ in = new ResultatTimeKey("CT_T2Bis", 20, false);
assertEquals(times.get(4), res.getEquivalentTempsSimu(in));
}
-}
\ No newline at end of file
+}
Modified: trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/DHReader.java
===================================================================
--- trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/DHReader.java 2014-01-31 18:19:15 UTC (rev 8593)
+++ trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/DHReader.java 2014-01-31 20:53:28 UTC (rev 8594)
@@ -11,6 +11,7 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URL;
+import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -83,7 +84,6 @@
import org.fudaa.dodico.crue.metier.emh.OrdCalcScenario;
import org.fudaa.dodico.crue.metier.emh.OrdCalcTransIniCalcPrecedent;
import org.fudaa.dodico.crue.metier.emh.OrdPrtCIniModeleBase;
-import org.fudaa.dodico.crue.metier.emh.ParamCalcScenario;
import org.fudaa.dodico.crue.metier.emh.ParamNumCalcPseudoPerm;
import org.fudaa.dodico.crue.metier.emh.ParamNumCalcTrans;
import org.fudaa.dodico.crue.metier.emh.ParamNumModeleBase;
@@ -102,7 +102,6 @@
import org.fudaa.dodico.crue.metier.helper.LoiHelper;
import org.fudaa.dodico.fortran.FortranReader;
import org.joda.time.Duration;
-import org.joda.time.LocalDateTime;
/**
* Reader pour le format Dh crue 9. C'est la methode {@link #readAllDonnees(CrueIOResu)} qui fait le travail. Ensuite elle dispatche les taches entre {@link #readDonneesGenerales(CompositeReader, CrueData, int)},
@@ -129,6 +128,14 @@
*/
private final Set<String> emhsWithSensOuvInitialized = new HashSet<String>();
+ DecimalFormat calulFormat = new DecimalFormat();
+
+ public DHReader() {
+ calulFormat.setParseIntegerOnly(true);
+ calulFormat.setMinimumIntegerDigits(2);
+
+ }
+
@Override
public void stop() {
// ne fait rien pour l'instant
@@ -320,7 +327,8 @@
final Duration duration = DateDurationConverter.getDuration(reader.intField(idx++), reader.intField(idx++),
reader.intField(idx++), reader.doubleField(idx++));
if (isFiner()) {
- LOGGER.log(Level.FINER, "DATE: Ligne {0} read date {1}", new Object[]{reader.getCurrent().getLineNumber(), DateDurationConverter.durationToXsd(duration)});
+ LOGGER.log(Level.FINER, "DATE: Ligne {0} read date {1}", new Object[]{reader.getCurrent().getLineNumber(), DateDurationConverter.durationToXsd(
+ duration)});
}
return duration;
@@ -473,7 +481,8 @@
} else if (iligne == 2) { // Ligne E3
final double coefRempliPourBrancheI = reader.doubleField(0);
if (isFine()) {
- LOGGER.log(Level.FINE, "ligne:{0}-> le niveau initial de la branche {1} est {2}", new Object[]{reader.getCurrent().getLineNumber(), brancheName, coefRempliPourBrancheI});
+ LOGGER.log(Level.FINE, "ligne:{0}-> le niveau initial de la branche {1} est {2}",
+ new Object[]{reader.getCurrent().getLineNumber(), brancheName, coefRempliPourBrancheI});
}
final int size = sectionsBranche.size();
CatEMHSection sectionEMH = null;
@@ -510,7 +519,8 @@
} else {
final double niveauEau = reader.doubleField(i);
if (isFine()) {
- LOGGER.log(Level.FINE, "ligne:{0}-> le niveau initial du noeud {1} est {2}", new Object[]{reader.getCurrent().getLineNumber(), noeudName, niveauEau}); //$NON-NLS-1$ //$NON-NLS-2$
+ LOGGER.log(Level.FINE, "ligne:{0}-> le niveau initial du noeud {1} est {2}",
+ new Object[]{reader.getCurrent().getLineNumber(), noeudName, niveauEau}); //$NON-NLS-1$ //$NON-NLS-2$
}
final CatEMHNoeud noeud = res.findNoeudByReference(noeudName);
@@ -553,7 +563,8 @@
} else {
final double coefRuis = reader.doubleField(i);
if (isFine()) {
- LOGGER.log(Level.FINE, "ligne:{0}-> le coefficient de ruissellement {1} est {2}", new Object[]{reader.getCurrent().getLineNumber(), noeudName, coefRuis}); //$NON-NLS-1$ //$NON-NLS-2$
+ LOGGER.log(Level.FINE, "ligne:{0}-> le coefficient de ruissellement {1} est {2}",
+ new Object[]{reader.getCurrent().getLineNumber(), noeudName, coefRuis}); //$NON-NLS-1$ //$NON-NLS-2$
}
final CatEMHNoeud noeud = res.findNoeudByReference(noeudName);
@@ -671,10 +682,14 @@
reader.readLine();
final Duration dtperm = readDuration(reader);
final int nbField = reader.getNumberOfFields();
- final double tolz = nbField > 4 ? reader.doubleField(4) : cruePropertyDefinitionContainer.getDefaultDoubleValue(CrueConfigMetierConstants.PROP_TOL_MAX_Z);
- final double tolq = nbField > 5 ? reader.doubleField(5) : cruePropertyDefinitionContainer.getDefaultDoubleValue(CrueConfigMetierConstants.PROP_TOL_MAX_Q);
- final int icalmx = nbField > 6 ? reader.intField(6) : cruePropertyDefinitionContainer.getDefaultIntValue(CrueConfigMetierConstants.PROP_NBR_PDT_MAX);
- final int ndecou = nbField > 8 ? reader.intField(8) : cruePropertyDefinitionContainer.getDefaultIntValue(CrueConfigMetierConstants.PROP_NBR_PDT_DECOUP);
+ final double tolz = nbField > 4 ? reader.doubleField(4) : cruePropertyDefinitionContainer.getDefaultDoubleValue(
+ CrueConfigMetierConstants.PROP_TOL_MAX_Z);
+ final double tolq = nbField > 5 ? reader.doubleField(5) : cruePropertyDefinitionContainer.getDefaultDoubleValue(
+ CrueConfigMetierConstants.PROP_TOL_MAX_Q);
+ final int icalmx = nbField > 6 ? reader.intField(6) : cruePropertyDefinitionContainer.getDefaultIntValue(
+ CrueConfigMetierConstants.PROP_NBR_PDT_MAX);
+ final int ndecou = nbField > 8 ? reader.intField(8) : cruePropertyDefinitionContainer.getDefaultIntValue(
+ CrueConfigMetierConstants.PROP_NBR_PDT_DECOUP);
if (isFine()) {
LOGGER.log(Level.FINE, "dtperm{0} | tolz {1}tolq {2} icalmx {3} ndecou{4}", new Object[]{dtperm, tolz, tolq, icalmx, ndecou});
}
@@ -720,7 +735,8 @@
Integer.valueOf(limtyp));
} else {
if (isFine()) {
- LOGGER.log(Level.FINE, "{0}: numPoint={1} limtype={2} soit {3}", new Object[]{reader.getCurrent().getLineNumber(), nomEmh, limtyp, typesConditionLimites.get(limtyp)});
+ LOGGER.log(Level.FINE, "{0}: numPoint={1} limtype={2} soit {3}",
+ new Object[]{reader.getCurrent().getLineNumber(), nomEmh, limtyp, typesConditionLimites.get(limtyp)});
}
// Ajout de la condition aux limites à l'EMH correspondante
@@ -869,7 +885,7 @@
final CalcPseudoPerm calcPerm = new CalcPseudoPerm();
- calcPerm.setNom(CruePrefix.P_CALCUL + "P" + (nbEtatPermanent + 1));
+ calcPerm.setNom(CruePrefix.P_CALCUL + "P" + calulFormat.format(nbEtatPermanent + 1));
calcPerm.setCommentaire("Calcul pseudo-permanent " + (nbEtatPermanent + 1));
// pour le premier on prend en compte la reprise éventuelle
final boolean first = ocal.getOrdCalc().isEmpty();
@@ -900,7 +916,6 @@
dclm = listeDCLMs.get(0);
// listeRefs.add(emh);
-
if (dclm instanceof CalcPseudoPermNoeudQapp) {
CalcPseudoPermNoeudQapp nncQapp = null;
@@ -940,7 +955,6 @@
if (CollectionUtils.isNotEmpty(listeDCLMs)) {
dclm = listeDCLMs.get(0);
-
if (dclm instanceof CalcPseudoPermBrancheOrificeManoeuvre) {
CalcPseudoPermBrancheOrificeManoeuvre brancheOrOuv = null;
@@ -1043,7 +1057,6 @@
Duration transDureeCalc = readDuration(reader, 4);
final int nts = reader.intField(16);
-
final ParamNumModeleBase pnum = res.getOrCreatePNUM();
final PdtCst pdtCst = new PdtCst();
pdtCst.setPdtCst(pasDeTemps);
@@ -1089,7 +1102,7 @@
// Un seul calcul transitoire possible en version crue 9
final CalcTrans calcTrans = new CalcTrans();
- calcTrans.setNom(CruePrefix.P_CALCUL + "T1");
+ calcTrans.setNom(CruePrefix.P_CALCUL + "T01");
calcTrans.setCommentaire("Calcul transitoire 1");
dclm.addCalcTrans(calcTrans);
final OrdCalcTransIniCalcPrecedent prec = new OrdCalcTransIniCalcPrecedent(dataLinked.getCrueConfigMetier());
@@ -1526,7 +1539,6 @@
dlhy.addLois(loiFF);
}
-
}
}
@@ -1592,9 +1604,7 @@
final CrueData metier = readRegles(res, reader);
// lecture ligne B
-
// Ligne B : ICAL, CRU, COFQRQ, ISORTI, ILE, TREPJ, TREPH, TREPM, TREPS
-
// ICAL = 0 : reprise de calcul en transitoire
// ICAL = 1 : succession de calculs en régime permanent
// ICAL = 2 : stabilisation d'une ligne d'eau initiale par une suite de calculs en régime permanent, puis calcul en
@@ -1649,7 +1659,6 @@
crueData.setMethodesInterpolation(methodesInterpolation);
// Pas d'enregistrement de "ile" qui sert pour l'algo uniquement
-
// Remplissage des données métier en fonction de la valeur de "ical"
// final CrueData metier = metier;
if (ical == 0) {
Modified: trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBReader.java
===================================================================
--- trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBReader.java 2014-01-31 18:19:15 UTC (rev 8593)
+++ trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/FCBReader.java 2014-01-31 20:53:28 UTC (rev 8594)
@@ -42,6 +42,7 @@
// on sait que le premier entier doit etre 800; soit la longueur des 10 commentaires comportant
// 256 caractères.
final int firstInt = 10 * sizeTitre;
+
// on lit le premier enregistrement qui fait 800 p
/*
* final int readAll =
@@ -85,7 +86,10 @@
// past r8 : pas de temps d'impression des résultats, en secondes.
// transformer en single ->ok
- /**final double r8 = **/bf.getFloat();
+ /**
+ * final double r8 = *
+ */
+ bf.getFloat();
// icodav i4 : présence (1) ou non (0) d'une régulation
// icodav==0 ou 2 pas de regulation
@@ -106,14 +110,12 @@
helper.getStingFromBuffer(nbCharTitreDCDh);
// -- on passe a la ligne contenant ibmax et iparam --//
-
// on arrive a la ligne des profils --//
// write(ifi2) (tit(ipro),sngl(dist(ipro)),zfond(nuprfl(ipro)), ipro,ipro=1,iprm)
// on recupere l'indice du début des profils.
readProfils(infos, nbProfils);
// -- on passe la boucle de nbbranches lignes--//
-
readBranches(infos, nbBranches);
// -- ensuite on lit les points si ou ils sont affiches--//
@@ -212,9 +214,15 @@
CalcTrans collectCalcTrans = EMHHelper.collectCalcTrans(ordCalc).get(0);//un seul calcul transitoire
String nomCalcul = collectCalcTrans.getNom();
int nbPdt = pdtNormal.size();
+ long max = 0;
for (int i = 0; i < nbPdt; i++) {
long duree = DateDurationConverter.toMillis(pdtNormal.get(i));
- final ResultatTimeKey resultatKey = new ResultatTimeKey(nomCalcul, duree);
+ max = Math.max(max, duree);
+ }
+ boolean useDay = DateDurationConverter.isGreaterThanDay(max);
+ for (int i = 0; i < nbPdt; i++) {
+ long duree = DateDurationConverter.toMillis(pdtNormal.get(i));
+ final ResultatTimeKey resultatKey = new ResultatTimeKey(nomCalcul, duree, useDay);
indexByResultatKey.put(resultatKey, i);
orderedResultatKey.add(resultatKey);
}
@@ -222,7 +230,7 @@
else {
if (ordCalc.size() != pdtNormal.size()) {
analyze_.addSevereError("io.fcb.nbResultatPseudoPermanentNonConcordant.erreur", Integer.toString(pdtNormal.size()),
- Integer.toString(ordCalc.size()));
+ Integer.toString(ordCalc.size()));
} else {
int nbPdt = pdtNormal.size();
for (int i = 0; i < nbPdt; i++) {
@@ -233,7 +241,7 @@
}
}
infos.setPdt(new Crue9ResultatCalculPasDeTemps(posNormal, pdtNormal, regul, ruinouNormal,
- indexByResultatKey, orderedResultatKey));
+ indexByResultatKey, orderedResultatKey));
}
Modified: trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/res/RCalTimeStepBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/res/RCalTimeStepBuilder.java 2014-01-31 18:19:15 UTC (rev 8593)
+++ trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/res/RCalTimeStepBuilder.java 2014-01-31 20:53:28 UTC (rev 8594)
@@ -70,12 +70,23 @@
String delimiteurChaineTrans = in.getParametrage().getDelimiteurChaine("ResPdt");
List<ResCalcTransDao> resCalcTranss = in.getResCalcTranss();
if (CollectionUtils.isNotEmpty(resCalcTranss)) {
+ long max = 0;
for (ResCalcTransDao resCalcTransDao : resCalcTranss) {
List<ResPdtDao> resPdts = resCalcTransDao.getResPdts();
if (CollectionUtils.isNotEmpty(resPdts)) {
for (ResPdtDao resPdtDao : resPdts) {
+ final long millis = DateDurationConverter.getDuration(resPdtDao.getTempsSimu()).getMillis();
+ max = Math.max(max, millis);
+ }
+ }
+ }
+ boolean useDay = DateDurationConverter.isGreaterThanDay(max);
+ for (ResCalcTransDao resCalcTransDao : resCalcTranss) {
+ List<ResPdtDao> resPdts = resCalcTransDao.getResPdts();
+ if (CollectionUtils.isNotEmpty(resPdts)) {
+ for (ResPdtDao resPdtDao : resPdts) {
ResultatTimeKey key = new ResultatTimeKey(resCalcTransDao.getNomRef(), DateDurationConverter.getDuration(
- resPdtDao.getTempsSimu()).getMillis());
+ resPdtDao.getTempsSimu()).getMillis(), useDay);
ResultatEntry entry = new ResultatEntry(key);
entry.setBinFile(new File(rcalDir, resPdtDao.getHref()));
entry.setOffsetInBytes(in.getParametrage().getBytes(resPdtDao.getOffsetMot()));
Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-0.zip
===================================================================
(Binary files differ)
Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-1.zip
===================================================================
(Binary files differ)
Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-2.zip
===================================================================
(Binary files differ)
Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-3.zip
===================================================================
(Binary files differ)
Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-4.zip
===================================================================
(Binary files differ)
Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-5.zip
===================================================================
(Binary files differ)
Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu4-0.zip
===================================================================
(Binary files differ)
Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu4-1.zip
===================================================================
(Binary files differ)
Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu5-0.zip
===================================================================
(Binary files differ)
Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu6-0.zip
===================================================================
(Binary files differ)
Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu7-0.zip
===================================================================
(Binary files differ)
Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu7-1.zip
===================================================================
(Binary files differ)
Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu7-2.zip
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X