/ - Diff - Application: gvSIG desktop - gvSIG

         @Override
         public DataFactoryUnit create(DynObject parameters, Services services) {
             return new MemoryBasicTypesIndexProvider<String>();
             return new MemoryBasicTypesIndexProvider<String>(String.class);
+        }
         @Override

         @Override
         public DataFactoryUnit create(DynObject parameters, Services services) {
             return new MemoryBasicTypesIndexProvider<String>();
             return new MemoryBasicTypesIndexProvider<String>(String.class);
+        }
         @Override

         @Override
         public DataFactoryUnit create(DynObject parameters, Services services) {
             return new MemoryBasicTypesIndexProvider<Double>();
             return new MemoryBasicTypesIndexProvider<Double>(Double.class);
+        }
         @Override

         @Override
         public DataFactoryUnit create(DynObject parameters, Services services) {
             return new MemoryBasicTypesIndexProvider<Integer>();
             return new MemoryBasicTypesIndexProvider<Integer>(Integer.class);
+        }
         @Override

     import java.util.List;
     import java.util.TreeMap;
     import java.util.logging.Level;
     import java.util.logging.Logger;
     import org.gvsig.fmap.dal.exception.DataException;
     import org.gvsig.fmap.dal.feature.exception.FeatureIndexException;
     import org.gvsig.fmap.dal.feature.spi.FeatureReferenceProviderServices;
     import org.gvsig.fmap.dal.feature.spi.index.AbstractFeatureIndexProvider;
     import org.gvsig.tools.ToolsLocator;
     import org.gvsig.tools.dataTypes.CoercionException;
     import org.gvsig.tools.dataTypes.DataType;
     import org.gvsig.tools.dataTypes.DataTypeUtils;
     import org.gvsig.tools.dataTypes.DataTypesManager;
     public class MemoryBasicTypesIndexProvider<T> extends AbstractFeatureIndexProvider {
         private TreeMap<T,ListOfLong> index = null;
         private final Class<T> classt;
         private final int dataType;
         public MemoryBasicTypesIndexProvider() {
         public MemoryBasicTypesIndexProvider(Class<T> classt) {
             this.classt = classt;
             this.dataType = ToolsLocator.getDataTypesManager().getDataType(classt).getType(); // getCoercion()
+        }
         @Override
         public void initialize() {
             try {
                 this.index = new TreeMap<>();
-...
+            }
+        }
         @Override
         public void delete(Object key_o, FeatureReferenceProviderServices fref) {
             T key_s = (T) key_o;
             long oid = (Long) fref.getOID();
-...
+            }
+        }
         @Override
         public void insert(Object key_o, FeatureReferenceProviderServices fref) {
             if (key_o == null) {
                 return;
-...
             items.add(oid);
+        }
         @Override
         public List match(Object key_o) throws FeatureIndexException {
             T key_s = (T) key_o;
     //        T key_s = this.classt.cast(key_o);
             T key_s;
             try {
                 key_s = (T) DataTypeUtils.coerce(this.dataType, key_o);
             } catch (CoercionException ex) {
                 return null;
+            }
             if( !this.index.containsKey(key_s) ) {
                 return null;
+            }
-...
                     "Can't perform this kind of search.");
+        }
         @Override
         public List nearest(int count, Object value) throws FeatureIndexException {
             throw new UnsupportedOperationException(
                     "Can't perform this kind of search.");
+        }
         @Override
         public boolean isMatchSupported() {
             return true;
+        }
         @Override
         public boolean isNearestSupported() {
             return false;
+        }
         @Override
         public boolean isNearestToleranceSupported() {
             return false;
+        }
         @Override
         public boolean isRangeSupported() {
             return false;
+        }
         @Override
         public List nearest(int count, Object value, Object tolerance)
                 throws FeatureIndexException {
             throw new UnsupportedOperationException();
+        }
         @Override
         public List range(Object value1, Object value2)
                 throws FeatureIndexException {
             throw new UnsupportedOperationException();
+        }
         @Override
         public void clear() throws DataException {
             this.index.clear();
+        }

         @Override
         public DataFactoryUnit create(DynObject parameters, Services services) {
             return new MemoryBasicTypesIndexProvider<Long>();
             return new MemoryBasicTypesIndexProvider<Long>(Long.class);
+        }
         @Override

     import java.util.List;
     import java.util.Map;
     import java.util.Map.Entry;
     import java.util.Objects;
     import java.util.logging.Level;
     import org.apache.commons.lang3.StringUtils;
     import org.gvsig.fmap.dal.DataTypes;
-...
     import org.gvsig.fmap.dal.feature.FeatureType;
     import org.gvsig.fmap.dal.feature.exception.SetReadOnlyAttributeException;
     import org.gvsig.tools.ToolsLocator;
     import org.gvsig.tools.dataTypes.Coercion;
     import org.gvsig.tools.dataTypes.CoercionException;
     import org.gvsig.tools.dataTypes.DataType;
     import org.gvsig.tools.dispose.DisposableIterator;
     import org.gvsig.tools.dynobject.DynStruct;
     import org.gvsig.tools.evaluator.Evaluator;
-...
             private Object value;
             private String sql;
             private EvaluatorFieldsInfo info = null;
             private Coercion coercion;
             //		private int attributeIndex;
             public JoinTransformEvaluator(String attribute, boolean is_numeric) {
-...
             public void updateValue(Object value) {
                 this.value = value;
                 String qt = this.isNumeric ? "" : "'";
                 this.sql = this.attribute + " = " + qt + this.value + qt;
                 this.coercion = null;
                 if (this.value!=null) {
                     DataType dataType = ToolsLocator.getDataTypesManager().getDataType(value.getClass());
                     if (dataType!=null) {
                         this.coercion = dataType.getCoercion();
+                    }
                     String qt = this.isNumeric ? "" : "'";
                     this.sql = this.attribute + " = " + qt + this.value + qt;
                 } else {
                     this.sql = this.attribute + " = null";
+                }
                 this.info = new EvaluatorFieldsInfo();
                 this.info.addMatchFieldValue(this.attribute, value);
+            }
-...
                 if( curValue == null ) {
                     return value == null;
+                }
                 return curValue.equals(value);
                 if ( value == null) {
                     return false;
+                }
                 Object coerceValue;
                 if (this.coercion == null) {
                     return StringUtils.equals(Objects.toString(curValue), Objects.toString(value));
+                }
                 try {
                     coerceValue = this.coercion.coerce(curValue);
                     return coerceValue.equals(value);
                 } catch (CoercionException ex) {
                     return StringUtils.equals(Objects.toString(curValue), Objects.toString(value));
+                }
+            }
             @Override

Application: gvSIG desktop

Revision 44895