[Fudaa-svn-commit] SF.net SVN: fudaa:[8380] trunk/framework/ctulu-gis/src/main/java/org/fudaa/ ctulu/gis/GISDataModelAttributeToAtomicSubstitutionAdapter.java

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

Revision: 8380
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8380&view=rev
Author:   deniger
Date:     2013-04-04 21:16:34 +0000 (Thu, 04 Apr 2013)
Log Message:
-----------
version 0.68

Modified Paths:
--------------
    trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISDataModelAttributeToAtomicSubstitutionAdapter.java

Modified: trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISDataModelAttributeToAtomicSubstitutionAdapter.java
===================================================================
--- trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISDataModelAttributeToAtomicSubstitutionAdapter.java	2013-04-04 09:44:57 UTC (rev 8379)
+++ trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISDataModelAttributeToAtomicSubstitutionAdapter.java	2013-04-04 21:16:34 UTC (rev 8380)
@@ -11,12 +11,11 @@
  */
 package org.fudaa.ctulu.gis;
 
-import org.fudaa.ctulu.ProgressionInterface;
-
 import com.vividsolutions.jts.geom.Envelope;
 import com.vividsolutions.jts.geom.Geometry;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
+import org.fudaa.ctulu.ProgressionInterface;
 
 /**
  * Permet de prendre en compte les donn\xE9es enregistrer avec des valeurs atomique rang\xE9es dans des valeurs non atomiques. S'appuie sur le proc\xE9d\xE9 de
@@ -26,7 +25,7 @@
  * @version $Id$
  */
 public class GISDataModelAttributeToAtomicSubstitutionAdapter implements GISDataModel {
-
+  
   private final GISDataModel model_;
   private final GISAttributeInterface initNotAtomic;
   private final int idxAttribute;
@@ -52,9 +51,9 @@
     }
     this.initNotAtomic = initNotAtomic;
     this.targetAtomic = targetAtomic;
-
+    
   }
-
+  
   @Override
   public GISDataModel createTranslate(GISPoint xyToAdd) {
     if (xyToAdd == null) {
@@ -82,7 +81,7 @@
   public double getDoubleValue(int _att, int _geom) {
     return model_.getDoubleValue(_att, _geom);
   }
-
+  
   @Override
   public void preload(GISAttributeInterface[] _att, ProgressionInterface _prog) {
     model_.preload(_att, _prog);
@@ -109,7 +108,7 @@
    */
   @Override
   public int getIndiceOf(GISAttributeInterface _att) {
-    if (_att == targetAtomic) {
+    if (_att == targetAtomic || (ObjectUtils.equals(_att, targetAtomic))) {
       return idxAttribute;
     }
     return model_.getIndiceOf(_att);
@@ -168,6 +167,6 @@
     } else {
       return model_.getValue(_att, _geom);
     }
-
+    
   }
 }

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