/ - Diff - Application: gvSIG desktop - gvSIG

     import org.apache.commons.lang3.ObjectUtils;
     import org.apache.commons.lang3.StringUtils;
     import org.cresques.cts.IProjection;
     import org.gvsig.fmap.dal.DataStoreParameters;
     import org.gvsig.fmap.dal.DataTypes;
     import org.gvsig.fmap.dal.ExpressionBuilder;
     import org.gvsig.fmap.dal.ExpressionBuilder.BinaryOperator;
     import org.gvsig.fmap.dal.ExpressionBuilder.Config;
-...
     import org.gvsig.fmap.dal.ExpressionBuilder.Visitable;
     import org.gvsig.fmap.dal.ExpressionBuilder.Visitor;
     import org.gvsig.fmap.dal.ExpressionBuilder.VisitorFilter;
     import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
     import org.gvsig.fmap.dal.feature.FeatureStore;
     import org.gvsig.fmap.geom.Geometry;
     import org.gvsig.fmap.geom.primitive.Envelope;
-...
                 return MessageFormat.format(config.getString(Config.group), this.value.toString());
+            }
+        }
         protected class ColumnDescriptorBase implements ColumnDescriptor {
             private String name;
             private int type;
             private int type_p;
             private int type_s;
             private boolean isPk;
             private boolean _allowNulls;
             private boolean _isAutomatic;
             private Object defaultValue;
             private int geom_type;
             private int geom_subtype;
             private Object geom_srsdbcode;
             private boolean _isIndexed;
             private DataStoreParameters parameters = null;
             public ColumnDescriptorBase(String name, int type, Object defaultValue) {
                 this.name = name;
                 this.type = type;
                 this.type_p = -1;
                 this.type_s = -1;
                 this.isPk = false;
                 this._allowNulls = true;
                 this._isAutomatic = false;
                 this.defaultValue = defaultValue;
                 this.geom_type = Geometry.TYPES.GEOMETRY;
                 this.geom_subtype = Geometry.SUBTYPES.GEOM2D;
                 this.geom_srsdbcode = null;
                 this._isIndexed = false;
+            }
             public ColumnDescriptorBase(String name, int type, int type_p, int type_s, boolean isPk, boolean isIndexed, boolean allowNulls, boolean isAutomatic, Object defaultValue) {
                 this.name = name;
                 this.type = type;
                 this.type_p = type_p;
                 this.type_s = type_s;
                 this.isPk = isPk;
                 this._allowNulls = allowNulls;
                 this._isAutomatic = isAutomatic;
                 this.defaultValue = defaultValue;
                 this.geom_type = Geometry.TYPES.GEOMETRY;
                 this.geom_subtype = Geometry.SUBTYPES.GEOM2D;
                 this.geom_srsdbcode = null;
                 this._isIndexed = isIndexed;
+            }
             public ColumnDescriptorBase(String name, int geom_type, int geom_subtype, IProjection proj, boolean isIndexed, boolean allowNulls) {
                 this.name = name;
                 this.type = DataTypes.GEOMETRY;
                 this.type_p = 0;
                 this.type_s = 0;
                 this.isPk = false;
                 this._allowNulls = allowNulls;
                 this._isAutomatic = false;
                 this.defaultValue = null;
                 this.geom_type = geom_type;
                 this.geom_subtype = geom_subtype;
                 this.geom_srsdbcode = getSRSId(proj);
                 this._isIndexed = isIndexed;
+            }
             public ColumnDescriptorBase(String name, int geom_type, int geom_subtype, Object srsdbcode, boolean isIndexed, boolean allowNulls) {
                 this.name = name;
                 this.type = DataTypes.GEOMETRY;
                 this.type_p = 0;
                 this.type_s = 0;
                 this.isPk = false;
                 this._allowNulls = allowNulls;
                 this._isAutomatic = false;
                 this.defaultValue = null;
                 this.geom_type = geom_type;
                 this.geom_subtype = geom_subtype;
                 this.geom_srsdbcode = srsdbcode;
                 this._isIndexed = isIndexed;
+            }
             @Override
             public String getName() {
                 return this.name;
+            }
             @Override
             public void setName(String name) {
                 this.name = name;
+            }
             @Override
             public int getType() {
                 return this.type;
+            }
             @Override
             public void setType(int type) {
                 this.type = type;
+            }
             @Override
             public int getPrecision() {
                 return type_p;
+            }
             @Override
             public void setPrecision(int precision) {
                 this.type_p = precision;
+            }
             @Override
             public int getSize() {
                 return type_s;
+            }
             @Override
             public void setSize(int size) {
                 this.type_s = size;
+            }
             @Override
             public boolean isPrimaryKey() {
                 return isPk;
+            }
             @Override
             public void setIsPrimaryKey(boolean isPk) {
                 this.isPk = isPk;
+            }
             @Override
             public boolean allowNulls() {
                 return _allowNulls;
+            }
             @Override
             public void setAllowNulls(boolean allowNulls) {
                 this._allowNulls = allowNulls;
+            }
             @Override
             public boolean isAutomatic() {
                 return _isAutomatic;
+            }
             @Override
             public boolean isIndexed() {
                 return _isIndexed;
+            }
             @Override
             public void setIsAutomatic(boolean isAutomatic) {
                 this._isAutomatic = isAutomatic;
+            }
             @Override
             public Object getDefaultValue() {
                 return defaultValue;
+            }
             @Override
             public void setDefaultValue(Object defaultValue) {
                 this.defaultValue = defaultValue;
+            }
             @Override
             public int getGeometryType() {
                 return geom_type;
+            }
             @Override
             public void setGeometryType(int geom_type) {
                 this.geom_type = geom_type;
+            }
             @Override
             public int getGeometrySubtype() {
                 return geom_subtype;
+            }
             @Override
             public void setGeometrySubtype(int geom_subtype) {
                 this.geom_subtype = geom_subtype;
+            }
             @Override
             public Object getGeometrySRSId() {
                 return geom_srsdbcode;
+            }
             @Override
             public void setGeometrySRSId(Object geom_srsid) {
                 this.geom_srsdbcode = geom_srsid;
+            }
             @Override
             public boolean isGeometry() {
                 return this.type == DataTypes.GEOMETRY;
+            }
             private void setStoreParameters(DataStoreParameters parameters) {
                 this.parameters = parameters;
+            }
             @Override
             public DataStoreParameters getStoreParameters() {
                 return this.parameters;
+            }
+        }
         public class VariableBase extends AbstractValue implements Variable {
             protected String name;
             protected ColumnDescriptor descriptor;
             public VariableBase(ColumnDescriptor descriptor) {
                 this.descriptor = descriptor;
                 this.name = descriptor.getName();
+            }
             public VariableBase(String name) {
                 this.descriptor = null;
                 this.name = name;
+            }
             @Override
             public ColumnDescriptor getDescriptor() {
                 return descriptor;
+            }
             @Override
             public String getName() {
                 return this.name;
+            }
-...
         public Variable column(String name) {
             return new VariableBase(name);
+        }
         @Override
         public Variable column(FeatureAttributeDescriptor fad) {
             ColumnDescriptorBase descriptor;
             if( fad.getType()==org.gvsig.fmap.geom.DataTypes.GEOMETRY ) {
                 descriptor = new ColumnDescriptorBase(
                         fad.getName(),
                         fad.getGeomType().getType(),
                         fad.getGeomType().getSubType(),
                         fad.getSRS(),
                         fad.isIndexed(),
                         fad.allowNull()
                 );
             } else {
                 descriptor = new ColumnDescriptorBase(
                         fad.getName(),
                         fad.getType(),
                         fad.getSize(),
                         fad.getPrecision(),
                         fad.isPrimaryKey(),
                         fad.isIndexed(),
                         fad.allowNull(),
                         fad.isAutomatic(),
                         fad.getDefaultValue()
                 );
+            }
             FeatureStore store = fad.getStore();
             if( store!=null ) {
                 descriptor.setStoreParameters(store.getParameters());
+            }
             return new VariableBase(descriptor);
+        }
         @Override
         public Parameter parameter(String name) {
             Parameters parameters = this.getParameters();
             Parameter parameter = parameters.get(name);

     import org.gvsig.fmap.dal.SQLBuilder.UpdateBuilder;
     import org.gvsig.fmap.dal.SQLBuilder.UpdateColumnBuilder;
     import org.gvsig.fmap.dal.SQLBuilder.UpdateTableStatisticsBuilder;
     import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
     import org.gvsig.fmap.dal.feature.spi.ExpressionBuilderBase.AbstractValue;
     import org.gvsig.fmap.geom.Geometry;
     import org.slf4j.Logger;
-...
         protected CreateIndexBuilder create_index;
         protected List<Parameter> parameters;
         protected class ColumnDescriptorBuilderBase implements ColumnDescriptorBuilder {
             private String name;
             private int type;
             private int type_p;
             private int type_s;
             private boolean isPk;
             private boolean _allowNulls;
             private boolean _isAutomatic;
             private Object defaultValue;
             private int geom_type;
             private int geom_subtype;
             private Object geom_srsdbcode;
             private boolean _isIndexed;
             public ColumnDescriptorBuilderBase(String name, int type, Object defaultValue) {
                 this.name = name;
                 this.type = type;
                 this.type_p = -1;
                 this.type_s = -1;
                 this.isPk = false;
                 this._allowNulls = true;
                 this._isAutomatic = false;
                 this.defaultValue = defaultValue;
                 this.geom_type = Geometry.TYPES.GEOMETRY;
                 this.geom_subtype = Geometry.SUBTYPES.GEOM2D;
                 this.geom_srsdbcode = null;
                 this._isIndexed = false;
+            }
             public ColumnDescriptorBuilderBase(String name, int type, int type_p, int type_s, boolean isPk, boolean isIndexed, boolean allowNulls, boolean isAutomatic, Object defaultValue) {
                 this.name = name;
                 this.type = type;
                 this.type_p = type_p;
                 this.type_s = type_s;
                 this.isPk = isPk;
                 this._allowNulls = allowNulls;
                 this._isAutomatic = isAutomatic;
                 this.defaultValue = defaultValue;
                 this.geom_type = Geometry.TYPES.GEOMETRY;
                 this.geom_subtype = Geometry.SUBTYPES.GEOM2D;
                 this.geom_srsdbcode = null;
                 this._isIndexed = isIndexed;
+            }
             public ColumnDescriptorBuilderBase(String name, int geom_type, int geom_subtype, IProjection proj, boolean isIndexed, boolean allowNulls) {
                 this.name = name;
                 this.type = DataTypes.GEOMETRY;
                 this.type_p = 0;
                 this.type_s = 0;
                 this.isPk = false;
                 this._allowNulls = allowNulls;
                 this._isAutomatic = false;
                 this.defaultValue = null;
                 this.geom_type = geom_type;
                 this.geom_subtype = geom_subtype;
                 this.geom_srsdbcode = getSRSId(proj);
                 this._isIndexed = isIndexed;
+            }
             public ColumnDescriptorBuilderBase(String name, int geom_type, int geom_subtype, Object srsdbcode, boolean isIndexed, boolean allowNulls) {
                 this.name = name;
                 this.type = DataTypes.GEOMETRY;
                 this.type_p = 0;
                 this.type_s = 0;
                 this.isPk = false;
                 this._allowNulls = allowNulls;
                 this._isAutomatic = false;
                 this.defaultValue = null;
                 this.geom_type = geom_type;
                 this.geom_subtype = geom_subtype;
                 this.geom_srsdbcode = srsdbcode;
                 this._isIndexed = isIndexed;
+            }
             @Override
             public String getName() {
                 return this.name;
+            }
             @Override
             public void setName(String name) {
                 this.name = name;
+            }
             @Override
             public int getType() {
                 return this.type;
+            }
             @Override
             public void setType(int type) {
                 this.type = type;
+            }
             @Override
             public int getPrecision() {
                 return type_p;
+            }
             @Override
             public void setPrecision(int precision) {
                 this.type_p = precision;
+            }
             @Override
             public int getSize() {
                 return type_s;
+            }
             @Override
             public void setSize(int size) {
                 this.type_s = size;
+            }
             @Override
             public boolean isPrimaryKey() {
                 return isPk;
+            }
             @Override
             public void setIsPrimaryKey(boolean isPk) {
                 this.isPk = isPk;
+            }
             @Override
             public boolean allowNulls() {
                 return _allowNulls;
+            }
             @Override
             public void setAllowNulls(boolean allowNulls) {
                 this._allowNulls = allowNulls;
+            }
             @Override
             public boolean isAutomatic() {
                 return _isAutomatic;
+            }
             @Override
             public boolean isIndexed() {
                 return _isIndexed;
+            }
             @Override
             public void setIsAutomatic(boolean isAutomatic) {
                 this._isAutomatic = isAutomatic;
+            }
             @Override
             public Object getDefaultValue() {
                 return defaultValue;
+            }
             @Override
             public void setDefaultValue(Object defaultValue) {
                 this.defaultValue = defaultValue;
+            }
             @Override
             public int getGeometryType() {
                 return geom_type;
+            }
             @Override
             public void setGeometryType(int geom_type) {
                 this.geom_type = geom_type;
+            }
             @Override
             public int getGeometrySubtype() {
                 return geom_subtype;
+            }
             @Override
             public void setGeometrySubtype(int geom_subtype) {
                 this.geom_subtype = geom_subtype;
+            }
             @Override
             public Object getGeometrySRSId() {
                 return geom_srsdbcode;
+            }
             @Override
             public void setGeometrySRSId(Object geom_srsid) {
                 this.geom_srsdbcode = geom_srsid;
+            }
             @Override
             public boolean isGeometry() {
                 return this.type == DataTypes.GEOMETRY;
+            }
+        }
         public class TableNameBuilderBase implements TableNameBuilder {
             public String tableName;
-...
             protected TableNameBuilder table;
             protected List<String> drops;
             protected List<ColumnDescriptorBuilderBase> adds;
             protected List<ColumnDescriptorBuilderBase> alters;
             protected List<ColumnDescriptor> adds;
             protected List<ColumnDescriptor> alters;
             protected List<Pair<String,String>> renames;
             public AlterTableBuilderBase() {
-...
                 this.drops.add(columnName);
                 return this;
+            }
             @Override
             public AlterTableBuilder add_column(FeatureAttributeDescriptor fad) {
                 this.adds.add(column(fad).getDescriptor());
                 return this;
+            }
             @Override
             public AlterTableBuilder add_column(String columnName, int type, int type_p, int type_s, boolean isPk, boolean isIndexed, boolean allowNulls, boolean isAutomatic, Object defaultValue) {
                 if (isPk || isAutomatic) {
                     allowNulls = false;
+                }
                 this.adds.add(new ColumnDescriptorBuilderBase(columnName, type, type_p, type_s, isPk, isIndexed, allowNulls, isAutomatic, defaultValue));
                 this.adds.add(new ColumnDescriptorBase(columnName, type, type_p, type_s, isPk, isIndexed, allowNulls, isAutomatic, defaultValue));
                 return this;
+            }
-...
                 if( StringUtils.isEmpty(columnName) ) {
                     throw new IllegalArgumentException("Argument 'columnName' can't be empty.");
+                }
                 this.adds.add(new ColumnDescriptorBuilderBase(columnName, type, subtype, proj, isIndexed, allowNulls));
                 this.adds.add(new ColumnDescriptorBase(columnName, type, subtype, proj, isIndexed, allowNulls));
                 return this;
+            }
-...
                 if( StringUtils.isEmpty(columnName) ) {
                     throw new IllegalArgumentException("Argument 'columnName' can't be empty.");
+                }
                 this.adds.add(new ColumnDescriptorBuilderBase(columnName, type, subtype, srsdbcode, isIndexed, allowNulls));
                 this.adds.add(new ColumnDescriptorBase(columnName, type, subtype, srsdbcode, isIndexed, allowNulls));
                 return this;
+            }
             @Override
             public AlterTableBuilder alter_column(FeatureAttributeDescriptor fad) {
                 this.alters.add(column(fad).getDescriptor());
                 return this;
+            }
             @Override
             public AlterTableBuilder alter_column(String columnName, int type, int type_p, int type_s, boolean isPk, boolean isIndexed, boolean allowNulls, boolean isAutomatic, Object defaultValue) {
                 if (isPk || isAutomatic) {
                     allowNulls = false;
+                }
                 this.alters.add(new ColumnDescriptorBuilderBase(columnName, type, type_p, type_s, isPk, isIndexed, allowNulls, isAutomatic, defaultValue));
                 this.alters.add(new ColumnDescriptorBase(columnName, type, type_p, type_s, isPk, isIndexed, allowNulls, isAutomatic, defaultValue));
                 return this;
+            }
-...
                 if( StringUtils.isEmpty(columnName) ) {
                     throw new IllegalArgumentException("Argument 'columnName' can't be empty.");
+                }
                 this.alters.add(new ColumnDescriptorBuilderBase(columnName, type, subtype, proj, isIndexed, allowNulls));
                 this.alters.add(new ColumnDescriptorBase(columnName, type, subtype, proj, isIndexed, allowNulls));
                 return this;
+            }
-...
                 if( StringUtils.isEmpty(columnName) ) {
                     throw new IllegalArgumentException("Argument 'columnName' can't be empty.");
+                }
                 this.alters.add(new ColumnDescriptorBuilderBase(columnName, type, subtype, srsdbcode, isIndexed, allowNulls));
                 this.alters.add(new ColumnDescriptorBase(columnName, type, subtype, srsdbcode, isIndexed, allowNulls));
                 return this;
+            }
-...
                     builder.append(identifier(column));
                     sqls.add(builder.toString());
+                }
                 for (ColumnDescriptorBuilderBase column : adds) {
                 for (ColumnDescriptor column : adds) {
                     StringBuilder builder = new StringBuilder();
                     builder.append("ALTER TABLE ");
                     builder.append(this.table.toString());
-...
+                    }
                     sqls.add(builder.toString());
+                }
                 for (ColumnDescriptorBuilderBase column : alters) {
                 for (ColumnDescriptor column : alters) {
                     StringBuilder builder = new StringBuilder();
                     builder.append("ALTER TABLE ");
                     builder.append(this.table.toString());
-...
         public class CreateTableBuilderBase implements CreateTableBuilder {
             protected TableNameBuilder table;
             protected List<ColumnDescriptorBuilderBase> columns;
             protected List<ColumnDescriptor> columns;
             public CreateTableBuilderBase() {
                 this.columns = new ArrayList<>();
-...
+            }
             @Override
             public CreateTableBuilderBase add_column(FeatureAttributeDescriptor fad) {
                 this.columns.add(column(fad).getDescriptor());
                 return this;
+            }
             @Override
             public CreateTableBuilderBase add_column(String columnName, int type, int type_p, int type_s, boolean isPk, boolean isIndexed, boolean allowNulls, boolean isAutomatic, Object defaultValue) {
                 if( StringUtils.isEmpty(columnName) ) {
                     throw new IllegalArgumentException("Argument 'columnName' can't be empty.");
-...
                 if (isPk || isAutomatic) {
                     allowNulls = false;
+                }
                 this.columns.add(new ColumnDescriptorBuilderBase(columnName, type, type_p, type_s, isPk, isIndexed, allowNulls, isAutomatic, defaultValue));
                 this.columns.add(new ColumnDescriptorBase(columnName, type, type_p, type_s, isPk, isIndexed, allowNulls, isAutomatic, defaultValue));
                 return this;
+            }
-...
                 if( StringUtils.isEmpty(columnName) ) {
                     throw new IllegalArgumentException("Argument 'columnName' can't be empty.");
+                }
                 this.columns.add(new ColumnDescriptorBuilderBase(columnName, type, subtype, proj, isIndexed, allowNulls));
                 this.columns.add(new ColumnDescriptorBase(columnName, type, subtype, proj, isIndexed, allowNulls));
                 return this;
+            }
-...
                 if( StringUtils.isEmpty(columnName) ) {
                     throw new IllegalArgumentException("Argument 'columnName' can't be empty.");
+                }
                 this.columns.add(new ColumnDescriptorBuilderBase(columnName, type, subtype, srsdbcode, isIndexed, allowNulls));
                 this.columns.add(new ColumnDescriptorBase(columnName, type, subtype, srsdbcode, isIndexed, allowNulls));
                 return this;
+            }
             @Override
             public ColumnDescriptorBuilder getColumnDescriptor(String columnName) {
             public ColumnDescriptor getColumnDescriptor(String columnName) {
                 if( StringUtils.isEmpty(columnName) ) {
                     return null;
+                }
                 for (ColumnDescriptorBuilderBase column : columns) {
                 for (ColumnDescriptor column : columns) {
                     if( columnName.equals(column.getName()) ) {
                         return column;
+                    }
-...
                 builder.append(this.table.toString());
                 builder.append(" (");
                 boolean first = true;
                 for (ColumnDescriptorBuilderBase column : columns) {
                 for (ColumnDescriptor column : columns) {
                     if (first) {
                         first = false;
                     } else {

     		DataServerExplorerProviderServices {
     	public EditableFeatureType createNewFeatureType() {
     		return new DefaultEditableFeatureType();
     		return new DefaultEditableFeatureType(null);
+    	}
     	public Resource createResource(String name, Object[] params)

         @Override
         public EditableFeatureType createFeatureType() {
             return new DefaultEditableFeatureType();
             return new DefaultEditableFeatureType(null);
+        }
         @Override

         @Override
         public EditableFeatureType createFeatureType() {
             EditableFeatureType ftype = this.dataManager.createFeatureType();
             EditableFeatureType ftype = new DefaultEditableFeatureType(this);
             return ftype;
+        }
         @Override
         public EditableFeatureType createFeatureType(String id) {
             DefaultEditableFeatureType ftype = new DefaultEditableFeatureType(id);
             DefaultEditableFeatureType ftype = new DefaultEditableFeatureType(this, id);
             return ftype;
+        }

     import org.gvsig.fmap.dal.feature.EditableFeatureAttributeDescriptor;
     import org.gvsig.fmap.dal.feature.FeatureAttributeEmulator;
     import org.gvsig.fmap.dal.feature.FeatureType;
     import org.gvsig.fmap.dal.feature.exception.AttributeFeatureTypeIntegrityException;
     import org.gvsig.fmap.dal.feature.exception.AttributeFeatureTypeSizeException;
     import org.gvsig.fmap.geom.Geometry;
-...
             hasStrongChanges = false;
+        }
         public DefaultEditableFeatureAttributeDescriptor() {
             super();
         public DefaultEditableFeatureAttributeDescriptor(FeatureType type) {
             super(type);
             this.source = null;
             hasStrongChanges = false;
+        }

      */
     package org.gvsig.fmap.dal.feature.impl;
     import java.lang.ref.WeakReference;
     import java.text.DateFormat;
     import java.util.HashMap;
     import java.util.Iterator;
-...
     import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
     import org.gvsig.fmap.dal.feature.FeatureAttributeEmulator;
     import org.gvsig.fmap.dal.feature.FeatureAttributeGetter;
     import org.gvsig.fmap.dal.feature.FeatureStore;
     import org.gvsig.fmap.dal.feature.FeatureType;
     import org.gvsig.fmap.geom.Geometry;
     import org.gvsig.fmap.geom.GeometryException;
     import org.gvsig.fmap.geom.GeometryLocator;
-...
         protected Tags tags = new DefaultTags();
         private DynMethod availableValuesMethod;
         private DynMethod calculateMethod;
         private WeakReference typeRef;
         protected DefaultFeatureAttributeDescriptor() {
         protected DefaultFeatureAttributeDescriptor(FeatureType type) {
             if( type == null ) {
                 this.typeRef = null;
             } else {
                 this.typeRef = new WeakReference(type);
+            }
             this.allowNull = true;
             this.dataType = null;
             this.dateFormat = null;
-...
+        }
         protected DefaultFeatureAttributeDescriptor(
                 DefaultFeatureAttributeDescriptor other) {
                 DefaultFeatureAttributeDescriptor other
             ) {
             copyFrom(other);
+        }
-...
                 throw new IllegalArgumentException("Can't copy from a non DefaultFeatureAttributeDescriptor");
+            }
             DefaultFeatureAttributeDescriptor other = (DefaultFeatureAttributeDescriptor) other1;
             this.typeRef = other.typeRef;
             this.allowNull = other.allowNull;
             this.dataType = other.dataType;
             this.dateFormat = other.dateFormat;
-...
+         *
          */
         @Override
         public Tags getTags() {
             return tags;
+        }
-...
+            }
+        }
         @Override
         public boolean isComputed() {
             return featureAttributeEmulator!=null || evaluator!=null;
+        }
         @Override
         public FeatureStore getStore() {
             FeatureType ftype = this.getFeatureType();
             if( ftype == null ) {
                 return null;
+            }
             return ftype.getStore();
+        }
         @Override
         public FeatureType getFeatureType() {
             if( this.typeRef==null ) {
                 return null;
+            }
             return (FeatureType) this.typeRef.get();
+        }
+    }

     import java.text.MessageFormat;
     import java.util.Iterator;
     import java.util.zip.CRC32;
     import org.gvsig.fmap.dal.DataTypes;
     import org.gvsig.fmap.dal.exception.DataListException;
-...
     import org.gvsig.fmap.dal.feature.EditableFeatureType;
     import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
     import org.gvsig.fmap.dal.feature.FeatureAttributeEmulator;
     import org.gvsig.fmap.dal.feature.FeatureStore;
     import org.gvsig.fmap.dal.feature.FeatureType;
     import org.gvsig.fmap.dal.feature.exception.FeatureTypeIntegrityException;
     import org.gvsig.fmap.dal.feature.exception.UnsupportedDataTypeException;
-...
         private boolean hasStrongChanges;
         private DefaultFeatureType source;
         public DefaultEditableFeatureType() {
             super();
         public DefaultEditableFeatureType(FeatureStore store) {
             super(store);
             this.hasStrongChanges = false;
             this.source = null;
+        }
         public DefaultEditableFeatureType(String id) {
             super(id);
         public DefaultEditableFeatureType(FeatureStore store, String id) {
             super(store, id);
             this.hasStrongChanges = false;
             this.source = null;
+        }
-...
             this.source = other;
+        }
         @Override
         protected void intitalizeAddAttibute(DefaultFeatureAttributeDescriptor attr) {
             super.add(new DefaultEditableFeatureAttributeDescriptor(attr));
+        }
-...
+        }
         private EditableFeatureAttributeDescriptor add(String name, int type, boolean updateHasStrongChanges) {
             DefaultEditableFeatureAttributeDescriptor attr = new DefaultEditableFeatureAttributeDescriptor();
             DefaultEditableFeatureAttributeDescriptor attr = new DefaultEditableFeatureAttributeDescriptor(this);
             Iterator iter = this.iterator();
             while (iter.hasNext()) {
                 EditableFeatureAttributeDescriptor descriptor = (EditableFeatureAttributeDescriptor) iter.next();

     import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
     import org.gvsig.fmap.dal.feature.FeatureAttributeEmulator;
     import org.gvsig.fmap.dal.feature.FeatureRules;
     import org.gvsig.fmap.dal.feature.FeatureStore;
     import org.gvsig.fmap.dal.feature.FeatureType;
     import org.gvsig.tools.dynobject.DynClass;
     import org.gvsig.tools.dynobject.DynField;
-...
     	protected String internalID = null;
     	private List srsList = null;
             private WeakReference storeRef;
     	protected DefaultFeatureType(String id) {
             if( StringUtils.isEmpty(id) ) {
                 id = "default";
+            }
     		this.internalID = Integer.toHexString((int) (Math.random()*100000)).toUpperCase();
     		this.id = id;
     		this.rules = new DefaultFeatureRules();
     		this.hasEvaluators = false;
     		this.hasEmulators = false;
     		this.defaultGeometryAttributeName = null;
     		this.defaultGeometryAttributeIndex = -1;
     		this.defaultTimeAttributeIndex = -1;
     		this.allowAtomaticValues = false;
     	protected DefaultFeatureType(FeatureStore store, String id) {
                 if (StringUtils.isEmpty(id)) {
                     id = "default";
+                }
                 if( store == null ) {
                     this.storeRef = null;
                 } else {
                     this.storeRef = new WeakReference(store);
+                }
                 this.internalID = Integer.toHexString((int) (Math.random() * 100000)).toUpperCase();
                 this.id = id;
                 this.rules = new DefaultFeatureRules();
                 this.hasEvaluators = false;
                 this.hasEmulators = false;
                 this.defaultGeometryAttributeName = null;
                 this.defaultGeometryAttributeIndex = -1;
                 this.defaultTimeAttributeIndex = -1;
                 this.allowAtomaticValues = false;
+    	}
     	protected DefaultFeatureType() {
     		this((String)null);
     	protected DefaultFeatureType(FeatureStore store) {
     		this(store, (String)null);
+    	}
     	protected DefaultFeatureType(DefaultFeatureType other) {
     		this((String)null);
     		this(other.getStore(), (String)null);
     		initialize(other, true);
+    	}
     	protected DefaultFeatureType(DefaultFeatureType other,
     			boolean copyAttributes) {
     		this((String)null);
     		this(other.getStore(), (String)null);
     		initialize(other, copyAttributes);
+    	}
-...
             crc.update(data);
             return crc.getValue();
+        }
         @Override
         public FeatureStore getStore() {
             if( this.storeRef == null ) {
                 return null;
+            }
             return (FeatureStore) this.storeRef.get();
+        }
+    }

     package org.gvsig.fmap.dal.store.h2;
     import java.sql.PreparedStatement;
     import java.sql.SQLException;
     import java.text.MessageFormat;
     import java.util.ArrayList;
     import java.util.Date;
-...
                     builder.append(identifier(column));
                     sqls.add(builder.toString());
+                }
                 for (ColumnDescriptorBuilderBase column : adds) {
                 for (ColumnDescriptor column : adds) {
                     StringBuilder builder = new StringBuilder();
                     builder.append("ALTER TABLE ");
                     builder.append(this.table.toString());
-...
                         sqls.add(sql);
+                    }
+                }
                 for (ColumnDescriptorBuilderBase column : alters) {
                 for (ColumnDescriptor column : alters) {
                     StringBuilder builder = new StringBuilder();
                     builder.append("ALTER TABLE ");
                     builder.append(this.table.toString());
-...
                 builder.append(this.table.toString());
                 builder.append(" (");
                 boolean first = true;
                 for (ColumnDescriptorBuilder column : columns) {
                 for (ColumnDescriptor column : columns) {
                     if (first) {
                         first = false;
-...
+                }
                 builder.append(" )");
                 sqls.add(builder.toString());
                 for (ColumnDescriptorBuilderBase column : columns) {
                 for (ColumnDescriptor column : columns) {
                     if( column.isGeometry() ) {
                         String sql;
                         String constraint_name = "constraint_" + this.table().getName() + "_" + column.getName()+"_dim";

     import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
     import org.gvsig.fmap.dal.feature.FeatureAttributeEmulator;
     import org.gvsig.fmap.dal.feature.FeatureAttributeGetter;
     import org.gvsig.fmap.dal.feature.FeatureStore;
     import org.gvsig.fmap.dal.feature.FeatureType;
     import org.gvsig.fmap.geom.Geometry;
     import org.gvsig.fmap.geom.type.GeometryType;
     import org.gvsig.tools.dataTypes.CoercionException;
-...
+            }
             return false;
+        }
         @Override
         public FeatureStore getStore() {
             return null;
+        }
         @Override
         public FeatureType getFeatureType() {
             return null;
+        }
+    }

trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.api/src/test/java/org/gvsig/fmap/dal/feature/DummyFeatureType.java
387	387	return null;
388	388	}
389	389
	390	@Override
	391	public FeatureStore getStore() {
	392	throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools \| Templates.
	393	}
	394
390	395	}

             return false;
+        }
         @Override
         public FeatureStore getStore() {
             throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+        }
         @Override
         public FeatureType getFeatureType() {
             throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+        }
+    }

     import java.util.List;
     import org.cresques.cts.IProjection;
     import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
     public interface SQLBuilder extends ExpressionBuilder {
-...
         public interface AlterTableBuilder extends Statement {
             public TableNameBuilder table();
             public AlterTableBuilder drop_column(String columnName);
             public AlterTableBuilder add_column(String columnName, int type, int type_p, int type_s, boolean isPk, boolean isIndexed, boolean allowNulls, boolean isAutomatic, Object defaultValue);
             public AlterTableBuilder add_column(FeatureAttributeDescriptor fad);
             public AlterTableBuilder add_column(String columnName, int type, int type_p, int type_s, boolean isPk, boolean isIndexed, boolean allowNulls, boolean isAutomatic, Object defaultValue);
             public AlterTableBuilder add_geometry_column(String columnName, int geom_type, int geom_subtype, IProjection proj, boolean isIndexed, boolean allowNulls);
             public AlterTableBuilder add_geometry_column(String columnName, int geom_type, int geom_subtype, Object srsdbcode, boolean isIndexed, boolean allowNulls);
             public AlterTableBuilder alter_column(FeatureAttributeDescriptor fad);
             public AlterTableBuilder alter_column(String columnName, int type, int type_p, int type_s, boolean isPk, boolean isIndexed, boolean allowNulls, boolean isAutomatic, Object defaultValue);
             public AlterTableBuilder alter_geometry_column(String columnName, int geom_type, int geom_subtype, IProjection proj, boolean isIndexed, boolean allowNulls);
             public AlterTableBuilder alter_geometry_column(String columnName, int geom_type, int geom_subtype, Object srsdbcode, boolean isIndexed, boolean allowNulls);
-...
         public interface CreateTableBuilder extends Statement {
             public TableNameBuilder table();
             public CreateTableBuilder add_column(FeatureAttributeDescriptor fad);
             public CreateTableBuilder add_column(String columnName, int type, int type_p, int type_s, boolean isPk, boolean isIndexed, boolean allowNulls, boolean isAutomatic, Object defaultValue);
             public CreateTableBuilder add_geometry_column(String columnName, int geom_type, int geom_subtype, IProjection proj, boolean isIndexed, boolean allowNulls);
             public CreateTableBuilder add_geometry_column(String columnName, int geom_type, int geom_subtype, Object srsdbcode, boolean isIndexed, boolean allowNulls);
             public ColumnDescriptorBuilder getColumnDescriptor(String columnName);
             public ColumnDescriptor getColumnDescriptor(String columnName);
             public List<String> toStrings();
+        }

              */
             public boolean isComputed();
             /**
              * Return the store associated to this attribute descriptor.
+             *
              * @return the FeatureStore of the attribute descriptor.
              */
             public FeatureStore getStore();
             public FeatureType getFeatureType();
+    }

          */
     	public FeatureAttributeDescriptor getDefaultTimeAttribute();
         /**
          * Return the store associated to this type.
+         *
          * @return the FeatureStore of the type.
          */
         public FeatureStore getStore();
+    }

     import java.util.List;
     import org.cresques.cts.IProjection;
     import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
     import org.gvsig.fmap.dal.feature.FeatureStore;
     import org.gvsig.fmap.geom.Geometry;
     import org.gvsig.fmap.geom.primitive.Envelope;
-...
             public IProjection getSRS();
+        }
         public interface ColumnDescriptor {
             public String getName();
             public int getType();
             public int getSize();
             public int getPrecision();
             public boolean isPrimaryKey();
             public boolean isIndexed();
             public boolean isAutomatic();
             boolean allowNulls();
             public Object getDefaultValue();
             public int getGeometryType();
             public int getGeometrySubtype();
             public Object getGeometrySRSId();
             public boolean isGeometry();
             public DataStoreParameters getStoreParameters();
             public void setName(String name);
             public void setType(int type);
             public void setSize(int size);
             public void setPrecision(int precision);
             public void setIsPrimaryKey(boolean isPk);
             public void setIsAutomatic(boolean isAutomatic);
             public void setAllowNulls(boolean allowNulls);
             public void setDefaultValue(Object defaultValue);
             public void setGeometryType(int geom_type);
             public void setGeometrySubtype(int geom_subtype);
             public void setGeometrySRSId(Object geom_srsid);
+        }
         public interface Variable extends Value, Comparable<Variable> {
             public String getName();
             public ColumnDescriptor getDescriptor();
+        }
         public interface Parameter extends Value {
-...
         public Variable variable(String name);
         public Variable column(String name); // Alias for variable(name)
         public Variable column(FeatureAttributeDescriptor fad);
         public Parameter parameter(String name);

         private final boolean isDefault;
         private final ExpressionBuilder builder;
         private final IProjection projection;
         private final FeatureAttributeDescriptor fad;
         /**
          * @param geometry
-...
                 String geomName,
                 ExpressionBuilder builder
             ) {
             FeatureAttributeDescriptor fad = (FeatureAttributeDescriptor) featureType
                     .get(geomName);
             fad = (FeatureAttributeDescriptor) featureType.get(geomName);
             this.projection = projection;
             this.builder = builder;
             this.isDefault = featureType.getDefaultGeometryAttributeName().equals(geomName);
-...
             return this.builder.set(
                     builder.ST_Crosses(
                             builder.geometry(geometry, projection),
                             builder.column(geomName)
                             builder.column(fad)
+                    )
             ).toString();
+        }

         private final boolean isDefault;
         private final ExpressionBuilder builder;
         private final IProjection projection;
         private final FeatureAttributeDescriptor fad;
         /**
          * @param geometry
-...
                 String geomName,
                 ExpressionBuilder builder
             ) {
             FeatureAttributeDescriptor fad = (FeatureAttributeDescriptor) featureType
                     .get(geomName);
             fad = (FeatureAttributeDescriptor) featureType.get(geomName);
             this.isDefault = featureType.getDefaultGeometryAttributeName().equals(geomName);
             this.geometry = geometry;
             this.geometryTrans = geometry.cloneGeometry();
-...
             return this.builder.set(
                     builder.ST_Disjoint(
                             builder.geometry(geometry, projection),
                             builder.column(geomName)
                             builder.column(fad)
+                    )
             ).toString();
+        }

         private final boolean isDefault;
         private final ExpressionBuilder builder;
         private final IProjection projection;
         private final FeatureAttributeDescriptor fad;
         /**
          * @param geometry
          * @param projection
-...
                 String geomName,
                 ExpressionBuilder builder
             ) {
             FeatureAttributeDescriptor fad = (FeatureAttributeDescriptor) featureType
             fad = (FeatureAttributeDescriptor) featureType
                     .get(geomName);
             this.isDefault = featureType.getDefaultGeometryAttributeName().equals(geomName);
             this.geometry = geometry;
-...
             return builder.set(
                     builder.ST_Intersects(
                             builder.geometry(geometry, this.projection),
                             builder.column(geomName)
                             builder.column(this.fad)
+                    )
             ).toString();
+        }

         private final boolean isDefault;
         private final ExpressionBuilder builder;
         private final IProjection projection;
         private final FeatureAttributeDescriptor fad;
         /**
          * @param geometry
-...
         ) {
             this.builder = builder;
             this.projection = projection;
             FeatureAttributeDescriptor fad = (FeatureAttributeDescriptor) featureType
                     .get(geomName);
             fad = (FeatureAttributeDescriptor) featureType.get(geomName);
             this.isDefault = featureType.getDefaultGeometryAttributeName().equals(geomName);
             this.geometry = geometry;
             this.geometryTrans = geometry.cloneGeometry();
-...
             return this.builder.set(
                     builder.ST_Equals(
                             builder.geometry(geometry, projection),
                             builder.column(geomName)
                             builder.column(fad)
+                    )
             ).toString();
+        }

         private final boolean isDefault;
         private final ExpressionBuilder builder;
         private final IProjection projection;
         private final FeatureAttributeDescriptor fad;
         /**
          * @param geometry
-...
                 String geomName,
                 ExpressionBuilder builder
             ) {
             FeatureAttributeDescriptor fad = (FeatureAttributeDescriptor) featureType
                     .get(geomName);
             fad = (FeatureAttributeDescriptor) featureType.get(geomName);
             this.isDefault = featureType.getDefaultGeometryAttributeName().equals(geomName);
             this.geometry = geometry;
             this.geometryTrans = geometry.cloneGeometry();
-...
             return this.builder.set(
                     builder.ST_Overlaps(
                             builder.geometry(geometry, projection),
                             builder.column(geomName)
                             builder.column(fad)
+                    )
             ).toString();
+        }

         private final boolean isDefault;
         private final ExpressionBuilder builder;
         private final IProjection projection;
         private final FeatureAttributeDescriptor fad;
         /**
          * @deprecated  use @{link org.gvsig.fmap.mapcontext.layers.vectorial.SpatialEvaluatorsFactory}
          * @param envelope
-...
                 String geomName,
                 ExpressionBuilder builder
             ) {
             FeatureAttributeDescriptor fad = (FeatureAttributeDescriptor) featureType
                     .get(geomName);
             fad = (FeatureAttributeDescriptor) featureType.get(geomName);
             this.isDefault = featureType.getDefaultGeometryAttributeName().equals(geomName);
             this.projection = envelopeProjection;
             this.builder = builder;
-...
             return this.builder.set(
                     builder.ST_Contains(
                             builder.envelope(envelope, projection),
                             builder.column(geomName)
                             builder.column(fad)
+                    )
             ).toString();
+        }

         private final boolean isDefault;
         private final ExpressionBuilder builder;
         private final IProjection projection;
         private final FeatureAttributeDescriptor fad;
         /**
          * @param geometry
-...
                 String geomName,
                 ExpressionBuilder builder
             ) {
             FeatureAttributeDescriptor fad = (FeatureAttributeDescriptor) featureType
                     .get(geomName);
             this.isDefault = featureType.getDefaultGeometryAttributeName().equals(
                     geomName);
             fad = (FeatureAttributeDescriptor) featureType.get(geomName);
             this.isDefault = featureType.getDefaultGeometryAttributeName().equals(geomName);
             this.geometry = geometry;
             this.geometryTrans = geometry.cloneGeometry();
             this.projection = projection;
-...
             return this.builder.set(
                     builder.ST_Within(
                             builder.geometry(geometry, projection),
                             builder.column(geomName)
                             builder.column(fad)
+                    )
             ).toString();
+        }

         private final String defaultGeometryAttributeName;
         private final IProjection projection;
         private final ExpressionBuilder builder;
         FeatureAttributeDescriptor fad;
         /**
          * @param envelope
-...
                 String geomName,
                 ExpressionBuilder builder
             ) {
             FeatureAttributeDescriptor fad = (FeatureAttributeDescriptor) featureType.get(geomName);
             fad = (FeatureAttributeDescriptor) featureType.get(geomName);
             defaultGeometryAttributeName = featureType.getDefaultGeometryAttributeName();
             this.isDefault = defaultGeometryAttributeName.equals(geomName);
             this.envelope = envelope;
-...
                     builder.ST_Intersects(
                             builder.geometry(envelope.getGeometry(), this.projection),
                             // builder.ST_Envelope(builder.column(geomName))
                             builder.column(geomName)
                             builder.column(fad)
+                    )
             ).toString();
+        }

         private final boolean isDefault;
         private final ExpressionBuilder builder;
         private final IProjection projection;
         private final FeatureAttributeDescriptor fad;
         /**
          * @param geometry
-...
                 String geomName,
                 ExpressionBuilder builder
             ) {
             FeatureAttributeDescriptor fad = (FeatureAttributeDescriptor) featureType
                     .get(geomName);
             fad = (FeatureAttributeDescriptor) featureType.get(geomName);
             this.isDefault = featureType.getDefaultGeometryAttributeName().equals(geomName);

Application: gvSIG desktop

Revision 43739