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

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 8420
          http://sourceforge.net/p/fudaa/svn/8420
Author:   bmarchan
Date:     2013-06-17 08:18:54 +0000 (Mon, 17 Jun 2013)
Log Message:
-----------


Modified Paths:
--------------
    trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/Hydraulique1dProfilModel.java
    trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dGraphesResultatsEditor.java
    trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilFormeBuseArche.java
    trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilFormeBuseCirculaire.java
    trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilFormeBuseDemiCirculaire.java
    trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilFormeDalot.java
    trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilFormeRectangle.java
    trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilFormeTrapeze.java

Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/Hydraulique1dProfilModel.java
===================================================================

--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/Hydraulique1dProfilModel.java	2013-06-10 15:58:05 UTC (rev 8419)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/Hydraulique1dProfilModel.java	2013-06-17 08:18:54 UTC (rev 8420)
@@ -80,9 +80,9 @@
   private int[] indicesNonNuls_=null;
 
   /** Les auditeurs pour le data modifi\xE9. */
-  private HashSet hlisteners_=new HashSet();
+  private HashSet<Hydraulique1dProfilDataListener> hlisteners_=new HashSet<Hydraulique1dProfilDataListener>();
   /** Les auditeurs pour la selection modifi\xE9e. */
-  private HashSet hsellisteners_=new HashSet();
+  private HashSet<Hydraulique1dProfilSelectionListener> hsellisteners_=new HashSet<Hydraulique1dProfilSelectionListener>();
 
   private boolean avecGeoreferencement_;
   private String infoGeoreferencement_;

Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dGraphesResultatsEditor.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dGraphesResultatsEditor.java	2013-06-10 15:58:05 UTC (rev 8419)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dGraphesResultatsEditor.java	2013-06-17 08:18:54 UTC (rev 8420)
@@ -45,6 +45,7 @@
 import org.fudaa.ebli.dialog.BPanneauNavigation;
 import org.fudaa.ebli.graphe.Contrainte;
 import org.fudaa.ebli.graphe.CourbeDefault;
+import org.fudaa.ebli.graphe.GrapheComponent;
 import org.fudaa.ebli.graphe.Valeur;
 import org.fudaa.fudaa.commun.impl.FudaaCommonImplementation;
 import org.fudaa.fudaa.hydraulique1d.CGlobal;
@@ -373,7 +374,7 @@
     }
     Object[] values = getListeBiefCasierLiaison().getSelectedValues();
 
-    ArrayList listeIndexes = new ArrayList(values.length);
+    ArrayList<Integer> listeIndexes = new ArrayList<Integer>(values.length);
     for (int i = 0; i < values.length; i++) {
       StringTokenizer st = new StringTokenizer(values[i].toString());
       if (debutChaine.equals(st.nextToken())) {
@@ -382,7 +383,7 @@
     }
     int[] res = new int[listeIndexes.size()];
     for (int i = 0; i < res.length; i++) {
-      res[i] = ((Integer) listeIndexes.get(i)).intValue();
+      res[i] = listeIndexes.get(i).intValue();
     }
 
     return res;
@@ -490,13 +491,13 @@
 
   }
 
-  protected List getListLaisse() {
-    List listeLaisse = new ArrayList();
+  protected List<GrapheComponent> getListLaisse() {
+    List<GrapheComponent> listeLaisse = new ArrayList<GrapheComponent>();
     if (getSelectedPanel().cbLaisse_.isSelected()) {
       MetierLaisse[] laisses = donnneHyd_.laisses();
       //Si Profil spatial
       if (getSelectedPanel().rbSpatial_.isSelected()) {
-        Vector vLaissesBief = new Vector();
+        Vector<Valeur> vLaissesBief = new Vector<Valeur>();
         for (int j = getListeBiefCasierLiaison().getMinSelectionIndex(); j <= getListeBiefCasierLiaison().getMaxSelectionIndex(); j++) {
           if (j < reseau_.biefs().length) {
             //On recherche les laisses rattach\xE9es au bief indiceBief
@@ -734,7 +735,7 @@
 //#################################################################################################
 class GrapheSaveFileChooser extends CtuluFileChooser {
 
-  Map filterFormat_;
+  Map<BuFileFilter, String> filterFormat_;
 
   /**
    *
@@ -745,10 +746,10 @@
     setFileHidingEnabled(false);
     setAcceptAllFileFilterUsed(false);
     BuFileFilter[] f = new BuFileFilter[CtuluImageExport.FORMAT_LIST.size() + 2];
-    filterFormat_ = new HashMap(f.length);
+    filterFormat_ = new HashMap<BuFileFilter, String>(f.length);
     int pngIDx = 0;
     for (int i = 0; i < (f.length - 2); i++) {
-      String fmt = (String) CtuluImageExport.FORMAT_LIST.get(i);
+      String fmt = CtuluImageExport.FORMAT_LIST.get(i);
       if ("png".equals(fmt)) {
         pngIDx = i;
       }
@@ -768,7 +769,7 @@
   }
 
   public String getSelectedFormat() {
-    return (String) filterFormat_.get(getFileFilter());
+    return filterFormat_.get(getFileFilter());
   }
 
   /**

Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilFormeBuseArche.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilFormeBuseArche.java	2013-06-10 15:58:05 UTC (rev 8419)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilFormeBuseArche.java	2013-06-17 08:18:54 UTC (rev 8420)
@@ -75,7 +75,7 @@
   @Override
   public GrPoint[] getPoints() {
     GrPoint[] ps=null;
-    Vector v=new Vector();
+    Vector<GrPoint> v=new Vector<GrPoint>();
     GrPoint pt=startPoint_;
 
     double r=portee_/2.;
@@ -107,7 +107,7 @@
     v.add(new GrPoint(pt.x_+(portee_+fente_)/2.+1.0,pt.y_,pt.z_));
     v.add(new GrPoint(pt.x_+portee_+2.0,pt.y_,pt.z_));
 
-    ps=(GrPoint[])v.toArray(new GrPoint[v.size()]);
+    ps=v.toArray(new GrPoint[v.size()]);
     return ps;
   }
 

Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilFormeBuseCirculaire.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilFormeBuseCirculaire.java	2013-06-10 15:58:05 UTC (rev 8419)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilFormeBuseCirculaire.java	2013-06-17 08:18:54 UTC (rev 8420)
@@ -73,7 +73,7 @@
   @Override
   public GrPoint[] getPoints() {
     GrPoint[] ps=null;
-    Vector v=new Vector();
+    Vector<GrPoint> v=new Vector<GrPoint>();
     GrPoint pt=startPoint_;
 
     // Angle de fente
@@ -89,7 +89,7 @@
     v.add(new GrPoint(pt.x_+(diametre_+fente_)/2.+1.0,pt.y_,pt.z_));
     v.add(new GrPoint(pt.x_+diametre_+2.0,pt.y_,pt.z_));
 
-    ps=(GrPoint[])v.toArray(new GrPoint[v.size()]);
+    ps=v.toArray(new GrPoint[v.size()]);
     return ps;
   }
 

Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilFormeBuseDemiCirculaire.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilFormeBuseDemiCirculaire.java	2013-06-10 15:58:05 UTC (rev 8419)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilFormeBuseDemiCirculaire.java	2013-06-17 08:18:54 UTC (rev 8420)
@@ -73,7 +73,7 @@
   @Override
   public GrPoint[] getPoints() {
     GrPoint[] ps=null;
-    Vector v=new Vector();
+    Vector<GrPoint> v=new Vector<GrPoint>();
     GrPoint pt=startPoint_;
 
     // Angle de fente
@@ -93,7 +93,7 @@
     v.add(new GrPoint(pt.x_+(diametre_+fente_)/2.+1.0,pt.y_,pt.z_));
     v.add(new GrPoint(pt.x_+diametre_+2.0,pt.y_,pt.z_));
 
-    ps=(GrPoint[])v.toArray(new GrPoint[v.size()]);
+    ps=v.toArray(new GrPoint[v.size()]);
     return ps;
   }
 

Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilFormeDalot.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilFormeDalot.java	2013-06-10 15:58:05 UTC (rev 8419)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilFormeDalot.java	2013-06-17 08:18:54 UTC (rev 8420)
@@ -75,7 +75,7 @@
   @Override
   public GrPoint[] getPoints() {
     GrPoint[] ps=null;
-    Vector v=new Vector();
+    Vector<GrPoint> v=new Vector<GrPoint>();
     GrPoint pt=startPoint_;
 
     v.add(pt=new GrPoint(pt.x_,pt.y_,pt.z_));
@@ -89,7 +89,7 @@
     v.add(pt=new GrPoint(pt.x_,pt.y_+couverture_,pt.z_));
     v.add(pt=new GrPoint(pt.x_+(largeur_-fente_)/2.+1.0,pt.y_,pt.z_));
 
-    ps=(GrPoint[])v.toArray(new GrPoint[v.size()]);
+    ps=v.toArray(new GrPoint[v.size()]);
     return ps;
   }
 

Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilFormeRectangle.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilFormeRectangle.java	2013-06-10 15:58:05 UTC (rev 8419)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilFormeRectangle.java	2013-06-17 08:18:54 UTC (rev 8420)
@@ -69,17 +69,17 @@
   @Override
   public GrPoint[] getPoints() {
     GrPoint[] ps= null;
-    Vector v= new Vector();
+    Vector<GrPoint> v= new Vector<GrPoint>();
     GrPoint prec= startPoint_;
     v.add(new GrPoint(prec.x_, prec.y_, prec.z_));
-    prec= (GrPoint)v.lastElement();
+    prec= v.lastElement();
     if (mode_ != CONNECT_LEFT) {
       v.add(
         new GrPoint(
           Math.ceil((prec.x_ + ANTI_VERTICAL) * 100) / 100,
           prec.y_ - hauteur_,
           prec.z_));
-      prec= (GrPoint)v.lastElement();
+      prec= v.lastElement();
     }
     if (mode_ == CONNECT_RIGHT)
       v.add(
@@ -99,7 +99,7 @@
           Math.ceil((prec.x_ + largeur_ - 2 * ANTI_VERTICAL) * 100) / 100,
           prec.y_,
           prec.z_));
-    prec= (GrPoint)v.lastElement();
+    prec= v.lastElement();
     if (mode_ != CONNECT_RIGHT)
       v.add(
         new GrPoint(
@@ -108,7 +108,7 @@
           prec.z_));
     ps= new GrPoint[v.size()];
     for (int i= 0; i < v.size(); i++)
-      ps[i]= (GrPoint)v.get(i);
+      ps[i]= v.get(i);
     return ps;
   }
   @Override

Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilFormeTrapeze.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilFormeTrapeze.java	2013-06-10 15:58:05 UTC (rev 8419)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilFormeTrapeze.java	2013-06-17 08:18:54 UTC (rev 8420)
@@ -68,21 +68,21 @@
   @Override
   public GrPoint[] getPoints() {
     GrPoint[] ps= null;
-    Vector v= new Vector();
+    Vector<GrPoint> v= new Vector<GrPoint>();
     GrPoint prec= startPoint_;
     v.add(new GrPoint(prec.x_, prec.y_, prec.z_));
-    prec= (GrPoint)v.lastElement();
+    prec= v.lastElement();
     if (mode_ != CONNECT_LEFT) {
       v.add(new GrPoint(prec.x_ + pente_ * hauteur_, prec.y_ - hauteur_, prec.z_));
-      prec= (GrPoint)v.lastElement();
+      prec= v.lastElement();
     }
     v.add(new GrPoint(prec.x_ + largeurPlaf_, prec.y_, prec.z_));
-    prec= (GrPoint)v.lastElement();
+    prec= v.lastElement();
     if (mode_ != CONNECT_RIGHT)
       v.add(new GrPoint(prec.x_ + pente_ * hauteur_, prec.y_ + hauteur_, prec.z_));
     ps= new GrPoint[v.size()];
     for (int i= 0; i < v.size(); i++)
-      ps[i]= (GrPoint)v.get(i);
+      ps[i]= v.get(i);
     return ps;
   }
   @Override

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





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

https://gitlab.com/fudaa

fudaa-svn-commit