[Fudaa-svn-commit] SF.net SVN: fudaa:[4332] branches/FudaaModeleur_TC1Bis/fudaa_devel

[<emm...@us...>]

Revision: 4332
          http://fudaa.svn.sourceforge.net/fudaa/?rev=4332&view=rev
Author:   emmanuel_martin
Date:     2009-01-08 09:39:03 +0000 (Thu, 08 Jan 2009)

Log Message:
-----------
Correction d'un bug lors de l'ajout d'un point ?\195?\160 un profil.

Modified Paths:
--------------
    branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollectionGeometry.java
    branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/MdlFille1d.java
    branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/Controller1d.java
    branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/Bief.java

Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollectionGeometry.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollectionGeometry.java	2009-01-08 09:22:51 UTC (rev 4331)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollectionGeometry.java	2009-01-08 09:39:03 UTC (rev 4332)
@@ -131,6 +131,8 @@
     Geometry geom = (Geometry)super.geometry_.getValueAt(_idxGeom);
     final Coordinate[] oldcs = geom.getCoordinates();
     final int initSize = oldcs.length;
+    if(_idxBefore<0||_idxBefore>=initSize)
+      throw new IllegalArgumentException("L'index du point \xE0 ajouter doit appartenir \xE0 la g\xE9om\xE9trie.");
     final Coordinate[] cs = new Coordinate[initSize + 1];
     int idx = 0;
     for (int i = 0; i < initSize; i++) {

Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/MdlFille1d.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/MdlFille1d.java	2009-01-08 09:22:51 UTC (rev 4331)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/MdlFille1d.java	2009-01-08 09:39:03 UTC (rev 4332)
@@ -15,7 +15,6 @@
 
 import javax.swing.JComponent;
 import javax.swing.JSplitPane;
-import javax.swing.SwingUtilities;
 
 import org.fudaa.ctulu.CtuluCommandManager;
 import org.fudaa.ctulu.CtuluExportDataInterface;
@@ -38,7 +37,6 @@
 import com.db4o.ObjectSet;
 import com.db4o.query.Query;
 import com.memoire.bu.BuBorderLayout;
-import com.memoire.bu.BuCommonImplementation;
 import com.memoire.bu.BuUndoRedoInterface;
 import com.memoire.fu.FuLog;
 

Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/Controller1d.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/Controller1d.java	2009-01-08 09:22:51 UTC (rev 4331)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/Controller1d.java	2009-01-08 09:39:03 UTC (rev 4332)
@@ -12,7 +12,6 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Observable;
-import java.util.Observer;
 
 import javax.swing.Action;
 import javax.swing.DefaultListModel;

Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/Bief.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/Bief.java	2009-01-08 09:22:51 UTC (rev 4331)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/model/Bief.java	2009-01-08 09:39:03 UTC (rev 4332)
@@ -264,7 +264,7 @@
       int previousIdx=UtilsProfil1d.getPreviousIndex(seq, coord);
       int nextIdx=UtilsProfil1d.getNextIndex(seq, coord);
       // Le point n'appartient pas au profil ou La coordonn\xE9e correspond d\xE9j\xE0 \xE0 un point
-      if (previousIdx==-2||nextIdx==-2||previousIdx+1==nextIdx-1||previousIdx==seq.size()-2&&nextIdx==-1||previousIdx==-1&&nextIdx==1)
+      if (previousIdx==-2||nextIdx==-2||previousIdx+1==nextIdx-1||nextIdx==-1||previousIdx==-1)
         return;
       // La coordonn\xE9e correspond \xE0 aucun point connu
       ((GISZoneCollectionGeometry)profils_.getGeomData()).addAtomic(_idxProfil, previousIdx, coord.x, coord.y, null);


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