[Fudaa-svn-commit] SF.net SVN: fudaa:[7297] trunk/soft/fudaa-crue

[<de...@us...>]

Revision: 7297
          http://fudaa.svn.sourceforge.net/fudaa/?rev=7297&view=rev
Author:   deniger
Date:     2012-06-12 07:38:16 +0000 (Tue, 12 Jun 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/soft/fudaa-crue/crue-server/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-modelling/pom.xml
    trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingComparisonOtherEtuAction.java
    trunk/soft/fudaa-crue/ui-options/pom.xml
    trunk/soft/fudaa-crue/ui-otfa/pom.xml
    trunk/soft/fudaa-crue/ui-planimetry/pom.xml
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/save/ConfigSaver.java
    trunk/soft/fudaa-crue/ui-post/pom.xml
    trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/services/PostServiceImpl.java
    trunk/soft/fudaa-crue/ui-study/pom.xml
    trunk/soft/fudaa-crue/ui-wrapper/pom.xml

Modified: trunk/soft/fudaa-crue/crue-server/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-server/pom.xml	2012-06-11 23:47:45 UTC (rev 7296)
+++ trunk/soft/fudaa-crue/crue-server/pom.xml	2012-06-12 07:38:16 UTC (rev 7297)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>0.53-SNAPSHOT</version>
+    <version>0.54-SNAPSHOT</version>
   </parent>
   <artifactId>crue-server</artifactId>
   <name>Crue server</name>

Modified: trunk/soft/fudaa-crue/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/pom.xml	2012-06-11 23:47:45 UTC (rev 7296)
+++ trunk/soft/fudaa-crue/pom.xml	2012-06-12 07:38:16 UTC (rev 7297)
@@ -8,7 +8,7 @@
   </parent>
   <groupId>org.fudaa.soft.fudaa-crue</groupId>
   <artifactId>fudaa-crue</artifactId>
-  <version>0.53-SNAPSHOT</version>
+  <version>0.54-SNAPSHOT</version>
   <name>Fudaa-Crue</name>
   <packaging>pom</packaging>
   <ciManagement>
@@ -56,7 +56,14 @@
         <groupId>org.fudaa.business.fudaa-sig</groupId>
         <artifactId>fudaa-sig</artifactId>
         <version>${fudaa-sig.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.swinglabs</groupId>
+            <artifactId>swingx</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
+        
       <!--pour les tests-->
       <dependency>
         <groupId>junit</groupId>
@@ -75,6 +82,11 @@
         <version>1.07.00</version>
       </dependency>
       <dependency>
+        <groupId>org.swinglabs.swingx</groupId>
+        <artifactId>swingx-all</artifactId>
+        <version>1.6.3</version>
+      </dependency>
+      <dependency>
         <groupId>org.fudaa.soft.fudaa-crue</groupId>
         <artifactId>crue-server</artifactId>
         <version>${project.version}</version>

Modified: trunk/soft/fudaa-crue/ui-application/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-application/pom.xml	2012-06-11 23:47:45 UTC (rev 7296)
+++ trunk/soft/fudaa-crue/ui-application/pom.xml	2012-06-12 07:38:16 UTC (rev 7297)
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>0.53-SNAPSHOT</version>
+    <version>0.54-SNAPSHOT</version>
   </parent>
 
   <artifactId>application</artifactId>

Modified: trunk/soft/fudaa-crue/ui-branding/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/pom.xml	2012-06-11 23:47:45 UTC (rev 7296)
+++ trunk/soft/fudaa-crue/ui-branding/pom.xml	2012-06-12 07:38:16 UTC (rev 7297)
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>0.53-SNAPSHOT</version>
+    <version>0.54-SNAPSHOT</version>
   </parent>
 
   <artifactId>ui-branding</artifactId>

Modified: trunk/soft/fudaa-crue/ui-commandline/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-commandline/pom.xml	2012-06-11 23:47:45 UTC (rev 7296)
+++ trunk/soft/fudaa-crue/ui-commandline/pom.xml	2012-06-12 07:38:16 UTC (rev 7297)
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>0.53-SNAPSHOT</version>
+    <version>0.54-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	2012-06-11 23:47:45 UTC (rev 7296)
+++ trunk/soft/fudaa-crue/ui-common/pom.xml	2012-06-12 07:38:16 UTC (rev 7297)
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>0.53-SNAPSHOT</version>
+    <version>0.54-SNAPSHOT</version>
   </parent>
 
   <artifactId>ui-common</artifactId>

Modified: trunk/soft/fudaa-crue/ui-comparison/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-comparison/pom.xml	2012-06-11 23:47:45 UTC (rev 7296)
+++ trunk/soft/fudaa-crue/ui-comparison/pom.xml	2012-06-12 07:38:16 UTC (rev 7297)
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>0.53-SNAPSHOT</version>
+    <version>0.54-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	2012-06-11 23:47:45 UTC (rev 7296)
+++ trunk/soft/fudaa-crue/ui-emh/pom.xml	2012-06-12 07:38:16 UTC (rev 7297)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>0.53-SNAPSHOT</version>
+    <version>0.54-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	2012-06-11 23:47:45 UTC (rev 7296)
+++ trunk/soft/fudaa-crue/ui-loader/pom.xml	2012-06-12 07:38:16 UTC (rev 7297)
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>0.53-SNAPSHOT</version>
+    <version>0.54-SNAPSHOT</version>
   </parent>
   <artifactId>ui-loader</artifactId>
   <packaging>nbm</packaging>

Modified: trunk/soft/fudaa-crue/ui-modelling/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/pom.xml	2012-06-11 23:47:45 UTC (rev 7296)
+++ trunk/soft/fudaa-crue/ui-modelling/pom.xml	2012-06-12 07:38:16 UTC (rev 7297)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>0.53-SNAPSHOT</version>
+    <version>0.54-SNAPSHOT</version>
   </parent>
   <packaging>nbm</packaging>
   <artifactId>ui-modelling</artifactId>

Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingComparisonOtherEtuAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingComparisonOtherEtuAction.java	2012-06-11 23:47:45 UTC (rev 7296)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingComparisonOtherEtuAction.java	2012-06-12 07:38:16 UTC (rev 7297)
@@ -4,7 +4,6 @@
  */
 package org.fudaa.fudaa.crue.modelling.action;
 
-import java.awt.event.ActionEvent;
 import javax.swing.Action;
 import org.fudaa.dodico.crue.metier.etude.EMHProjet;
 import org.fudaa.fudaa.crue.comparison.ScenarioComparaisonLauncher;

Modified: trunk/soft/fudaa-crue/ui-options/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-options/pom.xml	2012-06-11 23:47:45 UTC (rev 7296)
+++ trunk/soft/fudaa-crue/ui-options/pom.xml	2012-06-12 07:38:16 UTC (rev 7297)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>0.53-SNAPSHOT</version>
+    <version>0.54-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	2012-06-11 23:47:45 UTC (rev 7296)
+++ trunk/soft/fudaa-crue/ui-otfa/pom.xml	2012-06-12 07:38:16 UTC (rev 7297)
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>0.53-SNAPSHOT</version>
+    <version>0.54-SNAPSHOT</version>
   </parent>
 
   <artifactId>ui-otfa</artifactId>

Modified: trunk/soft/fudaa-crue/ui-planimetry/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/pom.xml	2012-06-11 23:47:45 UTC (rev 7296)
+++ trunk/soft/fudaa-crue/ui-planimetry/pom.xml	2012-06-12 07:38:16 UTC (rev 7297)
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>0.53-SNAPSHOT</version>
+    <version>0.54-SNAPSHOT</version>
   </parent>
   <packaging>nbm</packaging>
   <artifactId>ui-planimetry</artifactId>

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/save/ConfigSaver.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/save/ConfigSaver.java	2012-06-11 23:47:45 UTC (rev 7296)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/save/ConfigSaver.java	2012-06-12 07:38:16 UTC (rev 7297)
@@ -59,7 +59,7 @@
       Property property = entry.getValue();
       final Class valueType = property.getValueType();
       PropertyToStringTransformer transformer = createTransformers.get(valueType);
-      if(transformer==null){
+      if (transformer == null) {
         Logger.getLogger(ConfigSaver.class.getName()).log(Level.SEVERE, "no transformer for {0}", valueType);
       }
       assert transformer != null;
@@ -75,28 +75,25 @@
 
   public LinkedHashMap<String, Property> getProperties(VisuConfiguration in, LayerVisibility visibility) {
     LinkedHashMap<String, Property> res = new LinkedHashMap<String, Property>();
-    final VisuConfiguration visuConfiguration = new VisuConfiguration();
-    Sheet.Set generalConfig = VisuConfigurationInfo.createSet(visuConfiguration);
+    Sheet.Set generalConfig = VisuConfigurationInfo.createSet(in);
     addProperties(res, generalConfig);
-
-    List<Sheet.Set> sectionConfig = SectionConfigurationInfo.createSet(visuConfiguration.getSectionConfiguration());
+    List<Sheet.Set> sectionConfig = SectionConfigurationInfo.createSet(in.getSectionConfiguration());
     addVisibility(res, LayerVisibilityInfo.createSectionProperty(visibility));
     addProperties(res, sectionConfig);
 
-    List<Sheet.Set> traceConfig = TraceConfigurationInfo.createSet(visuConfiguration.getTraceConfiguration());
+    List<Sheet.Set> traceConfig = TraceConfigurationInfo.createSet(in.getTraceConfiguration());
     addVisibility(res, LayerVisibilityInfo.createTraceProperty(visibility));
     addProperties(res, traceConfig);
 
-    List<Sheet.Set> nodeConfig = NodeConfigurationInfo.createSet(visuConfiguration.getNodeConfiguration());
+    List<Sheet.Set> nodeConfig = NodeConfigurationInfo.createSet(in.getNodeConfiguration());
     addVisibility(res, LayerVisibilityInfo.createNodeProperty(visibility));
     addProperties(res, nodeConfig);
 
-    List<Sheet.Set> brancheConfig = BrancheConfigurationInfo.createSet(visuConfiguration.getBrancheConfiguration());
-    Color color = visuConfiguration.getBrancheConfiguration().getColor(EnumBrancheType.EMHBrancheBarrageFilEau);
+    List<Sheet.Set> brancheConfig = BrancheConfigurationInfo.createSet(in.getBrancheConfiguration());
     addVisibility(res, LayerVisibilityInfo.createBrancheProperty(visibility));
     addProperties(res, brancheConfig);
 
-    List<Sheet.Set> casierConfig = CasierConfigurationInfo.createSet(visuConfiguration.getCasierConfiguration());
+    List<Sheet.Set> casierConfig = CasierConfigurationInfo.createSet(in.getCasierConfiguration());
     addVisibility(res, LayerVisibilityInfo.createCasierProperty(visibility));
     addProperties(res, casierConfig);
     return res;

Modified: trunk/soft/fudaa-crue/ui-post/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-post/pom.xml	2012-06-11 23:47:45 UTC (rev 7296)
+++ trunk/soft/fudaa-crue/ui-post/pom.xml	2012-06-12 07:38:16 UTC (rev 7297)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>0.53-SNAPSHOT</version>
+    <version>0.54-SNAPSHOT</version>
   </parent>
   <packaging>nbm</packaging>
   <artifactId>ui-post</artifactId>

Modified: trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/services/PostServiceImpl.java
===================================================================
--- trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/services/PostServiceImpl.java	2012-06-11 23:47:45 UTC (rev 7296)
+++ trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/services/PostServiceImpl.java	2012-06-12 07:38:16 UTC (rev 7297)
@@ -1,20 +1,11 @@
 package org.fudaa.fudaa.crue.post.services;
 
 import java.awt.EventQueue;
-import java.util.Collection;
-import java.util.List;
 import java.util.Map;
 import org.fudaa.dodico.crue.io.common.CrueFileType;
-import org.fudaa.dodico.crue.metier.emh.CompteRendu;
-import org.fudaa.dodico.crue.metier.emh.CompteRendusInfoEMH;
-import org.fudaa.dodico.crue.metier.emh.EMHModeleBase;
-import org.fudaa.dodico.crue.metier.emh.EMHScenario;
-import org.fudaa.dodico.crue.metier.emh.EnumInfosEMH;
-import org.fudaa.dodico.crue.metier.emh.InfosEMH;
 import org.fudaa.dodico.crue.metier.etude.EMHProjet;
 import org.fudaa.dodico.crue.metier.etude.EMHRun;
 import org.fudaa.dodico.crue.metier.etude.ManagerEMHScenario;
-import org.fudaa.dodico.crue.metier.helper.EMHHelper;
 import org.fudaa.dodico.crue.projet.calcul.CalculCrueRunnerManager;
 import org.fudaa.dodico.crue.projet.calcul.ExecInputDefault;
 import org.fudaa.dodico.crue.projet.coeur.CoeurConfigContrat;

Modified: trunk/soft/fudaa-crue/ui-study/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-study/pom.xml	2012-06-11 23:47:45 UTC (rev 7296)
+++ trunk/soft/fudaa-crue/ui-study/pom.xml	2012-06-12 07:38:16 UTC (rev 7297)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>0.53-SNAPSHOT</version>
+    <version>0.54-SNAPSHOT</version>
   </parent>
   <packaging>nbm</packaging>
   <artifactId>ui-study</artifactId>

Modified: trunk/soft/fudaa-crue/ui-wrapper/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-wrapper/pom.xml	2012-06-11 23:47:45 UTC (rev 7296)
+++ trunk/soft/fudaa-crue/ui-wrapper/pom.xml	2012-06-12 07:38:16 UTC (rev 7297)
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>0.53-SNAPSHOT</version>
+    <version>0.54-SNAPSHOT</version>
   </parent>
 
   <artifactId>ui-wrapper</artifactId>
@@ -26,9 +26,10 @@
       <artifactId>fudaa-sig</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.fudaa.framework.ebli</groupId>
-      <artifactId>ebli-2d</artifactId>
+      <groupId>org.swinglabs.swingx</groupId>
+      <artifactId>swingx-all</artifactId>
     </dependency>
+    
   </dependencies>
 
   <build>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.