/ - Diff - Application: gvSIG desktop - gvSIG

     import org.gvsig.tools.dynobject.exception.DynFieldNotFoundException;
     import org.gvsig.tools.dynobject.exception.DynMethodException;
     import org.gvsig.tools.exception.BaseException;
     import org.gvsig.tools.resourcesstorage.ResourcesStorage;
     import org.gvsig.tools.util.UnmodifiableBasicMap;
     /**
-...
             public StoresRepository getStoresRepository() {
                 return null;
+            }
             @Override
             public ResourcesStorage getResourcesStorage() {
                 return null;
+            }
     	/**
     	 * unsupported by default (return null), override this otherwise

     import org.gvsig.timesupport.Time;
     import org.gvsig.tools.dispose.Disposable;
     import org.gvsig.tools.dynobject.DynObject_v2;
     import org.gvsig.tools.resourcesstorage.ResourcesStorage;
     import org.gvsig.tools.util.UnmodifiableBasicMap;
     /**
-...
             public StoresRepository getStoresRepository();
             public ResourcesStorage getResourcesStorage();
     	/**
     	 * Create a {@link DataServerExplorer} from the same source that this store.
+    	 *

     import org.gvsig.fmap.dal.StoresRepository;
     import org.gvsig.fmap.dal.feature.OpenFeatureStoreParameters;
     import org.gvsig.fmap.dal.feature.spi.simpleprovider.AutomaticDetectionOfTypes.Rows;
     import org.gvsig.tools.resourcesstorage.ResourcesStorage;
     /**
+     *
-...
         public long getRowCount();
         public StoresRepository getStoresRepository();
         public ResourcesStorage getResourcesStorage();
         public OpenFeatureStoreParameters getParameters();
+    }

trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.file/org.gvsig.fmap.dal.file.lib/src/main/java/org/gvsig/fmap/dal/feature/spi/simpleprovider/AbstractSimpleSequentialReader.java
5	5	import java.util.Map;
6	6	import org.gvsig.fmap.dal.StoresRepository;
7	7	import org.gvsig.fmap.dal.feature.OpenFeatureStoreParameters;
	8	import org.gvsig.tools.resourcesstorage.ResourcesStorage;
8	9
9	10	/**
10	11	*
...	...
72	73	return null;
73	74	}
74	75
	76	@Override
	77	public ResourcesStorage getResourcesStorage() {
	78	return null;
	79	}
75	80	}

     import org.gvsig.tools.dynobject.Tags;
     import org.gvsig.tools.dynobject.exception.DynFieldNotFoundException;
     import org.gvsig.tools.exception.BaseException;
     import org.gvsig.tools.resourcesstorage.ResourcesStorage;
     import org.gvsig.tools.task.SimpleTaskStatus;
     import org.gvsig.tools.task.TaskStatusManager;
     import org.gvsig.tools.util.UnmodifiableBasicMap;
-...
             private DataStore store;
             private StoresRepository storesRepository;
             private OpenFeatureStoreParameters parameters;
             private ResourcesStorage resourcesStorage;
             public ReaderData() {
                 this.needCalculateEnvelope = false;
                 this.features = new ArrayList<>();
-...
                 return storesRepository;
+            }
             public ResourcesStorage getResourcesStorage() {
                 return resourcesStorage;
+            }
             public void setResourcesStorage(ResourcesStorage resourcesStorage) {
                 this.resourcesStorage = resourcesStorage;
+            }
             public void setParameters(OpenFeatureStoreParameters parameters) {
                 if( parameters==null ) {
                     LOGGER.warn("Can't set parameters to null");
-...
                 taskStatus.message("_preparing");
                 readerData.setName(reader.getName());
                 readerData.setStoresRepository(reader.getStoresRepository());
                 readerData.setResourcesStorage(reader.getResourcesStorage());
                 readerData.setParameters(reader.getParameters());
                 readerData.setAlias(reader.getAlias());
-...
             return repo;
+        }
         @Override
         public ResourcesStorage getResourcesStorage() {
             ResourcesStorage storage = this.readerData.getResourcesStorage();
             return storage;
+        }
+    }

         @Override
         public ResourcesStorage getResourcesStorage() {
             ResourcesStorage resourcesStorage;
             try {
                 resourcesStorage = this.provider.getResourcesStorage();
                 if( resourcesStorage!=null ) {
                     return resourcesStorage;
+                }
             } catch(Throwable th) {
+            }
             try {
                 DataServerExplorer explorer = this.getExplorer();
                 if( explorer==null ) {
                     return null;

             return this.reference;
+        }
         @Override
         public Object getOrDefault(String name, Object defaultValue) {
             int index = this.data.getType().getIndex(name);
             if( index < 0 ) {
                 return defaultValue;
+            }
             return this.get(index);
+        }
         @Override
         public String getStringOrDefault(String name, String defaultValue) {
             int index = this.data.getType().getIndex(name);
             if( index < 0 ) {
                 return defaultValue;
+            }
             try {
                 return (String) this.get(index);
             } catch(Throwable th) {
                 return defaultValue;
+            }
+        }
         @Override
         public int getIntOrDefault(String name, int defaultValue) {
             int index = this.data.getType().getIndex(name);
             if( index < 0 ) {
                 return defaultValue;
+            }
             try {
                 return (int) this.get(index);
             } catch(Throwable th) {
                 return defaultValue;
+            }
+        }
         @Override
         public long getLongOrDefault(String name, long defaultValue) {
             int index = this.data.getType().getIndex(name);
             if( index < 0 ) {
                 return defaultValue;
+            }
             try {
                 return (long) this.get(index);
             } catch(Throwable th) {
                 return defaultValue;
+            }
+        }
         @Override
         public float getFloatOrDefault(String name, float defaultValue) {
             int index = this.data.getType().getIndex(name);
             if( index < 0 ) {
                 return defaultValue;
+            }
             try {
                 return (float) this.get(index);
             } catch(Throwable th) {
                 return defaultValue;
+            }
+        }
         @Override
         public double getDoubleOrDefault(String name, double defaultValue) {
             int index = this.data.getType().getIndex(name);
             if( index < 0 ) {
                 return defaultValue;
+            }
             try {
                 return (double) this.get(index);
             } catch(Throwable th) {
                 return defaultValue;
+            }
+        }
         @Override
         public Date getDateOrDefault(String name, Date defaultValue) {
             int index = this.data.getType().getIndex(name);
             if( index < 0 ) {
                 return defaultValue;
+            }
             try {
                 return (Date) this.get(index);
             } catch(Throwable th) {
                 return defaultValue;
+            }
+        }
         @Override
         public Object getOrDefault(int index, Object defaultValue) {
             if( index < 0 || index >= this.data.getType().size() ) {
                 return defaultValue;
+            }
             try {
                 return this.get(index);
             } catch(Throwable th) {
                 return defaultValue;
+            }
+        }
         @Override
         public String getStringOrDefault(int index, String defaultValue) {
             if( index < 0 || index >= this.data.getType().size() ) {
                 return defaultValue;
+            }
             try {
                 return (String) this.get(index);
             } catch(Throwable th) {
                 return defaultValue;
+            }
+        }
         @Override
         public int getIntOrDefault(int index, int defaultValue) {
             if( index < 0 || index >= this.data.getType().size() ) {
                 return defaultValue;
+            }
             try {
                 return (int) this.get(index);
             } catch(Throwable th) {
                 return defaultValue;
+            }
+        }
         @Override
         public long getLongOrDefault(int index, long defaultValue) {
             if( index < 0 || index >= this.data.getType().size() ) {
                 return defaultValue;
+            }
             try {
                 return (long) this.get(index);
             } catch(Throwable th) {
                 return defaultValue;
+            }
+        }
         @Override
         public float getFloatOrDefault(int index, float defaultValue) {
             if( index < 0 || index >= this.data.getType().size() ) {
                 return defaultValue;
+            }
             try {
                 return (float) this.get(index);
             } catch(Throwable th) {
                 return defaultValue;
+            }
+        }
         @Override
         public double getDoubleOrDefault(int index, double defaultValue) {
             if( index < 0 || index >= this.data.getType().size() ) {
                 return defaultValue;
+            }
             try {
                 return (double) this.get(index);
             } catch(Throwable th) {
                 return defaultValue;
+            }
+        }
         @Override
         public Date getDateOrDefault(int index, Date defaultValue) {
             if( index < 0 || index >= this.data.getType().size() ) {
                 return defaultValue;
+            }
             try {
                 return (Date) this.get(index);
             } catch(Throwable th) {
                 return defaultValue;
+            }
+        }
         class UnableToGetReferenceException extends BaseRuntimeException {
             /**

             public boolean hasSubquery() {
                 return this.subquery != null;
+            }
             @Override
             public String toString() {
                 StringBuilder builder = new StringBuilder();
                 if( this.hasDatabase() ) {
                     builder.append(this.database);
                     builder.append(".");
+                }
                 if( this.hasSchema()) {
                     builder.append(this.schema);
                     builder.append(".");
+                }
                 builder.append(this.table);
                 if( this.hasSubquery() ) {
                     builder.append("[");
                     builder.append(this.subquery);
                     builder.append("]");
+                }
                 return builder.toString();
+            }
+        }
         protected final JDBCHelper helper;

             ResultSet rs = null;
             try {
                 if (CollectionUtils.isEmpty(pks)) {
                     if (!table.hasSubquery()) {
                         pks = this.getPrimaryKeysFromMetadata(conn, null, table.getSchema(), table.getTable());
                         if (CollectionUtils.isEmpty(pks)) {
                             pks = getPrimaryKeysFromInformationSchema(conn, null, table.getSchema(), table.getTable());
+                        }
                     if (table.hasSubquery()) {
                         LOGGER.info("Searching pk in a table with a subquery ("+table.toString()+".");
+                    }
                     pks = this.getPrimaryKeysFromMetadata(conn, null, table.getSchema(), table.getTable());
                     if (CollectionUtils.isEmpty(pks)) {
                         pks = getPrimaryKeysFromInformationSchema(conn, null, table.getSchema(), table.getTable());
+                    }
+                }
                 JDBCSQLBuilderBase sqlbuilder = this.createSQLBuilder();

                 );
             fetchFeatureType.perform();
             if( !StringUtils.isEmpty(params.getDefaultGeometryField()) ) {
             if( !StringUtils.isBlank(params.getDefaultGeometryField()) ) {
                 if( !params.getDefaultGeometryField().equalsIgnoreCase(type.getDefaultGeometryAttributeName()) ) {
                     type.setDefaultGeometryAttributeName(params.getDefaultGeometryField());
                     EditableFeatureAttributeDescriptor attr = (EditableFeatureAttributeDescriptor) type.getDefaultGeometryAttribute();

     	 */
     	public EditableFeature getEditable();
     	/**
             public Object getOrDefault(String name, Object defaultValue);
             public String getStringOrDefault(String name, String defaultValue);
             public int getIntOrDefault(String name, int defaultValue);
             public long getLongOrDefault(String name, long defaultValue);
             public float getFloatOrDefault(String name, float defaultValue);
             public double getDoubleOrDefault(String name, double defaultValue);
             public Date getDateOrDefault(String name, Date defaultValue);
             public Object getOrDefault(int index, Object defaultValue);
             public String getStringOrDefault(int index, String defaultValue);
             public int getIntOrDefault(int index, int defaultValue);
             public long getLongOrDefault(int index, long defaultValue);
             public float getFloatOrDefault(int index, float defaultValue);
             public double getDoubleOrDefault(int index, double defaultValue);
             public Date getDateOrDefault(int index, Date defaultValue);
             /**
     	 * Returns the value of an attribute given its name.
+    	 *
     	 * @param name

Application: gvSIG desktop

Revision 44331