[Fudaa-svn-commit] SF.net SVN: fudaa:[4181] branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/ src/org/fudaa/ctulu/gis

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

Revision: 4181
          http://fudaa.svn.sourceforge.net/fudaa/?rev=4181&view=rev
Author:   bmarchan
Date:     2008-11-06 11:55:18 +0000 (Thu, 06 Nov 2008)

Log Message:
-----------
Change "IndexGeometry" par GISAttributsConstants.INDEX_GEOM pour etre sur que c'est un attribut systeme.

Modified Paths:
--------------
    branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeConstants.java
    branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISDataModelFeatureAdapter.java
    branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/gml/GISGMLZoneExporter.java

Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeConstants.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeConstants.java	2008-11-06 11:01:19 UTC (rev 4180)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeConstants.java	2008-11-06 11:55:18 UTC (rev 4181)
@@ -161,7 +161,18 @@
       return "ATTRIBUTE_Z";
     }
   };
+  
+  /**
+   * Un attribut index de g\xE9om\xE9trie.
+   * Attention : Il n'est utilis\xE9 que lors de la sauvegarde, et n'apparait pas dans les calques autrement.
+   */
+  public final static GISAttributeInteger INDEX_GEOM = new GISAttributeInteger(CtuluLib.getS("Index"), false) {
 
+    public String getID() {
+      return "ATTRIBUTE_INDEX_GEOM";
+    }
+  };
+
   /** La liste des attributs syst\xE8mes. */
   protected final static List<GISAttribute> attrs_=
     Arrays.asList(new GISAttribute[]{BATHY,TITRE,NATURE,VISIBILITE,ETAT_GEOM});

Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISDataModelFeatureAdapter.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISDataModelFeatureAdapter.java	2008-11-06 11:01:19 UTC (rev 4180)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISDataModelFeatureAdapter.java	2008-11-06 11:55:18 UTC (rev 4181)
@@ -93,7 +93,7 @@
     for (int i = 0; i < initAttributeCount; i++) {
       final GISAttributeInterface att = GISLib.createAttributeFrom(type.getAttributeType(i));
       if (att != null){
-        if(att.getName().equals("IndexGeometry"))
+        if(att.getID().equals(GISAttributeConstants.INDEX_GEOM.getID()))
           indexGeomAttr=i;
         else{  
           atts.add(att);

Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/gml/GISGMLZoneExporter.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/gml/GISGMLZoneExporter.java	2008-11-06 11:01:19 UTC (rev 4180)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/gml/GISGMLZoneExporter.java	2008-11-06 11:55:18 UTC (rev 4181)
@@ -32,6 +32,7 @@
 import org.fudaa.ctulu.CtuluActivity;
 import org.fudaa.ctulu.ProgressionInterface;
 import org.fudaa.ctulu.ProgressionUpdater;
+import org.fudaa.ctulu.gis.GISAttributeConstants;
 import org.fudaa.ctulu.gis.GISAttributeInterface;
 import org.fudaa.ctulu.gis.GISZoneCollection;
 
@@ -82,7 +83,8 @@
       _attrIdx.put(atts[i + 1], posInZone);
     }
     // Le dernier correspond \xE0 l'index de la g\xE9om\xE9trie dans la GISZone
-    atts[atts.length-1]=AttributeTypeFactory.newAttributeType("IndexGeometry", Integer.class);
+    GISAttributeInterface attInd=GISAttributeConstants.INDEX_GEOM;
+    atts[atts.length-1]=AttributeTypeFactory.newAttributeType(attInd.getID(), attInd.getDataClass());
     return atts;
   }
 


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