[Fudaa-svn-commit] SF.net SVN: fudaa:[6233] trunk/business

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

Revision: 6233
          http://fudaa.svn.sourceforge.net/fudaa/?rev=6233&view=rev
Author:   bmarchan
Date:     2011-04-22 08:29:29 +0000 (Fri, 22 Apr 2011)

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


Modified Paths:
--------------
    trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretBief.java
    trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretGEOReader.java
    trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarStReader.java
    trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigLineSingleModel.java

Modified: trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretBief.java
===================================================================
--- trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretBief.java	2011-04-22 08:27:12 UTC (rev 6232)
+++ trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretBief.java	2011-04-22 08:29:29 UTC (rev 6233)
@@ -62,7 +62,9 @@
 
     // G\xE9n\xE9ration des profiles et des traces de profiles \\
     for(int k=0;k<profils_.size();k++){
-      _progress.setProgression((int)((float)k/profils_.size()*100));
+      if (_progress!=null)
+        _progress.setProgression((int)((float)k/profils_.size()*100));
+      
       MascaretProfilAbstractRepresentation profil=profils_.get(k);
       CoordinateArraySequence coordSeq=new CoordinateArraySequence(profil.coordXYTraceProfil.size());
       // Trace profil

Modified: trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretGEOReader.java
===================================================================
--- trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretGEOReader.java	2011-04-22 08:27:12 UTC (rev 6232)
+++ trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/mascaret/io/MascaretGEOReader.java	2011-04-22 08:29:29 UTC (rev 6233)
@@ -160,7 +160,8 @@
       
       // G\xE9n\xE9ration des GISZoneCollectionLigneBrisee avec les informations extraites et
       // retour de celle-ci
-      progress_.setDesc(DodicoLib.getS("Lecture de ")+fileName_);
+      if (progress_!=null)
+        progress_.setDesc(DodicoLib.getS("Lecture de ")+fileName_);
       return bief.buildZones(analyze_, progress_);
     }
     catch (ParseError _exc) {

Modified: trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarStReader.java
===================================================================
--- trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarStReader.java	2011-04-22 08:27:12 UTC (rev 6232)
+++ trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarStReader.java	2011-04-22 08:29:29 UTC (rev 6233)
@@ -59,7 +59,7 @@
    * @return Un tableau GISZoneCollectionLigneBrisee[2]. [0] : la collection des profils (ou null si aucun profil), 
    * [1] : la collection de lignes directrices (ou null si aucune ligne directrice).
    */
-  protected Object internalRead() {
+  protected GISZoneCollectionLigneBrisee[] internalRead() {
     // Remarque : Cette impl\xE9mentation empeche des noms semblables (les noms sont stock\xE9s comme cl\xE9 de Map) sur les lignes 
     // directrices. Ce qui peut \xEAtre normal puisque c'est le m\xEAme nom en un point de chaque profil qui permet de constituer
     // la ligne.

Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigLineSingleModel.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigLineSingleModel.java	2011-04-22 08:27:12 UTC (rev 6232)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigLineSingleModel.java	2011-04-22 08:29:29 UTC (rev 6233)
@@ -7,13 +7,8 @@
  */
 package org.fudaa.fudaa.sig;
 
-import java.util.ArrayList;
-import java.util.List;
 
-import org.fudaa.ctulu.gis.GISAttributeInterface;
-import org.fudaa.ctulu.gis.GISZoneCollection;
 import org.fudaa.ctulu.gis.GISZoneCollectionLigneBrisee;
-import org.fudaa.ctulu.gis.GISZoneListener;
 import org.fudaa.ebli.calque.ZCalqueAffichageDonneesInterface;
 import org.fudaa.ebli.calque.ZModeleLigneBrisee;
 import org.fudaa.ebli.calque.edition.ZModeleGeometryDefault;
@@ -115,7 +110,7 @@
 
   public void prepareExport() {}
 
-  public GISZoneCollection getGeomData() {
+  public GISZoneCollectionLigneBrisee getGeomData() {
     return geom_;
   }
 


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