Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[8379] trunk/soft/fudaa-crue
|
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;
} catch (NumberFormatException numberFormatException) {
}
- Double parse = transformer.parseInSec(_value);
+ Double parse = secondParser == null ? null : secondParser.parseInSec(_value);
if (parse != null) {
return parse;
}
Modified: trunk/soft/fudaa-crue/ui-modelling/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-modelling/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>
<packaging>nbm</packaging>
<artifactId>ui-modelling</artifactId>
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-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DLHYTopComponent.java 2013-04-04 09:44:57 UTC (rev 8379)
@@ -16,6 +16,7 @@
import org.apache.commons.lang.StringUtils;
import org.fudaa.ctulu.CtuluLog;
import org.fudaa.ctulu.CtuluLogLevel;
+import org.fudaa.ctulu.CtuluNumberFormatI;
import org.fudaa.dodico.crue.common.time.ToStringTransformerDate;
import org.fudaa.dodico.crue.common.transformer.TransformerHelper;
import org.fudaa.dodico.crue.config.ccm.ConfigLoi;
@@ -39,6 +40,7 @@
import org.fudaa.fudaa.crue.common.log.LogsDisplayer;
import org.fudaa.fudaa.crue.common.services.SysdocContrat;
import org.fudaa.fudaa.crue.common.services.SysdocUrlBuilder;
+import org.fudaa.fudaa.crue.loi.common.SecondValueEditor;
import org.fudaa.fudaa.crue.loi.loiff.LoiUiController;
import org.fudaa.fudaa.crue.modelling.services.EnumModification;
import org.fudaa.fudaa.crue.modelling.services.ScenarioModificationEvent;
@@ -376,7 +378,10 @@
loiUiController.configureAxeH(getCcm(), getCurrentLoi(), false);
} else {
ToStringTransformerDate transformer = new ToStringTransformerDate(dateZeroLoiDF);
- loiUiController.setAxeHSpecificFormats(transformer, loiUiController.getAxeX().getSpecificDetailFormat());
+ final CtuluNumberFormatI detailFormat = loiUiController.getAxeX().getSpecificDetailFormat();
+ SecondValueEditor oldSecondValueEditor = (SecondValueEditor) loiUiController.getAxeX().getValueEditor();
+ SecondValueEditor editor = new SecondValueEditor(transformer, oldSecondValueEditor.getFormatter());
+ loiUiController.setAxeHSpecificFormats(transformer, detailFormat, editor);
}
loiUiController.getTableGraphePanel().updateState();
loiUiController.getGraphe().fullRepaint();
Modified: trunk/soft/fudaa-crue/ui-options/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-options/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-options/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-options</artifactId>
<name>Crue UI Options</name>
Modified: trunk/soft/fudaa-crue/ui-options/src/main/resources/FudaaCrue_Site.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-options/src/main/resources/FudaaCrue_Site.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-options/src/main/resources/FudaaCrue_Site.xml 2013-04-04 09:44:57 UTC (rev 8379)
@@ -28,6 +28,10 @@
<Commentaire>Nombre maximal de lignes lues dans un CR</Commentaire>
<Valeur>500</Valeur>
</SiteOption>
+ <SiteOption Nom="maxComparisonResultatByEMH" UserVisible="true">
+ <Commentaire>Nombre maximal de différences sur les résultats de calcul par EMH</Commentaire>
+ <Valeur>500</Valeur>
+ </SiteOption>
<SiteOption Nom="crue10.rptr.exeOption" UserVisible="true">
<Commentaire>Crue 10: option pour demande de pre-traitement réseau.</Commentaire>
<Valeur>-r</Valeur>
Modified: trunk/soft/fudaa-crue/ui-otfa/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-otfa/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-otfa</artifactId>
Modified: trunk/soft/fudaa-crue/ui-planimetry/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-planimetry/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>
<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-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-post/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>
<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-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-report/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-report</artifactId>
Modified: trunk/soft/fudaa-crue/ui-study/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-study/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-study/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>
<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-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-sysdoc/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-sysdoc</artifactId>
Modified: trunk/soft/fudaa-crue/ui-views/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-views/pom.xml 2013-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-views/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>
<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-04-04 09:36:34 UTC (rev 8378)
+++ trunk/soft/fudaa-crue/ui-wrapper/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-wrapper</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
