[Fudaa-svn-commit] SF.net SVN: fudaa:[3739] trunk/fudaa_devel

[<opa...@us...>]

Revision: 3739
          http://fudaa.svn.sourceforge.net/fudaa/?rev=3739&view=rev
Author:   opasteur
Date:     2008-08-07 22:45:03 +0000 (Thu, 07 Aug 2008)

Log Message:
-----------


Modified Paths:
--------------
    trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierEtude1d.java
    trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/EnumMetierMethodeOpt.java
    trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/EnumMetierTypeLit.java
    trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierApportCrueCalageAuto.java
    trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierCalageAuto.java
    trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierCrueCalageAuto.java
    trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierMesureCrueCalageAuto.java
    trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierParametresCalageAuto.java
    trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierResultatsCalageAuto.java
    trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/CConversionHydraulique1d.java
    trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvH1D_Masc.java
    trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvMasc_H1D.java
    trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dCrueCalagePanel.java
    trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dCruesCalageEditor.java
    trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dLaissesEditor.java
    trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dListingsCalageEditor.java
    trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresCalageEditor.java
    trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dZoneFrottementEditor.java
    trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauLaisseModel.java
    trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauZoneFrottementCalageModel.java
    trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauZoneFrottementModel.java

Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierEtude1d.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierEtude1d.java	2008-08-07 22:23:48 UTC (rev 3738)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierEtude1d.java	2008-08-07 22:45:03 UTC (rev 3739)
@@ -20,6 +20,7 @@
 import org.fudaa.dodico.boony.BoonyXgzSerializer;
 import org.fudaa.dodico.boony.BoonyXmlDeserializer;
 import org.fudaa.dodico.boony.BoonyXmlSerializer;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCalageAuto;
 import org.fudaa.dodico.hydraulique1d.metier.MetierHydraulique1d;
 import org.fudaa.dodico.hydraulique1d.metier.calageauto.*;
 import org.fudaa.dodico.hydraulique1d.metier.evenement.Notifieur;

Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/EnumMetierMethodeOpt.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/EnumMetierMethodeOpt.java	2008-08-07 22:23:48 UTC (rev 3738)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/EnumMetierMethodeOpt.java	2008-08-07 22:45:03 UTC (rev 3739)
@@ -12,21 +12,21 @@
 {
   private        int __value;
   private static int __size = 3;
-  private static org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierMethodeOpt[] __array = new org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierMethodeOpt [__size];
+  private static org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierMethodeOpt[] __array = new org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierMethodeOpt [__size];
 
   public static final int _DESCENTE_OPTIMALE = 0;
-  public static final org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierMethodeOpt DESCENTE_OPTIMALE = new org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierMethodeOpt(_DESCENTE_OPTIMALE);
+  public static final org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierMethodeOpt DESCENTE_OPTIMALE = new org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierMethodeOpt(_DESCENTE_OPTIMALE);
   public static final int _CASIER_NEWTON = 1;
-  public static final org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierMethodeOpt CASIER_NEWTON = new org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierMethodeOpt(_CASIER_NEWTON);
+  public static final org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierMethodeOpt CASIER_NEWTON = new org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierMethodeOpt(_CASIER_NEWTON);
   public static final int _ALGO_GENETIQUE = 2;
-  public static final org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierMethodeOpt ALGO_GENETIQUE = new org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierMethodeOpt(_ALGO_GENETIQUE);
+  public static final org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierMethodeOpt ALGO_GENETIQUE = new org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierMethodeOpt(_ALGO_GENETIQUE);
 
   public int value ()
   {
     return __value;
   }
 
-  public static org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierMethodeOpt from_int (int value)
+  public static org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierMethodeOpt from_int (int value)
   {
     if (value >= 0 && value < __size)
       return __array[value];

Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/EnumMetierTypeLit.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/EnumMetierTypeLit.java	2008-08-07 22:23:48 UTC (rev 3738)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/EnumMetierTypeLit.java	2008-08-07 22:45:03 UTC (rev 3739)
@@ -14,19 +14,19 @@
 {
   private        int __value;
   private static int __size = 2;
-  private static org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierTypeLit[] __array = new org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierTypeLit [__size];
+  private static org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierTypeLit[] __array = new org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierTypeLit [__size];
 
   public static final int _MINEUR = 0;
-  public static final org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierTypeLit MINEUR = new org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierTypeLit(_MINEUR);
+  public static final org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierTypeLit MINEUR = new org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierTypeLit(_MINEUR);
   public static final int _MAJEUR = 1;
-  public static final org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierTypeLit MAJEUR = new org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierTypeLit(_MAJEUR);
+  public static final org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierTypeLit MAJEUR = new org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierTypeLit(_MAJEUR);
 
   public int value ()
   {
     return __value;
   }
 
-  public static org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierTypeLit from_int (int value)
+  public static org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierTypeLit from_int (int value)
   {
     if (value >= 0 && value < __size)
       return __array[value];

Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierApportCrueCalageAuto.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierApportCrueCalageAuto.java	2008-08-07 22:23:48 UTC (rev 3738)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierApportCrueCalageAuto.java	2008-08-07 22:45:03 UTC (rev 3739)
@@ -8,7 +8,7 @@
  */
 package org.fudaa.dodico.hydraulique1d.metier.calageauto;
 
-import org.fudaa.dodico.hydraulique1d.calageauto.MetierApportCrueCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierApportCrueCalageAuto;
 import org.fudaa.dodico.hydraulique1d.metier.evenement.Notifieur;
 import org.fudaa.dodico.hydraulique1d.metier.MetierHydraulique1d;
 

Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierCalageAuto.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierCalageAuto.java	2008-08-07 22:23:48 UTC (rev 3738)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierCalageAuto.java	2008-08-07 22:45:03 UTC (rev 3739)
@@ -8,10 +8,10 @@
  */
 package org.fudaa.dodico.hydraulique1d.metier.calageauto;
 
-import org.fudaa.dodico.hydraulique1d.calageauto.MetierCalageAuto;
-import org.fudaa.dodico.hydraulique1d.calageauto.MetierCrueCalageAuto;
-import org.fudaa.dodico.hydraulique1d.calageauto.MetierParametresCalageAuto;
-import org.fudaa.dodico.hydraulique1d.calageauto.MetierResultatsCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCrueCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierParametresCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierResultatsCalageAuto;
 import org.fudaa.dodico.hydraulique1d.metier.evenement.Notifieur;
 import org.fudaa.dodico.hydraulique1d.metier.MetierZoneFrottement;
 import org.fudaa.dodico.hydraulique1d.metier.MetierHydraulique1d;

Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierCrueCalageAuto.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierCrueCalageAuto.java	2008-08-07 22:23:48 UTC (rev 3738)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierCrueCalageAuto.java	2008-08-07 22:45:03 UTC (rev 3739)
@@ -8,9 +8,9 @@
  */
 package org.fudaa.dodico.hydraulique1d.metier.calageauto;
 
-import org.fudaa.dodico.hydraulique1d.calageauto.MetierApportCrueCalageAuto;
-import org.fudaa.dodico.hydraulique1d.calageauto.MetierCrueCalageAuto;
-import org.fudaa.dodico.hydraulique1d.calageauto.MetierMesureCrueCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierApportCrueCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCrueCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierMesureCrueCalageAuto;
 import org.fudaa.dodico.hydraulique1d.metier.evenement.Notifieur;
 import org.fudaa.dodico.hydraulique1d.metier.MetierHydraulique1d;
 

Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierMesureCrueCalageAuto.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierMesureCrueCalageAuto.java	2008-08-07 22:23:48 UTC (rev 3738)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierMesureCrueCalageAuto.java	2008-08-07 22:45:03 UTC (rev 3739)
@@ -8,7 +8,7 @@
  */
 package org.fudaa.dodico.hydraulique1d.metier.calageauto;
 
-import org.fudaa.dodico.hydraulique1d.calageauto.MetierMesureCrueCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierMesureCrueCalageAuto;
 import org.fudaa.dodico.hydraulique1d.metier.evenement.Notifieur;
 import org.fudaa.dodico.hydraulique1d.metier.MetierHydraulique1d;
 

Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierParametresCalageAuto.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierParametresCalageAuto.java	2008-08-07 22:23:48 UTC (rev 3738)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierParametresCalageAuto.java	2008-08-07 22:45:03 UTC (rev 3739)
@@ -8,9 +8,9 @@
  */
 package org.fudaa.dodico.hydraulique1d.metier.calageauto;
 
-import org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierMethodeOpt;
-import org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierTypeLit;
-import org.fudaa.dodico.hydraulique1d.calageauto.MetierParametresCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierMethodeOpt;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierTypeLit;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierParametresCalageAuto;
 import org.fudaa.dodico.hydraulique1d.metier.evenement.Notifieur;
 import org.fudaa.dodico.hydraulique1d.metier.MetierHydraulique1d;
 
@@ -32,7 +32,8 @@
     super();
     pasGradient_=1;
     nbMaxIterations_=100;
-    typeLit_=org.fudaa.dodico.hydraulique1d.calageauto.MINEUR;
+    typeLit_= org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierTypeLit.MINEUR;
+   
     precision_=0.01;
     roInit_=1;
     methodeOpt_=EnumMetierMethodeOpt.DESCENTE_OPTIMALE;
@@ -69,7 +70,7 @@
         + " nbMaxIterations : "
         + nbMaxIterations_
         + " typeLit : "
-        + (typeLit_.equals(org.fudaa.dodico.hydraulique1d.calageauto.MINEUR) ? "mineur":"majeur")
+        + (typeLit_.equals( org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierTypeLit.MINEUR) ? "mineur":"majeur")
         + " precision : "
         + precision_
         + " roInit : "

Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierResultatsCalageAuto.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierResultatsCalageAuto.java	2008-08-07 22:23:48 UTC (rev 3738)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierResultatsCalageAuto.java	2008-08-07 22:45:03 UTC (rev 3739)
@@ -8,7 +8,7 @@
  */
 package org.fudaa.dodico.hydraulique1d.metier.calageauto;
 
-import org.fudaa.dodico.hydraulique1d.calageauto.MetierResultatsCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierResultatsCalageAuto;
 import org.fudaa.dodico.hydraulique1d.metier.evenement.Notifieur;
 import org.fudaa.dodico.hydraulique1d.metier.MetierResultatsTemporelSpatial;
 import org.fudaa.dodico.hydraulique1d.metier.MetierZoneFrottement;

Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/CConversionHydraulique1d.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/CConversionHydraulique1d.java	2008-08-07 22:23:48 UTC (rev 3738)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/CConversionHydraulique1d.java	2008-08-07 22:45:03 UTC (rev 3739)
@@ -18,11 +18,11 @@
 import org.fudaa.dodico.corba.mascaret.SParametresREP;
 import org.fudaa.dodico.corba.mascaret.SParametresTailleMaxFichier;
 import org.fudaa.dodico.corba.objet.IConnexion;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierResultatsCalageAuto;
 import org.fudaa.dodico.hydraulique1d.metier.MetierCalculHydraulique1d;
 import org.fudaa.dodico.hydraulique1d.metier.MetierEtude1d;
 import org.fudaa.dodico.hydraulique1d.metier.MetierParametresTailleMaxFichier;
 import org.fudaa.dodico.hydraulique1d.metier.MetierResultatsGeneraux;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierResultatsCalageAuto;
 /**
  * Classe qui contient des m\xE9thodes utiles \xE0 la conversion entre les 2 mod\xE8les.
  *

Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvH1D_Masc.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvH1D_Masc.java	2008-08-07 22:23:48 UTC (rev 3738)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvH1D_Masc.java	2008-08-07 22:45:03 UTC (rev 3739)
@@ -99,6 +99,12 @@
 import org.fudaa.dodico.corba.mascaret.SResultatsTemporelSpatial;
 import org.fudaa.dodico.corba.mascaret.SResultatsTemporelSpatialBief;
 import org.fudaa.dodico.corba.mascaret.SResultatsVariable;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierMethodeOpt;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierTypeLit;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierApportCrueCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCrueCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierMesureCrueCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierParametresCalageAuto;
 import org.fudaa.dodico.hydraulique1d.metier.EnumMetierCondLimiteImposee;
 import org.fudaa.dodico.hydraulique1d.metier.EnumMetierCritereArret;
 import org.fudaa.dodico.hydraulique1d.metier.EnumMetierLimiteCalcule;
@@ -137,12 +143,6 @@
 import org.fudaa.dodico.hydraulique1d.metier.MetierZone;
 import org.fudaa.dodico.hydraulique1d.metier.MetierZoneFrottement;
 import org.fudaa.dodico.hydraulique1d.metier.MetierZonePlanimetrage;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierMethodeOpt;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierTypeLit;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierApportCrueCalageAuto;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCrueCalageAuto;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierMesureCrueCalageAuto;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierParametresCalageAuto;
 import org.fudaa.dodico.hydraulique1d.metier.casier.MetierGeometrieCasier;
 import org.fudaa.dodico.hydraulique1d.metier.casier.MetierPlanimetrageCasier;
 import org.fudaa.dodico.hydraulique1d.metier.evenement.Notifieur;

Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvMasc_H1D.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvMasc_H1D.java	2008-08-07 22:23:48 UTC (rev 3738)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvMasc_H1D.java	2008-08-07 22:45:03 UTC (rev 3739)
@@ -93,6 +93,13 @@
 import org.fudaa.dodico.corba.mascaret.SResultatsTemporelSpatial;
 import org.fudaa.dodico.corba.mascaret.SResultatsTemporelSpatialBief;
 import org.fudaa.dodico.corba.mascaret.SResultatsVariable;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierMethodeOpt;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierTypeLit;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierApportCrueCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCrueCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierMesureCrueCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierParametresCalageAuto;
 import org.fudaa.dodico.hydraulique1d.metier.EnumMetierCondLimiteImposee;
 import org.fudaa.dodico.hydraulique1d.metier.EnumMetierCritereArret;
 import org.fudaa.dodico.hydraulique1d.metier.EnumMetierLimiteCalcule;
@@ -134,13 +141,6 @@
 import org.fudaa.dodico.hydraulique1d.metier.MetierZone;
 import org.fudaa.dodico.hydraulique1d.metier.MetierZoneFrottement;
 import org.fudaa.dodico.hydraulique1d.metier.MetierZonePlanimetrage;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierMethodeOpt;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierTypeLit;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierApportCrueCalageAuto;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCalageAuto;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCrueCalageAuto;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierMesureCrueCalageAuto;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierParametresCalageAuto;
 import org.fudaa.dodico.hydraulique1d.metier.casier.MetierChenalLiaison;
 import org.fudaa.dodico.hydraulique1d.metier.casier.MetierNuagePointsCasier;
 import org.fudaa.dodico.hydraulique1d.metier.casier.MetierOrificeLiaison;

Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dCrueCalagePanel.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dCrueCalagePanel.java	2008-08-07 22:23:48 UTC (rev 3738)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dCrueCalagePanel.java	2008-08-07 22:45:03 UTC (rev 3739)
@@ -18,10 +18,10 @@
 import javax.swing.JScrollPane;
 import javax.swing.border.TitledBorder;
 
-import org.fudaa.dodico.hydraulique1d.metier.MetierReseau;
 import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierApportCrueCalageAuto;
 import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCrueCalageAuto;
 import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierMesureCrueCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.MetierReseau;
 import org.fudaa.fudaa.hydraulique1d.tableau.Hydraulique1dLigneReelTableau;
 import org.fudaa.fudaa.hydraulique1d.tableau.Hydraulique1dTableauReel;
 import org.fudaa.fudaa.hydraulique1d.tableau.Hydraulique1dTableauReelModel;

Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dCruesCalageEditor.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dCruesCalageEditor.java	2008-08-07 22:23:48 UTC (rev 3738)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dCruesCalageEditor.java	2008-08-07 22:45:03 UTC (rev 3739)
@@ -20,9 +20,9 @@
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCrueCalageAuto;
 import org.fudaa.dodico.hydraulique1d.metier.MetierEtude1d;
 import org.fudaa.dodico.hydraulique1d.metier.MetierHydraulique1d;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCrueCalageAuto;
 import org.fudaa.ebli.commun.EbliPreferences;
 import org.fudaa.ebli.dialog.BDialogContent;
 

Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dLaissesEditor.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dLaissesEditor.java	2008-08-07 22:23:48 UTC (rev 3738)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dLaissesEditor.java	2008-08-07 22:45:03 UTC (rev 3739)
@@ -10,10 +10,10 @@
 
 import java.awt.event.ActionEvent;
 
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCalageAuto;
 import org.fudaa.dodico.hydraulique1d.metier.MetierDonneesHydrauliques;
 import org.fudaa.dodico.hydraulique1d.metier.MetierHydraulique1d;
 import org.fudaa.dodico.hydraulique1d.metier.MetierReseau;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCalageAuto;
 import org.fudaa.ebli.commun.EbliPreferences;
 import org.fudaa.fudaa.hydraulique1d.CGlobal;
 import org.fudaa.fudaa.hydraulique1d.tableau.Hydraulique1dTableauLaisseModel;

Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dListingsCalageEditor.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dListingsCalageEditor.java	2008-08-07 22:23:48 UTC (rev 3738)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dListingsCalageEditor.java	2008-08-07 22:45:03 UTC (rev 3739)
@@ -27,8 +27,8 @@
 import javax.swing.text.StyledDocument;
 
 
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierResultatsCalageAuto;
 import org.fudaa.dodico.hydraulique1d.metier.MetierHydraulique1d;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierResultatsCalageAuto;
 import org.fudaa.ebli.commun.EbliListModelLargeString;
 import org.fudaa.ebli.commun.EbliPreferences;
 import org.fudaa.ebli.dialog.BDialogContent;

Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresCalageEditor.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresCalageEditor.java	2008-08-07 22:23:48 UTC (rev 3738)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresCalageEditor.java	2008-08-07 22:45:03 UTC (rev 3739)
@@ -17,10 +17,10 @@
 import javax.swing.border.Border;
 import javax.swing.border.EtchedBorder;
 
-import org.fudaa.dodico.hydraulique1d.metier.MetierHydraulique1d;
 import org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierMethodeOpt;
 import org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierTypeLit;
 import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierParametresCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.MetierHydraulique1d;
 import org.fudaa.ebli.commun.EbliPreferences;
 import org.fudaa.ebli.dialog.BDialogContent;
 

Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dZoneFrottementEditor.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dZoneFrottementEditor.java	2008-08-07 22:23:48 UTC (rev 3738)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dZoneFrottementEditor.java	2008-08-07 22:45:03 UTC (rev 3739)
@@ -10,8 +10,8 @@
 import java.awt.event.ActionEvent;
 import java.io.File;
 
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCalageAuto;
 import org.fudaa.dodico.hydraulique1d.metier.MetierHydraulique1d;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCalageAuto;
 import org.fudaa.ebli.commun.EbliPreferences;
 import org.fudaa.fudaa.hydraulique1d.CGlobal;
 import org.fudaa.fudaa.hydraulique1d.Hydraulique1dBaseApplication;

Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauLaisseModel.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauLaisseModel.java	2008-08-07 22:23:48 UTC (rev 3738)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauLaisseModel.java	2008-08-07 22:45:03 UTC (rev 3739)
@@ -11,12 +11,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCrueCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierMesureCrueCalageAuto;
 import org.fudaa.dodico.hydraulique1d.metier.MetierDonneesHydrauliques;
 import org.fudaa.dodico.hydraulique1d.metier.MetierLaisse;
 import org.fudaa.dodico.hydraulique1d.metier.MetierSite;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCalageAuto;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCrueCalageAuto;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierMesureCrueCalageAuto;
 import org.fudaa.fudaa.hydraulique1d.Hydraulique1dImport;
 
 /**

Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauZoneFrottementCalageModel.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauZoneFrottementCalageModel.java	2008-08-07 22:23:48 UTC (rev 3738)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauZoneFrottementCalageModel.java	2008-08-07 22:45:03 UTC (rev 3739)
@@ -11,8 +11,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCalageAuto;
 import org.fudaa.dodico.hydraulique1d.metier.MetierZoneFrottement;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCalageAuto;
 
 /**
  * Mod\xE8le de tableau pour les zones de frottements calage.

Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauZoneFrottementModel.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauZoneFrottementModel.java	2008-08-07 22:23:48 UTC (rev 3738)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauZoneFrottementModel.java	2008-08-07 22:45:03 UTC (rev 3739)
@@ -11,9 +11,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCalageAuto;
 import org.fudaa.dodico.hydraulique1d.metier.MetierBief;
 import org.fudaa.dodico.hydraulique1d.metier.MetierZoneFrottement;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCalageAuto;
 
 /**
  * Mod\xE8le de tableau pour les zones de frottements.


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