fudaa-svn-commit — svn commit with diffs

[Fudaa-svn-commit] SF.net SVN: fudaa:[8413] trunk/soft/fudaa-crue/ui-modelling/src/main/java/ org/fudaa/fudaa/crue/modelling/loi/persist/CourbeConfigUpdater.java

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

Revision: 8413
          http://sourceforge.net/p/fudaa/svn/8413
Author:   deniger
Date:     2013-06-05 20:21:51 +0000 (Wed, 05 Jun 2013)
Log Message:
-----------
axe horizontal peut utiliser nom de variable et non uniquement la nature

Modified Paths:
--------------
    trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/persist/CourbeConfigUpdater.java

Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/persist/CourbeConfigUpdater.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/persist/CourbeConfigUpdater.java	2013-06-05 20:21:05 UTC (rev 8412)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/persist/CourbeConfigUpdater.java	2013-06-05 20:21:51 UTC (rev 8413)
@@ -6,6 +6,7 @@
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
+import org.fudaa.ebli.courbe.EGAxeHorizontal;
 import org.fudaa.ebli.courbe.EGAxeHorizontalPersist;
 import org.fudaa.ebli.courbe.EGAxeVertical;
 import org.fudaa.ebli.courbe.EGAxeVerticalPersist;
@@ -49,11 +50,17 @@
     }
     EGAxeHorizontalPersist horizontalPersist = config.getHorizontalPersist();
     if (horizontalPersist != null) {
+      final EGAxeHorizontal axeX = loiUiController.getAxeX();
+      String unit = axeX.getUnite();
+      String titre = axeX.getTitre();
       if (updateRange) {
-        horizontalPersist.apply(loiUiController.getAxeX());
+        horizontalPersist.apply(axeX);
       } else {
-        horizontalPersist.applyButRange(loiUiController.getAxeX());
+        horizontalPersist.applyButRange(axeX);
       }
+      axeX.setTitre(titre);
+      axeX.setUnite(unit);
+
     }
     for (EGAxeVertical axeY : axesY) {
       Object key = axeY.getKey();

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

[Fudaa-svn-commit] SF.net SVN: fudaa:[8412] trunk/soft/fudaa-crue/ui-loi/src/main/java/org/ fudaa/fudaa/crue/loi

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

Revision: 8412
          http://sourceforge.net/p/fudaa/svn/8412
Author:   deniger
Date:     2013-06-05 20:21:05 +0000 (Wed, 05 Jun 2013)
Log Message:
-----------
axe horizontal peut utiliser nom de variable et non uniquement la nature

Modified Paths:
--------------
    trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/casier/ProfilCasierLoiUiController.java
    trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbesUiController.java
    trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/DefaultLoiTableModel.java
    trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/res/ProfilSectionLoiUiResController.java
    trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilSectionLoiUiController.java

Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/casier/ProfilCasierLoiUiController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/casier/ProfilCasierLoiUiController.java	2013-05-18 22:04:05 UTC (rev 8411)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/casier/ProfilCasierLoiUiController.java	2013-06-05 20:21:05 UTC (rev 8412)
@@ -26,6 +26,7 @@
   ProfilCasierLitUtileState litUtileState;
 
   public ProfilCasierLoiUiController() {
+    setUseVariableForAxeH(true);
   }
 
   public ProfilCasierLitUtileState getLitUtileState() {

Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbesUiController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbesUiController.java	2013-05-18 22:04:05 UTC (rev 8411)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbesUiController.java	2013-06-05 20:21:05 UTC (rev 8412)
@@ -238,8 +238,9 @@
     }
     configureAxeH(varAbscisse.getNature(), usePresentation);
     axeH.setTitre(varAbscisse.getDisplayNom());
+    axeH.setUserObject(varAbscisse);
   }
-  
+
   public EGAxeVertical findAxe(final ItemVariable varOrdonnee) {
     if (varOrdonnee == null) {
       return null;

Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/DefaultLoiTableModel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/DefaultLoiTableModel.java	2013-05-18 22:04:05 UTC (rev 8411)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/DefaultLoiTableModel.java	2013-06-05 20:21:05 UTC (rev 8412)
@@ -78,7 +78,7 @@
   @Override
   public Object getValueAt(int _rowIndex, int _columnIndex) {
     if (_columnIndex == 0) {
-      return StringUtils.EMPTY;
+      return CtuluLibString.getString(_rowIndex + 1);
     }
     return super.getValueAt(_rowIndex, _columnIndex);
   }

Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/res/ProfilSectionLoiUiResController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/res/ProfilSectionLoiUiResController.java	2013-05-18 22:04:05 UTC (rev 8411)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/res/ProfilSectionLoiUiResController.java	2013-06-05 20:21:05 UTC (rev 8412)
@@ -15,7 +15,6 @@
   public ProfilSectionLoiUiResController(ConfigDefaultValuesProvider defaultValuesProvider) {
     super(defaultValuesProvider);
     tableGraphePanel.setAddPasteButtons(false);
-
   }
 
   @Override

Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilSectionLoiUiController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilSectionLoiUiController.java	2013-05-18 22:04:05 UTC (rev 8411)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilSectionLoiUiController.java	2013-06-05 20:21:05 UTC (rev 8412)
@@ -78,6 +78,7 @@
   JPanel pnEtiquettes;
 
   public ProfilSectionLoiUiController(ConfigDefaultValuesProvider defaultValuesProvider) {
+    setUseVariableForAxeH(true);
     tableGraphePanel.getTable().getModel().addTableModelListener(this);
     tableGraphePanel.getTable().addMouseListener(new MouseAdapter() {
       @Override

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

[Fudaa-svn-commit] SF.net SVN: fudaa:[8411] trunk/soft/fudaa-mascaret

[<bma...@us...>]

Revision: 8411
          http://sourceforge.net/p/fudaa/svn/8411
Author:   bmarchan
Date:     2013-05-18 22:04:05 +0000 (Sat, 18 May 2013)
Log Message:
-----------
Chgt pom

Modified Paths:
--------------
    trunk/soft/fudaa-mascaret/distrib/pom.xml
    trunk/soft/fudaa-mascaret/pom.xml
    trunk/soft/fudaa-mascaret/server/pom.xml
    trunk/soft/fudaa-mascaret/ui/pom.xml

Modified: trunk/soft/fudaa-mascaret/distrib/pom.xml
===================================================================
--- trunk/soft/fudaa-mascaret/distrib/pom.xml	2013-05-18 20:10:45 UTC (rev 8410)
+++ trunk/soft/fudaa-mascaret/distrib/pom.xml	2013-05-18 22:04:05 UTC (rev 8411)
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-mascaret</groupId>
     <artifactId>fudaa-mascaret</artifactId>
-    <version>3.1.5</version>
+    <version>3.1.6-SNAPSHOT</version>
   </parent>
   <artifactId>mascaret-distrib</artifactId>
   <properties>

Modified: trunk/soft/fudaa-mascaret/pom.xml
===================================================================
--- trunk/soft/fudaa-mascaret/pom.xml	2013-05-18 20:10:45 UTC (rev 8410)
+++ trunk/soft/fudaa-mascaret/pom.xml	2013-05-18 22:04:05 UTC (rev 8411)
@@ -15,7 +15,7 @@
   </parent>
   <groupId>org.fudaa.soft.fudaa-mascaret</groupId>
   <artifactId>fudaa-mascaret</artifactId>
-  <version>3.1.5</version>
+  <version>3.1.6-SNAPSHOT</version>
   <name>Fudaa-Mascaret</name>
   <packaging>pom</packaging>
   <modules>

Modified: trunk/soft/fudaa-mascaret/server/pom.xml
===================================================================
--- trunk/soft/fudaa-mascaret/server/pom.xml	2013-05-18 20:10:45 UTC (rev 8410)
+++ trunk/soft/fudaa-mascaret/server/pom.xml	2013-05-18 22:04:05 UTC (rev 8411)
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-mascaret</groupId>
     <artifactId>fudaa-mascaret</artifactId>
-    <version>3.1.5</version>
+    <version>3.1.6-SNAPSHOT</version>
   </parent>
   <artifactId>mascaret-server</artifactId>
   <build>

Modified: trunk/soft/fudaa-mascaret/ui/pom.xml
===================================================================
--- trunk/soft/fudaa-mascaret/ui/pom.xml	2013-05-18 20:10:45 UTC (rev 8410)
+++ trunk/soft/fudaa-mascaret/ui/pom.xml	2013-05-18 22:04:05 UTC (rev 8411)
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-mascaret</groupId>
     <artifactId>fudaa-mascaret</artifactId>
-    <version>3.1.5</version>
+    <version>3.1.6-SNAPSHOT</version>
   </parent>
   <artifactId>mascaret-ui</artifactId>
   <build>

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

[Fudaa-svn-commit] SF.net SVN: fudaa:[8410] trunk/soft/fudaa-mascaret

[<bma...@us...>]

Revision: 8410
          http://sourceforge.net/p/fudaa/svn/8410
Author:   bmarchan
Date:     2013-05-18 20:10:45 +0000 (Sat, 18 May 2013)
Log Message:
-----------


Modified Paths:
--------------
    trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/Rubens1DNonPermReader.java
    trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/Rubens1DNonPermWriter.java
    trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java

Modified: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/Rubens1DNonPermReader.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/Rubens1DNonPermReader.java	2013-05-16 21:48:56 UTC (rev 8409)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/Rubens1DNonPermReader.java	2013-05-18 20:10:45 UTC (rev 8410)
@@ -62,7 +62,7 @@
       CtuluLibMessage.println("numSectionOrigine=",numSectionOrigine);
       int[] numSectionFin = readIntegerRecord();
       CtuluLibMessage.println("numSectionFin=",numSectionFin);
-      ArrayList nomsVarIndependanteTemps = new ArrayList(4);
+      ArrayList<String> nomsVarIndependanteTemps = new ArrayList<String>(4);
       String nomVar=null;
       while (!NOM_FIN.equals(nomVar)) {
         nomVar = readStringRecord();
@@ -79,7 +79,7 @@
       for (int i = 0; i < nbVarIndependanteTemps; i++) {
         valeurVarIndependante[i] = readFloatRecord();
       }
-      ArrayList nomsVarDependanteTemps = new ArrayList();
+      ArrayList<String> nomsVarDependanteTemps = new ArrayList<String>();
       nomVar="";
       while (!NOM_FIN.equals(nomVar)) {
         nomVar = readStringRecord();
@@ -91,8 +91,7 @@
       int nbVarDependanteTemps=nomsVarDependanteTemps.size();
       CtuluLibMessage.println("lecture donn\xE9es temporelles (passe 1)");
       int nbPasTemps = 0;
-      int isAvailable;
-      while((isAvailable=is_.available())>10) {
+      while(is_.available()>10) {
         is_.readRecord(); // numPasTemps
         nbPasTemps++;
         is_.readRecord(); // Temps

Modified: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/Rubens1DNonPermWriter.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/Rubens1DNonPermWriter.java	2013-05-16 21:48:56 UTC (rev 8409)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/mascaret/Rubens1DNonPermWriter.java	2013-05-18 20:10:45 UTC (rev 8410)
@@ -62,8 +62,8 @@
         writeIntegerRecord(numSectionFin); // fin bief
 
         // Ecriture des noms des variables ind\xE9pendante du temps
-        ArrayList indicesVarIndependantTps=new ArrayList();
-        ArrayList indicesVarDependantTps=new ArrayList();
+        ArrayList<Integer> indicesVarIndependantTps=new ArrayList<Integer>();
+        ArrayList<Integer> indicesVarDependantTps=new ArrayList<Integer>();
         int nbVarTotal = sres.variables.length;
         ecritureNomsVarIndepTps(sres, indicesVarIndependantTps,
                                 indicesVarDependantTps, nbVarTotal);
@@ -85,8 +85,8 @@
         int nbCasierLiaison = sres.resultatsBiefs.length;
         writeIntegerRecord(nbCasierLiaison); // fin section
         // Ecriture des noms des variables ind\xE9pendante du temps
-        ArrayList indicesVarIndependantTps=new ArrayList();
-        ArrayList indicesVarDependantTps=new ArrayList();
+        ArrayList<Integer> indicesVarIndependantTps=new ArrayList<Integer>();
+        ArrayList<Integer> indicesVarDependantTps=new ArrayList<Integer>();
         int nbVarTotal = sres.variables.length;
         ecritureNomsVarIndepTps(sres, indicesVarIndependantTps,
                                 indicesVarDependantTps, nbVarTotal);
@@ -113,7 +113,7 @@
   }
 
   private void ecritureValeursDepTps(SResultatsTemporelSpatial sres,
-                                     ArrayList indicesVarDependantTps,
+                                     ArrayList<Integer> indicesVarDependantTps,
                                      int nbVarDependantTps) throws IOException {
     for (int i = 0; i < sres.pasTemps.length; i++) {
       writeIntegerRecord(i+1, i+1);
@@ -121,7 +121,7 @@
       writeFloatRecord(tps,tps);
       writeIntegerRecord(nbSectionTotal_,nbSectionTotal_);
       for (int j = 0; j < nbVarDependantTps; j++) {
-        int indiceVar = ((Integer)indicesVarDependantTps.get(j)).intValue();
+        int indiceVar = indicesVarDependantTps.get(j).intValue();
         float[] valeurs = getValeursVar(indiceVar,i,sres.resultatsBiefs);
         writeFloatRecord(valeurs);
       }
@@ -129,10 +129,10 @@
   }
 
   private void ecritureNomsvarDepTps(SResultatsTemporelSpatial sres,
-                                     ArrayList indicesVarDependantTps,
+                                     ArrayList<Integer> indicesVarDependantTps,
                                      int nbVarDependantTps) throws IOException {
     for (int i = 0; i < nbVarDependantTps; i++) {
-      int indiceVar = ((Integer)indicesVarDependantTps.get(i)).intValue();
+      int indiceVar = indicesVarDependantTps.get(i).intValue();
       String nomVar = sres.variables[indiceVar].nomCourt;
       writeStringRecord(to4Char(nomVar));
     }
@@ -140,7 +140,7 @@
   }
 
   private void ecritureValeursIndepTps(SResultatsTemporelSpatial sres,
-                                       ArrayList indicesVarIndependantTps) throws
+                                       ArrayList<Integer> indicesVarIndependantTps) throws
       IOException {
     writeIntegerRecord(nbSectionTotal_,nbSectionTotal_); // NbSecEff, NbSecEff
     // D'abord \xE9criture des abscisses
@@ -149,15 +149,15 @@
     // Ensuite \xE9criture des autres variables
     int nbVarIndependantTps = indicesVarIndependantTps.size();
     for (int i = 0; i < nbVarIndependantTps; i++) {
-      int indiceVar = ((Integer)indicesVarIndependantTps.get(i)).intValue();
+      int indiceVar = indicesVarIndependantTps.get(i).intValue();
       float[] valeurs = getValeursVar(indiceVar,0,sres.resultatsBiefs);
       writeFloatRecord(valeurs);
     }
   }
 
   private void ecritureNomsVarIndepTps(SResultatsTemporelSpatial sres,
-                                       ArrayList indicesVarIndependantTps,
-                                       ArrayList indicesVarDependantTps,
+                                       ArrayList<Integer> indicesVarIndependantTps,
+                                       ArrayList<Integer> indicesVarDependantTps,
                                        int nbVarTotal) throws IOException {
     writeStringRecord(to4Char("X")); // d'abord l'abscisse
     for (int i = 0; i < nbVarTotal; i++) {
@@ -173,7 +173,7 @@
   }
 
   private void ecritureValeursIndepTpsCasierLiaison(SResultatsTemporelSpatial
-      sres, ArrayList indicesVarIndependantTps) throws IOException {
+      sres, ArrayList<Integer> indicesVarIndependantTps) throws IOException {
     int nbCasierLiaison = sres.resultatsBiefs.length;
     writeIntegerRecord(nbCasierLiaison,nbCasierLiaison); // NbSecEff, NbSecEff
     // D'abord \xE9criture des abscisses qui sont en fait des numeros de section.
@@ -186,7 +186,7 @@
     for (int i = 0; i < nbVar; i++) {
       for (int j = 0; j < nbCasierLiaison; j++) {
         SResultatsTemporelSpatialBief resCasierLiaisoni = sres.resultatsBiefs[j];
-        int indiceVar = ((Integer)indicesVarIndependantTps.get(i)).intValue();
+        int indiceVar = indicesVarIndependantTps.get(i).intValue();
         float val = (float)resCasierLiaisoni.valeursVariables[indiceVar][0][0];
         os_.writeReal(val);
       }
@@ -195,7 +195,7 @@
   }
 
   private void ecritureValeursDepTpsCasierLiaison(SResultatsTemporelSpatial sres,
-      ArrayList indicesVarIndependantTps, int nbVarDependantTps) throws IOException {
+      ArrayList<Integer> indicesVarIndependantTps, int nbVarDependantTps) throws IOException {
     int nbCasierLiaison = sres.resultatsBiefs.length;
     int nbVar = indicesVarIndependantTps.size();
     int nbPasTps = sres.pasTemps.length;
@@ -207,7 +207,7 @@
       for (int j = 0; j < nbVar; j++) {
         for (int k = 0; k < nbCasierLiaison; k++) {
           SResultatsTemporelSpatialBief resCasierLiaisoni = sres.resultatsBiefs[k];
-          int indiceVar = ((Integer)indicesVarIndependantTps.get(j)).intValue();
+          int indiceVar = indicesVarIndependantTps.get(j).intValue();
           float val = (float)resCasierLiaisoni.valeursVariables[indiceVar][i][0];
           os_.writeReal(val);
         }

Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java	2013-05-16 21:48:56 UTC (rev 8409)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java	2013-05-18 20:10:45 UTC (rev 8410)
@@ -148,7 +148,7 @@
   static {
     isApp_.name = "Fudaa-Mascaret";
     isApp_.version = "3.1.6";
-    isApp_.date = "16-05-2013";
+    isApp_.date = "17-05-2013";
     isApp_.rights = MascaretResource.MASCARET.getString("Tous droits r\xE9serv\xE9s") + ". EDF-CETMEF (c) 2001-2013";
 //    isApp_.contact = "http://www.openmascaret.org/index.php?option=com_kunena&view=category&Itemid=177&layout=list";
     isApp_.contact = "http://www.openmascaret.org/";

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

[Fudaa-svn-commit] SF.net SVN: fudaa:[8409] trunk/soft/fudaa-mascaret/ui/src/main/java/org/ fudaa/fudaa/mascaret/MascaretImplementation.java

[<bma...@us...>]

Revision: 8409
          http://sourceforge.net/p/fudaa/svn/8409
Author:   bmarchan
Date:     2013-05-16 21:48:56 +0000 (Thu, 16 May 2013)
Log Message:
-----------
Version 3.1.6 suite a fix pb binaire

Modified Paths:
--------------
    trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java

Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java	2013-05-16 21:37:59 UTC (rev 8408)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java	2013-05-16 21:48:56 UTC (rev 8409)
@@ -147,9 +147,9 @@
 
   static {
     isApp_.name = "Fudaa-Mascaret";
-    isApp_.version = "3.1.5";
-    isApp_.date = "07-D\xE9cembre-2012";
-    isApp_.rights = MascaretResource.MASCARET.getString("Tous droits r\xE9serv\xE9s") + ". EDF-CETMEF (c) 2001-2012";
+    isApp_.version = "3.1.6";
+    isApp_.date = "16-05-2013";
+    isApp_.rights = MascaretResource.MASCARET.getString("Tous droits r\xE9serv\xE9s") + ". EDF-CETMEF (c) 2001-2013";
 //    isApp_.contact = "http://www.openmascaret.org/index.php?option=com_kunena&view=category&Itemid=177&layout=list";
     isApp_.contact = "http://www.openmascaret.org/";
     isApp_.license = MascaretResource.MASCARET.getString("licences GPL pour Fudaa-Mascaret et le noyau de calcul");
@@ -168,7 +168,7 @@
     isApp_.libraries = null;
     isApp_.thanks = new String[]{"Fudaa team"};
     idApp_.name = "Fudaa-Mascaret";
-    idApp_.version = "3.1.5";
+    idApp_.version = "3.1.6";
     idApp_.organization = "EDF-CETMEF";
     idApp_.author = author;
     idApp_.contact = "http://www.openmascaret.org/";

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

[Fudaa-svn-commit] SF.net SVN: fudaa:[8408] trunk/business/dodico-h2d/io/src/main/java/org/ fudaa/dodico

[<bma...@us...>]

Revision: 8408
          http://sourceforge.net/p/fudaa/svn/8408
Author:   bmarchan
Date:     2013-05-16 21:37:59 +0000 (Thu, 16 May 2013)
Log Message:
-----------
Fix : Ecriture/lecture des fichiers binaires en fonction de ByteOrder.nativeOrder() et non plus en fonction du nom de l'architecture.

Modified Paths:
--------------
    trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/CLVWriter.java
    trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/telemac/io/MatisseReader.java

Modified: trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/CLVWriter.java
===================================================================
--- trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/CLVWriter.java	2013-05-16 21:35:21 UTC (rev 8407)
+++ trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/reflux/io/CLVWriter.java	2013-05-16 21:37:59 UTC (rev 8408)
@@ -109,7 +109,7 @@
   public void setFile(final File _f) {
     analyze_ = new CtuluAnalyze();
     try {
-      out_ = new FortranBinaryOutputStream(new FileOutputStream(_f), false,NativeBinarySystem.getLocalMachineId());
+      out_ = new FortranBinaryOutputStream(new FileOutputStream(_f), false);
     } catch (final FileNotFoundException e) {
       e.printStackTrace();
     }

Modified: trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/telemac/io/MatisseReader.java
===================================================================
--- trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/telemac/io/MatisseReader.java	2013-05-16 21:35:21 UTC (rev 8407)
+++ trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/telemac/io/MatisseReader.java	2013-05-16 21:37:59 UTC (rev 8408)
@@ -15,6 +15,7 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.ByteOrder;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -30,7 +31,6 @@
 import org.fudaa.ctulu.gis.GISPolyligne;
 import org.fudaa.ctulu.gis.GISZone;
 import org.fudaa.ctulu.gis.GISZoneCollectionPoint;
-
 import org.fudaa.dodico.commun.DodicoLib;
 import org.fudaa.dodico.fichiers.NativeBinarySystem;
 import org.fudaa.dodico.fortran.FortranBinaryInputStream;
@@ -45,7 +45,7 @@
  */
 public class MatisseReader extends FileReadOperationAbstract implements CtuluActivity {
 
-  private String machineID_;
+  private ByteOrder byteOrder_;
   BufferedInputStream in_;
 
   boolean stop_;
@@ -53,7 +53,7 @@
   long totalSize_;
 
   public MatisseReader() {
-    machineID_ = NativeBinarySystem.getLocalMachineId();
+    byteOrder_ = NativeBinarySystem.getNativeByteOrder();
   }
 
   /**
@@ -78,7 +78,7 @@
   private synchronized GISZone readMatisse() {
     final GISZone r = new GISZone();
     try {
-      FortranBinaryInputStream in = new FortranBinaryInputStream(in_, false, machineID_);
+      FortranBinaryInputStream in = new FortranBinaryInputStream(in_, false, byteOrder_);
       // TITRE
       // Lecture du titre
       // je ne sais pas a quoi sert les 5 premier bytes
@@ -90,13 +90,13 @@
       int v2 = in.readInteger();
       if (v2 > 2) {
         // System.out.println("changement de format binaire");
-        if (NativeBinarySystem.isSparc(machineID_)) {
-          machineID_ = NativeBinarySystem.X86;
+        if (byteOrder_.equals(ByteOrder.LITTLE_ENDIAN)) {
+          byteOrder_ = ByteOrder.BIG_ENDIAN;
         } else {
-          machineID_ = NativeBinarySystem.SPARC;
+          byteOrder_ = ByteOrder.LITTLE_ENDIAN;
         }
         in_.reset();
-        in = new FortranBinaryInputStream(in_, false, machineID_);
+        in = new FortranBinaryInputStream(in_, false, byteOrder_);
         /* v1 = */in.readInt8();
         v2 = in.readInteger();
         if (v2 > 2) {
@@ -282,14 +282,6 @@
     progress_.setProgression((int) (_pos * 100L / totalSize_));
   }
 
-  /**
-   * @return l'identifiant de la machine
-   * @see NativeBinarySystem#getLocalMachineId()
-   */
-  public String getMachineId() {
-    return machineID_;
-  }
-
   @Override
   public void setFile(final File _f) {
 
@@ -322,13 +314,4 @@
     stop_ = true;
 
   }
-
-  /**
-   * @param _id l'identifiant de la machine
-   * @see NativeBinarySystem#getLocalMachineId()
-   */
-  public void setMachineId(final String _id) {
-    machineID_ = NativeBinarySystem.getMachineId(_id);
-  }
-
 }
\ No newline at end of file

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

[Fudaa-svn-commit] SF.net SVN: fudaa:[8407] trunk/framework/dodico-common/src/main/java/org/ fudaa/dodico

[<bma...@us...>]

Revision: 8407
          http://sourceforge.net/p/fudaa/svn/8407
Author:   bmarchan
Date:     2013-05-16 21:35:21 +0000 (Thu, 16 May 2013)
Log Message:
-----------
Fix : Ecriture/lecture des fichiers binaires en fonction de ByteOrder.nativeOrder() et non plus en fonction du nom de l'architecture.

Modified Paths:
--------------
    trunk/framework/dodico-common/src/main/java/org/fudaa/dodico/fichiers/NativeBinaryInputStream.java
    trunk/framework/dodico-common/src/main/java/org/fudaa/dodico/fichiers/NativeBinaryOutputStream.java
    trunk/framework/dodico-common/src/main/java/org/fudaa/dodico/fichiers/NativeBinarySystem.java
    trunk/framework/dodico-common/src/main/java/org/fudaa/dodico/fortran/DodicoArraysBinaryFileSaver.java
    trunk/framework/dodico-common/src/main/java/org/fudaa/dodico/fortran/DodicoDoubleArrayBinaryFileSaver.java
    trunk/framework/dodico-common/src/main/java/org/fudaa/dodico/fortran/FortranBinaryInputStream.java
    trunk/framework/dodico-common/src/main/java/org/fudaa/dodico/fortran/FortranBinaryOutputStream.java

Modified: trunk/framework/dodico-common/src/main/java/org/fudaa/dodico/fichiers/NativeBinaryInputStream.java
===================================================================
--- trunk/framework/dodico-common/src/main/java/org/fudaa/dodico/fichiers/NativeBinaryInputStream.java	2013-05-16 20:24:17 UTC (rev 8406)
+++ trunk/framework/dodico-common/src/main/java/org/fudaa/dodico/fichiers/NativeBinaryInputStream.java	2013-05-16 21:35:21 UTC (rev 8407)
@@ -11,10 +11,11 @@
 import java.io.DataInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.ByteOrder;
 
 /**
- * Une classe etendant DataInputStream et permettant de facilement lire des fichiers binaires dependants de la machine
- * (sparc, i386, ...).
+ * Une classe etendant DataInputStream et permettant de facilement lire des fichiers binaires dependants de l'architecture
+ * endianess  (LITTLE_ENDIAN ou BIG_ENDIAN).
  * 
  * @version $Id: NativeBinaryInputStream.java,v 1.6 2006-09-28 13:39:11 deniger Exp $
  * @author Axel von Arnim
@@ -37,6 +38,7 @@
    * @param _bufferLength la taille du buffer
    * @param _machine l'identifiant de la machine
    * @throws IOException
+   * @deprecated L'identifiant machine ne permet pas d'identifier le byte order natif.
    */
   public NativeBinaryInputStream(final InputStream _in, final int _bufferLength, final String _machine)
       throws IOException {
@@ -47,6 +49,7 @@
    * @param _in le flux support
    * @param _machine l'identifiant de la machine
    * @throws IOException
+   * @deprecated L'identifiant machine ne permet pas d'identifier le byte order natif.
    */
   public NativeBinaryInputStream(final InputStream _in, final String _machine) throws IOException {
     this(new BufferedInputStream(_in), _machine);
@@ -56,6 +59,7 @@
    * @param _in le flux support
    * @param _machine l'identifiant de la machine
    * @throws IOException
+   * @deprecated L'identifiant machine ne permet pas d'identifier le byte order natif.
    */
   public NativeBinaryInputStream(final BufferedInputStream _in, final String _machine) throws IOException {
     in_ = new DataInputStream(_in);
@@ -64,6 +68,34 @@
   }
 
   /**
+   * @param _in le flux support
+   * @throws IOException
+   */
+  public NativeBinaryInputStream(final InputStream _in) throws IOException {
+    this(_in, NativeBinarySystem.getNativeByteOrder());
+  }
+
+  /**
+   * @param _in le flux support
+   * @param _byteOrder L'endianess machine.
+   * @throws IOException
+   */
+  public NativeBinaryInputStream(final InputStream _in, ByteOrder _byteOrder) throws IOException {
+    this(new BufferedInputStream(_in),_byteOrder);
+  }
+
+  /**
+   * @param _in le flux support
+   * @param _byteOrder L'endianess machine.
+   * @throws IOException
+   */
+  public NativeBinaryInputStream(final BufferedInputStream _in, ByteOrder _byteOrder) throws IOException {
+    in_ = new DataInputStream(_in);
+    setByteOrder(_byteOrder);
+    buf_ = new byte[8];
+  }
+
+  /**
    * Lecture d'un champ chaine de caract\xE8res " <I>character </I>" Fortran.
    * 
    * @param _lgString Longueur de la chaine \xE0 lire
@@ -129,9 +161,26 @@
   }
 
   /**
+   * Affecte l'endianess.
+   * 
+   * @param _byteOrder L'endianess de l'architecture machine.
+   */
+  public final void setByteOrder(final ByteOrder _byteOrder) {
+    system_.setByteOrder(_byteOrder);
+  }
+
+  /**
+   * @return L'endianess associ\xE9 \xE0 l'arcitecture machine.
+   */
+  public final ByteOrder getByteOrder() {
+    return system_.getByteOrder();
+  }
+
+  /**
    * Affecte le type de machine. Par d\xE9faut, le type sparc est utilise.
    * 
    * @param _machine le type de la machine
+   * @deprecated L'identifiant machine ne permet pas d'identifier le byte order natif.
    */
   public final void setMachineType(final String _machine) {
     system_.setMachineType(_machine);
@@ -139,6 +188,7 @@
 
   /**
    * @return l'identifiant de la machine utilisee
+   * @deprecated L'identifiant machine ne permet pas d'identifier le byte order natif.
    */
   public String getMachineType() {
     return system_.getMachineType();

Modified: trunk/framework/dodico-common/src/main/java/org/fudaa/dodico/fichiers/NativeBinaryOutputStream.java
===================================================================
--- trunk/framework/dodico-common/src/main/java/org/fudaa/dodico/fichiers/NativeBinaryOutputStream.java	2013-05-16 20:24:17 UTC (rev 8406)
+++ trunk/framework/dodico-common/src/main/java/org/fudaa/dodico/fichiers/NativeBinaryOutputStream.java	2013-05-16 21:35:21 UTC (rev 8407)
@@ -10,6 +10,7 @@
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.nio.ByteOrder;
 
 /**
  * Une classe etendant DataOutputStream et permettant de facilement ecrire des fichiers binaires. dependants de la
@@ -24,29 +25,39 @@
   byte[] buf_;
 
   /**
+   * Contructeur, avec un endianess fonction de l'architecture machine.
    * @param _out le flux suppor
-   * @param _machine la description ou l'id de la machine
    * @see NativeBinarySystem#getLocalMachine()
    */
-  public NativeBinaryOutputStream(final OutputStream _out, final String _machine) {
+  public NativeBinaryOutputStream(final OutputStream _out) {
+    this(_out, NativeBinarySystem.getNativeByteOrder());
+  }
+
+  /**
+   * @param _out le flux suppor
+   * @param _byteOrder l'endianess de la machine
+   * @see NativeBinarySystem#getLocalMachine()
+   */
+  public NativeBinaryOutputStream(final OutputStream _out, final ByteOrder _byteOrder) {
     super(_out);
     buf_ = null;
-    setMachineType(_machine);
+    setByteOrder(_byteOrder);
   }
 
   /**
-   * @param _machine le type de la machine (X86 ou sparc)
-   * @see NativeBinarySystem#getLocalMachine()
+   * Affecte l'endianess.
+   * 
+   * @param _byteOrder L'endianess de l'architecture machine.
    */
-  public final void setMachineType(final String _machine) {
-    syst_.setMachineType(_machine);
+  public final void setByteOrder(final ByteOrder _byteOrder) {
+    syst_.setByteOrder(_byteOrder);
   }
 
   /**
-   * @return le type de machine utilise
+   * @return L'endianess associ\xE9 \xE0 l'arcitecture machine.
    */
-  public String getMachineType() {
-    return syst_.getMachineType();
+  public final ByteOrder getByteOrder() {
+    return syst_.getByteOrder();
   }
 
   /**

Modified: trunk/framework/dodico-common/src/main/java/org/fudaa/dodico/fichiers/NativeBinarySystem.java
===================================================================
--- trunk/framework/dodico-common/src/main/java/org/fudaa/dodico/fichiers/NativeBinarySystem.java	2013-05-16 20:24:17 UTC (rev 8406)
+++ trunk/framework/dodico-common/src/main/java/org/fudaa/dodico/fichiers/NativeBinarySystem.java	2013-05-16 21:35:21 UTC (rev 8407)
@@ -14,6 +14,8 @@
 import java.nio.ByteOrder;
 
 /**
+ * Classe de d\xE9finition des parametres de d\xE9codage des binaires en endianess. 
+ * 
  * @author fred deniger
  * @version $Id: NativeBinarySystem.java,v 1.1 2006-09-28 13:39:23 deniger Exp $
  */
@@ -47,6 +49,9 @@
     return machineType_;
   }
 
+  /**
+   * @deprecated Ne plus utiliser, cette m\xE9thode est erronn\xE9e.
+   */
   public static final ByteOrder getByteOrder(final String _machine) {
     String machine = _machine;
     if (machine == null) {
@@ -57,13 +62,23 @@
 
   }
 
-  public final void setMachineType(final String _machine) {
-    String machine = _machine;
-    if (machine == null) {
-      machine = NativeBinarySystem.getLocalMachine();
-    }
-    byteOrder=getByteOrder(_machine);
-    if (isX86(machine)) {
+  /**
+   * @return Le type d'encodage natif des octets, suivant l'architecture de la machine
+   */
+  public static ByteOrder getNativeByteOrder() {
+    return ByteOrder.nativeOrder();
+  }
+    
+  /**
+   * Definit l'ordre des bytes pour donnees binaires (little_endian ou big_endian).
+   * @param _byteOrder L'ordre des bytes
+   */
+  public final void setByteOrder(ByteOrder _byteOrder) {
+    byteOrder=_byteOrder;
+    
+    if (ByteOrder.LITTLE_ENDIAN.equals(_byteOrder)) {
+      // B.M. Cette bijection entre LITTLE_ENDIAN et X86 est erron\xE9e, mais est historique. 
+      // On la conserve pour la compatibilit\xE9 des programmes.
       machineType_ = X86;
       l1_ = 0;
       i1_ = 0;
@@ -80,6 +95,8 @@
       l7_ = 6;
       l8_ = 7;
     } else {
+      // B.M. Cette bijection entre BIG_ENDIAN et SPARC est erron\xE9e, mais est historique. 
+      // On la conserve pour la compatibilit\xE9 des programmes.
       machineType_ = SPARC;
       l1_ = 7;
       l2_ = 6;
@@ -97,6 +114,17 @@
       s2_ = 0;
     }
   }
+  
+  /**
+   * @deprecated Ne plus utiliser, cette m\xE9thode est erron\xE9e. Utiliser uniquement {@link #setByteOrder(ByteOrder)}
+   */
+  public final void setMachineType(final String _machine) {
+    String machine = _machine;
+    if (machine == null) {
+      machine = NativeBinarySystem.getLocalMachine();
+    }
+    setByteOrder(getByteOrder(_machine));
+  }
 
   /**
    * @param _name le nom SPARC_NAME ou X86_NAME

Modified: trunk/framework/dodico-common/src/main/java/org/fudaa/dodico/fortran/DodicoArraysBinaryFileSaver.java
===================================================================
--- trunk/framework/dodico-common/src/main/java/org/fudaa/dodico/fortran/DodicoArraysBinaryFileSaver.java	2013-05-16 20:24:17 UTC (rev 8406)
+++ trunk/framework/dodico-common/src/main/java/org/fudaa/dodico/fortran/DodicoArraysBinaryFileSaver.java	2013-05-16 21:35:21 UTC (rev 8407)
@@ -1,19 +1,19 @@
 package org.fudaa.dodico.fortran;
 
-import com.memoire.fu.FuEmptyArrays;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileOutputStream;
-
-import org.fudaa.ctulu.fileformat.FortranLib;
-import org.fudaa.dodico.fichiers.NativeBinarySystem;
-
-import com.memoire.fu.FuLog;
-import java.io.FileInputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.ByteOrder;
+
 import org.fudaa.ctulu.CtuluLibArray;
 import org.fudaa.ctulu.CtuluLibFile;
+import org.fudaa.ctulu.fileformat.FortranLib;
 
+import com.memoire.fu.FuEmptyArrays;
+import com.memoire.fu.FuLog;
+
 /**
  * Permet d'\xE9crire facilement des tableaux d'entier, bool\xE9ens dans un fichier binaire.
  *
@@ -56,7 +56,8 @@
     FortranBinaryOutputStream output = null;
     boolean ok = true;
     try {
-      output = new FortranBinaryOutputStream(file, true, NativeBinarySystem.X86);
+      // FIXME B.M. Force a little endian pour correspondre anciennement a X86
+      output = new FortranBinaryOutputStream(file, true, ByteOrder.LITTLE_ENDIAN);
       int nbValues = in.length;
       output.writeInteger(nbValues);
       output.writeRecord();
@@ -164,7 +165,8 @@
     int[][] mapOfValues = null;
     try {
       try {
-        input = new FortranBinaryInputStream(in, true, NativeBinarySystem.X86);
+          // FIXME B.M. Force a little endian pour correspondre anciennement a X86
+        input = new FortranBinaryInputStream(in, true, ByteOrder.LITTLE_ENDIAN);
         input.readRecord();
         int nbValues = input.readInteger();
         if (nbValues >= 0) {
@@ -206,7 +208,8 @@
     FortranBinaryInputStream input = null;
     try {
       try {
-        input = new FortranBinaryInputStream(in, true, NativeBinarySystem.X86);
+          // FIXME B.M. Force a little endian pour correspondre anciennement a X86
+        input = new FortranBinaryInputStream(in, true, ByteOrder.LITTLE_ENDIAN);
         input.readRecord();
         int nbValues = input.readInteger();
         input.readRecord();
@@ -255,7 +258,8 @@
     FortranBinaryOutputStream output = null;
     boolean ok = true;
     try {
-      output = new FortranBinaryOutputStream(out, true, NativeBinarySystem.X86);
+        // FIXME B.M. Force a little endian pour correspondre anciennement a X86
+      output = new FortranBinaryOutputStream(out, true, ByteOrder.LITTLE_ENDIAN);
       int nbValues = mapOfValues.length;
       output.writeInteger(nbValues);
       output.writeRecord();

Modified: trunk/framework/dodico-common/src/main/java/org/fudaa/dodico/fortran/DodicoDoubleArrayBinaryFileSaver.java
===================================================================
--- trunk/framework/dodico-common/src/main/java/org/fudaa/dodico/fortran/DodicoDoubleArrayBinaryFileSaver.java	2013-05-16 20:24:17 UTC (rev 8406)
+++ trunk/framework/dodico-common/src/main/java/org/fudaa/dodico/fortran/DodicoDoubleArrayBinaryFileSaver.java	2013-05-16 21:35:21 UTC (rev 8407)
@@ -4,12 +4,12 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.nio.ByteOrder;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 
 import org.fudaa.ctulu.fileformat.FortranLib;
-import org.fudaa.dodico.fichiers.NativeBinarySystem;
 
 import com.memoire.fu.FuLog;
 
@@ -30,7 +30,8 @@
     FortranBinaryInputStream input = null;
     try {
       try {
-        input = new FortranBinaryInputStream(new FileInputStream(destFile), true, NativeBinarySystem.X86);
+          // FIXME B.M. Force a little endian pour correspondre anciennement a X86
+        input = new FortranBinaryInputStream(new FileInputStream(destFile), true, ByteOrder.LITTLE_ENDIAN);
         while (true) {
           input.readRecord();
           int readInteger = input.readInteger();
@@ -59,7 +60,8 @@
     FortranBinaryOutputStream output = null;
     boolean ok = true;
     try {
-      output = new FortranBinaryOutputStream(new FileOutputStream(destFile), true, NativeBinarySystem.X86);
+        // FIXME B.M. Force a little endian pour correspondre anciennement a X86
+      output = new FortranBinaryOutputStream(new FileOutputStream(destFile), true, ByteOrder.LITTLE_ENDIAN);
       for (Entry<String, double[]> entry : mapOfValues.entrySet()) {
         String key = entry.getKey();
         if (key.isEmpty()) {

Modified: trunk/framework/dodico-common/src/main/java/org/fudaa/dodico/fortran/FortranBinaryInputStream.java
===================================================================
--- trunk/framework/dodico-common/src/main/java/org/fudaa/dodico/fortran/FortranBinaryInputStream.java	2013-05-16 20:24:17 UTC (rev 8406)
+++ trunk/framework/dodico-common/src/main/java/org/fudaa/dodico/fortran/FortranBinaryInputStream.java	2013-05-16 21:35:21 UTC (rev 8407)
@@ -10,10 +10,12 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.ByteOrder;
 
 import org.fudaa.ctulu.fileformat.FortranInterface;
 
 import org.fudaa.dodico.fichiers.NativeBinaryInputStream;
+import org.fudaa.dodico.fichiers.NativeBinarySystem;
 
 /**
  * Une classe facilitant la lecture de fichiers binaires \xE9crits par Fortran Utilise la classe NativeBinaryInputStream
@@ -87,7 +89,7 @@
    * @throws IOException
    */
   public FortranBinaryInputStream(final InputStream _in, final boolean _sequential) throws IOException {
-    this(_in, _sequential, System.getProperty("os.arch"));
+    this(_in, _sequential, NativeBinarySystem.getNativeByteOrder());
   }
 
   /**
@@ -101,8 +103,8 @@
    * @see org.fudaa.dodico.fichiers.NativeBinaryInputStream
    * @throws IOException
    */
-  public FortranBinaryInputStream(final InputStream _in, final boolean _sequential, final String _architectureID) throws IOException {
-    super(_in, _architectureID);
+  public FortranBinaryInputStream(final InputStream _in, final boolean _sequential, final ByteOrder _byteOrder) throws IOException {
+    super(_in, _byteOrder);
     sequential_ = _sequential;
     recordLength_ = 0;
     nextPos_ = 0;

Modified: trunk/framework/dodico-common/src/main/java/org/fudaa/dodico/fortran/FortranBinaryOutputStream.java
===================================================================
--- trunk/framework/dodico-common/src/main/java/org/fudaa/dodico/fortran/FortranBinaryOutputStream.java	2013-05-16 20:24:17 UTC (rev 8406)
+++ trunk/framework/dodico-common/src/main/java/org/fudaa/dodico/fortran/FortranBinaryOutputStream.java	2013-05-16 21:35:21 UTC (rev 8407)
@@ -15,7 +15,6 @@
 import java.nio.charset.Charset;
 
 import org.fudaa.ctulu.fileformat.FortranInterface;
-import org.fudaa.dodico.fichiers.NativeBinaryOutputStream;
 import org.fudaa.dodico.fichiers.NativeBinarySystem;
 
 /**
@@ -80,7 +79,7 @@
    * @param _sequential <B>true</B> le fichier est binaire \xE0 acc\xE8s <I>Sequential</I>. <B>false</B> le fichier est binaire \xE0 acc\xE8s <I>Direct</I>
    */
   public FortranBinaryOutputStream(final OutputStream _out, final boolean _sequential) {
-    this(_out, _sequential, System.getProperty("os.arch"));
+    this(_out, _sequential, NativeBinarySystem.getNativeByteOrder());
   }
 
   /**
@@ -89,6 +88,7 @@
    * @param _out OutputStream
    * @param _sequential <B>true</B> le fichier est binaire \xE0 acc\xE8s <I>Sequential</I>. <B>false</B> le fichier est binaire \xE0 acc\xE8s <I>Direct</I>
    * @param _architectureID l'architecture demandee
+   * @deprecated L'identifiant machine ne permet pas d'identifier le byte order natif.
    */
   public FortranBinaryOutputStream(final OutputStream _out, final boolean _sequential, final String _architectureID) {
     this.out = _out;
@@ -99,6 +99,21 @@
   }
 
   /**
+   * Cr\xE9ation en pr\xE9cisant si le fichier binaire est \xE0 access s\xE9quentiel ou non.
+   *
+   * @param _out OutputStream
+   * @param _sequential <B>true</B> le fichier est binaire \xE0 acc\xE8s <I>Sequential</I>. <B>false</B> le fichier est binaire \xE0 acc\xE8s <I>Direct</I>
+   * @param _byteOrder l'endianess demandee
+   */
+  public FortranBinaryOutputStream(final OutputStream _out, final boolean _sequential, final ByteOrder _byteOrder) {
+    this.out = _out;
+    arrayStream_ = new ByteArrayOutputStream();
+    byteOrder = _byteOrder;
+    sequential_ = _sequential;
+    recordLength_ = 0;
+  }
+
+  /**
    * Affectation de la longueur des enregistrements (pour les fichiers \xE0 acc\xE8s <I>Direct</I>).
    *
    * @param _length Longueur d'enregistrement en longworld (1 longworld=4 octets)

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

[Fudaa-svn-commit] SF.net SVN: fudaa:[8406] trunk/soft/fudaa-crue/ui-report/src/test/java/org/ fudaa/fudaa/crue/report/formule/VariableContentFormuleTest.java

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

Revision: 8406
          http://sourceforge.net/p/fudaa/svn/8406
Author:   deniger
Date:     2013-05-16 20:24:17 +0000 (Thu, 16 May 2013)
Log Message:
-----------
correction test unitaire

Modified Paths:
--------------
    trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/VariableContentFormuleTest.java

Modified: trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/VariableContentFormuleTest.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/VariableContentFormuleTest.java	2013-05-16 20:12:23 UTC (rev 8405)
+++ trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/VariableContentFormuleTest.java	2013-05-16 20:24:17 UTC (rev 8406)
@@ -89,9 +89,9 @@
 
     FormuleCalculatorExpr calculator = content.getCalculator();
     calculator.setService(runProvider);
-    Double value = calculator.getValue(null, new ReportRunVariableKey(current, ReportVariableTypeEnum.FORMULE, ""), null);
+    Double value = calculator.getValue(null, new ReportRunVariableKey(current, ReportVariableTypeEnum.FORMULE, "Br_B1"), "Br_B1");
     assertEquals(1000, value.intValue());
-    value = calculator.getValue(null, new ReportRunVariableKey(other, ReportVariableTypeEnum.FORMULE, ""), null);
+    value = calculator.getValue(null, new ReportRunVariableKey(other, ReportVariableTypeEnum.FORMULE, "Br_B1"), "Br_B1");
     assertEquals(10, value.intValue());
 
 

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

[Fudaa-svn-commit] SF.net SVN: fudaa:[8405] trunk/soft/fudaa-crue/crue-core/src/main/java/org/ fudaa/dodico/crue/common/io/CacheFileInputStream.java

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

Revision: 8405
          http://sourceforge.net/p/fudaa/svn/8405
Author:   deniger
Date:     2013-05-16 20:12:23 +0000 (Thu, 16 May 2013)
Log Message:
-----------
update pour tests unitaires en //

Modified Paths:
--------------
    trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/io/CacheFileInputStream.java

Modified: trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/io/CacheFileInputStream.java
===================================================================
--- trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/io/CacheFileInputStream.java	2013-04-24 06:17:27 UTC (rev 8404)
+++ trunk/soft/fudaa-crue/crue-core/src/main/java/org/fudaa/dodico/crue/common/io/CacheFileInputStream.java	2013-05-16 20:12:23 UTC (rev 8405)
@@ -7,6 +7,7 @@
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -61,7 +62,7 @@
         thread = Thread.currentThread();
       } else {
         thread = null;
-        Collection<FileInputStream> values = inputByFile.values();
+        Collection<FileInputStream> values = new ArrayList<FileInputStream>(inputByFile.values());
         for (FileInputStream fileInputStream : values) {
           if (fileInputStream != null) {
             try {

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

[Fudaa-svn-commit] SF.net SVN: fudaa:[8404] trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/ fudaa/dodico/crue/projet/otfa/OtfaExecutor.java

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

Revision: 8404
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8404&view=rev
Author:   deniger
Date:     2013-04-24 06:17:27 +0000 (Wed, 24 Apr 2013)
Log Message:
-----------
TraceCasiers

Modified Paths:
--------------
    trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java

Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java	2013-04-24 06:16:38 UTC (rev 8403)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java	2013-04-24 06:17:27 UTC (rev 8404)
@@ -109,7 +109,6 @@
         for (File file : allEtu) {
           locker.lock(file, user);
         }
-        Thread.currentThread().sleep(5000);
         processAllLines(in, campagneLogs);
       } finally {
         for (File file : allEtu) {
@@ -126,7 +125,7 @@
       Logger.getLogger(OtfaExecutor.class.getName()).log(Level.WARNING, "message");
       oomError = error;
     } catch (Exception ex) {
-      Logger.getLogger(OtfaExecutor.class.getName()).log(Level.INFO, "message");
+      Logger.getLogger(OtfaExecutor.class.getName()).log(Level.INFO, "message", ex);
     } finally {
       for (File file : allEtu) {
         locker.unlock(file);

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

[Fudaa-svn-commit] SF.net SVN: fudaa:[8403] trunk/soft/fudaa-crue/crue-io/src/test/java/org/ fudaa/dodico/crue/io/avct/AvctReaderTest.java

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

Revision: 8403
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8403&view=rev
Author:   deniger
Date:     2013-04-24 06:16:38 +0000 (Wed, 24 Apr 2013)
Log Message:
-----------
TraceCasiers

Modified Paths:
--------------
    trunk/soft/fudaa-crue/crue-io/src/test/java/org/fudaa/dodico/crue/io/avct/AvctReaderTest.java

Modified: trunk/soft/fudaa-crue/crue-io/src/test/java/org/fudaa/dodico/crue/io/avct/AvctReaderTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-io/src/test/java/org/fudaa/dodico/crue/io/avct/AvctReaderTest.java	2013-04-23 21:17:42 UTC (rev 8402)
+++ trunk/soft/fudaa-crue/crue-io/src/test/java/org/fudaa/dodico/crue/io/avct/AvctReaderTest.java	2013-04-24 06:16:38 UTC (rev 8403)
@@ -43,7 +43,7 @@
   private void testContent(CompteRenduAvancement metier) {
     assertEquals("CALPP", metier.getCode());
     assertEquals("2012-03-06T17:11:23.000", DateDurationConverter.dateToXsd(metier.getDate()));
-    assertEquals("2012-03-06 17:11:23.000", DateDurationConverter.dateToXsdUI(metier.getDate()));
+    assertEquals("2012-03-06 17:11:23", DateDurationConverter.dateToXsdUI(metier.getDate()));
     assertEquals(4, metier.getIndicateurs().size());
     assertEquals(0d, metier.getIndicateurs().get(3).getValeur(), 1e-5);
     assertEquals(40d, metier.getIndicateurs().get(3).getMax(), 1e-5);

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

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

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

Revision: 8402
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8402&view=rev
Author:   deniger
Date:     2013-04-23 21:17:42 +0000 (Tue, 23 Apr 2013)
Log Message:
-----------
TraceCasiers

Modified Paths:
--------------
    trunk/soft/fudaa-crue/crue-compare/pom.xml
    trunk/soft/fudaa-crue/crue-config/pom.xml
    trunk/soft/fudaa-crue/crue-core/pom.xml
    trunk/soft/fudaa-crue/crue-emh/pom.xml
    trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/result/ModeleResultatTimeKeyContent.java
    trunk/soft/fudaa-crue/crue-io/pom.xml
    trunk/soft/fudaa-crue/crue-otfa/pom.xml
    trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java
    trunk/soft/fudaa-crue/crue-project/pom.xml
    trunk/soft/fudaa-crue/crue-sysdoc/pom.xml
    trunk/soft/fudaa-crue/crue-test/pom.xml
    trunk/soft/fudaa-crue/crue-validation/pom.xml
    trunk/soft/fudaa-crue/pom.xml
    trunk/soft/fudaa-crue/ui-application/pom.xml
    trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf
    trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrueDev.conf
    trunk/soft/fudaa-crue/ui-branding/pom.xml
    trunk/soft/fudaa-crue/ui-commandline/pom.xml
    trunk/soft/fudaa-crue/ui-common/pom.xml
    trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/DialogHelper.java
    trunk/soft/fudaa-crue/ui-comparison/pom.xml
    trunk/soft/fudaa-crue/ui-emh/pom.xml
    trunk/soft/fudaa-crue/ui-loader/pom.xml
    trunk/soft/fudaa-crue/ui-loi/pom.xml
    trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbeVisibiltyUI.java
    trunk/soft/fudaa-crue/ui-modelling/pom.xml
    trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AddSectionInBranchePanelContent.java
    trunk/soft/fudaa-crue/ui-options/pom.xml
    trunk/soft/fudaa-crue/ui-otfa/pom.xml
    trunk/soft/fudaa-crue/ui-planimetry/pom.xml
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/SectionProfilAttachedToBrancheAction.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/TraceCasierImporterAction.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/TraceCasierToCasierAction.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/TraceProfilToSectionAction.java
    trunk/soft/fudaa-crue/ui-post/pom.xml
    trunk/soft/fudaa-crue/ui-report/pom.xml
    trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/extern/ExternFileChooser.java
    trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalBrancheChooser.java
    trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/planimetry/ReportPlanimetryConfigUI.java
    trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/time/ReportTimeStepTopPanel.java
    trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/time/ReportTimeVideoRecorderEditor.java
    trunk/soft/fudaa-crue/ui-study/pom.xml
    trunk/soft/fudaa-crue/ui-sysdoc/pom.xml
    trunk/soft/fudaa-crue/ui-views/pom.xml
    trunk/soft/fudaa-crue/ui-wrapper/pom.xml

Modified: trunk/soft/fudaa-crue/crue-compare/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/pom.xml	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/crue-compare/pom.xml	2013-04-23 21:17:42 UTC (rev 8402)
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>0.69-SNAPSHOT</version>
+    <version>1.0RC2-SNAPSHOT</version>
   </parent>
   <artifactId>crue-compare</artifactId>
   <name>Crue Compare</name>

Modified: trunk/soft/fudaa-crue/crue-config/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-config/pom.xml	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/crue-config/pom.xml	2013-04-23 21:17:42 UTC (rev 8402)
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>0.69-SNAPSHOT</version>
+    <version>1.0RC2-SNAPSHOT</version>
   </parent>
   <artifactId>crue-config</artifactId>
   <name>Crue Config</name>

Modified: trunk/soft/fudaa-crue/crue-core/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-core/pom.xml	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/crue-core/pom.xml	2013-04-23 21:17:42 UTC (rev 8402)
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>0.69-SNAPSHOT</version>
+    <version>1.0RC2-SNAPSHOT</version>
   </parent>
   <artifactId>crue-core</artifactId>
   <name>Crue Core</name>

Modified: trunk/soft/fudaa-crue/crue-emh/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/pom.xml	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/crue-emh/pom.xml	2013-04-23 21:17:42 UTC (rev 8402)
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>0.69-SNAPSHOT</version>
+    <version>1.0RC2-SNAPSHOT</version>
   </parent>
   <artifactId>crue-emh</artifactId>
   <name>Crue EMH</name>

Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/result/ModeleResultatTimeKeyContent.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/result/ModeleResultatTimeKeyContent.java	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/result/ModeleResultatTimeKeyContent.java	2013-04-23 21:17:42 UTC (rev 8402)
@@ -123,8 +123,14 @@
   }
 
   public long getGlobalTimeForResultatKey(ResultatTimeKey key) {
-    createTimeByKey();
-    return timeByKey.get(key);
+    if (key == null) {
+      return 0;
+    }
+    if (key.isPermanent()) {
+      createTimeByKey();
+      return timeByKey.get(key);
+    }
+    return key.getDuree();
   }
 
   /**

Modified: trunk/soft/fudaa-crue/crue-io/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-io/pom.xml	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/crue-io/pom.xml	2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>0.69-SNAPSHOT</version>
+    <version>1.0RC2-SNAPSHOT</version>
   </parent>
   <artifactId>crue-io</artifactId>
   <name>Crue IO</name>

Modified: trunk/soft/fudaa-crue/crue-otfa/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/pom.xml	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/crue-otfa/pom.xml	2013-04-23 21:17:42 UTC (rev 8402)
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>0.69-SNAPSHOT</version>
+    <version>1.0RC2-SNAPSHOT</version>
   </parent>
   <artifactId>crue-otfa</artifactId>
   <name>Crue OTFA</name>

Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java	2013-04-23 21:17:42 UTC (rev 8402)
@@ -68,6 +68,8 @@
   public RTFAResultLines launch(OtfaCampagne in) {
     RTFAResultLines result = null;
     OutOfMemoryError oomError = null;
+    FileLocker locker = new FileLocker();
+    Set<File> allEtu = new HashSet<File>();
     try {
       if (!lineSaver.isStarted()) {
         lineSaver.start(false);
@@ -93,7 +95,6 @@
         return result;
       }
 
-      Set<File> allEtu = new HashSet<File>();
       List<OtfaCampagneLine> lines = in.getLines();
       for (OtfaCampagneLine line : lines) {
         allEtu.add(line.getReference().getEtuFile(in.getOtfaDir()));
@@ -104,11 +105,11 @@
           return result;
         }
       }
-      FileLocker locker = new FileLocker();
       try {
         for (File file : allEtu) {
           locker.lock(file, user);
         }
+        Thread.currentThread().sleep(5000);
         processAllLines(in, campagneLogs);
       } finally {
         for (File file : allEtu) {
@@ -124,7 +125,12 @@
     } catch (OutOfMemoryError error) {
       Logger.getLogger(OtfaExecutor.class.getName()).log(Level.WARNING, "message");
       oomError = error;
+    } catch (Exception ex) {
+      Logger.getLogger(OtfaExecutor.class.getName()).log(Level.INFO, "message");
     } finally {
+      for (File file : allEtu) {
+        locker.unlock(file);
+      }
       lineSaver.close();
     }
     if (oomError != null) {

Modified: trunk/soft/fudaa-crue/crue-project/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-project/pom.xml	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/crue-project/pom.xml	2013-04-23 21:17:42 UTC (rev 8402)
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>0.69-SNAPSHOT</version>
+    <version>1.0RC2-SNAPSHOT</version>
   </parent>
   <artifactId>crue-project</artifactId>
   <name>Crue Project</name>

Modified: trunk/soft/fudaa-crue/crue-sysdoc/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-sysdoc/pom.xml	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/crue-sysdoc/pom.xml	2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>0.69-SNAPSHOT</version>
+    <version>1.0RC2-SNAPSHOT</version>
   </parent>
   <artifactId>crue-sysdoc</artifactId>
   <name>Crue Sysdoc</name>

Modified: trunk/soft/fudaa-crue/crue-test/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-test/pom.xml	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/crue-test/pom.xml	2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>0.69-SNAPSHOT</version>
+    <version>1.0RC2-SNAPSHOT</version>
   </parent>
 
   <artifactId>crue-test</artifactId>

Modified: trunk/soft/fudaa-crue/crue-validation/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-validation/pom.xml	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/crue-validation/pom.xml	2013-04-23 21:17:42 UTC (rev 8402)
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>0.69-SNAPSHOT</version>
+    <version>1.0RC2-SNAPSHOT</version>
   </parent>
   <artifactId>crue-validation</artifactId>
   <name>Crue Validation</name>

Modified: trunk/soft/fudaa-crue/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/pom.xml	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/pom.xml	2013-04-23 21:17:42 UTC (rev 8402)
@@ -8,7 +8,7 @@
   </parent>
   <groupId>org.fudaa.soft.fudaa-crue</groupId>
   <artifactId>fudaa-crue</artifactId>
-  <version>0.69-SNAPSHOT</version>
+  <version>1.0RC2-SNAPSHOT</version>
   <name>Fudaa-Crue</name>
   <packaging>pom</packaging>
   <ciManagement>

Modified: trunk/soft/fudaa-crue/ui-application/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-application/pom.xml	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-application/pom.xml	2013-04-23 21:17:42 UTC (rev 8402)
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>0.69-SNAPSHOT</version>
+    <version>1.0RC2-SNAPSHOT</version>
   </parent>
 
   <artifactId>application</artifactId>

Modified: trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf
===================================================================
--- trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf	2013-04-23 21:17:42 UTC (rev 8402)
@@ -1,8 +1,8 @@
 # ${HOME} will be replaced by user home directory according to platform
 #default_userdir="${DEFAULT_USERDIR_ROOT}/0.62"
 #default_cachedir="${DEFAULT_CACHEDIR_ROOT}/0.62"
-default_userdir="${HOME}\.${APPNAME}\0.69"
-default_mac_userdir="${HOME}/Library/Application Support/${APPNAME}/0.69/"
+default_userdir="${HOME}\.${APPNAME}\1.0RC2"
+default_mac_userdir="${HOME}/Library/Application Support/${APPNAME}/1.0RC2/"
 # options used by the launcher by default, can be overridden by explicit
 # command line switches
 default_options="--branding fudaacrue -J-Xms24m -J-Xmx512m --multi-instances"

Modified: trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrueDev.conf
===================================================================
--- trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrueDev.conf	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrueDev.conf	2013-04-23 21:17:42 UTC (rev 8402)
@@ -1,5 +1,5 @@
 # ${HOME} will be replaced by user home directory according to platform
-default_userdir="${HOME}\.${APPNAME}\0.68"
+default_userdir="${HOME}\.${APPNAME}\1.0RC2"
 
 # options used by the launcher by default, can be overridden by explicit
 # command line switches

Modified: trunk/soft/fudaa-crue/ui-branding/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/pom.xml	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-branding/pom.xml	2013-04-23 21:17:42 UTC (rev 8402)
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>0.69-SNAPSHOT</version>
+    <version>1.0RC2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ui-branding</artifactId>

Modified: trunk/soft/fudaa-crue/ui-commandline/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-commandline/pom.xml	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-commandline/pom.xml	2013-04-23 21:17:42 UTC (rev 8402)
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>0.69-SNAPSHOT</version>
+    <version>1.0RC2-SNAPSHOT</version>
   </parent>
   <artifactId>ui-commandline</artifactId>
   <packaging>nbm</packaging>

Modified: trunk/soft/fudaa-crue/ui-common/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-common/pom.xml	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-common/pom.xml	2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>0.69-SNAPSHOT</version>
+    <version>1.0RC2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ui-common</artifactId>

Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/DialogHelper.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/DialogHelper.java	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/DialogHelper.java	2013-04-23 21:17:42 UTC (rev 8402)
@@ -202,12 +202,19 @@
     return showQuestionAndSaveDialogConf(title, message, classToSave, null, null);
   }
 
+  public static boolean showQuestion(DialogDescriptor dialogDescriptor, Class classToSave, String helpId, PerspectiveEnum perspective) {
+    if (helpId != null) {
+      SysdocUrlBuilder.installDialogHelpCtx(dialogDescriptor, helpId, perspective);
+    }
+    return showQuestion(dialogDescriptor, classToSave);
+  }
+
   public static boolean showQuestionAndSaveDialogConf(String title, Object message, Class classToSave, String helpId, PerspectiveEnum perspective) {
     DialogDescriptor descriptor = new DialogDescriptor(message, title);
     if (helpId != null) {
       SysdocUrlBuilder.installDialogHelpCtx(descriptor, helpId, perspective);
     }
-    return showQuestionAndSaveDialogConf(descriptor, classToSave);
+    return showQuestion(descriptor, classToSave);
   }
 
   /**
@@ -306,12 +313,12 @@
     });
   }
 
-  public static boolean showQuestionAndSaveDialogConf(DialogDescriptor descriptor, Class classToSave) {
-    return showQuestionAndSaveDialogConf(descriptor, classToSave, false);
+  public static boolean showQuestion(DialogDescriptor descriptor, Class classToSave) {
+    return showQuestion(descriptor, classToSave, false);
 
   }
 
-  public static boolean showQuestionAndSaveDialogConf(DialogDescriptor descriptor, Class classToSave, boolean minMaxaction) {
+  public static boolean showQuestion(DialogDescriptor descriptor, Class classToSave, boolean minMaxaction) {
     JDialog createDialog = (JDialog) DialogDisplayer.getDefault().createDialog(descriptor);
     createDialog.pack();
     createDialog.setName(classToSave.getCanonicalName());

Modified: trunk/soft/fudaa-crue/ui-comparison/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-comparison/pom.xml	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-comparison/pom.xml	2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>0.69-SNAPSHOT</version>
+    <version>1.0RC2-SNAPSHOT</version>
   </parent>
   <artifactId>ui-comparison</artifactId>
   <packaging>nbm</packaging>

Modified: trunk/soft/fudaa-crue/ui-emh/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-emh/pom.xml	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-emh/pom.xml	2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>0.69-SNAPSHOT</version>
+    <version>1.0RC2-SNAPSHOT</version>
   </parent>
   <artifactId>ui-emh</artifactId>
   <packaging>nbm</packaging>

Modified: trunk/soft/fudaa-crue/ui-loader/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-loader/pom.xml	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-loader/pom.xml	2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>0.69-SNAPSHOT</version>
+    <version>1.0RC2-SNAPSHOT</version>
   </parent>
   <artifactId>ui-loader</artifactId>
   <packaging>nbm</packaging>

Modified: trunk/soft/fudaa-crue/ui-loi/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/pom.xml	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-loi/pom.xml	2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>0.69-SNAPSHOT</version>
+    <version>1.0RC2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ui-loi</artifactId>

Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbeVisibiltyUI.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbeVisibiltyUI.java	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbeVisibiltyUI.java	2013-04-23 21:17:42 UTC (rev 8402)
@@ -55,6 +55,6 @@
     });
     new CheckBoxListPopupListener(list);
     SysdocUrlBuilder.installDialogHelpCtx(desc, "bdlAffichageCourbes", null);
-    DialogHelper.showQuestionAndSaveDialogConf(desc, getClass());
+    DialogHelper.showQuestion(desc, getClass());
   }
 }

Modified: trunk/soft/fudaa-crue/ui-modelling/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/pom.xml	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-modelling/pom.xml	2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>0.69-SNAPSHOT</version>
+    <version>1.0RC2-SNAPSHOT</version>
   </parent>
   <packaging>nbm</packaging>
   <artifactId>ui-modelling</artifactId>

Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AddSectionInBranchePanelContent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AddSectionInBranchePanelContent.java	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AddSectionInBranchePanelContent.java	2013-04-23 21:17:42 UTC (rev 8402)
@@ -102,7 +102,7 @@
     tfDistance.validateData();
     update(null, null);
     updateBrancheDistance();
-    return DialogHelper.showQuestionAndSaveDialogConf(dialog, getClass());
+    return DialogHelper.showQuestion(dialog, getClass());
   }
 
   @Override

Modified: trunk/soft/fudaa-crue/ui-options/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-options/pom.xml	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-options/pom.xml	2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>0.69-SNAPSHOT</version>
+    <version>1.0RC2-SNAPSHOT</version>
   </parent>
   <artifactId>ui-options</artifactId>
   <name>Crue UI Options</name>

Modified: trunk/soft/fudaa-crue/ui-otfa/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/pom.xml	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-otfa/pom.xml	2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>0.69-SNAPSHOT</version>
+    <version>1.0RC2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ui-otfa</artifactId>

Modified: trunk/soft/fudaa-crue/ui-planimetry/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/pom.xml	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-planimetry/pom.xml	2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>0.69-SNAPSHOT</version>
+    <version>1.0RC2-SNAPSHOT</version>
   </parent>
   <packaging>nbm</packaging>
   <artifactId>ui-planimetry</artifactId>

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/SectionProfilAttachedToBrancheAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/SectionProfilAttachedToBrancheAction.java	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/SectionProfilAttachedToBrancheAction.java	2013-04-23 21:17:42 UTC (rev 8402)
@@ -99,7 +99,7 @@
     DialogHelper.readInPreferences(panel.getView(), "outlineView", getClass());
     DialogDescriptor descriptor = new DialogDescriptor(panel, getTitle());
     SysdocUrlBuilder.installDialogHelpCtx(descriptor, "affecteSectionsBranches", PerspectiveEnum.MODELLING);
-    boolean accepted = DialogHelper.showQuestionAndSaveDialogConf(descriptor, getClass());
+    boolean accepted = DialogHelper.showQuestion(descriptor, getClass());
     DialogHelper.writeInPreferences(panel.getView(), "outlineView", getClass());
     if (accepted) {
       final List<SectionProfilToBrancheParametersChange> acceptedModification = panel.getAcceptedModification();

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/TraceCasierImporterAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/TraceCasierImporterAction.java	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/TraceCasierImporterAction.java	2013-04-23 21:17:42 UTC (rev 8402)
@@ -2,6 +2,7 @@
 
 import com.memoire.bu.BuFileFilter;
 import com.memoire.bu.BuGridLayout;
+import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.io.File;
 import javax.swing.event.DocumentEvent;
@@ -32,22 +33,22 @@
  * @author deniger ( genesis)
  */
 public class TraceCasierImporterAction extends EbliActionSimple {
-
+  
   private final PlanimetryController controller;
-
+  
   public TraceCasierImporterAction(PlanimetryController controller) {
     super(NbBundle.getMessage(TraceCasierImporterAction.class, "TraceCasierImporterAction.ActionName"), null, TraceCasierImporterAction.class.
             getSimpleName());
     this.controller = controller;
   }
-
+  
   @Override
   public void actionPerformed(ActionEvent _e) {
     ChooseInputFiles panel = new ChooseInputFiles();
+    panel.setPreferredSize(new Dimension(450, 350));
     DialogDescriptor dialogDescriptor = new DialogDescriptor(panel, getTitle());
     panel.setDialogDescriptor(dialogDescriptor);
-    boolean accepted = DialogHelper.
-            showQuestionAndSaveDialogConf(getTitle(), dialogDescriptor, getClass(), "importTraceCasiers", PerspectiveEnum.MODELLING);
+    boolean accepted = DialogHelper.showQuestion(dialogDescriptor, getClass(), "importTraceCasiers", PerspectiveEnum.MODELLING);
     if (accepted) {
       final File shapeFile = panel.getShapeFile();
       final File profilFile = panel.getProfilDbfFile();
@@ -69,12 +70,12 @@
           controller.getGroupExternController().addTraceCasiers(casiersZone, shapeFile, SigFormatHelper.EnumFormat.SHP);
           DialogHelper.showNotifyOperationTermine(getTitle(), NbBundle.getMessage(TraceCasierImporterAction.class,
                   "TraceCasierImporterAction.Result", casiersZone.getNumGeometries()));
-
+          
         }
       }
     }
   }
-
+  
   private CtuluLogResult<GISZoneCollectionLigneBrisee> loadFiles(File shapeFile, File profilFile, ProgressHandle progress) {
     progress.switchToIndeterminate();
     FSigFileLoadResult result = new FSigFileLoadResult();
@@ -87,13 +88,13 @@
     CtuluLogResult<GISZoneCollectionLigneBrisee> toCasier = processor.toCasier();
     return toCasier;
   }
-
+  
   private static class ChooseInputFiles extends CtuluDialogPanel {
-
+    
     private final CtuluFileChooserPanel chooseShpFile;
     private final CtuluFileChooserPanel chooseDbfFile;
     DialogDescriptor dialogDescriptor;
-
+    
     public ChooseInputFiles() {
       setLayout(new BuGridLayout(2, 5, 10));
       chooseShpFile = addFileChooserPanel(this, NbBundle.getMessage(TraceCasierImporterAction.class, "importTraceCasier.ChooseShapefile.Label"), false,
@@ -105,12 +106,12 @@
         public void insertUpdate(DocumentEvent e) {
           updateValidState();
         }
-
+        
         @Override
         public void removeUpdate(DocumentEvent e) {
           updateValidState();
         }
-
+        
         @Override
         public void changedUpdate(DocumentEvent e) {
           updateValidState();
@@ -121,12 +122,12 @@
       chooseDbfFile.setAllFileFilter(true);
       chooseDbfFile.setFilter(new FileFilter[]{new BuFileFilter("dbf")});
     }
-
+    
     public void setDialogDescriptor(DialogDescriptor dialogDescriptor) {
       this.dialogDescriptor = dialogDescriptor;
       updateValidState();
     }
-
+    
     protected void updateValidState() {
       if (getShapeFile() != null && chooseDbfFile.getFile() == null) {
         chooseDbfFile.setInitDir(getShapeFile().getParentFile());
@@ -135,11 +136,11 @@
         dialogDescriptor.setValid(getShapeFile() != null && getShapeFile().isFile());
       }
     }
-
+    
     protected File getShapeFile() {
       return chooseShpFile.getFile();
     }
-
+    
     protected File getProfilDbfFile() {
       return chooseDbfFile.getFile();
     }

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/TraceCasierToCasierAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/TraceCasierToCasierAction.java	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/TraceCasierToCasierAction.java	2013-04-23 21:17:42 UTC (rev 8402)
@@ -60,7 +60,7 @@
     DialogDescriptor des = new DialogDescriptor(panel, getTitle());
     SysdocUrlBuilder.installDialogHelpCtx(des, "creationCasiersDepuisTraceCasiers", PerspectiveEnum.MODELLING);
     DialogHelper.readInPreferences(panel.getView(), "outlineView", getClass());
-    boolean accepted = DialogHelper.showQuestionAndSaveDialogConf(des, TraceProfilToSectionPanel.class);
+    boolean accepted = DialogHelper.showQuestion(des, TraceProfilToSectionPanel.class);
     DialogHelper.writeInPreferences(panel.getView(), "outlineView", getClass());
     if (accepted) {
       List<TraceCasierSousModele> acceptedModification = panel.getAcceptedModification();

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/TraceProfilToSectionAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/TraceProfilToSectionAction.java	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/TraceProfilToSectionAction.java	2013-04-23 21:17:42 UTC (rev 8402)
@@ -59,7 +59,7 @@
     DialogDescriptor des = new DialogDescriptor(panel, getTitle());
     SysdocUrlBuilder.installDialogHelpCtx(des, "creationSectionsDepuisTraceProfils", PerspectiveEnum.MODELLING);
     DialogHelper.readInPreferences(panel.getView(), "outlineView", getClass());
-    boolean accepted = DialogHelper.showQuestionAndSaveDialogConf(des, TraceProfilToSectionPanel.class);
+    boolean accepted = DialogHelper.showQuestion(des, TraceProfilToSectionPanel.class);
     DialogHelper.writeInPreferences(panel.getView(), "outlineView", getClass());
     if (accepted) {
       List<TraceProfilSousModele> acceptedModification = panel.getAcceptedModification();

Modified: trunk/soft/fudaa-crue/ui-post/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-post/pom.xml	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-post/pom.xml	2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>0.69-SNAPSHOT</version>
+    <version>1.0RC2-SNAPSHOT</version>
   </parent>
   <packaging>nbm</packaging>
   <artifactId>ui-post</artifactId>

Modified: trunk/soft/fudaa-crue/ui-report/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-report/pom.xml	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-report/pom.xml	2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>0.69-SNAPSHOT</version>
+    <version>1.0RC2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ui-report</artifactId>

Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/extern/ExternFileChooser.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/extern/ExternFileChooser.java	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/extern/ExternFileChooser.java	2013-04-23 21:17:42 UTC (rev 8402)
@@ -48,7 +48,7 @@
     DialogDescriptor descriptor = new DialogDescriptor(view, NbBundle.getMessage(ExternFileChooser.class, "fileExtern.DialogTitle"));
     DialogHelper.readInPreferences(view.getView(), "outlineView", ExternFileChooser.class);
     SysdocUrlBuilder.installDialogHelpCtx(descriptor, "choisirFichierExterne", PerspectiveEnum.REPORT);
-    boolean ok = DialogHelper.showQuestionAndSaveDialogConf(descriptor, getClass());
+    boolean ok = DialogHelper.showQuestion(descriptor, getClass());
     DialogHelper.writeInPreferences(view.getView(), "outlineView", ExternFileChooser.class);
     if (ok) {
       List<String> files = new ArrayList<String>();

Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalBrancheChooser.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalBrancheChooser.java	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalBrancheChooser.java	2013-04-23 21:17:42 UTC (rev 8402)
@@ -38,7 +38,7 @@
     ui.setDescriptor(descriptor);
     DialogHelper.readInPreferences(ui.getView(), "outlineView", ReportLongitudinalBrancheChooserUI.class);
     SysdocUrlBuilder.installDialogHelpCtx(descriptor, "vueProfilLongitudinalConfigurationBranches", PerspectiveEnum.REPORT);
-    boolean ok = DialogHelper.showQuestionAndSaveDialogConf(descriptor, getClass());
+    boolean ok = DialogHelper.showQuestion(descriptor, getClass());
     DialogHelper.writeInPreferences(ui.getView(), "outlineView", ReportLongitudinalBrancheChooserUI.class);
     if (ok) {
       config.branchesConfig.clear();

Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/planimetry/ReportPlanimetryConfigUI.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/planimetry/ReportPlanimetryConfigUI.java	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/planimetry/ReportPlanimetryConfigUI.java	2013-04-23 21:17:42 UTC (rev 8402)
@@ -75,7 +75,7 @@
 
     DialogDescriptor dialog = new DialogDescriptor(tabbedPane, org.openide.util.NbBundle.getMessage(ReportPlanimetryConfigUI.class, "DialogEditRapport.Name"));
     SysdocUrlBuilder.installDialogHelpCtx(dialog, "configurationVuePlanimetrique", PerspectiveEnum.REPORT);
-    boolean ok = DialogHelper.showQuestionAndSaveDialogConf(dialog, getClass());
+    boolean ok = DialogHelper.showQuestion(dialog, getClass());
     if (ok) {
       ReportVariableKey before = brancheConfigurationExtra.getData().getArrowVariable();
       brancheConfigurationExtra.setData((ReportPlanimetryBrancheExtraData) brancheEditor.apply());

Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/time/ReportTimeStepTopPanel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/time/ReportTimeStepTopPanel.java	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/time/ReportTimeStepTopPanel.java	2013-04-23 21:17:42 UTC (rev 8402)
@@ -131,7 +131,7 @@
     ReportTimeReduceRangePanel reducePanelBuilder = new ReportTimeReduceRangePanel(values, subLabeltoStringTransformer, reducedRange);
     final JPanel reducePanel = reducePanelBuilder.getPanel();
     DialogDescriptor dial = new DialogDescriptor(reducePanel, NbBundle.getMessage(ReportTimeStepTopPanel.class, "ReduceTime.DialogTitle"));
-    boolean ok = DialogHelper.showQuestionAndSaveDialogConf(dial, ReportTimeReduceRangePanel.class, false);
+    boolean ok = DialogHelper.showQuestion(dial, ReportTimeReduceRangePanel.class, false);
     if (ok) {
       IntRange newRange = reducePanelBuilder.getRange();
       if (!ObjectUtils.equals(newRange, reducedRange)) {

Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/time/ReportTimeVideoRecorderEditor.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/time/ReportTimeVideoRecorderEditor.java	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/time/ReportTimeVideoRecorderEditor.java	2013-04-23 21:17:42 UTC (rev 8402)
@@ -30,7 +30,7 @@
     editor.getExplorerManager().setRootContext(NodeHelper.createNode(nodes, "videos"));
     DialogDescriptor descriptor = new DialogDescriptor(editor, org.openide.util.NbBundle.getMessage(ReportTimeVideoRecorderEditor.class, "ConfigurationVideos.DialogTitle"));
     SysdocUrlBuilder.installDialogHelpCtx(descriptor, "configurationExportVideo", PerspectiveEnum.REPORT);
-    return DialogHelper.showQuestionAndSaveDialogConf(descriptor, getClass());
+    return DialogHelper.showQuestion(descriptor, getClass());
   }
 
   private static class Editor extends DefaultOutlineViewEditor {

Modified: trunk/soft/fudaa-crue/ui-study/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-study/pom.xml	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-study/pom.xml	2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>0.69-SNAPSHOT</version>
+    <version>1.0RC2-SNAPSHOT</version>
   </parent>
   <packaging>nbm</packaging>
   <artifactId>ui-study</artifactId>

Modified: trunk/soft/fudaa-crue/ui-sysdoc/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-sysdoc/pom.xml	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-sysdoc/pom.xml	2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>0.69-SNAPSHOT</version>
+    <version>1.0RC2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ui-sysdoc</artifactId>

Modified: trunk/soft/fudaa-crue/ui-views/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-views/pom.xml	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-views/pom.xml	2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>0.69-SNAPSHOT</version>
+    <version>1.0RC2-SNAPSHOT</version>
   </parent>
   <packaging>nbm</packaging>
   <artifactId>ui-views</artifactId>

Modified: trunk/soft/fudaa-crue/ui-wrapper/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-wrapper/pom.xml	2013-04-13 01:37:51 UTC (rev 8401)
+++ trunk/soft/fudaa-crue/ui-wrapper/pom.xml	2013-04-23 21:17:42 UTC (rev 8402)
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>0.69-SNAPSHOT</version>
+    <version>1.0RC2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ui-wrapper</artifactId>

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

[Fudaa-svn-commit] SF.net SVN: fudaa:[8399] trunk/framework/ctulu-gis/src/main/java/org/fudaa/ ctulu/gis/GISDataModelFilterAdapter.java

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

Revision: 8399
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8399&view=rev
Author:   deniger
Date:     2013-04-12 17:14:30 +0000 (Fri, 12 Apr 2013)
Log Message:
-----------
TraceCasiers

Modified Paths:
--------------
    trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISDataModelFilterAdapter.java

Modified: trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISDataModelFilterAdapter.java
===================================================================
--- trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISDataModelFilterAdapter.java	2013-04-12 14:10:51 UTC (rev 8398)
+++ trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISDataModelFilterAdapter.java	2013-04-12 17:14:30 UTC (rev 8399)
@@ -11,10 +11,9 @@
  */
 package org.fudaa.ctulu.gis;
 
+import com.vividsolutions.jts.geom.Geometry;
+import com.vividsolutions.jts.geom.LineString;
 import java.util.BitSet;
-
-import com.vividsolutions.jts.geom.Geometry;
-
 import org.fudaa.ctulu.CtuluLibArray;
 
 /**
@@ -98,6 +97,32 @@
   }
 
   /**
+   * Dans ce cas, les LineString ferm\xE9es sont \xE9galement accept\xE9es
+   *
+   * @param _collection
+   * @param _att
+   * @return
+   */
+  public static GISDataModelFilterAdapter buildLigneFermeeCommonAdapter(final GISDataModel _collection, final GISAttributeInterface[] _att) {
+    boolean allLigneFermee = true;
+    final GISVisitorChooser chooser = new GISVisitorChooser();
+    final int nb = _collection.getNumGeometries();
+    final BitSet set = new BitSet(nb);
+    for (int i = 0; i < nb; i++) {
+      ((GISGeometry) _collection.getGeometry(i)).accept(chooser);
+      if (chooser.isPolygone() || (chooser.isPolyligne() && ((LineString) _collection.getGeometry(i)).isClosed())) {
+        set.set(i);
+      } else {
+        allLigneFermee = false;
+      }
+    }
+    if (allLigneFermee) {
+      return buildAdapter(_collection, _att, null);
+    }
+    return buildAdapter(_collection, _att, CtuluLibArray.getSelectedIdx(set));
+  }
+
+  /**
    * Cr\xE9ation d'un filtre ne conservant que les lignes ouvertes et les d'attributs donn\xE9s.
    */
   public static GISDataModelFilterAdapter buildLigneOuverteAdapter(final GISDataModel _collection, final GISAttributeInterface[] _att) {

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

[Fudaa-svn-commit] SF.net SVN: fudaa:[8397] trunk/soft/fudaa-crue/ui-planimetry/src/main/java/ org/fudaa/fudaa/crue/planimetry/interaction/

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

Revision: 8397
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8397&view=rev
Author:   deniger
Date:     2013-04-12 14:07:14 +0000 (Fri, 12 Apr 2013)
Log Message:
-----------
TraceCasiers

Removed Paths:
-------------
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/interaction/

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

[Fudaa-svn-commit] SF.net SVN: fudaa:[8395] trunk/framework/ebli-1d/src/main/java/org/fudaa/ ebli/courbe/EGCourbe.java

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

Revision: 8395
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8395&view=rev
Author:   deniger
Date:     2013-04-12 10:50:32 +0000 (Fri, 12 Apr 2013)
Log Message:
-----------
Corrections et am?\195?\169liorations multiples

Modified Paths:
--------------
    trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java

Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java	2013-04-12 07:17:54 UTC (rev 8394)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java	2013-04-12 10:50:32 UTC (rev 8395)
@@ -513,7 +513,11 @@
     final Shape oldClip = _g.getClip();
     final int minX = _t.getMinEcranX();
     final int adjust = 3;
-    _g.setClip(minX - adjust, _t.getMinEcranY(), _t.getMaxEcranX() - minX + adjust * 2, _t.getMaxEcranY() - _t.getMinEcranY());
+    if (getAxeY() == null) {
+      _g.setClip(minX - adjust, 0, _t.getMaxEcranX() - minX + adjust * 2, _t.getMaxEcranY());
+    } else {
+      _g.setClip(minX - adjust, _t.getMinEcranY(), _t.getMaxEcranX() - minX + adjust * 2, _t.getMaxEcranY() - _t.getMinEcranY());
+    }
     final int nbPt = model_.getNbValues();
     double xi, yi, xie, yie;
     boolean xiVisible;

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

[Fudaa-svn-commit] SF.net SVN: fudaa:[8393] trunk/framework

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

Revision: 8393
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8393&view=rev
Author:   deniger
Date:     2013-04-11 13:56:01 +0000 (Thu, 11 Apr 2013)
Log Message:
-----------


Modified Paths:
--------------
    trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluExprGUI.java
    trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableModel.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZSceneEditor.java

Added Paths:
-----------
    trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/PostfixMathCommandEnhancedI.java

Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluExprGUI.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluExprGUI.java	2013-04-11 07:26:06 UTC (rev 8392)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluExprGUI.java	2013-04-11 13:56:01 UTC (rev 8393)
@@ -39,6 +39,7 @@
 import org.fudaa.ctulu.CtuluLibString;
 import org.fudaa.ctulu.table.CtuluTable;
 import org.nfunk.jep.Variable;
+import org.nfunk.jep.function.PostfixMathCommandI;
 
 /**
  * @author Fred Deniger
@@ -63,41 +64,41 @@
     InfoUpdater(final BuLabel _lb) {
       lb_ = _lb;
     }
-    
+
     public void updateCst() {
       Variable v = null;
       if (!cstSelected_.isSelectionEmpty()) {
         v = (Variable) cstModel_.getElementAt(cstSelected_.getMaxSelectionIndex());
-        
+
       }
       updateTxt(v);
     }
-    
+
     public void updateVar() {
       Variable v = null;
       if (!varSelected_.isSelectionEmpty()) {
         v = (Variable) model_.getElementAt(varSelected_.getMaxSelectionIndex());
-        
+
       }
       updateTxt(v);
     }
-    
+
     @Override
     public void valueChanged(final ListSelectionEvent _e) {
-      
+
       if (_e.getSource() == cstSelected_) {
         updateCst();
       }
       if (_e.getSource() == varSelected_) {
         updateVar();
       }
-      
+
     }
-    
+
     private void updateTxt(final Variable _v) {
       String txt = CtuluLibString.ESPACE;
       if (_v != null) {
-        
+
         final String name = _v.getName();
         if (expr_.containsDescFor(name)) {
           txt = name + ": " + expr_.getDesc(name);
@@ -108,14 +109,14 @@
       lb_.setText(txt);
     }
   }
-  
+
   class ValueTableModel extends AbstractTableModel {
-    
+
     protected void fireChanged() {
       super.fireTableRowsDeleted(0, getRowCount());
       super.fireTableRowsInserted(0, getRowCount());
     }
-    
+
     @Override
     public Class getColumnClass(final int _columnIndex) {
       if (_columnIndex == 0) {
@@ -123,22 +124,22 @@
       }
       return Double.class;
     }
-    
+
     @Override
     public int getColumnCount() {
       return 2;
     }
-    
+
     @Override
     public String getColumnName(final int _column) {
       return CtuluLibString.ESPACE;
     }
-    
+
     @Override
     public int getRowCount() {
       return varToSet_ == null ? 0 : varToSet_.length;
     }
-    
+
     @Override
     public Object getValueAt(final int _rowIndex, final int _columnIndex) {
       if (_columnIndex == 0) {
@@ -146,12 +147,12 @@
       }
       return varToSet_[_rowIndex].getValue();
     }
-    
+
     @Override
     public boolean isCellEditable(final int _rowIndex, final int _columnIndex) {
       return _columnIndex == 1;
     }
-    
+
     @Override
     public void setValueAt(final Object _value, final int _rowIndex, final int _columnIndex) {
       if (_value == null || _value.equals(varToSet_[_rowIndex].getValue())) {
@@ -161,35 +162,35 @@
       clearResult();
     }
   }
-  
+
   private static final class VariableModel extends AbstractListModel implements ComboBoxModel {
-    
+
     final List l_;
     Object selected_;
-    
+
     VariableModel(final List _l) {
       l_ = _l;
     }
-    
+
     protected void fireAllChanged() {
       super.fireIntervalAdded(this, 0, getSize());
     }
-    
+
     @Override
     public Object getElementAt(final int _index) {
       return l_.get(_index);
     }
-    
+
     @Override
     public Object getSelectedItem() {
       return selected_;
     }
-    
+
     @Override
     public int getSize() {
       return l_.size();
     }
-    
+
     @Override
     public void setSelectedItem(final Object _anItem) {
       if (selected_ != _anItem) {
@@ -198,9 +199,9 @@
       }
     }
   }
-  
+
   class VarRenderer extends DefaultListCellRenderer {
-    
+
     @Override
     public Component getListCellRendererComponent(final JList _list, final Object _value, final int _index,
             final boolean _isSelected, final boolean _cellHasFocus) {
@@ -228,9 +229,9 @@
       return c;
     }
   }
-  
+
   static class TableCellRenderer extends DefaultTableCellRenderer {
-    
+
     @Override
     public Component getTableCellRendererComponent(final JTable _table, final Object _value, final boolean _isSelected,
             final boolean _hasFocus, final int _row, final int _column) {
@@ -248,7 +249,7 @@
    * @version $Id: CtuluExprGUI.java,v 1.9 2006-09-19 14:36:55 deniger Exp $
    */
   public static class VariableComparator implements Comparator {
-    
+
     @Override
     public int compare(final Object _o1, final Object _o2) {
       if (_o1 == _o2) {
@@ -321,7 +322,7 @@
     add(top);
     final BuLabel lb = new BuLabel(CtuluLibString.ESPACE);
     add(lb);
-    
+
     var = new BuPanel(lay);
     var.add(new BuLabel(CtuluLib.getS("Constantes")));
     listCst.setVisibleRowCount(3);
@@ -347,7 +348,7 @@
     scroll.setPreferredHeight(prefH);
     var.add(scroll);
     top.add(var);
-    
+
     txt_ = new BuTextArea();
     txt_.getDocument().addDocumentListener(this);
     txt_.setColumns(30);
@@ -393,26 +394,26 @@
       @Override
       public void focusLost(final FocusEvent _e) {
       }
-      
+
       @Override
       public void focusGained(final FocusEvent _e) {
         listener.updateVar();
-        
+
       }
     });
     listCst.addFocusListener(new FocusListener() {
       @Override
       public void focusLost(final FocusEvent _e) {
       }
-      
+
       @Override
       public void focusGained(final FocusEvent _e) {
         listener.updateCst();
-        
+
       }
     });
   }
-  
+
   private void initFctList(final BuEmptyList _listFct) {
     _listFct.setVisibleRowCount(3);
     _listFct.setModel(fctModel_);
@@ -426,7 +427,7 @@
       }
     });
   }
-  
+
   private void initCstVar(final BuEmptyList _listVar, final BuEmptyList _listCst) {
     _listVar.addMouseListener(new MouseAdapter() {
       @Override
@@ -447,31 +448,31 @@
     _listVar.setModel(model_);
     _listCst.setModel(cstModel_);
   }
-  
+
   public boolean isExprValide() {
     if (btValid_.isEnabled()) {
       valideExpr();
     }
     return isValid_;
   }
-  
+
   public BuTextArea getTxtArea() {
     return txt_;
   }
-  
+
   private void updateBt() {
     btValid_.setEnabled(true);
     if (btEvaluate_ != null) {
       btEvaluate_.setEnabled(true);
     }
   }
-  
+
   public void setError(String msg) {
     txtError_.setForeground(Color.RED);
     txtError_.setToolTipText(msg);
     txtError_.setText(msg);
   }
-  
+
   public final void valideExpr() {
     expr_.getParser().parseExpression(getExprText());
     isValid_ = !expr_.getParser().hasError();
@@ -497,16 +498,16 @@
       varToSet_ = newVar;
       tModel_.fireChanged();
     }
-    
+
     expr_.findUsedVar();
   }
-  
+
   protected void clearResult() {
     if (tfResult_ != null) {
       tfResult_.setText(CtuluLibString.EMPTY_STRING);
     }
   }
-  
+
   String containsNullValue() {
     final StringBuffer buf = new StringBuffer();
     boolean aie = false;
@@ -523,7 +524,7 @@
     }
     return aie ? buf.toString() : null;
   }
-  
+
   @Override
   public void actionPerformed(final ActionEvent _e) {
     if (_e.getSource() == btValid_) {
@@ -552,45 +553,53 @@
       }
     }
   }
-  
+
   protected void insertFct() {
-    txt_.insert(fctModel_.getElementAt(fctSelected_.getMaxSelectionIndex()) + "(", txt_.getCaretPosition());
+    final Object functionName = fctModel_.getElementAt(fctSelected_.getMaxSelectionIndex());
+    PostfixMathCommandI command = expr_.getParser().getFunctionTable().get((String) functionName);
+    String preSeparator = "(";
+    String postSeparator = ")";
+    if (command instanceof PostfixMathCommandEnhancedI && ((PostfixMathCommandEnhancedI) command).needQuotes()) {
+      preSeparator = "(\"";
+      postSeparator = "\")";
+    }
+    txt_.insert(functionName + preSeparator, txt_.getCaretPosition());
     final int pos = txt_.getCaretPosition();
-    txt_.insert(")", pos);
+    txt_.insert(postSeparator, pos);
     txt_.setCaretPosition(pos);
     txt_.requestFocus();
   }
-  
+
   public void setButtonValidVisible(boolean b) {
     btValid_.setVisible(b);
   }
-  
+
   protected void insertVar(final VariableModel _var, final ListSelectionModel _select) {
     txt_.insert(((Variable) _var.getElementAt(_select.getMaxSelectionIndex())).getName(), txt_.getCaretPosition());
     txt_.requestFocus();
   }
-  
+
   @Override
   public void changedUpdate(final DocumentEvent _e) {
     updateBt();
   }
-  
+
   public final CtuluExpr getExpr() {
     return expr_;
   }
-  
+
   public String getExprText() {
     String txt = txt_.getText();
     txt = txt.replace('\r', ' ');
     txt = txt.replace('\n', ' ');
     return txt;
   }
-  
+
   @Override
   public void insertUpdate(final DocumentEvent _e) {
     updateBt();
   }
-  
+
   @Override
   public void removeUpdate(final DocumentEvent _e) {
     updateBt();

Added: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/PostfixMathCommandEnhancedI.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/PostfixMathCommandEnhancedI.java	                        (rev 0)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/PostfixMathCommandEnhancedI.java	2013-04-11 13:56:01 UTC (rev 8393)
@@ -0,0 +1,13 @@
+/*
+ GPL 2
+ */
+package org.fudaa.ctulu.editor;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public interface PostfixMathCommandEnhancedI {
+
+  boolean needQuotes();
+}

Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableModel.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableModel.java	2013-04-11 07:26:06 UTC (rev 8392)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableModel.java	2013-04-11 13:56:01 UTC (rev 8393)
@@ -10,6 +10,7 @@
 import javax.swing.table.AbstractTableModel;
 import org.fudaa.ctulu.CtuluCommandContainer;
 import org.fudaa.ctulu.CtuluLibString;
+import org.fudaa.ebli.commun.EbliLib;
 
 /**
  * Un model pour pour les courbes.
@@ -116,12 +117,16 @@
 
   @Override
   public String getColumnName(final int _column) {
-    String res = CtuluLibString.ESPACE;
+
+    String res = null;
     if (getH() != null && _column == xColIndex) {
       res = getH().titre_;
     } else if (_column == yColIndex && c_ != null && c_.getAxeY() != null) {
       res = c_.getAxeY().titre_;
     }
+    if (res == null && _column == 0) {
+      return EbliLib.getS("Sel.");
+    }
     return (res == null || res.length() == 0) ? CtuluLibString.ESPACE : res;
   }
 

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZSceneEditor.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZSceneEditor.java	2013-04-11 07:26:06 UTC (rev 8392)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZSceneEditor.java	2013-04-11 13:56:01 UTC (rev 8393)
@@ -201,15 +201,32 @@
         boite.ajuste(boiteTmp);
       }
     }
-    if (boite != null) {
-      calquePanel_.getVueCalque().changeRepere(this, boite);
-    }
+    zoomOn(boite);
   }
 
   /**
    * Effectue un zoom sur la selection mais en gardant des dimensions minimums.
    */
   public void zoomControlledOnSelected() {
+    GrBoite boite = getZoomOnSelected();
+    zoomOn(boite);
+  }
+
+  /**
+   * Selectionne l'objet suivant celui selectionn\xE9.
+   */
+  public void selectNextObject() {
+    scene_.selectNext();
+  }
+
+  /**
+   * Selectionne l'objet pr\xE9c\xE9dent celui selectionn\xE9.
+   */
+  public void selectPreviousObject() {
+    scene_.selectPrevious();
+  }
+
+  public GrBoite getZoomOnSelected() {
     GrBoite boite = null;
     for (ZCalqueAffichageDonneesInterface cq : scene_.getAllLayers()) {
       GrBoite boiteTmp = cq.getZoomOnSelected();
@@ -219,22 +236,30 @@
         boite.ajuste(boiteTmp);
       }
     }
-    if (boite != null) {
-      calquePanel_.getVueCalque().changeRepere(this, boite);
-    }
+    return boite;
   }
 
   /**
-   * Selectionne l'objet suivant celui selectionn\xE9.
+   * n'ajoute pas une marge autour de la s\xE9lection
+   *
+   * @return
    */
-  public void selectNextObject() {
-    scene_.selectNext();
+  public GrBoite getDomaineOnSelected() {
+    GrBoite boite = null;
+    for (ZCalqueAffichageDonneesInterface cq : scene_.getAllLayers()) {
+      GrBoite boiteTmp = cq.getDomaineOnSelected();
+      if (boite == null) {
+        boite = boiteTmp;
+      } else {
+        boite.ajuste(boiteTmp);
+      }
+    }
+    return boite;
   }
 
-  /**
-   * Selectionne l'objet pr\xE9c\xE9dent celui selectionn\xE9.
-   */
-  public void selectPreviousObject() {
-    scene_.selectPrevious();
+  public void zoomOn(GrBoite boite) {
+    if (boite != null) {
+      calquePanel_.getVueCalque().changeRepere(this, boite);
+    }
   }
 }

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

[Fudaa-svn-commit] SF.net SVN: fudaa:[8392] trunk/framework/ctulu-common/src/main/java/org/ fudaa/ctulu/table/CtuluTable.java

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

Revision: 8392
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8392&view=rev
Author:   deniger
Date:     2013-04-11 07:26:06 +0000 (Thu, 11 Apr 2013)
Log Message:
-----------


Modified Paths:
--------------
    trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTable.java

Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTable.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTable.java	2013-04-11 07:25:12 UTC (rev 8391)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTable.java	2013-04-11 07:26:06 UTC (rev 8392)
@@ -10,6 +10,10 @@
  */
 package org.fudaa.ctulu.table;
 
+import com.memoire.bu.BuTable;
+import com.memoire.bu.BuTableStaticModel;
+import com.memoire.fu.FuLib;
+import com.memoire.fu.FuLog;
 import java.awt.Component;
 import java.awt.Point;
 import java.awt.Rectangle;
@@ -30,7 +34,8 @@
 import java.util.Date;
 import java.util.EventObject;
 import java.util.StringTokenizer;
-
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import javax.swing.AbstractAction;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
@@ -40,7 +45,6 @@
 import javax.swing.table.TableCellRenderer;
 import javax.swing.table.TableColumn;
 import javax.swing.table.TableModel;
-
 import jxl.Workbook;
 import jxl.format.Alignment;
 import jxl.format.VerticalAlignment;
@@ -50,15 +54,8 @@
 import jxl.write.WritableSheet;
 import jxl.write.WritableWorkbook;
 import jxl.write.WriteException;
-
-import com.memoire.bu.BuTable;
-import com.memoire.bu.BuTableStaticModel;
-import com.memoire.fu.FuLib;
-import com.memoire.fu.FuLog;
-
 import org.fudaa.ctulu.CtuluLibString;
 import org.fudaa.ctulu.ToStringTransformable;
-
 import skt.swing.table.TableColumnAutoResizer;
 import skt.swing.table.TableColumnResizer;
 import skt.swing.table.TableRowResizer;
@@ -723,7 +720,11 @@
     if (getCursor() == TableColumnResizer.resizeCursor || getCursor() == TableRowResizer.RESIZE_CURSOR) {
       return;
     }
-    super.changeSelection(_row, _column, _toggle, _extend);
+    try {
+      super.changeSelection(_row, _column, _toggle, _extend);
+    } catch (Exception e) {
+      Logger.getLogger(CtuluTable.class.getName()).log(Level.WARNING, "message {0}", e);
+    }
   }
 
   /*

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

[Fudaa-svn-commit] SF.net SVN: fudaa:[8390] trunk/framework/ebli-1d/src/main/java/org/fudaa/ ebli/courbe

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

Revision: 8390
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8390&view=rev
Author:   deniger
Date:     2013-04-08 15:18:37 +0000 (Mon, 08 Apr 2013)
Log Message:
-----------


Modified Paths:
--------------
    trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeHorizontalPersist.java
    trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphe.java
    trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGPaletteLegendeGraphe.java

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	2013-04-06 02:18:47 UTC (rev 8389)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeHorizontalPersist.java	2013-04-08 15:18:37 UTC (rev 8390)
@@ -259,6 +259,18 @@
   }
 
   public void apply(final EGAxeHorizontal axeX) {
+    applyButRange(axeX);
+    if (range != null) {
+      axeX.range_.initWith(range);
+    }
+  }
+
+  /**
+   * N'applique pas la modification du Range.
+   *
+   * @param axeX
+   */
+  public void applyButRange(final EGAxeHorizontal axeX) {
     axeX.titre_ = this.titre;
     axeX.titreVisible_ = this.titreVisible;
     axeX.unite_ = this.unite;
@@ -281,9 +293,6 @@
     axeX.longueurPas_ = longueurPas_;
     axeX.modeGraduations_ = modeGraduations_;
     axeX.nbSousGraduations_ = nbSousGraduations_;
-    if (range != null) {
-      axeX.range_.initWith(range);
-    }
     axeX.initDisplayValues();
   }
 }

Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphe.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphe.java	2013-04-06 02:18:47 UTC (rev 8389)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphe.java	2013-04-08 15:18:37 UTC (rev 8390)
@@ -644,7 +644,6 @@
           axeYRange.put(axe, r);
         }
         o.ajusteY(r);
-        System.err.println("r=" + r);
       }
     }
     for (final Iterator it = axeYRange.entrySet().iterator(); it.hasNext();) {

Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGPaletteLegendeGraphe.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGPaletteLegendeGraphe.java	2013-04-06 02:18:47 UTC (rev 8389)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGPaletteLegendeGraphe.java	2013-04-08 15:18:37 UTC (rev 8390)
@@ -134,7 +134,7 @@
 //      axe.fireCourbeAspectChanged(false);
     }
     if (initAxeHorizontal != null) {
-      initAxeHorizontal.apply(graphe_.getTransformer().getXAxe());
+      initAxeHorizontal.applyButRange(graphe_.getTransformer().getXAxe());
     }
     return super.cancel();
   }

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

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

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

Revision: 8389
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8389&view=rev
Author:   deniger
Date:     2013-04-06 02:18:47 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------


Modified Paths:
--------------
    trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/AbstractLoiUiController.java
    trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilSectionLoiUiController.java
    trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionTopComponent.java
    trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/persist/CourbeConfigUpdater.java

Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/AbstractLoiUiController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/AbstractLoiUiController.java	2013-04-06 02:13:52 UTC (rev 8388)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/AbstractLoiUiController.java	2013-04-06 02:18:47 UTC (rev 8389)
@@ -90,9 +90,9 @@
     tableGraphePanel.getTable().getColumnModel().getColumn(0).setCellRenderer(new LoiStateCellRenderer());
     tableGraphePanel.getTable().getColumnModel().getColumn(1).setHeaderValue(configLoi.getVarAbscisse().getNom());
     tableGraphePanel.getTable().getColumnModel().getColumn(2).setHeaderValue(varOrdonnee.getNom());
-    getGraphe().fullRepaint();
     getGraphe().restore();
     getGraphe().fullRepaint();
+    panel.repaint();
 
     loiModel.addObserver(new Observer() {
       @Override

Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilSectionLoiUiController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilSectionLoiUiController.java	2013-04-06 02:13:52 UTC (rev 8388)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilSectionLoiUiController.java	2013-04-06 02:18:47 UTC (rev 8389)
@@ -288,7 +288,8 @@
     updating = false;
     updateValidationState();
     updateWithAvailableFrottements(sousModeleParent.getFrtConteneur().getListFrt());
-    getGraphe().restoreAllYAxe();
+    getGraphe().restore();
+    getGraphe().fullRepaint();
   }
   boolean updating;
 

Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionTopComponent.java	2013-04-06 02:13:52 UTC (rev 8388)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionTopComponent.java	2013-04-06 02:18:47 UTC (rev 8389)
@@ -407,6 +407,8 @@
     }
     profilUiController.setEditable(editable);
     applyCourbeConfig();
+    profilUiController.getGraphe().restore();
+    profilUiController.getGraphe().restore();
     updating = false;
     setModified(false);
   }

Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/persist/CourbeConfigUpdater.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/persist/CourbeConfigUpdater.java	2013-04-06 02:13:52 UTC (rev 8388)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/persist/CourbeConfigUpdater.java	2013-04-06 02:18:47 UTC (rev 8389)
@@ -55,7 +55,7 @@
       String oldUnite = axeY.getUnite();
       EGAxeVerticalPersist axeVConfig = config.getAxeVConfig(key);
       if (axeVConfig != null) {
-        axeVConfig.apply(axeY);
+        axeVConfig.applyAllButRange(axeY);
         axeY.setTitre(oldTitle);
         axeY.setUnite(oldUnite);
       }

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

[Fudaa-svn-commit] SF.net SVN: fudaa:[8388] trunk/framework/ctulu-gis/src/main/java/org/fudaa/ ctulu/gis

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

Revision: 8388
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8388&view=rev
Author:   deniger
Date:     2013-04-06 02:13:52 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------


Modified Paths:
--------------
    trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISDataModelAttributeToAtomicSubstitutionAdapter.java
    trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISLib.java

Modified: trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISDataModelAttributeToAtomicSubstitutionAdapter.java
===================================================================
--- trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISDataModelAttributeToAtomicSubstitutionAdapter.java	2013-04-06 02:12:17 UTC (rev 8387)
+++ trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISDataModelAttributeToAtomicSubstitutionAdapter.java	2013-04-06 02:13:52 UTC (rev 8388)
@@ -153,7 +153,7 @@
       String[] svals = initStringValue.split(GISDataModelFeatureAdapter.VALUE_SEPARATOR);
       int max = Math.min(svals.length, values.length);
       for (int j = 0; j < svals.length; j++) {
-        StringUtils.replace(svals[j], GISDataModelFeatureAdapter.VALUE_SEPARATOR_AS_STRING, GISDataModelFeatureAdapter.VALUE_SEPARATOR);
+        svals[j] = StringUtils.replace(svals[j], GISDataModelFeatureAdapter.VALUE_SEPARATOR_AS_STRING, GISDataModelFeatureAdapter.VALUE_SEPARATOR);
       }
       final Class targetDataClass = targetAtomic.getDataClass();
       if (targetDataClass.equals(Integer.class)) {

Modified: trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISLib.java
===================================================================
--- trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISLib.java	2013-04-06 02:12:17 UTC (rev 8387)
+++ trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISLib.java	2013-04-06 02:13:52 UTC (rev 8388)
@@ -887,11 +887,11 @@
         tbType = "[B]";
       }
 
-      type = AttributeTypeFactory.newAttributeType(tbType + (_useIdAsName ? _att.getID() : _att.getName()), String.class, true, 18);
+      type = AttributeTypeFactory.newAttributeType(tbType + (_useIdAsName ? _att.getID() : _att.getName()), String.class, true, 250);
     } // 18 pour les shapefiles ...;
     else {
       type = AttributeTypeFactory.newAttributeType(_useIdAsName ? _att.getID() : _att.getName(), _att
-              .getDataClass(), true, 18);
+              .getDataClass(), true, 250);
     }
     return type;
   }

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

[Fudaa-svn-commit] SF.net SVN: fudaa:[8387] trunk/framework/ebli-1d/src/main/java/org/fudaa/ ebli/courbe

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

Revision: 8387
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8387&view=rev
Author:   deniger
Date:     2013-04-06 02:12:17 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------


Modified Paths:
--------------
    trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeVerticalPersist.java
    trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGFillePanel.java
    trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphe.java

Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeVerticalPersist.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeVerticalPersist.java	2013-04-06 01:39:09 UTC (rev 8386)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeVerticalPersist.java	2013-04-06 02:12:17 UTC (rev 8387)
@@ -291,6 +291,19 @@
   }
 
   public void apply(EGAxeVertical axeY) {
+    applyAllButRange(axeY);
+    if (range != null) {
+      axeY.range_.initWith(range);
+    }
+  }
+
+  public EGAxeVertical generateAxe() {
+    EGAxeVertical axeY = new EGAxeVertical();
+    apply(axeY);
+    return axeY;
+  }
+
+  public void applyAllButRange(EGAxeVertical axeY) {
     axeY.droite_ = this.droite;
     axeY.titreVertical_ = this.titreVertical;
     axeY.titreVerticalDroite_ = this.titreVerticalDroite;
@@ -314,15 +327,6 @@
     axeY.longueurPas_ = longueurPas_;
     axeY.setModeGraduations(modeGraduations_);
     axeY.nbSousGraduations_ = nbSousGraduations_;
-    if (range != null) {
-      axeY.range_.initWith(range);
-    }
     axeY.initDisplayValues();
   }
-
-  public EGAxeVertical generateAxe() {
-    EGAxeVertical axeY = new EGAxeVertical();
-    apply(axeY);
-    return axeY;
-  }
 }

Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGFillePanel.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGFillePanel.java	2013-04-06 01:39:09 UTC (rev 8386)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGFillePanel.java	2013-04-06 02:12:17 UTC (rev 8387)
@@ -106,6 +106,7 @@
     vue_ = new EGVue(_a);
     add(vue_, BuBorderLayout.CENTER);
     selection_ = new EGInteractionSelection(vue_.graphe_);
+    setDoubleBuffered(false);
 
     // suiviInfos_ = new EGInteractionSuiviAllOrdonnees(vue_.getGraphe());
 

Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphe.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphe.java	2013-04-06 01:39:09 UTC (rev 8386)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphe.java	2013-04-06 02:12:17 UTC (rev 8387)
@@ -117,8 +117,6 @@
   public ExportTableCommentSupplier getExportTableCommentSupplier() {
     return exportTableCommentSupplier;
   }
-  
-  
 
   private void ajusteXAxe() {
     final EGAxeHorizontal hAxe = getTransformer().getXAxe();
@@ -368,7 +366,7 @@
       } else if (_c.isVisible_) {
         final EGAxeVertical vert = _c.getAxeY();
         // si l'axe n'a pas d\xE9j\xE0 \xE9t\xE9 initialis\xE9.
-        if (!vert.isRangeInit()) {
+        if (vert != null && !vert.isRangeInit()) {
           vert.ajusteFor(_c);
         }
 
@@ -635,6 +633,9 @@
       final EGObject o = m.getEGObject(i);
       if (o.isVisible_) {
         final EGAxeVertical axe = o.getAxeY();
+        if (axe == null) {
+          continue;
+        }
         CtuluRange r = (CtuluRange) axeYRange.get(axe);
         if (r == null) {
           r = new CtuluRange();
@@ -643,6 +644,7 @@
           axeYRange.put(axe, r);
         }
         o.ajusteY(r);
+        System.err.println("r=" + r);
       }
     }
     for (final Iterator it = axeYRange.entrySet().iterator(); it.hasNext();) {

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

[Fudaa-svn-commit] SF.net SVN: fudaa:[8385] trunk/business/fudaa-sig/src/main/java/org/fudaa/ fudaa/sig/wizard/FSigDataModelStoreAdapter.java

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

Revision: 8385
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8385&view=rev
Author:   deniger
Date:     2013-04-04 22:43:47 +0000 (Thu, 04 Apr 2013)
Log Message:
-----------
version 0.68

Modified Paths:
--------------
    trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigDataModelStoreAdapter.java

Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigDataModelStoreAdapter.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigDataModelStoreAdapter.java	2013-04-04 22:43:32 UTC (rev 8384)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigDataModelStoreAdapter.java	2013-04-04 22:43:47 UTC (rev 8385)
@@ -7,14 +7,16 @@
  */
 package org.fudaa.fudaa.sig.wizard;
 
+import com.memoire.fu.FuLog;
+import com.vividsolutions.jts.geom.Envelope;
+import com.vividsolutions.jts.geom.Geometry;
+import com.vividsolutions.jts.geom.Polygon;
 import gnu.trove.TIntArrayList;
-
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.NoSuchElementException;
-
 import org.fudaa.ctulu.CtuluLibArray;
 import org.fudaa.ctulu.ProgressionInterface;
 import org.fudaa.ctulu.ProgressionUpdater;
@@ -32,11 +34,6 @@
 import org.geotools.feature.FeatureIterator;
 import org.geotools.feature.FeatureType;
 
-import com.memoire.fu.FuLog;
-import com.vividsolutions.jts.geom.Envelope;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.Polygon;
-
 /**
  * @author Fred Deniger
  * @version $Id: FSigDataModelStoreAdapter.java,v 1.3 2007-04-30 14:22:38 deniger Exp $
@@ -342,7 +339,7 @@
       return -1;
     }
     buildAttributes();
-    return CtuluLibArray.findObjectEgalEgal(atts_, _att);
+    return CtuluLibArray.findObject(atts_, _att);
   }
 
   @Override

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

[Fudaa-svn-commit] SF.net SVN: fudaa:[8384] trunk/soft/fudaa-crue/ui-planimetry/src/test/ resources/ggcrue/

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

Revision: 8384
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8384&view=rev
Author:   deniger
Date:     2013-04-04 22:43:32 +0000 (Thu, 04 Apr 2013)
Log Message:
-----------
version 0.68

Property Changed:
----------------
    trunk/soft/fudaa-crue/ui-planimetry/src/test/resources/ggcrue/


Property changes on: trunk/soft/fudaa-crue/ui-planimetry/src/test/resources/ggcrue
___________________________________________________________________
Added: svn:ignore
   + .~lock.EMG_Profil_point.dbf#


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

[Fudaa-svn-commit] SF.net SVN: fudaa:[8383] trunk/framework

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

Revision: 8383
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8383&view=rev
Author:   deniger
Date:     2013-04-04 22:39:19 +0000 (Thu, 04 Apr 2013)
Log Message:
-----------
version 0.68

Modified Paths:
--------------
    trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISDataModelAttributeToAtomicSubstitutionAdapter.java
    trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISLib.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/SelectionMoveInteraction.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZCalquePointEditable.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZModelePointEditable.java

Modified: trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISDataModelAttributeToAtomicSubstitutionAdapter.java
===================================================================
--- trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISDataModelAttributeToAtomicSubstitutionAdapter.java	2013-04-04 22:38:48 UTC (rev 8382)
+++ trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISDataModelAttributeToAtomicSubstitutionAdapter.java	2013-04-04 22:39:19 UTC (rev 8383)
@@ -84,7 +84,17 @@
 
   @Override
   public void preload(GISAttributeInterface[] _att, ProgressionInterface _prog) {
-    model_.preload(_att, _prog);
+    if (_att == null) {
+      return;
+    }
+    GISAttributeInterface[] targetAtt = new GISAttributeInterface[_att.length];
+    for (int i = 0; i < targetAtt.length; i++) {
+      targetAtt[i] = _att[i];
+      if (ObjectUtils.equals(targetAtomic, targetAtt[i])) {
+        targetAtt[i] = initNotAtomic;
+      }
+    }
+    model_.preload(targetAtt, _prog);
   }
 
   /* (non-Javadoc)

Modified: trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISLib.java
===================================================================
--- trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISLib.java	2013-04-04 22:38:48 UTC (rev 8382)
+++ trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISLib.java	2013-04-04 22:39:19 UTC (rev 8383)
@@ -7,21 +7,19 @@
  */
 package org.fudaa.ctulu.gis;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.fudaa.ctulu.ProgressionInterface;
-import org.fudaa.ctulu.ProgressionUpdater;
-import org.geotools.feature.AttributeType;
-import org.geotools.feature.AttributeTypeFactory;
-
 import com.memoire.fu.FuLog;
 import com.vividsolutions.jts.algorithm.CGAlgorithms;
 import com.vividsolutions.jts.algorithm.PointInRing;
 import com.vividsolutions.jts.algorithm.SIRtreePointInRing;
 import com.vividsolutions.jts.geom.*;
 import com.vividsolutions.jts.geom.impl.CoordinateArraySequence;
+import java.util.ArrayList;
+import java.util.List;
+import org.fudaa.ctulu.ProgressionInterface;
+import org.fudaa.ctulu.ProgressionUpdater;
 import org.fudaa.ctulu.editor.CtuluValueEditorDefaults;
+import org.geotools.feature.AttributeType;
+import org.geotools.feature.AttributeTypeFactory;
 
 /**
  * @author deniger
@@ -658,6 +656,13 @@
     return GISGeometryFactory.INSTANCE.createLineString(_cs);
   }
 
+  public static void preloadAttributes(GISDataModel dataModel) {
+    if (dataModel.getNbAttributes() > 0) {
+      dataModel.preload(GISLib.getAttributeFrom(dataModel), null);
+    }
+
+  }
+
   public static Envelope computeEnveloppe(final Geometry[] _models) {
     final Envelope r = new Envelope();
     for (int i = _models.length - 1; i >= 0; i--) {

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/SelectionMoveInteraction.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/SelectionMoveInteraction.java	2013-04-04 22:38:48 UTC (rev 8382)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/SelectionMoveInteraction.java	2013-04-04 22:39:19 UTC (rev 8383)
@@ -100,7 +100,8 @@
   public void mouseClicked(MouseEvent _evt) {
     if (_evt.getClickCount() >= 2) {
       moveEnCours = false;
-      super.mouseClicked(_evt);
+      deplacement.mouseClicked(_evt);
+      return;
     }
     if (moveEnCours) {
       deplacement.mouseClicked(_evt);

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZCalquePointEditable.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZCalquePointEditable.java	2013-04-04 22:38:48 UTC (rev 8382)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZCalquePointEditable.java	2013-04-04 22:39:19 UTC (rev 8383)
@@ -48,14 +48,14 @@
  * @version $Id$
  */
 public class ZCalquePointEditable extends ZCalquePoint implements ZCalqueEditable, ZModelGeometryListener {
-  
+
   private Color labelsForegroundColor = Color.BLACK;
   private Color labelsBackgroundColor = Color.WHITE;
   /**
    * Le finder pour une recherche sur le calque
    */
   protected CalqueFindActionAtomic finder_;
-  
+
   public void setLabelsForegroundColor(Color labelsForegroundColor) {
     if (!ObjectUtils.equals(this.labelsForegroundColor, labelsForegroundColor)) {
       Color old = this.labelsForegroundColor;
@@ -64,7 +64,7 @@
       firePropertyChange(ZCalqueGeometryLabelConfigure.PROPERTY_LABELS_FOREGROUND, old, labelsForegroundColor);
     }
   }
-  
+
   public void setLabelsBackgroundColor(Color labelsBackgroundColor) {
     if (!ObjectUtils.equals(this.labelsBackgroundColor, labelsBackgroundColor)) {
       Color old = this.labelsBackgroundColor;
@@ -73,15 +73,15 @@
       firePropertyChange(ZCalqueGeometryLabelConfigure.PROPERTY_LABELS_BACKGROUND, old, labelsBackgroundColor);
     }
   }
-  
+
   public Color getLabelsBackgroundColor() {
     return labelsBackgroundColor;
   }
-  
+
   public Color getLabelsForegroundColor() {
     return labelsForegroundColor;
   }
-  
+
   protected void drawLabel(FontMetrics fm, String s, GrPoint pEcran, Color bgColor, Graphics2D _g, Color fgColor) {
     int stringWidth = fm.stringWidth(s);
     int x = (int) (pEcran.x_ - stringWidth / 2);
@@ -93,7 +93,7 @@
     _g.setColor(fgColor);
     _g.drawString(s, (int) x, (int) y);
   }
-  
+
   public void clearCacheAndRepaint() {
     clearCache();
     repaint();
@@ -104,13 +104,13 @@
    * @version $Id$
    */
   private class VariableFindExpression extends CalqueFindPointExpression {
-    
+
     TObjectIntHashMap varAtt_;
-    
+
     public VariableFindExpression() {
       super(ZCalquePointEditable.this.modele());
     }
-    
+
     @Override
     public void initialiseExpr(final CtuluExpr _expr) {
       super.initialiseExpr(_expr);
@@ -129,9 +129,9 @@
           }
         }
       }
-      
+
     }
-    
+
     @Override
     public void majVariable(final int _idx, final Variable[] _varToUpdate) {
       super.majVariable(_idx, _varToUpdate);
@@ -147,7 +147,7 @@
     }
   }
   ZEditorInterface editor_;
-  
+
   public ZCalquePointEditable() {
     super();
   }
@@ -162,7 +162,7 @@
       ((ZModelePointEditableInterface) _modele).addModelListener(this);
     }
   }
-  
+
   @Override
   public boolean addAtome(final GrPoint _ptReel, final CtuluCommandContainer _cmd, final CtuluUI _ui) {
     return false;
@@ -178,27 +178,27 @@
     if (_att == attrLabels_) {
       return;
     }
-    if (_att == null || !_att.isAtomicValue()) {
+    if (_att == null) {
       attrLabels_ = null;
     } else {
       attrLabels_ = _att;
     }
     clearCacheAndRepaint();
   }
-  
+
   @Override
   public void paintDonnees(Graphics2D _g, GrMorphisme _versEcran, GrMorphisme _versReel, GrBoite _clipReel) {
     super.paintDonnees(_g, _versEcran, _versReel, _clipReel);
     paintLabelsOnAtomics(_g, _versEcran, _versReel, _clipReel);
   }
-  
+
   protected void paintLabelsOnAtomics(final Graphics2D _g, final GrMorphisme _versEcran, final GrMorphisme _versReel,
           final GrBoite _clipReel) {
-    
+
     if (attrLabels_ != null && !isRapide()) {
       GISZoneCollection geomData = getModelEditable().getGeomData();
       int idxLabels = geomData.getIndiceOf(attrLabels_);
-      
+
       if (idxLabels != -1) {
         final Color fgColor = labelsForegroundColor;
         final Color bgColor = labelsBackgroundColor;
@@ -239,16 +239,15 @@
           }
         }
         _g.setFont(old);
-        
+
       }
     }
   }
-  
+
   @Override
   public boolean addAtomeProjectedOnSelectedGeometry(GrPoint grPoint, CtuluCommandComposite cmp, CtuluUI _ui) {
     return false;
   }
-  
 
   @Override
   public boolean addForme(final GrObjet _o, final int _deforme, final CtuluCommandContainer _cmd, final CtuluUI _ui,
@@ -270,37 +269,37 @@
   public boolean isAtomicMode() {
     return getSelectionMode() == SelectionMode.ATOMIC;
   }
-  
+
   @Override
   public boolean canUseAtomicMode() {
     return false;
   }
-  
+
   @Override
   public boolean canUseSegmentMode() {
     return false;
   }
-  
+
   @Override
   public String editSelected() {
     return editor_ == null ? EbliLib.getS("Edition impossible") : editor_.edit();
   }
-  
+
   @Override
   public final ZEditorInterface getEditor() {
     return editor_;
   }
-  
+
   @Override
   public EbliFindExpressionContainerInterface getExpressionContainer() {
     return new VariableFindExpression();
   }
-  
+
   @Override
   public ZModeleEditable getModelEditable() {
     return (ZModeleEditable) modeleDonnees();
   }
-  
+
   @Override
   public int[] getSelectedObjectInTable() {
     return getSelectedIndex();
@@ -309,22 +308,22 @@
    public boolean isAtomicMode() {
    return false;
    }*/
-  
+
   @Override
   public SelectionMode getSelectionMode() {
     return SelectionMode.NORMAL;
   }
-  
+
   @Override
   public boolean isPaletteModifiable() {
     return false;
   }
-  
+
   @Override
   public boolean isTitleModifiable() {
     return true;
   }
-  
+
   @Override
   public void setModele(final ZModelePoint _modele) {
     if (null == _modele || _modele instanceof ZModelePointEditableInterface) {
@@ -339,7 +338,7 @@
       throw new IllegalArgumentException("bad model");
     }
   }
-  
+
   @Override
   public boolean moveSelectedObjects(final double _dx, final double _dy, double _dz, final CtuluCommandContainer _cmd,
           final CtuluUI _ui) {
@@ -378,7 +377,7 @@
     if (isSelectionEmpty()) {
       return false;
     }
-    
+
     final CtuluCommandComposite cmp = new CtuluCommandComposite();
     final int min = selection_.getMinIndex();
     final ZModelePointEditableInterface modele = (ZModelePointEditableInterface) modele_;
@@ -389,7 +388,7 @@
         double dyold = modele.getY(i) - _yreel0;
         double dxnew = dxold * Math.cos(_angRad) - dyold * Math.sin(_angRad);
         double dynew = dxold * Math.sin(_angRad) + dyold * Math.cos(_angRad);
-        
+
         modele.setPoint(i, dxnew + _xreel0, dynew + _yreel0, cmp);
       }
     }
@@ -400,7 +399,7 @@
 
     return false;
   }
-  
+
   @Override
   public void paintDeplacement(final Graphics2D _g2d, final int _dx, final int _dy, final TraceIcon _ic) {
     if (!isSelectionEmpty()) {
@@ -427,7 +426,7 @@
       }
     }
   }
-  
+
   @Override
   public boolean removeSelectedObjects(final CtuluCommandContainer _cmd, final CtuluUI _ui) {
     if (!isSelectionEmpty()) {
@@ -444,7 +443,7 @@
    return false;
    }
    */
-  
+
   @Override
   public boolean setSelectionMode(SelectionMode mode) {
     return false;
@@ -475,7 +474,7 @@
     setSelection(isels);
     return true;
   }
-  
+
   @Override
   public final void setEditor(final ZEditorInterface _editor) {
     editor_ = _editor;
@@ -492,17 +491,17 @@
   public boolean joinSelectedObjects(final CtuluCommandContainer _cmd, CtuluUI _ui) {
     return false;
   }
-  
+
   @Override
   public void attributeAction(Object _source, int _indexAtt, GISAttributeInterface _att, int _action) {
     clearCacheAndRepaint();
   }
-  
+
   @Override
   public void attributeValueChangeAction(Object _source, int _indexAtt, GISAttributeInterface _att, int _indexGeom, Object _newValue) {
     clearCacheAndRepaint();
   }
-  
+
   @Override
   public void geometryAction(Object _source, int _indexGeom, Geometry _geom, int _action) {
     clearCacheAndRepaint();

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZModelePointEditable.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZModelePointEditable.java	2013-04-04 22:38:48 UTC (rev 8382)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZModelePointEditable.java	2013-04-04 22:39:19 UTC (rev 8383)
@@ -9,8 +9,6 @@
 
 import com.memoire.bu.BuTable;
 import com.vividsolutions.jts.geom.CoordinateSequence;
-import com.vividsolutions.jts.geom.Envelope;
-import com.vividsolutions.jts.geom.Geometry;
 import com.vividsolutions.jts.geom.Point;
 import java.util.ArrayList;
 import java.util.List;
@@ -234,12 +232,11 @@
     GrBoite bt = null;
     for (int i = pts_.getNumGeometries() - 1; i >= 0; i--) {
       if (isGeometryVisible(i)) {
-        final Geometry g = pts_.getGeometry(i);
-        final Envelope e = g.getEnvelopeInternal();
+        final GISPoint g = pts_.get(i);
         if (bt == null) {
           bt = new GrBoite();
         }
-        bt.ajuste(e);
+        bt.ajuste(g.getX(), g.getY(), g.getZ());
       }
     }
     return bt;
@@ -255,7 +252,7 @@
       final int i = _layer.getLayerSelection().getMaxIndex();
       final int i2 = _layer.getLayerSelection().getMinIndex();
       _d.put(EbliLib.getS("Distance entre les 2 points"),
-             CtuluLib.DEFAULT_NUMBER_FORMAT.format(CtuluLibGeometrie.getDistance(getX(i), getY(i), getX(i2), getY(i2))));
+              CtuluLib.DEFAULT_NUMBER_FORMAT.format(CtuluLibGeometrie.getDistance(getX(i), getY(i), getX(i2), getY(i2))));
       return;
     }
     if (nb != 1) {
@@ -368,6 +365,7 @@
 
   /**
    * Fait passer la g\xE9om\xE9trie en Modifier
+   *
    * @param _idx : index de la geom\xE9trie
    * @param _cmd :
    */

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

[Fudaa-svn-commit] SF.net SVN: fudaa:[8381] trunk/framework/ctulu-gis/src/main/java/org/fudaa/ ctulu/gis/GISDataModelAttributeToAtomicSubstitutionAdapter.java

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

Revision: 8381
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8381&view=rev
Author:   deniger
Date:     2013-04-04 21:25:18 +0000 (Thu, 04 Apr 2013)
Log Message:
-----------
version 0.68

Modified Paths:
--------------
    trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISDataModelAttributeToAtomicSubstitutionAdapter.java

Modified: trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISDataModelAttributeToAtomicSubstitutionAdapter.java
===================================================================
--- trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISDataModelAttributeToAtomicSubstitutionAdapter.java	2013-04-04 21:16:34 UTC (rev 8380)
+++ trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISDataModelAttributeToAtomicSubstitutionAdapter.java	2013-04-04 21:25:18 UTC (rev 8381)
@@ -25,7 +25,7 @@
  * @version $Id$
  */
 public class GISDataModelAttributeToAtomicSubstitutionAdapter implements GISDataModel {
-  
+
   private final GISDataModel model_;
   private final GISAttributeInterface initNotAtomic;
   private final int idxAttribute;
@@ -51,9 +51,9 @@
     }
     this.initNotAtomic = initNotAtomic;
     this.targetAtomic = targetAtomic;
-    
+
   }
-  
+
   @Override
   public GISDataModel createTranslate(GISPoint xyToAdd) {
     if (xyToAdd == null) {
@@ -81,7 +81,7 @@
   public double getDoubleValue(int _att, int _geom) {
     return model_.getDoubleValue(_att, _geom);
   }
-  
+
   @Override
   public void preload(GISAttributeInterface[] _att, ProgressionInterface _prog) {
     model_.preload(_att, _prog);
@@ -167,6 +167,6 @@
     } else {
       return model_.getValue(_att, _geom);
     }
-    
+
   }
 }

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