[Fudaa-svn-commit] SF.net SVN: fudaa:[6246] trunk/framework/ebli-2d/src/main/java/org/fudaa/ ebli/calque/edition

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

Revision: 6246
          http://fudaa.svn.sourceforge.net/fudaa/?rev=6246&view=rev
Author:   bmarchan
Date:     2011-05-05 09:14:57 +0000 (Thu, 05 May 2011)

Log Message:
-----------
FIX : PB d'affichage de la fenetre d'export de valeurs vers excel

Modified Paths:
--------------
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZModeleLigneBriseeDefault.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZModeleMultiPointEditable.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZModelePointEditable.java

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZModeleLigneBriseeDefault.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZModeleLigneBriseeDefault.java	2011-05-04 16:11:12 UTC (rev 6245)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZModeleLigneBriseeDefault.java	2011-05-05 09:14:57 UTC (rev 6246)
@@ -106,7 +106,7 @@
         return Integer.class;
       }
       if (_columnIndex >= 4) {
-        return ligne_.getAttribute(_columnIndex - 4).getDataClass();
+        return att_[_columnIndex - 4].getDataClass();
       }
       return Double.class;
     }
@@ -123,7 +123,7 @@
         return EbliLib.getS("Y");
       default:
       }
-      return ligne_.getAttribute(_column - 4).getLongName();
+      return att_[_column - 4].getName();
     }
 
     public int getRowCount() {
@@ -154,10 +154,10 @@
       }
       final LineString s = (LineString) ligne_.getGeometry(idxLine);
       if (_columnIndex == 2) {
-        return Double.toString(s.getCoordinateSequence().getX(idxAtom));
+        return s.getCoordinateSequence().getX(idxAtom);
       }
       if (_columnIndex == 3) {
-        return Double.toString(s.getCoordinateSequence().getY(idxAtom));
+        return s.getCoordinateSequence().getY(idxAtom);
       }
       final CtuluCollection model = (CtuluCollection) ligne_.getModel(att_[_columnIndex - 4]).getObjectValueAt(idxLine);
       return model.getObjectValueAt(idxAtom);

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZModeleMultiPointEditable.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZModeleMultiPointEditable.java	2011-05-04 16:11:12 UTC (rev 6245)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZModeleMultiPointEditable.java	2011-05-05 09:14:57 UTC (rev 6246)
@@ -100,7 +100,7 @@
         return Integer.class;
       }
       if (_columnIndex >= 4) {
-        return ligne_.getAttribute(_columnIndex - 4).getDataClass();
+        return att_[_columnIndex - 4].getDataClass();
       }
       return Double.class;
     }
@@ -117,7 +117,7 @@
         return EbliLib.getS("Y");
       default:
       }
-      return ligne_.getAttribute(_column - 4).getLongName();
+      return att_[_column - 4].getName();
     }
 
     public int getRowCount() {
@@ -148,10 +148,10 @@
       }
       final Geometry s = (Geometry) ligne_.getGeometry(idxLine);
       if (_columnIndex == 2) {
-        return Double.toString(s.getCoordinates()[idxAtom].x);
+        return s.getCoordinates()[idxAtom].x;
       }
       if (_columnIndex == 3) {
-        return Double.toString(s.getCoordinates()[idxAtom].y);
+        return s.getCoordinates()[idxAtom].y;
       }
       final CtuluCollection model = (CtuluCollection) ligne_.getModel(att_[_columnIndex - 4]).getObjectValueAt(idxLine);
       return model.getObjectValueAt(idxAtom);

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZModelePointEditable.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZModelePointEditable.java	2011-05-04 16:11:12 UTC (rev 6245)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZModelePointEditable.java	2011-05-05 09:14:57 UTC (rev 6246)
@@ -68,7 +68,7 @@
       }
       final int r = _column - 3;
       final GISZoneCollection pt = ZModelePointEditable.this.getGeomData();
-      return pt.getAttribute(r).getLongName();
+      return pt.getAttribute(r).getName();
     }
 
     public int getRowCount() {


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