You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(46) |
Jul
(37) |
Aug
(154) |
Sep
(140) |
Oct
(132) |
Nov
(104) |
Dec
(67) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(113) |
Feb
(73) |
Mar
(102) |
Apr
(106) |
May
(114) |
Jun
(67) |
Jul
(116) |
Aug
(48) |
Sep
(108) |
Oct
(296) |
Nov
(56) |
Dec
(53) |
| 2010 |
Jan
(95) |
Feb
(31) |
Mar
(40) |
Apr
(12) |
May
(10) |
Jun
(27) |
Jul
(19) |
Aug
(81) |
Sep
(48) |
Oct
(45) |
Nov
(40) |
Dec
(7) |
| 2011 |
Jan
(16) |
Feb
(32) |
Mar
(55) |
Apr
(38) |
May
(24) |
Jun
(37) |
Jul
(12) |
Aug
(16) |
Sep
(97) |
Oct
(90) |
Nov
(101) |
Dec
(89) |
| 2012 |
Jan
(18) |
Feb
(2) |
Mar
(54) |
Apr
(69) |
May
(97) |
Jun
(131) |
Jul
(70) |
Aug
(48) |
Sep
(48) |
Oct
(119) |
Nov
(194) |
Dec
(60) |
| 2013 |
Jan
(73) |
Feb
(35) |
Mar
(42) |
Apr
(28) |
May
(7) |
Jun
(17) |
Jul
(27) |
Aug
(10) |
Sep
(38) |
Oct
(12) |
Nov
(4) |
Dec
(16) |
| 2014 |
Jan
(33) |
Feb
(37) |
Mar
(19) |
Apr
(3) |
May
(47) |
Jun
(26) |
Jul
(22) |
Aug
|
Sep
(10) |
Oct
(30) |
Nov
(24) |
Dec
(19) |
| 2015 |
Jan
(13) |
Feb
(16) |
Mar
(36) |
Apr
(19) |
May
(5) |
Jun
(5) |
Jul
(3) |
Aug
(11) |
Sep
(22) |
Oct
(7) |
Nov
(14) |
Dec
|
| 2016 |
Jan
|
Feb
(26) |
Mar
(13) |
Apr
(61) |
May
|
Jun
|
Jul
(4) |
Aug
|
Sep
|
Oct
(27) |
Nov
(14) |
Dec
(21) |
| 2017 |
Jan
(30) |
Feb
(4) |
Mar
(3) |
Apr
(5) |
May
(69) |
Jun
(29) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <de...@us...> - 2014-01-28 07:22:57
|
Revision: 8589
http://sourceforge.net/p/fudaa/svn/8589
Author: deniger
Date: 2014-01-28 07:22:54 +0000 (Tue, 28 Jan 2014)
Log Message:
-----------
maven 3 support
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-application/pom.xml
Modified: trunk/soft/fudaa-crue/ui-application/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-application/pom.xml 2014-01-27 22:59:36 UTC (rev 8588)
+++ trunk/soft/fudaa-crue/ui-application/pom.xml 2014-01-28 07:22:54 UTC (rev 8589)
@@ -101,7 +101,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>nbm-maven-plugin</artifactId>
- <version>3.8.1</version>
<extensions>true</extensions>
<configuration>
<finalName>Fudaa-Crue-${version}</finalName>
@@ -114,26 +113,6 @@
<profiles>
<profile>
- <id>deployment</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>nbm-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>extra</id>
- <goals>
- <goal>autoupdate</goal>
- <goal>webstart-app</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>dev</id>
<build>
<plugins>
@@ -202,6 +181,9 @@
<profile>
<id>release</id>
<activation>
+ <os>
+ <family>Windows</family>
+ </os>
<file>
<exists>${basedir}/src/main/resources/installer/ReplaceVistaIcon.exe</exists>
</file>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-01-22 14:51:20
|
Revision: 8587
http://sourceforge.net/p/fudaa/svn/8587
Author: deniger
Date: 2014-01-22 14:51:15 +0000 (Wed, 22 Jan 2014)
Log Message:
-----------
CRUE-628 version 1.03
Modified Paths:
--------------
branches/soft/fudaa-crue-1.0_branche/crue-compare/pom.xml
branches/soft/fudaa-crue-1.0_branche/crue-config/pom.xml
branches/soft/fudaa-crue-1.0_branche/crue-core/pom.xml
branches/soft/fudaa-crue-1.0_branche/crue-emh/pom.xml
branches/soft/fudaa-crue-1.0_branche/crue-io/pom.xml
branches/soft/fudaa-crue-1.0_branche/crue-otfa/pom.xml
branches/soft/fudaa-crue-1.0_branche/crue-project/pom.xml
branches/soft/fudaa-crue-1.0_branche/crue-sysdoc/pom.xml
branches/soft/fudaa-crue-1.0_branche/crue-test/pom.xml
branches/soft/fudaa-crue-1.0_branche/crue-validation/pom.xml
branches/soft/fudaa-crue-1.0_branche/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-application/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-branding/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-commandline/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-common/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-comparison/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-emh/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-loader/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-loi/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-modelling/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-options/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-otfa/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-planimetry/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-post/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-report/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-study/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-sysdoc/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-views/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-wrapper/pom.xml
Modified: branches/soft/fudaa-crue-1.0_branche/crue-compare/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/crue-compare/pom.xml 2014-01-22 14:42:30 UTC (rev 8586)
+++ branches/soft/fudaa-crue-1.0_branche/crue-compare/pom.xml 2014-01-22 14:51:15 UTC (rev 8587)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.02</version>
+ <version>1.03</version>
</parent>
<artifactId>crue-compare</artifactId>
<name>Crue Compare</name>
Modified: branches/soft/fudaa-crue-1.0_branche/crue-config/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/crue-config/pom.xml 2014-01-22 14:42:30 UTC (rev 8586)
+++ branches/soft/fudaa-crue-1.0_branche/crue-config/pom.xml 2014-01-22 14:51:15 UTC (rev 8587)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.02</version>
+ <version>1.03</version>
</parent>
<artifactId>crue-config</artifactId>
<name>Crue Config</name>
Modified: branches/soft/fudaa-crue-1.0_branche/crue-core/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/crue-core/pom.xml 2014-01-22 14:42:30 UTC (rev 8586)
+++ branches/soft/fudaa-crue-1.0_branche/crue-core/pom.xml 2014-01-22 14:51:15 UTC (rev 8587)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.02</version>
+ <version>1.03</version>
</parent>
<artifactId>crue-core</artifactId>
<name>Crue Core</name>
Modified: branches/soft/fudaa-crue-1.0_branche/crue-emh/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/crue-emh/pom.xml 2014-01-22 14:42:30 UTC (rev 8586)
+++ branches/soft/fudaa-crue-1.0_branche/crue-emh/pom.xml 2014-01-22 14:51:15 UTC (rev 8587)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.02</version>
+ <version>1.03</version>
</parent>
<artifactId>crue-emh</artifactId>
<name>Crue EMH</name>
Modified: branches/soft/fudaa-crue-1.0_branche/crue-io/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/crue-io/pom.xml 2014-01-22 14:42:30 UTC (rev 8586)
+++ branches/soft/fudaa-crue-1.0_branche/crue-io/pom.xml 2014-01-22 14:51:15 UTC (rev 8587)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.02</version>
+ <version>1.03</version>
</parent>
<artifactId>crue-io</artifactId>
<name>Crue IO</name>
Modified: branches/soft/fudaa-crue-1.0_branche/crue-otfa/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/crue-otfa/pom.xml 2014-01-22 14:42:30 UTC (rev 8586)
+++ branches/soft/fudaa-crue-1.0_branche/crue-otfa/pom.xml 2014-01-22 14:51:15 UTC (rev 8587)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.02</version>
+ <version>1.03</version>
</parent>
<artifactId>crue-otfa</artifactId>
<name>Crue OTFA</name>
Modified: branches/soft/fudaa-crue-1.0_branche/crue-project/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/crue-project/pom.xml 2014-01-22 14:42:30 UTC (rev 8586)
+++ branches/soft/fudaa-crue-1.0_branche/crue-project/pom.xml 2014-01-22 14:51:15 UTC (rev 8587)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.02</version>
+ <version>1.03</version>
</parent>
<artifactId>crue-project</artifactId>
<name>Crue Project</name>
Modified: branches/soft/fudaa-crue-1.0_branche/crue-sysdoc/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/crue-sysdoc/pom.xml 2014-01-22 14:42:30 UTC (rev 8586)
+++ branches/soft/fudaa-crue-1.0_branche/crue-sysdoc/pom.xml 2014-01-22 14:51:15 UTC (rev 8587)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.02</version>
+ <version>1.03</version>
</parent>
<artifactId>crue-sysdoc</artifactId>
<name>Crue Sysdoc</name>
Modified: branches/soft/fudaa-crue-1.0_branche/crue-test/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/crue-test/pom.xml 2014-01-22 14:42:30 UTC (rev 8586)
+++ branches/soft/fudaa-crue-1.0_branche/crue-test/pom.xml 2014-01-22 14:51:15 UTC (rev 8587)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.02</version>
+ <version>1.03</version>
</parent>
<artifactId>crue-test</artifactId>
Modified: branches/soft/fudaa-crue-1.0_branche/crue-validation/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/crue-validation/pom.xml 2014-01-22 14:42:30 UTC (rev 8586)
+++ branches/soft/fudaa-crue-1.0_branche/crue-validation/pom.xml 2014-01-22 14:51:15 UTC (rev 8587)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.02</version>
+ <version>1.03</version>
</parent>
<artifactId>crue-validation</artifactId>
<name>Crue Validation</name>
Modified: branches/soft/fudaa-crue-1.0_branche/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/pom.xml 2014-01-22 14:42:30 UTC (rev 8586)
+++ branches/soft/fudaa-crue-1.0_branche/pom.xml 2014-01-22 14:51:15 UTC (rev 8587)
@@ -8,7 +8,7 @@
</parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.02</version>
+ <version>1.03</version>
<name>Fudaa-Crue</name>
<packaging>pom</packaging>
<ciManagement>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-application/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-application/pom.xml 2014-01-22 14:42:30 UTC (rev 8586)
+++ branches/soft/fudaa-crue-1.0_branche/ui-application/pom.xml 2014-01-22 14:51:15 UTC (rev 8587)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.02</version>
+ <version>1.03</version>
</parent>
<artifactId>application</artifactId>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-branding/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-branding/pom.xml 2014-01-22 14:42:30 UTC (rev 8586)
+++ branches/soft/fudaa-crue-1.0_branche/ui-branding/pom.xml 2014-01-22 14:51:15 UTC (rev 8587)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.02</version>
+ <version>1.03</version>
</parent>
<artifactId>ui-branding</artifactId>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-commandline/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-commandline/pom.xml 2014-01-22 14:42:30 UTC (rev 8586)
+++ branches/soft/fudaa-crue-1.0_branche/ui-commandline/pom.xml 2014-01-22 14:51:15 UTC (rev 8587)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.02</version>
+ <version>1.03</version>
</parent>
<artifactId>ui-commandline</artifactId>
<packaging>nbm</packaging>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-common/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-common/pom.xml 2014-01-22 14:42:30 UTC (rev 8586)
+++ branches/soft/fudaa-crue-1.0_branche/ui-common/pom.xml 2014-01-22 14:51:15 UTC (rev 8587)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.02</version>
+ <version>1.03</version>
</parent>
<artifactId>ui-common</artifactId>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-comparison/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-comparison/pom.xml 2014-01-22 14:42:30 UTC (rev 8586)
+++ branches/soft/fudaa-crue-1.0_branche/ui-comparison/pom.xml 2014-01-22 14:51:15 UTC (rev 8587)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.02</version>
+ <version>1.03</version>
</parent>
<artifactId>ui-comparison</artifactId>
<packaging>nbm</packaging>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-emh/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-emh/pom.xml 2014-01-22 14:42:30 UTC (rev 8586)
+++ branches/soft/fudaa-crue-1.0_branche/ui-emh/pom.xml 2014-01-22 14:51:15 UTC (rev 8587)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.02</version>
+ <version>1.03</version>
</parent>
<artifactId>ui-emh</artifactId>
<packaging>nbm</packaging>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-loader/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-loader/pom.xml 2014-01-22 14:42:30 UTC (rev 8586)
+++ branches/soft/fudaa-crue-1.0_branche/ui-loader/pom.xml 2014-01-22 14:51:15 UTC (rev 8587)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.02</version>
+ <version>1.03</version>
</parent>
<artifactId>ui-loader</artifactId>
<packaging>nbm</packaging>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-loi/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-loi/pom.xml 2014-01-22 14:42:30 UTC (rev 8586)
+++ branches/soft/fudaa-crue-1.0_branche/ui-loi/pom.xml 2014-01-22 14:51:15 UTC (rev 8587)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.02</version>
+ <version>1.03</version>
</parent>
<artifactId>ui-loi</artifactId>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-modelling/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-modelling/pom.xml 2014-01-22 14:42:30 UTC (rev 8586)
+++ branches/soft/fudaa-crue-1.0_branche/ui-modelling/pom.xml 2014-01-22 14:51:15 UTC (rev 8587)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.02</version>
+ <version>1.03</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-modelling</artifactId>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-options/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-options/pom.xml 2014-01-22 14:42:30 UTC (rev 8586)
+++ branches/soft/fudaa-crue-1.0_branche/ui-options/pom.xml 2014-01-22 14:51:15 UTC (rev 8587)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.02</version>
+ <version>1.03</version>
</parent>
<artifactId>ui-options</artifactId>
<name>Crue UI Options</name>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-otfa/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-otfa/pom.xml 2014-01-22 14:42:30 UTC (rev 8586)
+++ branches/soft/fudaa-crue-1.0_branche/ui-otfa/pom.xml 2014-01-22 14:51:15 UTC (rev 8587)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.02</version>
+ <version>1.03</version>
</parent>
<artifactId>ui-otfa</artifactId>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-planimetry/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-planimetry/pom.xml 2014-01-22 14:42:30 UTC (rev 8586)
+++ branches/soft/fudaa-crue-1.0_branche/ui-planimetry/pom.xml 2014-01-22 14:51:15 UTC (rev 8587)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.02</version>
+ <version>1.03</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-planimetry</artifactId>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-post/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-post/pom.xml 2014-01-22 14:42:30 UTC (rev 8586)
+++ branches/soft/fudaa-crue-1.0_branche/ui-post/pom.xml 2014-01-22 14:51:15 UTC (rev 8587)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.02</version>
+ <version>1.03</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-post</artifactId>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-report/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-report/pom.xml 2014-01-22 14:42:30 UTC (rev 8586)
+++ branches/soft/fudaa-crue-1.0_branche/ui-report/pom.xml 2014-01-22 14:51:15 UTC (rev 8587)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.02</version>
+ <version>1.03</version>
</parent>
<artifactId>ui-report</artifactId>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-study/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-study/pom.xml 2014-01-22 14:42:30 UTC (rev 8586)
+++ branches/soft/fudaa-crue-1.0_branche/ui-study/pom.xml 2014-01-22 14:51:15 UTC (rev 8587)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.02</version>
+ <version>1.03</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-study</artifactId>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-sysdoc/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-sysdoc/pom.xml 2014-01-22 14:42:30 UTC (rev 8586)
+++ branches/soft/fudaa-crue-1.0_branche/ui-sysdoc/pom.xml 2014-01-22 14:51:15 UTC (rev 8587)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.02</version>
+ <version>1.03</version>
</parent>
<artifactId>ui-sysdoc</artifactId>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-views/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-views/pom.xml 2014-01-22 14:42:30 UTC (rev 8586)
+++ branches/soft/fudaa-crue-1.0_branche/ui-views/pom.xml 2014-01-22 14:51:15 UTC (rev 8587)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.02</version>
+ <version>1.03</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-views</artifactId>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-wrapper/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-wrapper/pom.xml 2014-01-22 14:42:30 UTC (rev 8586)
+++ branches/soft/fudaa-crue-1.0_branche/ui-wrapper/pom.xml 2014-01-22 14:51:15 UTC (rev 8587)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.02</version>
+ <version>1.03</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-22 14:42:32
|
Revision: 8586
http://sourceforge.net/p/fudaa/svn/8586
Author: deniger
Date: 2014-01-22 14:42:30 +0000 (Wed, 22 Jan 2014)
Log Message:
-----------
CRUE-628
Added Paths:
-----------
branches/soft/fudaa-crue-1.0_branche/ui-branding/src/test/
branches/soft/fudaa-crue-1.0_branche/ui-branding/src/test/java/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-01-22 10:31:03
|
Revision: 8585
http://sourceforge.net/p/fudaa/svn/8585
Author: deniger
Date: 2014-01-22 10:31:01 +0000 (Wed, 22 Jan 2014)
Log Message:
-----------
CRUE-628
Modified Paths:
--------------
branches/soft/fudaa-crue-1.0_branche/ui-common/src/main/java/org/fudaa/fudaa/crue/common/InitPerspectiveInstaller.java
Modified: branches/soft/fudaa-crue-1.0_branche/ui-common/src/main/java/org/fudaa/fudaa/crue/common/InitPerspectiveInstaller.java
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-common/src/main/java/org/fudaa/fudaa/crue/common/InitPerspectiveInstaller.java 2014-01-21 09:23:51 UTC (rev 8584)
+++ branches/soft/fudaa-crue-1.0_branche/ui-common/src/main/java/org/fudaa/fudaa/crue/common/InitPerspectiveInstaller.java 2014-01-22 10:31:01 UTC (rev 8585)
@@ -86,6 +86,16 @@
@Override
public void run() {
+ String[] syspesp = PropertyEditorManager.getEditorSearchPath();
+ String[] nbpesp = new String[]{
+ "org.netbeans.beaninfo.editors", // NOI18N
+ "org.openide.explorer.propertysheet.editors", // NOI18N
+ };
+ String[] allpesp = new String[syspesp.length + nbpesp.length];
+ System.arraycopy(nbpesp, 0, allpesp, 0, nbpesp.length);
+ System.arraycopy(syspesp, 0, allpesp, nbpesp.length, syspesp.length);
+ PropertyEditorManager.setEditorSearchPath(allpesp);
+
DurationPropertyEditor.registerEditor();
LocalDateTimeEditor.registerEditor();
PrendreClicheFinPermanentEditor.registerAllClicheEditors();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-01-21 09:23:57
|
Revision: 8584
http://sourceforge.net/p/fudaa/svn/8584
Author: deniger
Date: 2014-01-21 09:23:51 +0000 (Tue, 21 Jan 2014)
Log Message:
-----------
CRUE-595 et version 1.02
Modified Paths:
--------------
branches/soft/fudaa-crue-1.0_branche/crue-compare/pom.xml
branches/soft/fudaa-crue-1.0_branche/crue-config/pom.xml
branches/soft/fudaa-crue-1.0_branche/crue-core/pom.xml
branches/soft/fudaa-crue-1.0_branche/crue-emh/pom.xml
branches/soft/fudaa-crue-1.0_branche/crue-io/pom.xml
branches/soft/fudaa-crue-1.0_branche/crue-otfa/pom.xml
branches/soft/fudaa-crue-1.0_branche/crue-project/pom.xml
branches/soft/fudaa-crue-1.0_branche/crue-sysdoc/pom.xml
branches/soft/fudaa-crue-1.0_branche/crue-test/pom.xml
branches/soft/fudaa-crue-1.0_branche/crue-validation/pom.xml
branches/soft/fudaa-crue-1.0_branche/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-application/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-application/src/main/resources/etc/fudaacrue.conf
branches/soft/fudaa-crue-1.0_branche/ui-branding/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-commandline/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-common/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-comparison/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-emh/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-loader/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-loi/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-modelling/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-options/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-otfa/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-planimetry/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-post/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-report/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-study/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-sysdoc/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-views/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-wrapper/pom.xml
Modified: branches/soft/fudaa-crue-1.0_branche/crue-compare/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/crue-compare/pom.xml 2014-01-21 09:17:08 UTC (rev 8583)
+++ branches/soft/fudaa-crue-1.0_branche/crue-compare/pom.xml 2014-01-21 09:23:51 UTC (rev 8584)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.01</version>
+ <version>1.02</version>
</parent>
<artifactId>crue-compare</artifactId>
<name>Crue Compare</name>
Modified: branches/soft/fudaa-crue-1.0_branche/crue-config/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/crue-config/pom.xml 2014-01-21 09:17:08 UTC (rev 8583)
+++ branches/soft/fudaa-crue-1.0_branche/crue-config/pom.xml 2014-01-21 09:23:51 UTC (rev 8584)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.01</version>
+ <version>1.02</version>
</parent>
<artifactId>crue-config</artifactId>
<name>Crue Config</name>
Modified: branches/soft/fudaa-crue-1.0_branche/crue-core/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/crue-core/pom.xml 2014-01-21 09:17:08 UTC (rev 8583)
+++ branches/soft/fudaa-crue-1.0_branche/crue-core/pom.xml 2014-01-21 09:23:51 UTC (rev 8584)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.01</version>
+ <version>1.02</version>
</parent>
<artifactId>crue-core</artifactId>
<name>Crue Core</name>
Modified: branches/soft/fudaa-crue-1.0_branche/crue-emh/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/crue-emh/pom.xml 2014-01-21 09:17:08 UTC (rev 8583)
+++ branches/soft/fudaa-crue-1.0_branche/crue-emh/pom.xml 2014-01-21 09:23:51 UTC (rev 8584)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.01</version>
+ <version>1.02</version>
</parent>
<artifactId>crue-emh</artifactId>
<name>Crue EMH</name>
Modified: branches/soft/fudaa-crue-1.0_branche/crue-io/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/crue-io/pom.xml 2014-01-21 09:17:08 UTC (rev 8583)
+++ branches/soft/fudaa-crue-1.0_branche/crue-io/pom.xml 2014-01-21 09:23:51 UTC (rev 8584)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.01</version>
+ <version>1.02</version>
</parent>
<artifactId>crue-io</artifactId>
<name>Crue IO</name>
Modified: branches/soft/fudaa-crue-1.0_branche/crue-otfa/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/crue-otfa/pom.xml 2014-01-21 09:17:08 UTC (rev 8583)
+++ branches/soft/fudaa-crue-1.0_branche/crue-otfa/pom.xml 2014-01-21 09:23:51 UTC (rev 8584)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.01</version>
+ <version>1.02</version>
</parent>
<artifactId>crue-otfa</artifactId>
<name>Crue OTFA</name>
Modified: branches/soft/fudaa-crue-1.0_branche/crue-project/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/crue-project/pom.xml 2014-01-21 09:17:08 UTC (rev 8583)
+++ branches/soft/fudaa-crue-1.0_branche/crue-project/pom.xml 2014-01-21 09:23:51 UTC (rev 8584)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.01</version>
+ <version>1.02</version>
</parent>
<artifactId>crue-project</artifactId>
<name>Crue Project</name>
Modified: branches/soft/fudaa-crue-1.0_branche/crue-sysdoc/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/crue-sysdoc/pom.xml 2014-01-21 09:17:08 UTC (rev 8583)
+++ branches/soft/fudaa-crue-1.0_branche/crue-sysdoc/pom.xml 2014-01-21 09:23:51 UTC (rev 8584)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.01</version>
+ <version>1.02</version>
</parent>
<artifactId>crue-sysdoc</artifactId>
<name>Crue Sysdoc</name>
Modified: branches/soft/fudaa-crue-1.0_branche/crue-test/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/crue-test/pom.xml 2014-01-21 09:17:08 UTC (rev 8583)
+++ branches/soft/fudaa-crue-1.0_branche/crue-test/pom.xml 2014-01-21 09:23:51 UTC (rev 8584)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.01</version>
+ <version>1.02</version>
</parent>
<artifactId>crue-test</artifactId>
Modified: branches/soft/fudaa-crue-1.0_branche/crue-validation/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/crue-validation/pom.xml 2014-01-21 09:17:08 UTC (rev 8583)
+++ branches/soft/fudaa-crue-1.0_branche/crue-validation/pom.xml 2014-01-21 09:23:51 UTC (rev 8584)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.01</version>
+ <version>1.02</version>
</parent>
<artifactId>crue-validation</artifactId>
<name>Crue Validation</name>
Modified: branches/soft/fudaa-crue-1.0_branche/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/pom.xml 2014-01-21 09:17:08 UTC (rev 8583)
+++ branches/soft/fudaa-crue-1.0_branche/pom.xml 2014-01-21 09:23:51 UTC (rev 8584)
@@ -8,7 +8,7 @@
</parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.01</version>
+ <version>1.02</version>
<name>Fudaa-Crue</name>
<packaging>pom</packaging>
<ciManagement>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-application/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-application/pom.xml 2014-01-21 09:17:08 UTC (rev 8583)
+++ branches/soft/fudaa-crue-1.0_branche/ui-application/pom.xml 2014-01-21 09:23:51 UTC (rev 8584)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.01</version>
+ <version>1.02</version>
</parent>
<artifactId>application</artifactId>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-application/src/main/resources/etc/fudaacrue.conf
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-application/src/main/resources/etc/fudaacrue.conf 2014-01-21 09:17:08 UTC (rev 8583)
+++ branches/soft/fudaa-crue-1.0_branche/ui-application/src/main/resources/etc/fudaacrue.conf 2014-01-21 09:23:51 UTC (rev 8584)
@@ -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.02"
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: branches/soft/fudaa-crue-1.0_branche/ui-branding/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-branding/pom.xml 2014-01-21 09:17:08 UTC (rev 8583)
+++ branches/soft/fudaa-crue-1.0_branche/ui-branding/pom.xml 2014-01-21 09:23:51 UTC (rev 8584)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.01</version>
+ <version>1.02</version>
</parent>
<artifactId>ui-branding</artifactId>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-commandline/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-commandline/pom.xml 2014-01-21 09:17:08 UTC (rev 8583)
+++ branches/soft/fudaa-crue-1.0_branche/ui-commandline/pom.xml 2014-01-21 09:23:51 UTC (rev 8584)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.01</version>
+ <version>1.02</version>
</parent>
<artifactId>ui-commandline</artifactId>
<packaging>nbm</packaging>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-common/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-common/pom.xml 2014-01-21 09:17:08 UTC (rev 8583)
+++ branches/soft/fudaa-crue-1.0_branche/ui-common/pom.xml 2014-01-21 09:23:51 UTC (rev 8584)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.01</version>
+ <version>1.02</version>
</parent>
<artifactId>ui-common</artifactId>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-comparison/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-comparison/pom.xml 2014-01-21 09:17:08 UTC (rev 8583)
+++ branches/soft/fudaa-crue-1.0_branche/ui-comparison/pom.xml 2014-01-21 09:23:51 UTC (rev 8584)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.01</version>
+ <version>1.02</version>
</parent>
<artifactId>ui-comparison</artifactId>
<packaging>nbm</packaging>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-emh/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-emh/pom.xml 2014-01-21 09:17:08 UTC (rev 8583)
+++ branches/soft/fudaa-crue-1.0_branche/ui-emh/pom.xml 2014-01-21 09:23:51 UTC (rev 8584)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.01</version>
+ <version>1.02</version>
</parent>
<artifactId>ui-emh</artifactId>
<packaging>nbm</packaging>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-loader/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-loader/pom.xml 2014-01-21 09:17:08 UTC (rev 8583)
+++ branches/soft/fudaa-crue-1.0_branche/ui-loader/pom.xml 2014-01-21 09:23:51 UTC (rev 8584)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.01</version>
+ <version>1.02</version>
</parent>
<artifactId>ui-loader</artifactId>
<packaging>nbm</packaging>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-loi/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-loi/pom.xml 2014-01-21 09:17:08 UTC (rev 8583)
+++ branches/soft/fudaa-crue-1.0_branche/ui-loi/pom.xml 2014-01-21 09:23:51 UTC (rev 8584)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.01</version>
+ <version>1.02</version>
</parent>
<artifactId>ui-loi</artifactId>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-modelling/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-modelling/pom.xml 2014-01-21 09:17:08 UTC (rev 8583)
+++ branches/soft/fudaa-crue-1.0_branche/ui-modelling/pom.xml 2014-01-21 09:23:51 UTC (rev 8584)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.01</version>
+ <version>1.02</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-modelling</artifactId>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-options/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-options/pom.xml 2014-01-21 09:17:08 UTC (rev 8583)
+++ branches/soft/fudaa-crue-1.0_branche/ui-options/pom.xml 2014-01-21 09:23:51 UTC (rev 8584)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.01</version>
+ <version>1.02</version>
</parent>
<artifactId>ui-options</artifactId>
<name>Crue UI Options</name>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-otfa/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-otfa/pom.xml 2014-01-21 09:17:08 UTC (rev 8583)
+++ branches/soft/fudaa-crue-1.0_branche/ui-otfa/pom.xml 2014-01-21 09:23:51 UTC (rev 8584)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.01</version>
+ <version>1.02</version>
</parent>
<artifactId>ui-otfa</artifactId>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-planimetry/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-planimetry/pom.xml 2014-01-21 09:17:08 UTC (rev 8583)
+++ branches/soft/fudaa-crue-1.0_branche/ui-planimetry/pom.xml 2014-01-21 09:23:51 UTC (rev 8584)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.01</version>
+ <version>1.02</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-planimetry</artifactId>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-post/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-post/pom.xml 2014-01-21 09:17:08 UTC (rev 8583)
+++ branches/soft/fudaa-crue-1.0_branche/ui-post/pom.xml 2014-01-21 09:23:51 UTC (rev 8584)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.01</version>
+ <version>1.02</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-post</artifactId>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-report/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-report/pom.xml 2014-01-21 09:17:08 UTC (rev 8583)
+++ branches/soft/fudaa-crue-1.0_branche/ui-report/pom.xml 2014-01-21 09:23:51 UTC (rev 8584)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.01</version>
+ <version>1.02</version>
</parent>
<artifactId>ui-report</artifactId>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-study/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-study/pom.xml 2014-01-21 09:17:08 UTC (rev 8583)
+++ branches/soft/fudaa-crue-1.0_branche/ui-study/pom.xml 2014-01-21 09:23:51 UTC (rev 8584)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.01</version>
+ <version>1.02</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-study</artifactId>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-sysdoc/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-sysdoc/pom.xml 2014-01-21 09:17:08 UTC (rev 8583)
+++ branches/soft/fudaa-crue-1.0_branche/ui-sysdoc/pom.xml 2014-01-21 09:23:51 UTC (rev 8584)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.01</version>
+ <version>1.02</version>
</parent>
<artifactId>ui-sysdoc</artifactId>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-views/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-views/pom.xml 2014-01-21 09:17:08 UTC (rev 8583)
+++ branches/soft/fudaa-crue-1.0_branche/ui-views/pom.xml 2014-01-21 09:23:51 UTC (rev 8584)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.01</version>
+ <version>1.02</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-views</artifactId>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-wrapper/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-wrapper/pom.xml 2014-01-21 09:17:08 UTC (rev 8583)
+++ branches/soft/fudaa-crue-1.0_branche/ui-wrapper/pom.xml 2014-01-21 09:23:51 UTC (rev 8584)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.01</version>
+ <version>1.02</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-21 09:17:12
|
Revision: 8583
http://sourceforge.net/p/fudaa/svn/8583
Author: deniger
Date: 2014-01-21 09:17:08 +0000 (Tue, 21 Jan 2014)
Log Message:
-----------
CRUE-595
Modified Paths:
--------------
branches/soft/fudaa-crue-1.0_branche/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/modelling-pnumWsmode.xml
Modified: branches/soft/fudaa-crue-1.0_branche/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/modelling-pnumWsmode.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/modelling-pnumWsmode.xml 2014-01-20 23:04:39 UTC (rev 8582)
+++ branches/soft/fudaa-crue-1.0_branche/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/modelling-pnumWsmode.xml 2014-01-21 09:17:08 UTC (rev 8583)
@@ -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="95" 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-20 23:04:43
|
Revision: 8582
http://sourceforge.net/p/fudaa/svn/8582
Author: deniger
Date: 2014-01-20 23:04:39 +0000 (Mon, 20 Jan 2014)
Log Message:
-----------
CRUE-627
Modified Paths:
--------------
trunk/pom/super-pom/pom.xml
Modified: trunk/pom/super-pom/pom.xml
===================================================================
--- trunk/pom/super-pom/pom.xml 2014-01-20 23:04:26 UTC (rev 8581)
+++ trunk/pom/super-pom/pom.xml 2014-01-20 23:04:39 UTC (rev 8582)
@@ -209,11 +209,11 @@
<artifactId>wagon-webdav-jackrabbit</artifactId>
<version>2.6</version>
</extension>-->
- <extension>
+<!-- <extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ftp</artifactId>
<version>2.0</version>
- </extension>
+ </extension>-->
</extensions>
</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 23:04:32
|
Revision: 8581
http://sourceforge.net/p/fudaa/svn/8581
Author: deniger
Date: 2014-01-20 23:04:26 +0000 (Mon, 20 Jan 2014)
Log Message:
-----------
CRUE-627
Modified Paths:
--------------
trunk/business/fudaa-sig/nbactions.xml
trunk/business/fudaa-sig/pom.xml
Modified: trunk/business/fudaa-sig/nbactions.xml
===================================================================
--- trunk/business/fudaa-sig/nbactions.xml 2014-01-20 22:59:20 UTC (rev 8580)
+++ trunk/business/fudaa-sig/nbactions.xml 2014-01-20 23:04:26 UTC (rev 8581)
@@ -4,6 +4,8 @@
<actionName>CUSTOM-deploy</actionName>
<displayName>deploy</displayName>
<goals>
+ <goal>-Dmaven.wagon.provider.http=httpclient</goal>
+ <goal>-e</goal>
<goal>deploy</goal>
</goals>
</action>
Modified: trunk/business/fudaa-sig/pom.xml
===================================================================
--- trunk/business/fudaa-sig/pom.xml 2014-01-20 22:59:20 UTC (rev 8580)
+++ trunk/business/fudaa-sig/pom.xml 2014-01-20 23:04:26 UTC (rev 8581)
@@ -3,6 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<properties>
<dodico-h2d.version>1.4-SNAPSHOT</dodico-h2d.version>
+ <javaCompiler>1.7</javaCompiler>
+ <targetJdk>1.7</targetJdk>
</properties>
<parent>
@@ -47,7 +49,7 @@
<build>
<pluginManagement>
<plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
@@ -80,5 +82,13 @@
</plugin>
</plugins>
</pluginManagement>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http</artifactId>
+ <version>2.1</version>
+ </extension>
+ </extensions>
</build>
+
</project>
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:59:24
|
Revision: 8580
http://sourceforge.net/p/fudaa/svn/8580
Author: deniger
Date: 2014-01-20 22:59:20 +0000 (Mon, 20 Jan 2014)
Log Message:
-----------
CRUE-627
Modified Paths:
--------------
branches/soft/fudaa-crue-1.0_branche/crue-compare/pom.xml
branches/soft/fudaa-crue-1.0_branche/crue-config/pom.xml
branches/soft/fudaa-crue-1.0_branche/crue-core/pom.xml
branches/soft/fudaa-crue-1.0_branche/crue-emh/pom.xml
branches/soft/fudaa-crue-1.0_branche/crue-io/pom.xml
branches/soft/fudaa-crue-1.0_branche/crue-otfa/pom.xml
branches/soft/fudaa-crue-1.0_branche/crue-project/pom.xml
branches/soft/fudaa-crue-1.0_branche/crue-sysdoc/pom.xml
branches/soft/fudaa-crue-1.0_branche/crue-test/pom.xml
branches/soft/fudaa-crue-1.0_branche/crue-validation/pom.xml
branches/soft/fudaa-crue-1.0_branche/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-application/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-branding/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-commandline/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-common/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-common/src/main/java/org/fudaa/fudaa/crue/common/InitPerspectiveInstaller.java
branches/soft/fudaa-crue-1.0_branche/ui-comparison/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-emh/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-loader/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-loi/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-modelling/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DFRTTopComponent.java
branches/soft/fudaa-crue-1.0_branche/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DLHYTopComponent.java
branches/soft/fudaa-crue-1.0_branche/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DcspEditorLoiTopComponent.java
branches/soft/fudaa-crue-1.0_branche/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilCasierEditorTopComponent.java
branches/soft/fudaa-crue-1.0_branche/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionTopComponent.java
branches/soft/fudaa-crue-1.0_branche/ui-options/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-otfa/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-planimetry/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-post/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-report/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-report/src/main/java/org/fudaa/fudaa/crue/report/AbstractReportTimeViewTopComponent.java
branches/soft/fudaa-crue-1.0_branche/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportDFRTTopComponent.java
branches/soft/fudaa-crue-1.0_branche/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportDLHYTopComponent.java
branches/soft/fudaa-crue-1.0_branche/ui-study/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-sysdoc/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-views/pom.xml
branches/soft/fudaa-crue-1.0_branche/ui-wrapper/pom.xml
Modified: branches/soft/fudaa-crue-1.0_branche/crue-compare/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/crue-compare/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
+++ branches/soft/fudaa-crue-1.0_branche/crue-compare/pom.xml 2014-01-20 22:59:20 UTC (rev 8580)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0</version>
+ <version>1.01</version>
</parent>
<artifactId>crue-compare</artifactId>
<name>Crue Compare</name>
Modified: branches/soft/fudaa-crue-1.0_branche/crue-config/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/crue-config/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
+++ branches/soft/fudaa-crue-1.0_branche/crue-config/pom.xml 2014-01-20 22:59:20 UTC (rev 8580)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0</version>
+ <version>1.01</version>
</parent>
<artifactId>crue-config</artifactId>
<name>Crue Config</name>
Modified: branches/soft/fudaa-crue-1.0_branche/crue-core/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/crue-core/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
+++ branches/soft/fudaa-crue-1.0_branche/crue-core/pom.xml 2014-01-20 22:59:20 UTC (rev 8580)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0</version>
+ <version>1.01</version>
</parent>
<artifactId>crue-core</artifactId>
<name>Crue Core</name>
Modified: branches/soft/fudaa-crue-1.0_branche/crue-emh/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/crue-emh/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
+++ branches/soft/fudaa-crue-1.0_branche/crue-emh/pom.xml 2014-01-20 22:59:20 UTC (rev 8580)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0</version>
+ <version>1.01</version>
</parent>
<artifactId>crue-emh</artifactId>
<name>Crue EMH</name>
Modified: branches/soft/fudaa-crue-1.0_branche/crue-io/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/crue-io/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
+++ branches/soft/fudaa-crue-1.0_branche/crue-io/pom.xml 2014-01-20 22:59:20 UTC (rev 8580)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0</version>
+ <version>1.01</version>
</parent>
<artifactId>crue-io</artifactId>
<name>Crue IO</name>
Modified: branches/soft/fudaa-crue-1.0_branche/crue-otfa/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/crue-otfa/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
+++ branches/soft/fudaa-crue-1.0_branche/crue-otfa/pom.xml 2014-01-20 22:59:20 UTC (rev 8580)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0</version>
+ <version>1.01</version>
</parent>
<artifactId>crue-otfa</artifactId>
<name>Crue OTFA</name>
Modified: branches/soft/fudaa-crue-1.0_branche/crue-project/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/crue-project/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
+++ branches/soft/fudaa-crue-1.0_branche/crue-project/pom.xml 2014-01-20 22:59:20 UTC (rev 8580)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0</version>
+ <version>1.01</version>
</parent>
<artifactId>crue-project</artifactId>
<name>Crue Project</name>
Modified: branches/soft/fudaa-crue-1.0_branche/crue-sysdoc/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/crue-sysdoc/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
+++ branches/soft/fudaa-crue-1.0_branche/crue-sysdoc/pom.xml 2014-01-20 22:59:20 UTC (rev 8580)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0</version>
+ <version>1.01</version>
</parent>
<artifactId>crue-sysdoc</artifactId>
<name>Crue Sysdoc</name>
Modified: branches/soft/fudaa-crue-1.0_branche/crue-test/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/crue-test/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
+++ branches/soft/fudaa-crue-1.0_branche/crue-test/pom.xml 2014-01-20 22:59:20 UTC (rev 8580)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0</version>
+ <version>1.01</version>
</parent>
<artifactId>crue-test</artifactId>
Modified: branches/soft/fudaa-crue-1.0_branche/crue-validation/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/crue-validation/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
+++ branches/soft/fudaa-crue-1.0_branche/crue-validation/pom.xml 2014-01-20 22:59:20 UTC (rev 8580)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0</version>
+ <version>1.01</version>
</parent>
<artifactId>crue-validation</artifactId>
<name>Crue Validation</name>
Modified: branches/soft/fudaa-crue-1.0_branche/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
+++ branches/soft/fudaa-crue-1.0_branche/pom.xml 2014-01-20 22:59:20 UTC (rev 8580)
@@ -4,11 +4,11 @@
<parent>
<groupId>org.fudaa.pom</groupId>
<artifactId>soft-pom</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
</parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0</version>
+ <version>1.01</version>
<name>Fudaa-Crue</name>
<packaging>pom</packaging>
<ciManagement>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-application/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-application/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
+++ branches/soft/fudaa-crue-1.0_branche/ui-application/pom.xml 2014-01-20 22:59:20 UTC (rev 8580)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0</version>
+ <version>1.01</version>
</parent>
<artifactId>application</artifactId>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-branding/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-branding/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
+++ branches/soft/fudaa-crue-1.0_branche/ui-branding/pom.xml 2014-01-20 22:59:20 UTC (rev 8580)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0</version>
+ <version>1.01</version>
</parent>
<artifactId>ui-branding</artifactId>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-commandline/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-commandline/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
+++ branches/soft/fudaa-crue-1.0_branche/ui-commandline/pom.xml 2014-01-20 22:59:20 UTC (rev 8580)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0</version>
+ <version>1.01</version>
</parent>
<artifactId>ui-commandline</artifactId>
<packaging>nbm</packaging>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-common/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-common/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
+++ branches/soft/fudaa-crue-1.0_branche/ui-common/pom.xml 2014-01-20 22:59:20 UTC (rev 8580)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0</version>
+ <version>1.01</version>
</parent>
<artifactId>ui-common</artifactId>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-common/src/main/java/org/fudaa/fudaa/crue/common/InitPerspectiveInstaller.java
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-common/src/main/java/org/fudaa/fudaa/crue/common/InitPerspectiveInstaller.java 2014-01-20 22:30:26 UTC (rev 8579)
+++ branches/soft/fudaa-crue-1.0_branche/ui-common/src/main/java/org/fudaa/fudaa/crue/common/InitPerspectiveInstaller.java 2014-01-20 22:59:20 UTC (rev 8580)
@@ -45,10 +45,7 @@
public void restored() {
BuResource.BU.setIconFamily("crystal");
BPalettePlage.setDisplayReversed();
- DurationPropertyEditor.registerEditor();
- LocalDateTimeEditor.registerEditor();
- PrendreClicheFinPermanentEditor.registerAllClicheEditors();
- PropertyEditorManager.registerEditor(Color.class, CustomColorChooser.class);
+
WindowManager.getDefault().invokeWhenUIReady(this);
}
@@ -89,6 +86,10 @@
@Override
public void run() {
+ DurationPropertyEditor.registerEditor();
+ LocalDateTimeEditor.registerEditor();
+ PrendreClicheFinPermanentEditor.registerAllClicheEditors();
+ PropertyEditorManager.registerEditor(Color.class, CustomColorChooser.class);
Set<TopComponent> opened = WindowManager.getDefault().getRegistry().getOpened();
for (TopComponent topComponent : opened) {
topComponent.close();
Modified: branches/soft/fudaa-crue-1.0_branche/ui-comparison/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-comparison/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
+++ branches/soft/fudaa-crue-1.0_branche/ui-comparison/pom.xml 2014-01-20 22:59:20 UTC (rev 8580)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0</version>
+ <version>1.01</version>
</parent>
<artifactId>ui-comparison</artifactId>
<packaging>nbm</packaging>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-emh/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-emh/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
+++ branches/soft/fudaa-crue-1.0_branche/ui-emh/pom.xml 2014-01-20 22:59:20 UTC (rev 8580)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0</version>
+ <version>1.01</version>
</parent>
<artifactId>ui-emh</artifactId>
<packaging>nbm</packaging>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-loader/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-loader/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
+++ branches/soft/fudaa-crue-1.0_branche/ui-loader/pom.xml 2014-01-20 22:59:20 UTC (rev 8580)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0</version>
+ <version>1.01</version>
</parent>
<artifactId>ui-loader</artifactId>
<packaging>nbm</packaging>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-loi/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-loi/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
+++ branches/soft/fudaa-crue-1.0_branche/ui-loi/pom.xml 2014-01-20 22:59:20 UTC (rev 8580)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0</version>
+ <version>1.01</version>
</parent>
<artifactId>ui-loi</artifactId>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-modelling/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-modelling/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
+++ branches/soft/fudaa-crue-1.0_branche/ui-modelling/pom.xml 2014-01-20 22:59:20 UTC (rev 8580)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0</version>
+ <version>1.01</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-modelling</artifactId>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DFRTTopComponent.java
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DFRTTopComponent.java 2014-01-20 22:30:26 UTC (rev 8579)
+++ branches/soft/fudaa-crue-1.0_branche/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DFRTTopComponent.java 2014-01-20 22:59:20 UTC (rev 8580)
@@ -17,6 +17,7 @@
import org.apache.commons.lang.StringUtils;
import org.fudaa.ctulu.CtuluLog;
import org.fudaa.ctulu.CtuluLogLevel;
+import org.fudaa.ctulu.gui.ExportTableCommentSupplier;
import org.fudaa.dodico.crue.common.BusinessMessages;
import org.fudaa.dodico.crue.common.CollectionCrueUtil;
import org.fudaa.dodico.crue.common.transformer.TransformerHelper;
@@ -30,7 +31,6 @@
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.fudaa.crue.common.helper.DialogHelper;
import org.fudaa.fudaa.crue.common.helper.ObjetNommeCellRenderer;
import org.fudaa.fudaa.crue.common.helper.ObjetWithIdCellRenderer;
Modified: branches/soft/fudaa-crue-1.0_branche/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DLHYTopComponent.java
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DLHYTopComponent.java 2014-01-20 22:30:26 UTC (rev 8579)
+++ branches/soft/fudaa-crue-1.0_branche/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DLHYTopComponent.java 2014-01-20 22:59:20 UTC (rev 8580)
@@ -17,6 +17,7 @@
import org.fudaa.ctulu.CtuluLog;
import org.fudaa.ctulu.CtuluLogLevel;
import org.fudaa.ctulu.CtuluNumberFormatI;
+import org.fudaa.ctulu.gui.ExportTableCommentSupplier;
import org.fudaa.dodico.crue.common.time.ToStringTransformerDate;
import org.fudaa.dodico.crue.common.transformer.TransformerHelper;
import org.fudaa.dodico.crue.config.ccm.ConfigLoi;
@@ -30,7 +31,6 @@
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.fudaa.crue.common.PerspectiveEnum;
import org.fudaa.fudaa.crue.common.editor.LocalDateTimePanel;
import org.fudaa.fudaa.crue.common.helper.DialogHelper;
Modified: branches/soft/fudaa-crue-1.0_branche/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DcspEditorLoiTopComponent.java
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DcspEditorLoiTopComponent.java 2014-01-20 22:30:26 UTC (rev 8579)
+++ branches/soft/fudaa-crue-1.0_branche/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DcspEditorLoiTopComponent.java 2014-01-20 22:59:20 UTC (rev 8580)
@@ -2,7 +2,11 @@
import com.memoire.bu.BuGridLayout;
import java.awt.BorderLayout;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.MissingResourceException;
+import java.util.Observable;
+import java.util.Observer;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.JLabel;
@@ -12,10 +16,13 @@
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.fudaa.ctulu.CtuluLog;
+import org.fudaa.ctulu.gui.ExportTableCommentSupplier;
import org.fudaa.dodico.crue.config.loi.EnumTypeLoi;
-import org.fudaa.dodico.crue.metier.emh.*;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrt;
+import org.fudaa.dodico.crue.metier.emh.EMH;
+import org.fudaa.dodico.crue.metier.emh.Loi;
+import org.fudaa.dodico.crue.metier.emh.PtEvolutionFF;
import org.fudaa.dodico.crue.validation.ValidationHelperLoi;
-import org.fudaa.ebli.commun.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: branches/soft/fudaa-crue-1.0_branche/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilCasierEditorTopComponent.java
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilCasierEditorTopComponent.java 2014-01-20 22:30:26 UTC (rev 8579)
+++ branches/soft/fudaa-crue-1.0_branche/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilCasierEditorTopComponent.java 2014-01-20 22:59:20 UTC (rev 8580)
@@ -18,6 +18,7 @@
import org.fudaa.ctulu.CtuluLog;
import org.fudaa.ctulu.CtuluLogLevel;
import org.fudaa.ctulu.CtuluLogRecord;
+import org.fudaa.ctulu.gui.ExportTableCommentSupplier;
import org.fudaa.dodico.crue.common.BusinessMessages;
import org.fudaa.dodico.crue.common.transformer.TransformerHelper;
import org.fudaa.dodico.crue.config.ccm.DecimalFormatEpsilonEnum;
@@ -30,7 +31,6 @@
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.fudaa.crue.common.helper.DialogHelper;
import org.fudaa.fudaa.crue.common.helper.ObjetNommeCellRenderer;
import org.fudaa.fudaa.crue.common.log.LogIconTranslationProvider;
Modified: branches/soft/fudaa-crue-1.0_branche/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionTopComponent.java
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionTopComponent.java 2014-01-20 22:30:26 UTC (rev 8579)
+++ branches/soft/fudaa-crue-1.0_branche/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionTopComponent.java 2014-01-20 22:59:20 UTC (rev 8580)
@@ -17,6 +17,7 @@
import org.apache.commons.lang.StringUtils;
import org.fudaa.ctulu.CtuluLog;
import org.fudaa.ctulu.CtuluLogLevel;
+import org.fudaa.ctulu.gui.ExportTableCommentSupplier;
import org.fudaa.dodico.crue.common.transformer.TransformerHelper;
import org.fudaa.dodico.crue.config.ccm.CrueConfigMetier;
import org.fudaa.dodico.crue.config.ccm.CrueConfigMetierConstants;
@@ -36,7 +37,6 @@
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.fudaa.crue.common.action.ExportImageAction;
import org.fudaa.fudaa.crue.common.action.ExportImageToClipboardAction;
import org.fudaa.fudaa.crue.common.helper.ComboBoxHelper;
Modified: branches/soft/fudaa-crue-1.0_branche/ui-options/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-options/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
+++ branches/soft/fudaa-crue-1.0_branche/ui-options/pom.xml 2014-01-20 22:59:20 UTC (rev 8580)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0</version>
+ <version>1.01</version>
</parent>
<artifactId>ui-options</artifactId>
<name>Crue UI Options</name>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-otfa/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-otfa/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
+++ branches/soft/fudaa-crue-1.0_branche/ui-otfa/pom.xml 2014-01-20 22:59:20 UTC (rev 8580)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0</version>
+ <version>1.01</version>
</parent>
<artifactId>ui-otfa</artifactId>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-planimetry/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-planimetry/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
+++ branches/soft/fudaa-crue-1.0_branche/ui-planimetry/pom.xml 2014-01-20 22:59:20 UTC (rev 8580)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0</version>
+ <version>1.01</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-planimetry</artifactId>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-post/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-post/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
+++ branches/soft/fudaa-crue-1.0_branche/ui-post/pom.xml 2014-01-20 22:59:20 UTC (rev 8580)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0</version>
+ <version>1.01</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-post</artifactId>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-report/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-report/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
+++ branches/soft/fudaa-crue-1.0_branche/ui-report/pom.xml 2014-01-20 22:59:20 UTC (rev 8580)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0</version>
+ <version>1.01</version>
</parent>
<artifactId>ui-report</artifactId>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-report/src/main/java/org/fudaa/fudaa/crue/report/AbstractReportTimeViewTopComponent.java
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-report/src/main/java/org/fudaa/fudaa/crue/report/AbstractReportTimeViewTopComponent.java 2014-01-20 22:30:26 UTC (rev 8579)
+++ branches/soft/fudaa-crue-1.0_branche/ui-report/src/main/java/org/fudaa/fudaa/crue/report/AbstractReportTimeViewTopComponent.java 2014-01-20 22:59:20 UTC (rev 8580)
@@ -15,13 +15,13 @@
import javax.swing.AbstractButton;
import javax.swing.Action;
import javax.swing.JPanel;
+import org.fudaa.ctulu.gui.ExportTableCommentSupplier;
import org.fudaa.ctulu.image.CtuluImageProducer;
import org.fudaa.dodico.crue.config.ccm.PropertyNature;
import org.fudaa.dodico.crue.metier.emh.EMHScenario;
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.ebli.courbe.EGAxe;
import org.fudaa.ebli.courbe.EGAxeHorizontal;
import org.fudaa.ebli.courbe.EGAxeHorizontalPersist;
Modified: branches/soft/fudaa-crue-1.0_branche/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportDFRTTopComponent.java
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportDFRTTopComponent.java 2014-01-20 22:30:26 UTC (rev 8579)
+++ branches/soft/fudaa-crue-1.0_branche/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportDFRTTopComponent.java 2014-01-20 22:59:20 UTC (rev 8580)
@@ -8,10 +8,10 @@
import java.util.*;
import javax.swing.*;
import org.apache.commons.lang.StringUtils;
+import org.fudaa.ctulu.gui.ExportTableCommentSupplier;
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.fudaa.crue.common.AbstractTopComponent;
import org.fudaa.fudaa.crue.common.PerspectiveEnum;
import org.fudaa.fudaa.crue.common.helper.ObjetNommeCellRenderer;
Modified: branches/soft/fudaa-crue-1.0_branche/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportDLHYTopComponent.java
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportDLHYTopComponent.java 2014-01-20 22:30:26 UTC (rev 8579)
+++ branches/soft/fudaa-crue-1.0_branche/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportDLHYTopComponent.java 2014-01-20 22:59:20 UTC (rev 8580)
@@ -9,9 +9,9 @@
import java.util.*;
import javax.swing.*;
import org.apache.commons.lang.StringUtils;
+import org.fudaa.ctulu.gui.ExportTableCommentSupplier;
import org.fudaa.dodico.crue.metier.comparator.ObjetNommeByNameComparator;
import org.fudaa.dodico.crue.metier.emh.*;
-import org.fudaa.ebli.commun.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;
Modified: branches/soft/fudaa-crue-1.0_branche/ui-study/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-study/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
+++ branches/soft/fudaa-crue-1.0_branche/ui-study/pom.xml 2014-01-20 22:59:20 UTC (rev 8580)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0</version>
+ <version>1.01</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-study</artifactId>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-sysdoc/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-sysdoc/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
+++ branches/soft/fudaa-crue-1.0_branche/ui-sysdoc/pom.xml 2014-01-20 22:59:20 UTC (rev 8580)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0</version>
+ <version>1.01</version>
</parent>
<artifactId>ui-sysdoc</artifactId>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-views/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-views/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
+++ branches/soft/fudaa-crue-1.0_branche/ui-views/pom.xml 2014-01-20 22:59:20 UTC (rev 8580)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>1.0</version>
+ <version>1.01</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-views</artifactId>
Modified: branches/soft/fudaa-crue-1.0_branche/ui-wrapper/pom.xml
===================================================================
--- branches/soft/fudaa-crue-1.0_branche/ui-wrapper/pom.xml 2014-01-20 22:30:26 UTC (rev 8579)
+++ branches/soft/fudaa-crue-1.0_branche/ui-wrapper/pom.xml 2014-01-20 22:59:20 UTC (rev 8580)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>1.0</version>
+ <version>1.01</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-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-20 22:19:06
|
Revision: 8578
http://sourceforge.net/p/fudaa/svn/8578
Author: deniger
Date: 2014-01-20 22:19:03 +0000 (Mon, 20 Jan 2014)
Log Message:
-----------
CRUE-627
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/InitPerspectiveInstaller.java
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/InitPerspectiveInstaller.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/InitPerspectiveInstaller.java 2014-01-20 22:17:47 UTC (rev 8577)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/InitPerspectiveInstaller.java 2014-01-20 22:19:03 UTC (rev 8578)
@@ -45,10 +45,7 @@
public void restored() {
BuResource.BU.setIconFamily("crystal");
BPalettePlage.setDisplayReversed();
- DurationPropertyEditor.registerEditor();
- LocalDateTimeEditor.registerEditor();
- PrendreClicheFinPermanentEditor.registerAllClicheEditors();
- PropertyEditorManager.registerEditor(Color.class, CustomColorChooser.class);
+
WindowManager.getDefault().invokeWhenUIReady(this);
}
@@ -89,6 +86,10 @@
@Override
public void run() {
+ DurationPropertyEditor.registerEditor();
+ LocalDateTimeEditor.registerEditor();
+ PrendreClicheFinPermanentEditor.registerAllClicheEditors();
+ PropertyEditorManager.registerEditor(Color.class, CustomColorChooser.class);
Set<TopComponent> opened = WindowManager.getDefault().getRegistry().getOpened();
for (TopComponent topComponent : opened) {
topComponent.close();
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:17:50
|
Revision: 8577
http://sourceforge.net/p/fudaa/svn/8577
Author: deniger
Date: 2014-01-20 22:17:47 +0000 (Mon, 20 Jan 2014)
Log Message:
-----------
eviter un nullpointer
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/pdt/PrendreClichePeriodiqueEditor.java
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/pdt/PrendreClichePeriodiqueEditor.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/pdt/PrendreClichePeriodiqueEditor.java 2014-01-20 22:16:20 UTC (rev 8576)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/pdt/PrendreClichePeriodiqueEditor.java 2014-01-20 22:17:47 UTC (rev 8577)
@@ -38,7 +38,7 @@
@Override
public void propertyChange(PropertyChangeEvent evt) {
if (PropertyEnv.PROP_STATE.equals(evt.getPropertyName())
- && evt.getNewValue() == PropertyEnv.STATE_VALID) {
+ && evt.getNewValue() == PropertyEnv.STATE_VALID && prendreClichePeriodiquePanel != null) {
setValue(prendreClichePeriodiquePanel.getCliche());
}
}
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:16:24
|
Revision: 8576
http://sourceforge.net/p/fudaa/svn/8576
Author: deniger
Date: 2014-01-20 22:16:20 +0000 (Mon, 20 Jan 2014)
Log Message:
-----------
version 1.4 pom parent
Modified Paths:
--------------
trunk/soft/fudaa-crue/pom.xml
Modified: trunk/soft/fudaa-crue/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/pom.xml 2014-01-19 21:13:42 UTC (rev 8575)
+++ trunk/soft/fudaa-crue/pom.xml 2014-01-20 22:16:20 UTC (rev 8576)
@@ -332,6 +332,29 @@
</dependency>
</dependencies>
</dependencyManagement>
+ <dependencies>
+ <!--a enlever mais pour la première installation...-->
+<!-- <dependency>
+ <groupId>org.apache.maven.reporting</groupId>
+ <artifactId>maven-reporting-api</artifactId>
+ <version>2.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.5.15</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.5.6</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.2</version>
+ </dependency>-->
+ </dependencies>
<build>
<pluginManagement>
<plugins>
@@ -376,6 +399,13 @@
<cluster>${brandingToken}</cluster>
</configuration>
</plugin>
+ <plugin> <!-- required since nbm-plugin 3.0-->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <useDefaultManifestFile>true</useDefaultManifestFile>
+ </configuration>
+ </plugin>
<plugin>
<groupId>nl.cloudfarming.mojo</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-01-19 21:13:45
|
Revision: 8575
http://sourceforge.net/p/fudaa/svn/8575
Author: deniger
Date: 2014-01-19 21:13:42 +0000 (Sun, 19 Jan 2014)
Log Message:
-----------
version 1.4 pom parent
Modified Paths:
--------------
trunk/soft/fudaa-crue/pom.xml
Modified: trunk/soft/fudaa-crue/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/pom.xml 2014-01-19 21:13:22 UTC (rev 8574)
+++ trunk/soft/fudaa-crue/pom.xml 2014-01-19 21:13:42 UTC (rev 8575)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.pom</groupId>
<artifactId>soft-pom</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
</parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-01-19 21:13:24
|
Revision: 8574
http://sourceforge.net/p/fudaa/svn/8574
Author: deniger
Date: 2014-01-19 21:13:22 +0000 (Sun, 19 Jan 2014)
Log Message:
-----------
version 1.4 pom parent
Modified Paths:
--------------
trunk/business/fudaa-sig/pom.xml
Modified: trunk/business/fudaa-sig/pom.xml
===================================================================
--- trunk/business/fudaa-sig/pom.xml 2014-01-19 21:00:53 UTC (rev 8573)
+++ trunk/business/fudaa-sig/pom.xml 2014-01-19 21:13:22 UTC (rev 8574)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.fudaa.pom</groupId>
<artifactId>business-pom</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
</parent>
<groupId>org.fudaa.business.fudaa-sig</groupId>
<artifactId>fudaa-sig</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-01-19 21:00:55
|
Revision: 8573
http://sourceforge.net/p/fudaa/svn/8573
Author: deniger
Date: 2014-01-19 21:00:53 +0000 (Sun, 19 Jan 2014)
Log Message:
-----------
mise en place liquibase
Modified Paths:
--------------
trunk/framework/pom.xml
Modified: trunk/framework/pom.xml
===================================================================
--- trunk/framework/pom.xml 2014-01-19 21:00:36 UTC (rev 8572)
+++ trunk/framework/pom.xml 2014-01-19 21:00:53 UTC (rev 8573)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.pom</groupId>
<artifactId>super-pom</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
</parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-01-19 21:00:41
|
Revision: 8572
http://sourceforge.net/p/fudaa/svn/8572
Author: deniger
Date: 2014-01-19 21:00:36 +0000 (Sun, 19 Jan 2014)
Log Message:
-----------
mise en place liquibase
Modified Paths:
--------------
trunk/pom/business-pom/pom.xml
trunk/pom/soft-pom/pom.xml
trunk/pom/super-pom/pom.xml
Modified: trunk/pom/business-pom/pom.xml
===================================================================
--- trunk/pom/business-pom/pom.xml 2014-01-16 07:11:32 UTC (rev 8571)
+++ trunk/pom/business-pom/pom.xml 2014-01-19 21:00:36 UTC (rev 8572)
@@ -8,7 +8,7 @@
-->
<groupId>org.fudaa.pom</groupId>
<artifactId>super-pom</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
</parent>
<properties>
<businessGroupId>org.fudaa.business</businessGroupId>
Modified: trunk/pom/soft-pom/pom.xml
===================================================================
--- trunk/pom/soft-pom/pom.xml 2014-01-16 07:11:32 UTC (rev 8571)
+++ trunk/pom/soft-pom/pom.xml 2014-01-19 21:00:36 UTC (rev 8572)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.pom</groupId>
<artifactId>super-pom</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
</parent>
<groupId>org.fudaa.pom</groupId>
<artifactId>soft-pom</artifactId>
Modified: trunk/pom/super-pom/pom.xml
===================================================================
--- trunk/pom/super-pom/pom.xml 2014-01-16 07:11:32 UTC (rev 8571)
+++ trunk/pom/super-pom/pom.xml 2014-01-19 21:00:36 UTC (rev 8572)
@@ -5,7 +5,7 @@
<groupId>org.fudaa.pom</groupId>
<artifactId>super-pom</artifactId>
<packaging>pom</packaging>
- <version>1.3</version>
+ <version>1.4</version>
<name>Super Pom</name>
<url>http://fudaa.fr</url>
<properties>
@@ -33,13 +33,13 @@
<id>artifactory-fudaa</id>
<name>fudaa-releases</name>
<!-- on utilise webdav pour éviter les erreurs 401 -->
- <url>dav:http://repository.fudaa.fr/artifactory/libs-releases-local</url>
+ <url>http://repository.fudaa.fr/artifactory/libs-releases-local</url>
</repository>
<snapshotRepository>
<id>artifactory-fudaa-snapshot</id>
<name>fudaa-snapshots</name>
<!-- on utilise webdav pour éviter les erreurs 401 -->
- <url>dav:http://repository.fudaa.fr/artifactory/libs-snapshots-local
+ <url>http://repository.fudaa.fr/artifactory/libs-snapshots-local
</url>
</snapshotRepository>
@@ -204,11 +204,11 @@
<extensions>
- <extension>
+<!-- <extension>
<groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-webdav</artifactId>
- <version>1.0-beta-2</version>
- </extension>
+ <artifactId>wagon-webdav-jackrabbit</artifactId>
+ <version>2.6</version>
+ </extension>-->
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ftp</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 8571
http://sourceforge.net/p/fudaa/svn/8571
Author: deniger
Date: 2014-01-16 07:11:32 +0000 (Thu, 16 Jan 2014)
Log Message:
-----------
CRUE-623
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/sig/traceprofil/GGPointToTraceProfilProcessor.java
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/sig/traceprofil/GGPointToTraceProfilProcessor.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/sig/traceprofil/GGPointToTraceProfilProcessor.java 2014-01-15 23:32:06 UTC (rev 8570)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/sig/traceprofil/GGPointToTraceProfilProcessor.java 2014-01-16 07:11:32 UTC (rev 8571)
@@ -27,7 +27,7 @@
*/
public class GGPointToTraceProfilProcessor {
- public static final String ATTRIBUTE_NAME_NOM_PROFIL = "Nom_profil";
+ public static final String ATTRIBUTE_NAME_NOM_PROFIL = "PROFIL_PRE";
public static final String ATTRIBUTE_LIM_LIT = "Lim_lit";
public static final String ATTRIBUTE_LIM_GEOM = "Lim_geom";
private final GISZoneCollectionPoint pt;
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:51
|
Revision: 8567
http://sourceforge.net/p/fudaa/svn/8567
Author: deniger
Date: 2014-01-10 23:00:49 +0000 (Fri, 10 Jan 2014)
Log Message:
-----------
CRUE-619
Modified Paths:
--------------
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableXlsxWriter.java
trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserCsvExcel.java
trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableSimpleExporter.java
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableXlsxWriter.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableXlsxWriter.java 2014-01-10 23:00:37 UTC (rev 8566)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableXlsxWriter.java 2014-01-10 23:00:49 UTC (rev 8567)
@@ -20,6 +20,7 @@
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.fudaa.ctulu.CtuluDoubleParser;
import org.fudaa.ctulu.CtuluLibFile;
import org.fudaa.ctulu.CtuluLibString;
@@ -68,6 +69,7 @@
Sheet currentSheet = wb.createSheet(CtuluResource.CTULU.getString("Feuille {0}", CtuluLibString
.getString(sheet + 1)));
Row row = currentSheet.createRow(0);
+ CtuluDoubleParser doubleParser = new CtuluDoubleParser();
for (int i = 0; i < table_.getMaxCol(); i++) {
row.createCell(i).setCellValue(table_.getColumnName(i));
}
@@ -78,7 +80,9 @@
Object value = table_.getValue(rowIdx, i);
if (value != null) {
Class dataClass = value.getClass();
- if (Number.class.isAssignableFrom(dataClass)) {
+ if (String.class.equals(dataClass) && doubleParser.isValid((String) value)) {
+ createCell.setCellValue(doubleParser.parse((String) value));
+ } else if (Number.class.isAssignableFrom(dataClass)) {
createCell.setCellValue(((Number) value).doubleValue());
} else if (Date.class.equals(dataClass)) {
createCell.setCellValue(((Date) value));
Modified: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserCsvExcel.java
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserCsvExcel.java 2014-01-10 23:00:37 UTC (rev 8566)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserCsvExcel.java 2014-01-10 23:00:49 UTC (rev 8567)
@@ -41,7 +41,7 @@
public CtuluFileChooserCsvExcel(Component parentComponent) {
this.parentComponent = parentComponent;
- ftCsv_ = new BuFileFilter(new String[]{"txt", "csv"}, CtuluResource.CTULU.getString("Texte CSV"));
+ ftCsv_ = new BuFileFilter(new String[]{"csv", "txt"}, CtuluResource.CTULU.getString("Texte CSV"));
ftCsv_.setExtensionListInDescription(true);
ftXsl_ = new BuFileFilter(new String[]{"xls"}, CtuluResource.CTULU.getString("Fichier Excel 97-2003"));
ftXsl_.setExtensionListInDescription(true);
@@ -56,7 +56,7 @@
setApproveButtonToolTipText(CtuluLib.getS("L'extension du fichier sera automatiquement compl\xE9t\xE9e"));
CtuluFileChooserTestWritable tester = new CtuluFileChooserTestWritable(parentComponent);
tester.setAppendExtension(true, null);
- setFileFilter(ftCsv_);
+ setFileFilter(ftXslx_);
setTester(tester);
}
@@ -84,10 +84,10 @@
}
private File completeExtension(File f) {
- final javax.swing.filechooser.FileFilter filter = getFileFilter();
+ final BuFileFilter filter = (BuFileFilter) getFileFilter();
final String name = f.getName();
if (name.indexOf('.') < 0) {
- return new File(f.getAbsolutePath() + (filter == ftXsl_ ? ".xls" : ".txt"));
+ return new File(f.getAbsolutePath() + "." + filter.getFirstExt());
}
return f;
}
Modified: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableSimpleExporter.java
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableSimpleExporter.java 2014-01-10 23:00:37 UTC (rev 8566)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableSimpleExporter.java 2014-01-10 23:00:49 UTC (rev 8567)
@@ -101,7 +101,6 @@
w.write(task.getStateReceiver());
}
} catch (final Exception e) {
- e.printStackTrace();
ui_.error(dest_.getName(), e.getMessage(), false);
}
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-10 21:56:51
|
Revision: 8565
http://sourceforge.net/p/fudaa/svn/8565
Author: deniger
Date: 2014-01-10 21:56:47 +0000 (Fri, 10 Jan 2014)
Log Message:
-----------
CRUE-619
Modified Paths:
--------------
trunk/framework/ctulu-common/pom.xml
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableExcelWriter.java
trunk/framework/ctulu-common/src/main/resources/org/fudaa/ctulu/ctulu_en.fr_txt
trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserCsvExcel.java
trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserWriter.java
trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableExportPanel.java
trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableSimpleExporter.java
trunk/framework/pom.xml
Added Paths:
-----------
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableXlsxWriter.java
Modified: trunk/framework/ctulu-common/pom.xml
===================================================================
--- trunk/framework/ctulu-common/pom.xml 2014-01-10 17:38:27 UTC (rev 8564)
+++ trunk/framework/ctulu-common/pom.xml 2014-01-10 21:56:47 UTC (rev 8565)
@@ -55,6 +55,10 @@
<artifactId>db4o-java5</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableExcelWriter.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableExcelWriter.java 2014-01-10 17:38:27 UTC (rev 8564)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableExcelWriter.java 2014-01-10 21:56:47 UTC (rev 8565)
@@ -9,8 +9,6 @@
import java.io.File;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
import jxl.Workbook;
import jxl.write.Label;
@@ -70,8 +68,6 @@
WritableSheet currentSheet = classeur.createSheet(CtuluResource.CTULU.getString("Feuille {0}", CtuluLibString
.getString(sheet + 1)), sheet);
- final List sheets = new ArrayList();
- sheets.add(currentSheet);
for (int i = 0; i < table_.getMaxCol(); i++) {
currentSheet.addCell(new Label(col, 0, table_.getColumnName(i)));
for (int row = 0; row < table_.getMaxRow(); row++) {
@@ -85,7 +81,6 @@
sheet++;
currentSheet = classeur.createSheet(CtuluResource.CTULU.getString("Feuille {0}", CtuluLibString
.getString(sheet + 1)), sheet);
- sheets.add(currentSheet);
col = 0;
}
up.majAvancement();
@@ -102,7 +97,7 @@
}
- BuFileFilter ftXsl_ = new BuFileFilter(new String[] { "xls" }, CtuluResource.CTULU.getString("Fichier excel"));
+ BuFileFilter ftXsl_ = new BuFileFilter(new String[]{"xls"}, CtuluResource.CTULU.getString("Fichier Excel 97-2003"));
@Override
public BuFileFilter getFilter() {
Copied: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableXlsxWriter.java (from rev 8421, trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableExcelWriter.java)
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableXlsxWriter.java (rev 0)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableXlsxWriter.java 2014-01-10 21:56:47 UTC (rev 8565)
@@ -0,0 +1,149 @@
+/**
+ * @creation 11 f\xE9vr. 2005
+ * @modification $Date: 2007-04-16 16:33:53 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail fud...@li...
+ */
+package org.fudaa.ctulu.table;
+
+import java.io.File;
+import java.io.IOException;
+
+import com.memoire.bu.BuFileFilter;
+import java.io.FileOutputStream;
+import java.util.Date;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.apache.poi.ss.usermodel.Cell;
+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.xssf.usermodel.XSSFWorkbook;
+import org.fudaa.ctulu.CtuluLibFile;
+
+import org.fudaa.ctulu.CtuluLibString;
+import org.fudaa.ctulu.CtuluResource;
+import org.fudaa.ctulu.ProgressionInterface;
+import org.fudaa.ctulu.ProgressionUpdater;
+
+/**
+ * @author Fred Deniger
+ * @version $Id: CtuluTableExcelWriter.java,v 1.7 2007-04-16 16:33:53 deniger Exp $
+ */
+public class CtuluTableXlsxWriter implements CtuluWriter {
+
+ CtuluTableModelInterface table_;
+
+ File dest_;
+
+ /**
+ * @param _table la table a ecrire
+ * @param _dest le fichier de destination
+ */
+ public CtuluTableXlsxWriter(final CtuluTableModelInterface _table, final File _dest) {
+ super();
+ table_ = _table;
+ dest_ = _dest;
+ }
+
+ public CtuluTableXlsxWriter() {
+ super();
+ }
+
+ /**
+ * @param _p le receveur de l'avancement
+ */
+ @Override
+ public void write(final ProgressionInterface _p) {
+ Workbook wb = new XSSFWorkbook();
+ try {
+ // le max de colonne autorisee
+ final int max = 16384;
+ //
+ final ProgressionUpdater up = new ProgressionUpdater(_p);
+ int col = 0;
+ int sheet = 0;
+ up.setValue(3, table_.getMaxCol(), 0, 60);
+ Sheet currentSheet = wb.createSheet(CtuluResource.CTULU.getString("Feuille {0}", CtuluLibString
+ .getString(sheet + 1)));
+ Row row = currentSheet.createRow(0);
+ for (int i = 0; i < table_.getMaxCol(); i++) {
+ row.createCell(i).setCellValue(table_.getColumnName(i));
+ }
+ for (int rowIdx = 0; rowIdx < table_.getMaxRow(); rowIdx++) {
+ row = currentSheet.createRow(rowIdx + 1);
+ for (int i = 0; i < table_.getMaxCol(); i++) {
+ Cell createCell = row.createCell(i);
+ Object value = table_.getValue(rowIdx, i);
+ if (value != null) {
+ Class dataClass = value.getClass();
+ if (Number.class.isAssignableFrom(dataClass)) {
+ createCell.setCellValue(((Number) value).doubleValue());
+ } else if (Date.class.equals(dataClass)) {
+ createCell.setCellValue(((Date) value));
+ } else {
+ createCell.setCellValue(value.toString());
+ }
+ }
+ }
+ col++;
+ if (col > max) {
+ currentSheet = wb.createSheet(CtuluResource.CTULU.getString("Feuille {0}", CtuluLibString
+ .getString(sheet + 1)));
+ col = 0;
+ }
+ up.majAvancement();
+ }
+ if (_p != null) {
+ _p.setProgression(80);
+ }
+ writeToFile(wb);
+ } finally {
+ }
+
+ }
+
+ protected void writeToFile(Workbook wb) {
+ FileOutputStream fileOut = null;
+ try {
+ fileOut = new FileOutputStream(dest_);
+ wb.write(fileOut);
+ fileOut.close();
+ } catch (IOException ex) {
+ Logger.getLogger(CtuluTableXlsxWriter.class.getName()).log(Level.SEVERE, null, ex);
+ } finally {
+ CtuluLibFile.close(fileOut);
+ }
+ }
+
+ BuFileFilter ftXsl_ = new BuFileFilter(new String[]{"xlsx"}, CtuluResource.CTULU.getString("Fichier Excel"));
+
+ @Override
+ public BuFileFilter getFilter() {
+ return ftXsl_;
+ }
+
+ @Override
+ public void setFile(File f) {
+ dest_ = f;
+ }
+
+ @Override
+ public void setModel(CtuluTableModelInterface _model) {
+ table_ = _model;
+ }
+
+ String extension_ = ".xlsx";
+
+ @Override
+ public String getMostPopularExtension() {
+ return extension_;
+ }
+
+ @Override
+ public boolean allowFormatData() {
+ return true;
+ }
+
+}
Modified: trunk/framework/ctulu-common/src/main/resources/org/fudaa/ctulu/ctulu_en.fr_txt
===================================================================
--- trunk/framework/ctulu-common/src/main/resources/org/fudaa/ctulu/ctulu_en.fr_txt 2014-01-10 17:38:27 UTC (rev 8564)
+++ trunk/framework/ctulu-common/src/main/resources/org/fudaa/ctulu/ctulu_en.fr_txt 2014-01-10 21:56:47 UTC (rev 8565)
@@ -108,7 +108,8 @@
Fen\xEAtres=Frames
Fermer le projet=Close current project
Fichier cible non d\xE9fini=Target file is not set
-Fichier excel=Excel file
+Fichier Excel=Excel file
+Fichier Excel 97-2003=Excel 97-2003 file
Fichier non trouv\xE9=File not found
Fichiers=Files
Filtre strict=Strict filter
Modified: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserCsvExcel.java
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserCsvExcel.java 2014-01-10 17:38:27 UTC (rev 8564)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserCsvExcel.java 2014-01-10 21:56:47 UTC (rev 8565)
@@ -12,6 +12,7 @@
import java.awt.Component;
import java.io.File;
import javax.swing.JFileChooser;
+import javax.swing.filechooser.FileFilter;
import org.fudaa.ctulu.CtuluLib;
import org.fudaa.ctulu.CtuluResource;
import org.fudaa.ctulu.CtuluUI;
@@ -21,22 +22,33 @@
* @version $Id: CtuluFileChooserCsvExcel.java,v 1.6 2007-06-14 11:58:18 deniger Exp $
*/
public class CtuluFileChooserCsvExcel extends CtuluFileChooser {
-
+
+ public enum TypeChoosen {
+
+ CSV,
+ XLS,
+ XLSX;
+ }
+
final BuFileFilter ftCsv_;
final BuFileFilter ftXsl_;
+ final BuFileFilter ftXslx_;
final Component parentComponent;
-
+
public CtuluFileChooserCsvExcel(CtuluUI _ui) {
this(_ui == null ? null : _ui.getParentComponent());
}
-
+
public CtuluFileChooserCsvExcel(Component parentComponent) {
this.parentComponent = parentComponent;
ftCsv_ = new BuFileFilter(new String[]{"txt", "csv"}, CtuluResource.CTULU.getString("Texte CSV"));
ftCsv_.setExtensionListInDescription(true);
- ftXsl_ = new BuFileFilter(new String[]{"xls"}, CtuluResource.CTULU.getString("Fichier excel"));
+ ftXsl_ = new BuFileFilter(new String[]{"xls"}, CtuluResource.CTULU.getString("Fichier Excel 97-2003"));
ftXsl_.setExtensionListInDescription(true);
+ ftXslx_ = new BuFileFilter(new String[]{"xlsx"}, CtuluResource.CTULU.getString("Fichier Excel"));
+ ftXslx_.setExtensionListInDescription(true);
addChoosableFileFilter(ftXsl_);
+ addChoosableFileFilter(ftXslx_);
addChoosableFileFilter(ftCsv_);
setAcceptAllFileFilterUsed(false);
setMultiSelectionEnabled(false);
@@ -51,10 +63,17 @@
/**
* @return true si le format excel est choisi
*/
- public boolean isExcelChoosen() {
- return getFileFilter() == ftXsl_;
+ public TypeChoosen getTypeChoosen() {
+ FileFilter fileFilter = getFileFilter();
+ if (fileFilter == ftXsl_) {
+ return TypeChoosen.XLS;
+ }
+ if (fileFilter == ftXslx_) {
+ return TypeChoosen.XLSX;
+ }
+ return TypeChoosen.CSV;
}
-
+
public File getDestFile() {
final int res = showDialog(parentComponent, BuResource.BU.getString("Continuer"));
if (res != JFileChooser.APPROVE_OPTION) {
@@ -63,7 +82,7 @@
File f = getSelectedFile();
return completeExtension(f);
}
-
+
private File completeExtension(File f) {
final javax.swing.filechooser.FileFilter filter = getFileFilter();
final String name = f.getName();
@@ -72,4 +91,4 @@
}
return f;
}
-}
\ No newline at end of file
+}
Modified: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserWriter.java
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserWriter.java 2014-01-10 17:38:27 UTC (rev 8564)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserWriter.java 2014-01-10 21:56:47 UTC (rev 8565)
@@ -9,34 +9,33 @@
import org.fudaa.ctulu.CtuluUI;
import org.fudaa.ctulu.table.CtuluTableCsvWriter;
import org.fudaa.ctulu.table.CtuluTableExcelWriter;
+import org.fudaa.ctulu.table.CtuluTableXlsxWriter;
import org.fudaa.ctulu.table.CtuluWriter;
/**
- * Chooser G\xE9n\xE9rique qui complete tous les formats en ajoutant les interfaces
- * CtuluWriter appropri\xE9es.
- *
+ * Chooser G\xE9n\xE9rique qui complete tous les formats en ajoutant les interfaces CtuluWriter appropri\xE9es.
+ *
* @author Adrien Hadoux
- *
+ *
*/
public class CtuluFileChooserWriter extends CtuluFileChooser {
-
-
- final List<CtuluWriter> listWriter_;
- final CtuluUI ui_;
-
+ final List<CtuluWriter> listWriter_;
+ final CtuluUI ui_;
+
public CtuluFileChooserWriter(CtuluUI _ui, final List<CtuluWriter> _listWriter) {
-
+
ui_ = _ui;
-
- if(_listWriter!=null)
- listWriter_ = _listWriter;
- else{
+
+ if (_listWriter != null) {
+ listWriter_ = _listWriter;
+ } else {
// -- on ajoute par defaut les import export csv et excel --//
- listWriter_=new ArrayList<CtuluWriter>();
+ listWriter_ = new ArrayList<CtuluWriter>();
+ listWriter_.add(new CtuluTableXlsxWriter());
listWriter_.add(new CtuluTableExcelWriter());
listWriter_.add(new CtuluTableCsvWriter());
- }
+ }
for (CtuluWriter writer : listWriter_) {
writer.getFilter().setExtensionListInDescription(true);
addChoosableFileFilter(writer.getFilter());
@@ -46,19 +45,20 @@
CtuluFileChooserTestWritable tester = new CtuluFileChooserTestWritable(_ui);
tester.setAppendExtension(true, null);
setTester(tester);
-
-
+
}
-
+
/**
* retourne le writter selectionn\xE9
- *
+ *
* @return
*/
public CtuluWriter getSelectedWriter() {
- for (CtuluWriter writer : listWriter_)
- if (writer.getFilter() == getFileFilter())
+ for (CtuluWriter writer : listWriter_) {
+ if (writer.getFilter() == getFileFilter()) {
return writer;
+ }
+ }
return null;
}
@@ -69,15 +69,15 @@
}
File f = getSelectedFile();
-
-
return completeExtension(f);
}
-
+
private File completeExtension(File f) {
- if(f==null) return null;
+ if (f == null) {
+ return null;
+ }
f = new File(f.getAbsolutePath() + getSelectedWriter().getMostPopularExtension());
return f;
- }
-
+ }
+
}
Modified: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableExportPanel.java
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableExportPanel.java 2014-01-10 17:38:27 UTC (rev 8564)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableExportPanel.java 2014-01-10 21:56:47 UTC (rev 8565)
@@ -36,10 +36,12 @@
import org.fudaa.ctulu.CtuluResource;
import org.fudaa.ctulu.CtuluTaskDelegate;
import org.fudaa.ctulu.CtuluUI;
+import org.fudaa.ctulu.gui.CtuluFileChooserCsvExcel.TypeChoosen;
import org.fudaa.ctulu.table.CtuluTableCsvWriter;
import org.fudaa.ctulu.table.CtuluTableExcelWriter;
import org.fudaa.ctulu.table.CtuluTableModelDefault;
import org.fudaa.ctulu.table.CtuluTableModelInterface;
+import org.fudaa.ctulu.table.CtuluTableXlsxWriter;
import org.jdesktop.swingx.JXTreeTable;
/**
@@ -52,25 +54,25 @@
JList cbModel_;
BuRadioButton cbOnlySelected_;
File dest_;
- boolean xlsFormat_;
+ TypeChoosen choosenType_;
final JTable table_;
final CtuluUI ui_;
JDialog parentDial_;
char separator = '\t';
- public static void showExportDialog(final char separator, final JTable _table, final File _dest, final boolean _xsl,
+ public static void showExportDialog(final char separator, final JTable _table, final File _dest, final TypeChoosen type,
final CtuluUI _ui) {
- showExportDialog(separator, _table, _dest, _xsl, _ui, CtuluLibSwing.getFrameAncestor(_ui.getParentComponent()));
+ showExportDialog(separator, _table, _dest, type, _ui, CtuluLibSwing.getFrameAncestor(_ui.getParentComponent()));
}
- public static void showExportDialog(final JTable _table, final File _dest, final boolean _xsl, final CtuluUI _ui,
+ public static void showExportDialog(final JTable _table, final File _dest, final TypeChoosen type, final CtuluUI _ui,
final Window windowParent) {
- showExportDialog('\t', _table, _dest, _xsl, _ui, windowParent);
+ showExportDialog('\t', _table, _dest, type, _ui, windowParent);
}
- public static void showExportDialog(final char separator, final JTable _table, final File _dest, final boolean _xsl,
+ public static void showExportDialog(final char separator, final JTable _table, final File _dest, final TypeChoosen type,
final CtuluUI _ui, final Window windowParent) {
- final CtuluTableExportPanel pn = new CtuluTableExportPanel(_table, _dest, _xsl, _ui);
+ final CtuluTableExportPanel pn = new CtuluTableExportPanel(_table, _dest, type, _ui);
pn.separator = separator;
final CtuluDialog dial = CtuluDialogPanel.createDialog(windowParent, pn);
pn.setParentDial(dial);
@@ -87,7 +89,7 @@
if (f == null) {
return;
}
- CtuluTableExportPanel.showExportDialog(separator, _t, f, choose.isExcelChoosen(), _ui);
+ CtuluTableExportPanel.showExportDialog(separator, _t, f, choose.getTypeChoosen(), _ui);
}
public static void doExport(char separator, final JTable _t, final CtuluUI _ui) {
@@ -99,13 +101,13 @@
}
@SuppressWarnings("serial")
- private CtuluTableExportPanel(final JTable _table, final File _dest, final boolean _xsl, final CtuluUI _ui) {
+ private CtuluTableExportPanel(final JTable _table, final File _dest, final TypeChoosen type, final CtuluUI _ui) {
super(false);
setLayout(new BuBorderLayout(5, 5));
table_ = _table;
dest_ = _dest;
ui_ = _ui;
- xlsFormat_ = _xsl;
+ choosenType_ = type;
cbModel_ = new BuList();
cbModel_.setModel(new AbstractListModel() {
@Override
@@ -194,9 +196,12 @@
public void run() {
final CtuluTableModelInterface m = createDefaultModele(colToWrite, rowToWrite);
try {
- if (xlsFormat_) {
+ if (TypeChoosen.XLS.equals(choosenType_)) {
final CtuluTableExcelWriter w = new CtuluTableExcelWriter(m, dest_);
w.write(task.getStateReceiver());
+ } else if (TypeChoosen.XLSX.equals(choosenType_)) {
+ final CtuluTableXlsxWriter w = new CtuluTableXlsxWriter(m, dest_);
+ w.write(task.getStateReceiver());
} else {
int nbDigits = BuPreferences.BU.getIntegerProperty(CtuluTablePreferencesComponent.COORDS_EXPORT_NB_DIGITS, -1);
DecimalFormat fmt;
@@ -245,4 +250,4 @@
public void setParentDial(final JDialog _parentDial) {
parentDial_ = _parentDial;
}
-}
\ No newline at end of file
+}
Modified: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableSimpleExporter.java
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableSimpleExporter.java 2014-01-10 17:38:27 UTC (rev 8564)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableSimpleExporter.java 2014-01-10 21:56:47 UTC (rev 8565)
@@ -19,9 +19,11 @@
import org.fudaa.ctulu.CtuluLib;
import org.fudaa.ctulu.CtuluTaskDelegate;
import org.fudaa.ctulu.CtuluUI;
+import org.fudaa.ctulu.gui.CtuluFileChooserCsvExcel.TypeChoosen;
import org.fudaa.ctulu.table.CtuluTableCsvWriter;
import org.fudaa.ctulu.table.CtuluTableExcelWriter;
import org.fudaa.ctulu.table.CtuluTableModelInterface;
+import org.fudaa.ctulu.table.CtuluTableXlsxWriter;
/**
* @author DENIGER
@@ -31,12 +33,13 @@
private static final char DEFAULT_SEPARATOR = '\t';
File dest_;
- boolean xlsFormat_;
+ CtuluFileChooserCsvExcel.TypeChoosen typeChoosen;
final CtuluUI ui_;
char separator = '\t';
private CtuluTableModelInterface model;
- public static void showExportDialog(final char separator, final CtuluTableModelInterface _table, final File _dest, final boolean _xsl,
+ public static void showExportDialog(final char separator, final CtuluTableModelInterface _table, final File _dest,
+ final CtuluFileChooserCsvExcel.TypeChoosen _xsl,
final CtuluUI _ui) {
final CtuluTableSimpleExporter pn = new CtuluTableSimpleExporter(_dest, _xsl, _ui, _table);
pn.separator = separator;
@@ -53,7 +56,7 @@
if (f == null) {
return;
}
- CtuluTableSimpleExporter.showExportDialog(separator, _t, f, choose.isExcelChoosen(), _ui);
+ CtuluTableSimpleExporter.showExportDialog(separator, _t, f, choose.getTypeChoosen(), _ui);
}
public static void doExport(char separator, final CtuluTableModelInterface _t, final CtuluUI _ui) {
@@ -64,9 +67,9 @@
doExport('\t', _t, _ui, CtuluLibSwing.getFrameAncestor(_ui.getParentComponent()));
}
- public CtuluTableSimpleExporter(File dest_, boolean xlsFormat_, CtuluUI ui_, CtuluTableModelInterface model) {
+ public CtuluTableSimpleExporter(File dest_, CtuluFileChooserCsvExcel.TypeChoosen _typeChoosen, CtuluUI ui_, CtuluTableModelInterface model) {
this.dest_ = dest_;
- this.xlsFormat_ = xlsFormat_;
+ this.typeChoosen = _typeChoosen;
this.ui_ = ui_;
this.model = model;
}
@@ -79,7 +82,10 @@
public void run() {
final CtuluTableModelInterface m = model;
try {
- if (xlsFormat_) {
+ if (TypeChoosen.XLSX.equals(typeChoosen)) {
+ final CtuluTableXlsxWriter w = new CtuluTableXlsxWriter(m, dest_);
+ w.write(task.getStateReceiver());
+ } else if (TypeChoosen.XLS.equals(typeChoosen)) {
final CtuluTableExcelWriter w = new CtuluTableExcelWriter(m, dest_);
w.write(task.getStateReceiver());
} else {
@@ -102,6 +108,5 @@
}
});
-
}
-}
\ No newline at end of file
+}
Modified: trunk/framework/pom.xml
===================================================================
--- trunk/framework/pom.xml 2014-01-10 17:38:27 UTC (rev 8564)
+++ trunk/framework/pom.xml 2014-01-10 21:56:47 UTC (rev 8565)
@@ -206,6 +206,11 @@
<version>1.0</version>
</dependency>
<dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml</artifactId>
+ <version>3.9</version>
+ </dependency>
+ <dependency>
<groupId>net.sourceforge.jexcelapi</groupId>
<artifactId>jxl</artifactId>
<version>2.6.3</version>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-01-10 17:38:30
|
Revision: 8564
http://sourceforge.net/p/fudaa/svn/8564
Author: deniger
Date: 2014-01-10 17:38:27 +0000 (Fri, 10 Jan 2014)
Log Message:
-----------
CRUE-614, CRUE-598
Modified Paths:
--------------
trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/FileDeleteResult.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeHorizontalPersist.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGrapheModelListener.java
Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/FileDeleteResult.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/FileDeleteResult.java 2014-01-10 17:38:12 UTC (rev 8563)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/FileDeleteResult.java 2014-01-10 17:38:27 UTC (rev 8564)
@@ -6,6 +6,7 @@
/**
* Permet de savoir quel
+ *
* @author deniger ( genesis)
*/
public class FileDeleteResult {
@@ -17,6 +18,14 @@
return dirNotDeleted;
}
+ public boolean isNotEmpty() {
+ return !isEmpty();
+ }
+
+ public boolean isEmpty() {
+ return filesNotDeleted.isEmpty() && dirNotDeleted.isEmpty();
+ }
+
public List<File> getFilesNotDeleted() {
return filesNotDeleted;
}
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeHorizontalPersist.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeHorizontalPersist.java 2014-01-10 17:38:12 UTC (rev 8563)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeHorizontalPersist.java 2014-01-10 17:38:27 UTC (rev 8564)
@@ -97,7 +97,7 @@
longueurPas_ = axeX.longueurPas_;
modeGraduations_ = axeX.modeGraduations_;
nbSousGraduations_ = axeX.nbSousGraduations_;
- range = axeX.range_;
+ range = axeX.range_ == null ? null : new CtuluRange(axeX.range_);
}
public EGAxeHorizontal generateAxe() {
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGrapheModelListener.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGrapheModelListener.java 2014-01-10 17:38:12 UTC (rev 8563)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGrapheModelListener.java 2014-01-10 17:38:27 UTC (rev 8564)
@@ -25,7 +25,6 @@
/**
* @param _c la courbe dont le contenu a ete modifie. null si toutes ou inconnue.
- * @param _mustRestore TODO
* @param _mustRestore true si on doit restaurer la vue
*/
void courbeContentChanged(EGObject _c, boolean _mustRestore);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-01-07 21:10:45
|
Revision: 8562
http://sourceforge.net/p/fudaa/svn/8562
Author: deniger
Date: 2014-01-07 21:10:41 +0000 (Tue, 07 Jan 2014)
Log Message:
-----------
CRUE-598
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalBrancheChooserUI.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalRightVariableChooser.java
trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/longitudinal/Bundle.properties
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalBrancheChooserUI.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalBrancheChooserUI.java 2014-01-07 20:53:57 UTC (rev 8561)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalBrancheChooserUI.java 2014-01-07 21:10:41 UTC (rev 8562)
@@ -65,7 +65,7 @@
usedBranche.add(name);
}
double length = config.getLength();
- if (length <= 0) {
+ if (length < 0) {
error.addError(NbBundle.getMessage(ReportLongitudinalBrancheChooserUI.class, "BrancheConfig.BrancheLengthNegativeOrNull.error"), idx, name);
}
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalRightVariableChooser.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalRightVariableChooser.java 2014-01-07 20:53:57 UTC (rev 8561)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalRightVariableChooser.java 2014-01-07 21:10:41 UTC (rev 8562)
@@ -86,7 +86,8 @@
createLines.get(0).updateCheckBoxes(runKeys);
}
- boolean ok = DialogHelper.showQuestionAndSaveDialogConf(NbBundle.getMessage(ReportLongitudinalRightVariableChooser.class, "ChooseRightVariable.DialogTitle"), pn, getClass(), "vueProfilLongitudinalConfigurationAutresVariables", PerspectiveEnum.REPORT);
+ boolean ok = DialogHelper.showQuestionAndSaveDialogConf(NbBundle.getMessage(ReportLongitudinalRightVariableChooser.class,
+ "ChooseRightVariable.DialogTitle"), pn, getClass(), "vueProfilLongitudinalConfigurationAutresVariables", PerspectiveEnum.REPORT);
if (ok) {
config.removeAllVariableDrawnOnRightAxis(reportResultProviderService);
String newVar = (String) cb1.getSelectedItem();
@@ -94,9 +95,11 @@
newVar = null;
}
ReportVariableKey varKey = newVar == null ? null : reportResultProviderService.createVariableKey(newVar);
- List<ReportRunKey> selectedKeys = createLines.get(0).getSelectedKeys();
- for (ReportRunKey reportRunKey : selectedKeys) {
- config.profilVariables.add(new ReportRunVariableKey(reportRunKey, varKey));
+ if (newVar != null) {
+ List<ReportRunKey> selectedKeys = createLines.get(0).getSelectedKeys();
+ for (ReportRunKey reportRunKey : selectedKeys) {
+ config.profilVariables.add(new ReportRunVariableKey(reportRunKey, varKey));
+ }
}
}
Modified: trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/longitudinal/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/longitudinal/Bundle.properties 2014-01-07 20:53:57 UTC (rev 8561)
+++ trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/longitudinal/Bundle.properties 2014-01-07 21:10:41 UTC (rev 8562)
@@ -15,7 +15,7 @@
aval_amont.name=(-)
BrancheConfig.BrancheNameIsEmpty.error=Ligne {0}: le nom de la branche est vide
BrancheConfig.BrancheNameAlreadyUsed.error=Ligne {0}: la branche {1} est d\u00e9j\u00e0 utilis\u00e9e
-BrancheConfig.BrancheLengthNegativeOrNull.error=Ligne {0}: la longueur d''affichage de la branche {1} est inf\u00e9rieure ou \u00e9gale \u00e0 0
+BrancheConfig.BrancheLengthNegativeOrNull.error=Ligne {0}: la longueur d''affichage de la branche {1} est inf\u00e9rieure \u00e0 0
ChooseTime.DialogTitle=Choix des pas de temps
ChooseRightVariable.Label=Variable affich\u00e9e \u00e0 droite
ChooseRightVariable.DialogTitle=Choix variable
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:54:00
|
Revision: 8561
http://sourceforge.net/p/fudaa/svn/8561
Author: deniger
Date: 2014-01-07 20:53:57 +0000 (Tue, 07 Jan 2014)
Log Message:
-----------
CRUE-597
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/transversal/ReportProfilTransversalTopComponent.java
trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/transversal/Bundle.properties
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/transversal/ReportProfilTransversalTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/transversal/ReportProfilTransversalTopComponent.java 2014-01-07 20:35:30 UTC (rev 8560)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/transversal/ReportProfilTransversalTopComponent.java 2014-01-07 20:53:57 UTC (rev 8561)
@@ -145,7 +145,6 @@
protected void chooseSection() {
final List<CatEMHSection> sections = reportService.getModele().getSections();
List<String> sectionNames = TransformerHelper.toNom(sections);
- Collections.sort(sectionNames);
ChooseInListHelper<String> chooser = new ChooseInListHelper<String>();
chooser.setLabel(NbBundle.getMessage(ReportProfilTransversalTopComponent.class, "ChooseSectionName.Label"));
chooser.setDialogTitle(NbBundle.getMessage(ReportProfilTransversalTopComponent.class, "ChooseSection.DialogTitle"));
@@ -165,6 +164,9 @@
}
private CatEMHSection findSection(CatEMHSection current, int inc) {
+ if (current == null) {
+ return null;
+ }
CatEMHBranche branche = current.getBranche();
if (branche != null) {
List<RelationEMHSectionDansBranche> listeSections = branche.getListeSections();
@@ -178,7 +180,7 @@
NbBundle.getMessage(ReportProfilTransversalTopComponent.class, "NoAvalSectionWithResultat.DialogContent"));
} else {
DialogHelper.showInfo(NbBundle.getMessage(ReportProfilTransversalTopComponent.class, "SectionNavigation.InfoDialog"),
- NbBundle.getMessage(ReportProfilTransversalTopComponent.class, "NoAvalSectionWithResultat.DialogContent"));
+ NbBundle.getMessage(ReportProfilTransversalTopComponent.class, "SeveralAvalBranche.DialogContent"));
}
return null;
@@ -186,11 +188,7 @@
branche = branchesAval.get(0);
listeSections = branche.getListeSections();
CatEMHSection first = listeSections.get(0).getEmh();
-// if (first.hasResultat()) {
return first;
-// } else {
-// return findSection(first, inc);
-// }
} else if (idx < 0) {
List<CatEMHBranche> branchesAmont = branche.getNoeudAmont().getBranchesAmont();
final boolean empty = CollectionUtils.isEmpty(branchesAmont);
@@ -200,7 +198,7 @@
NbBundle.getMessage(ReportProfilTransversalTopComponent.class, "NoAmontSectionWithResultat.DialogContent"));
} else {
DialogHelper.showInfo(NbBundle.getMessage(ReportProfilTransversalTopComponent.class, "SectionNavigation.InfoDialog"),
- NbBundle.getMessage(ReportProfilTransversalTopComponent.class, "NoAmontSectionWithResultat.DialogContent"));
+ NbBundle.getMessage(ReportProfilTransversalTopComponent.class, "SeveralAmontBranche.DialogContent"));
}
return null;
@@ -261,30 +259,34 @@
@Override
public List<EbliActionInterface> getMainActions() {
- EbliActionSimple chooseSection = new EbliActionSimple(NbBundle.getMessage(ReportProfilTransversalTopComponent.class, "ChooseSection.ButtonName"), null, "SECTIONS") {
- @Override
- public void actionPerformed(ActionEvent _e) {
- chooseSection();
- }
- };
- EbliActionSimple amont = new EbliActionSimple(NbBundle.getMessage(ReportProfilTransversalTopComponent.class, "ChooseSectionAmont.ButtonName"), ReportHelper.getIcon("navigation_previous.png"), "AMONT") {
- @Override
- public void actionPerformed(ActionEvent _e) {
- chooseAmont();
- }
- };
- EbliActionSimple aval = new EbliActionSimple(NbBundle.getMessage(ReportProfilTransversalTopComponent.class, "ChooseSectionAval.ButtonName"), ReportHelper.getIcon("navigation_next.png"), "NEXT") {
- @Override
- public void actionPerformed(ActionEvent _e) {
- chooseAval();
- }
- };
- EbliActionSimple chooseVariables = new EbliActionSimple(NbBundle.getMessage(ReportProfilTransversalTopComponent.class, "AddVariable.ButtonName"), null, "VARIABLES") {
- @Override
- public void actionPerformed(ActionEvent _e) {
- chooseProfilVariables();
- }
- };
+ EbliActionSimple chooseSection = new EbliActionSimple(NbBundle.getMessage(ReportProfilTransversalTopComponent.class, "ChooseSection.ButtonName"),
+ null, "SECTIONS") {
+ @Override
+ public void actionPerformed(ActionEvent _e) {
+ chooseSection();
+ }
+ };
+ EbliActionSimple amont = new EbliActionSimple(NbBundle.getMessage(ReportProfilTransversalTopComponent.class, "ChooseSectionAmont.ButtonName"),
+ ReportHelper.getIcon("navigation_previous.png"), "AMONT") {
+ @Override
+ public void actionPerformed(ActionEvent _e) {
+ chooseAmont();
+ }
+ };
+ EbliActionSimple aval = new EbliActionSimple(NbBundle.getMessage(ReportProfilTransversalTopComponent.class, "ChooseSectionAval.ButtonName"),
+ ReportHelper.getIcon("navigation_next.png"), "NEXT") {
+ @Override
+ public void actionPerformed(ActionEvent _e) {
+ chooseAval();
+ }
+ };
+ EbliActionSimple chooseVariables = new EbliActionSimple(NbBundle.getMessage(ReportProfilTransversalTopComponent.class, "AddVariable.ButtonName"),
+ null, "VARIABLES") {
+ @Override
+ public void actionPerformed(ActionEvent _e) {
+ chooseProfilVariables();
+ }
+ };
return Arrays.asList((EbliActionInterface) chooseSection, amont, aval, chooseVariables, createConfigExternAction());
}
Modified: trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/transversal/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/transversal/Bundle.properties 2014-01-07 20:35:30 UTC (rev 8560)
+++ trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/transversal/Bundle.properties 2014-01-07 20:53:57 UTC (rev 8561)
@@ -9,7 +9,7 @@
ChooseSection.DialogTitle=Profil en travers
SectionNavigation.InfoDialog=Navigation
NoAmontSectionWithResultat.DialogContent=Aucune section amont n'a \u00e9t\u00e9 trouv\u00e9e
-SeveralAontBranche.DialogContent=La navigation vers l'amont est impossible: plusieurs branches amont
+SeveralAmontBranche.DialogContent=La navigation vers l'amont est impossible: plusieurs branches amont
NoAvalSectionWithResultat.DialogContent=Aucune section aval n'a \u00e9t\u00e9 trouv\u00e9e
SeveralAvalBranche.DialogContent=La navigation vers l'aval est impossible: plusieurs branches aval
ConfigureTitle.Action=Configurer le titre
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:35:32
|
Revision: 8560
http://sourceforge.net/p/fudaa/svn/8560
Author: deniger
Date: 2014-01-07 20:35:30 +0000 (Tue, 07 Jan 2014)
Log Message:
-----------
CRUE-602
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerTraceController.java
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerTraceController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerTraceController.java 2014-01-07 20:14:39 UTC (rev 8559)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerTraceController.java 2014-01-07 20:35:30 UTC (rev 8560)
@@ -92,9 +92,7 @@
@Override
public void cancel() {
- if (modified) {
- reset();
- }
+ reset();
super.cancel();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|