/ - Diff - Application: gvSIG desktop - gvSIG

Revision 44100

     package org.gvsig.fmap.dal.swing.impl.featuretype;
     import org.gvsig.fmap.dal.swing.featuretype.FeatureTypeAttributePanel;
     import com.vividsolutions.jts.operation.distance.GeometryLocation;
     import java.awt.event.ItemEvent;
     import java.awt.event.ItemListener;
     import java.util.ArrayList;
-...
     import javax.swing.event.ChangeListener;
     import org.cresques.cts.IProjection;
     import org.gvsig.expressionevaluator.Expression;
     import org.gvsig.expressionevaluator.ExpressionEvaluatorLocator;
     import org.gvsig.expressionevaluator.ExpressionEvaluatorManager;
     import org.gvsig.expressionevaluator.MutableSymbolTable;
     import org.gvsig.expressionevaluator.swing.CalculatorController;
     import org.gvsig.expressionevaluator.swing.ExpressionEvaluatorSwingLocator;
     import org.gvsig.expressionevaluator.swing.ExpressionEvaluatorSwingManager;
-...
     import org.gvsig.fmap.dal.DALLocator;
     import org.gvsig.fmap.dal.DataManager;
     import org.gvsig.fmap.dal.DataTypes;
     import org.gvsig.fmap.dal.exception.DataException;
     import org.gvsig.fmap.dal.expressionevaluator.FeatureAttributeEmulatorExpression;
     import org.gvsig.fmap.dal.expressionevaluator.FeatureSymbolTable;
     import org.gvsig.fmap.dal.feature.EditableFeatureAttributeDescriptor;
     import org.gvsig.fmap.dal.feature.Feature;
     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.swing.DALSwingLocator;
     import org.gvsig.fmap.dal.swing.DataSwingManager;
     import org.gvsig.fmap.geom.Geometry;
-...
         private CalculatorController<Integer> pickerSize;
         private CalculatorController<Integer> pickerPrecision;
         private CalculatorController<Object> pickerDefaultValue;
         private CalculatorController<String> pickerFieldName;
     //    private CalculatorController<String> pickerFieldName;
         private PickerController<IProjection> pickerCRS;
         private ExpressionPickerController pickerVirtualField;
-...
             this.pickerPrecision = evaluatorManager.createCalculatorController(
                     this.txtPrecision, DataTypes.INT
             );
             this.pickerFieldName = evaluatorManager.createCalculatorController(
                     this.txtFieldName, DataTypes.STRING
             );
     //        this.pickerFieldName = evaluatorManager.createCalculatorController(
     //                this.txtFieldName, DataTypes.STRING
     //        );
             this.pickerDefaultValue = evaluatorManager.createCalculatorController(
                     this.txtDefaultValue, DataTypes.OBJECT
             );
-...
+                    }
+                }
             });
             this.pickerPrecision.addChangeListener(new ChangeListener() {
                 @Override
                 public void stateChanged(ChangeEvent e) {
                     doCheckSizeAndPrecision();
+                }
             });
             this.pickerSize.addChangeListener(new ChangeListener() {
                 @Override
                 public void stateChanged(ChangeEvent e) {
                     doCheckSizeAndPrecision();
+                }
             });
+        }
         @Override
-...
         public void clean() {
             this.pickerDefaultValue.set(null);
             this.pickerFieldName.set(null);
             this.txtFieldName.setText("");
     //        this.pickerFieldName.set(null);
             this.pickerIntervalEnd.set(null);
             this.pickerIntervalStart.set(null);
             this.pickerPrecision.set(null);
-...
+            }
             this.pickerVirtualField = ExpressionEvaluatorSwingLocator.getManager()
                     .createExpressionPickerController(txtVirtualField, btnVirtualField);
             if( descriptor.getFeatureType()!=null && descriptor.getFeatureType().getStore()!=null ) {
                 this.pickerVirtualField.addElement(
                     expressionSwingManager.createElement(
                             DataSwingManager.FEATURE_STORE_EXPRESSION_ELEMENT,
                             this.pickerVirtualField,
                             descriptor.getFeatureType().getStore()
+                    )
                 );
             if( descriptor.getFeatureType()!=null ) {
                 FeatureStore store = descriptor.getFeatureType().getStore();
                 if( store!=null ) {
                     this.pickerVirtualField.addElement(
                         expressionSwingManager.createElement(
                                 DataSwingManager.FEATURE_STORE_EXPRESSION_ELEMENT,
                                 this.pickerVirtualField,
                                 store
+                        )
                     );
                     Feature sampleFeature = null;
                     try {
                         sampleFeature = store.getFeatureSelection().first();
                         if( sampleFeature == null ) {
                             sampleFeature = store.first();
+                        }
                     } catch (DataException ex) {
+                    }
                     if( sampleFeature!=null ) {
                         FeatureSymbolTable featureSymbolTable = DALLocator.getDataManager().createFeatureSymbolTable();
                         featureSymbolTable.setFeature(sampleFeature);
                         this.pickerVirtualField.setPreviewSymbolTable(featureSymbolTable.createParent());
+                    }
+                }
+            }
             if (!(descriptor instanceof EditableFeatureAttributeDescriptor)) {
                 this.setEditable(false);
+            }
             this.pickerDefaultValue.set(descriptor.getDefaultValue());
             this.pickerFieldName.set(descriptor.getName());
             this.txtFieldName.setText(descriptor.getName());
     //        this.pickerFieldName.set(descriptor.getName());
             RelativeInterval interval = (RelativeInterval) descriptor.getInterval();
             if (interval == null) {
                 this.pickerIntervalEnd.set(null);
-...
                 if (fieldType == null) {
                     fieldType = DataTypes.UNKNOWN;
+                }
                 if( fieldType != DataTypes.STRING ) {
                     int maxsize = this.getMaxSizeOfType(fieldType);
                     Integer size = this.pickerSize.get();
                     if( maxsize>0 && size!=null && size>maxsize ) {
                         this.pickerSize.set(maxsize);
+                    }
+                }
                 switch (fieldType) {
                     case DataTypes.GEOMETRY:
                         this.cboGeometryType.setEnabled(editable);
-...
                         this.pickerIntervalEnd.setEditable(false);
                         this.tabAditionalFields.setEnabledAt(1, true);
                         this.tabAditionalFields.setEnabledAt(2, false);
                         this.pickerSize.set(null);
                         this.pickerPrecision.set(null);
                         this.pickerSize.setEnabled(false);
                         this.pickerPrecision.setEnabled(false);
                         break;
                     case DataTypes.INSTANT:
                     case DataTypes.INTERVAL:
-...
                         this.pickerCRS.setEnabled(false);
                         this.cboDateFormat.setEnabled(editable);
                         this.pickerIntervalStart.setEnabled(editable);
                         this.pickerIntervalEnd.setEditable(editable);
                         this.pickerIntervalEnd.setEnabled(editable);
                         this.tabAditionalFields.setEnabledAt(1, false);
                         this.tabAditionalFields.setEnabledAt(2, true);
                         this.pickerSize.set(null);
                         this.pickerPrecision.set(null);
                         this.pickerSize.setEnabled(false);
                         this.pickerPrecision.setEnabled(false);
                         break;
                     case DataTypes.BYTE:
                     case DataTypes.INT:
                     case DataTypes.LONG:
                     case DataTypes.STRING:
                         this.cboGeometryType.setEnabled(false);
                         this.cboGeometrySubtype.setEnabled(false);
                         this.pickerCRS.setEnabled(false);
                         this.cboDateFormat.setEnabled(false);
                         this.pickerIntervalStart.setEnabled(false);
                         this.pickerIntervalEnd.setEditable(false);
                         this.tabAditionalFields.setEnabledAt(1, false);
                         this.tabAditionalFields.setEnabledAt(2, false);
                         this.pickerPrecision.set(null);
                         this.pickerSize.setEnabled(true);
                         this.pickerPrecision.setEnabled(false);
                         break;
                     case DataTypes.FLOAT:
                     case DataTypes.DOUBLE:
                         this.cboGeometryType.setEnabled(false);
                         this.cboGeometrySubtype.setEnabled(false);
                         this.pickerCRS.setEnabled(false);
                         this.cboDateFormat.setEnabled(false);
                         this.pickerIntervalStart.setEnabled(false);
                         this.pickerIntervalEnd.setEditable(false);
                         this.tabAditionalFields.setEnabledAt(1, false);
                         this.tabAditionalFields.setEnabledAt(2, false);
                         this.pickerSize.setEnabled(true);
                         this.pickerPrecision.setEnabled(true);
                         break;
                     default:
                         this.cboGeometryType.setEnabled(false);
                         this.cboGeometrySubtype.setEnabled(false);
-...
                         this.pickerIntervalEnd.setEditable(false);
                         this.tabAditionalFields.setEnabledAt(1, false);
                         this.tabAditionalFields.setEnabledAt(2, false);
                         this.pickerSize.set(null);
                         this.pickerPrecision.set(null);
                         this.pickerSize.setEnabled(false);
                         this.pickerPrecision.setEnabled(false);
+                }
             } catch (Exception ex) {
                 ex.printStackTrace();
+            }
+        }
         public void setEditable(boolean editable) {
             this.editable = editable;
             this.pickerDefaultValue.setEditable(editable);
             this.pickerFieldName.setEditable(editable);
             this.txtFieldName.setEditable(editable);
     //        this.pickerFieldName.setEditable(editable);
             this.pickerIntervalEnd.setEditable(editable);
             this.pickerIntervalStart.setEditable(editable);
             this.pickerPrecision.setEditable(editable);
-...
             this.cboGeometrySubtype.setEnabled(editable);
+        }
         private int getMaxSizeOfType(int dataType) {
             switch(dataType) {
                 case DataTypes.BOOLEAN:
                     return 1;
                 case DataTypes.BYTE:
                     return 3;
                 case DataTypes.INT:
                     return 9;
                 case DataTypes.LONG:
                     return 19;
                 case DataTypes.FLOAT:
                     return 20;
                 case DataTypes.DOUBLE:
                     return 20;
                 case DataTypes.DATE:
                     return 8;
                 default:
                     return -1;
+            }
+        }
         private void doCheckSizeAndPrecision() {
             Integer size = this.pickerSize.get();
             if( size == null ) {
                 return;
+            }
             int maxsize = this.getMaxSizeOfType((int) ListElement.getSelected(cboFieldType));
             if( size<1 || (maxsize>0 && size>maxsize) ) {
                 this.pickerSize.setWarning(true, "The size is not valid for the selected type");
             } else {
                 this.pickerSize.setWarning(false);
+            }
             if( this.pickerPrecision.isEnabled() ) {
                 Integer precision = this.pickerPrecision.get();
                 if( precision == null ) {
                     return ;
+                }
                 if( precision < 0 ) {
                     this.pickerPrecision.setWarning(true, "the precision can not have a negative value");
                 } else if( precision>size ) {
                     this.pickerPrecision.setWarning(true, "the precision can not have a value greater than the size");
                 } else {
                     this.pickerPrecision.setWarning(false);
+                }
+            }
+        }
+    }

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/DummyFetureStore.java
733	733	return null;
734	734	}
735	735
	736	@Override
	737	public Feature first() throws DataException {
	738	return null;
	739	}
	740
736	741	}

         public List<Feature> getFeatures(Expression filter, String sortBy, boolean asc);
         public Feature first() throws DataException;
         public Feature findFirst(String filter) throws DataException;
         public Feature findFirst(String filter, String sortBy) throws DataException;

     package org.gvsig.fmap.dal.expressionevaluator;
     import org.gvsig.expressionevaluator.MutableSymbolTable;
     import org.gvsig.expressionevaluator.SymbolTable;
     import org.gvsig.fmap.dal.feature.Feature;
-...
         @Override
         public FeatureSymbolTable clone() throws CloneNotSupportedException;
         /**
          * Utility method that creates a mutable symbol table whose table
          * delegated to this.
+         *
          * @return
          */
         public MutableSymbolTable createParent();
+    }

         @Override
         public FeatureSet getFeatureSet(String filter, String sortBy, boolean asc) throws DataException {
             FeatureQuery query = this.createFeatureQuery();
             FeatureQuery query = null;
             if( !StringUtils.isEmpty(filter) ) {
                 query = this.createFeatureQuery();
                 query.setFilter(filter);
+            }
             if( !StringUtils.isEmpty(sortBy) ) {
                 if( query == null ) {
                     query = this.createFeatureQuery();
+                }
                 query.getOrder().add(sortBy, asc);
+            }
             if( query == null ) {
                 return this.getFeatureSet();
+            }
             return this.getFeatureSet(query);
+        }
-...
+        }
         @Override
         public Feature first() throws DataException {
             return this.findFirst((String)null, null, true);
+        }
         @Override
         public Feature findFirst(String filter) throws DataException {
             return this.findFirst(filter, null, true);
+        }

                 if( it == null ) {
                     return null;
+                }
                 Feature f = (Feature) it.next();
                 return f;
                 if( it.hasNext() ) {
                     Feature f = (Feature) it.next();
                     return f;
+                }
                 return null;
             } finally {
                 DisposeUtils.disposeQuietly(it);
+            }

     import org.gvsig.expressionevaluator.ExpressionEvaluatorManager;
     import org.gvsig.expressionevaluator.Function;
     import org.gvsig.expressionevaluator.Interpreter;
     import org.gvsig.expressionevaluator.MutableSymbolTable;
     import org.gvsig.expressionevaluator.spi.AbstractFunction;
     import org.gvsig.expressionevaluator.spi.AbstractSymbolTable;
     import org.gvsig.fmap.dal.DataManager;
-...
             this.type = feature.getType();
+        }
         @Override
         public MutableSymbolTable createParent() {
             ExpressionEvaluatorManager expManager = ExpressionEvaluatorLocator.getManager();
             MutableSymbolTable symbolTable = expManager.createSymbolTable();
             symbolTable.addSymbolTable(this);
             return symbolTable;
+        }
         public static void selfRegister() {
             ExpressionEvaluatorManager manager = ExpressionEvaluatorLocator.getManager();
             manager.registerSymbolTable(new DefaultFeatureSymbolTable(), false);

Also available in: Unified diff