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

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

Revision: 3690
          http://fudaa.svn.sourceforge.net/fudaa/?rev=3690&view=rev
Author:   bmarchan
Date:     2008-07-15 08:26:24 -0700 (Tue, 15 Jul 2008)

Log Message:
-----------
Cr?\195?\169ation d'une valeur d'attribut String global a partir d'un tableau de String

Modified Paths:
--------------
    branches/Br_FudaaModeleur_TF/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeConstants.java
    branches/Br_FudaaModeleur_TF/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeString.java
    branches/Br_FudaaModeleur_TF/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISDataModelPointMultiPointAdapter.java

Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeConstants.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeConstants.java	2008-07-15 15:24:26 UTC (rev 3689)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeConstants.java	2008-07-15 15:26:24 UTC (rev 3690)
@@ -116,10 +116,11 @@
       // Si la valeur en entr\xE9e est la valeur par d\xE9faut, alors une nouvelle valeur en sortie est cr\xE9\xE9e.
       // Ceci permet d'affecter automatiquement un nom nouveau \xE0 une g\xE9om\xE9trie cr\xE9\xE9e.
       if (r == null || def_.equals(r)) {
-        r="Geom_"+(++numid_);
+        return r="Geom_"+(++numid_);
       }
-      return r;
-
+      else {
+        return super.createGlobalValues(_initValues);
+      }
     }
 
     public Object getDefaultValue() {

Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeString.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeString.java	2008-07-15 15:24:26 UTC (rev 3689)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeString.java	2008-07-15 15:26:24 UTC (rev 3690)
@@ -41,6 +41,15 @@
   public Object getDefaultValue(){
     return CtuluLibString.EMPTY_STRING;
   }
+  
+  protected Object createGlobalValues(final Object _initValues) {
+    if (_initValues instanceof Object[]) { // Plusieurs valeurs en entr\xE9e : On prend la premi\xE8re.
+      return ((Object[])_initValues)[0];
+    }
+    else {
+      return super.createGlobalValues(_initValues);
+    }
+  }
 
   public int getPrecision(){
     return 50;

Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISDataModelPointMultiPointAdapter.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISDataModelPointMultiPointAdapter.java	2008-07-15 15:24:26 UTC (rev 3689)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISDataModelPointMultiPointAdapter.java	2008-07-15 15:26:24 UTC (rev 3690)
@@ -134,7 +134,7 @@
       ArrayList<Integer> idxpts=hibloc2ListPts_.get(_idxGeom);
       Object[] vals=new Object[idxpts.size()];
       for (int i=0; i<idxpts.size(); i++) vals[i]=initmd_.getValue(_idxAtt,idxpts.get(i));
-      datas_[_idxAtt][_idxGeom]=getAttribute(_idxAtt).createAtomicModel(vals, vals.length);
+      datas_[_idxAtt][_idxGeom]=getAttribute(_idxAtt).createDataForGeom(vals, vals.length);
     }
     return datas_[_idxAtt][_idxGeom];
   }


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