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

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

Revision: 8189
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8189&view=rev
Author:   deniger
Date:     2013-01-07 15:52:54 +0000 (Mon, 07 Jan 2013)
Log Message:
-----------


Modified Paths:
--------------
    trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/gml/GMLReader.java
    trunk/framework/dodico-common/src/test/java/org/fudaa/dodico/common/TestIO.java
    trunk/framework/pom.xml

Modified: trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/gml/GMLReader.java
===================================================================
--- trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/gml/GMLReader.java	2013-01-07 15:52:34 UTC (rev 8188)
+++ trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/gml/GMLReader.java	2013-01-07 15:52:54 UTC (rev 8189)
@@ -40,7 +40,6 @@
 import java.io.LineNumberReader;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.StringTokenizer;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.ZipInputStream;
 
@@ -922,36 +921,17 @@
    */
   private void parsePoints(final String _ptString, final GeometryFactory _geometryFactory) {
     String aPoint;
-//    StringTokenizer stokenizerPoint;
     Coordinate coord = new Coordinate();
     int dim;
     String numb;
-//    StringBuilder sb;
-//    int t;
-//    char ch;
-    //    // remove \n and \r and replace with spaces
-    //    sb = new StringBuilder(_ptString);
-    //
-    //    for (t = 0; t < sb.length(); t++) {
-    //      ch = sb.charAt(t);
-    //
-    //      if ((ch == '\n') || (ch == '\r')) {
-    //        sb.setCharAt(t, ' ');
-    //      }
-    //    }
-    //    StringUtils.split(numb, ch)
-    //    final StringTokenizer stokenizer = new StringTokenizer(new String(sb), CtuluLibString.ESPACE, false);
     List<String> splitWorker = splitCoordinate(_ptString);
 
     final int nb = splitWorker.size();
     for (int i = 0; i < nb; i++) {
 
-//    while (stokenizer.hasMoreElements()) {
       // have a point in memory - handle the single point
-//      aPoint = stokenizer.nextToken();
       aPoint = splitWorker.get(i);
       List<String> splitVirgule = splitVirgule(aPoint);
-//      stokenizerPoint = new StringTokenizer(aPoint, CtuluLibString.VIR, false);
       coord.x = Double.NaN;
       coord.y = Double.NaN;
       coord.z = Double.NaN;
@@ -959,7 +939,6 @@
 
       final int nbVirg = splitVirgule.size();
       for (int j = 0; j < nbVirg; j++) {
-//      while (stokenizerPoint.hasMoreElements()) {
         numb = splitVirgule.get(j);
         if (dim == 0) {
           coord.x = Double.parseDouble(numb);
@@ -976,7 +955,6 @@
       }
       pointList_.add(coord); // remember it
       coord = new Coordinate();
-//      stokenizerPoint = null;
     }
   }
 

Modified: trunk/framework/dodico-common/src/test/java/org/fudaa/dodico/common/TestIO.java
===================================================================
--- trunk/framework/dodico-common/src/test/java/org/fudaa/dodico/common/TestIO.java	2013-01-07 15:52:34 UTC (rev 8188)
+++ trunk/framework/dodico-common/src/test/java/org/fudaa/dodico/common/TestIO.java	2013-01-07 15:52:54 UTC (rev 8189)
@@ -80,6 +80,9 @@
   public void assertDoubleEquals(double _v1, double _v2) {
     assertEquals(_v1, _v2, eps_);
   }
+  public void assertDoubleEquals(String message,double _v1, double _v2) {
+    assertEquals(message,_v1, _v2, eps_);
+  }
 
   /**
    * Permet de trouver une ressource presente dans le rep de la classe donnee.

Modified: trunk/framework/pom.xml
===================================================================
--- trunk/framework/pom.xml	2013-01-07 15:52:34 UTC (rev 8188)
+++ trunk/framework/pom.xml	2013-01-07 15:52:54 UTC (rev 8189)
@@ -200,7 +200,6 @@
     				-->
         <version>2.0.4</version>
       </dependency>
-      
       <dependency>
         <groupId>PDFRenderer</groupId>
         <artifactId>PDFRenderer</artifactId>

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