/ - Diff - Application: gvSIG desktop - gvSIG

                 for (FeatureAttributeDescriptor sourceAttr : sourceStore.getDefaultFeatureType()) {
                     switch(sourceAttr.getType()) {
                         case DataTypes.TIMESTAMP:
                             Date sourceTimestamp = sourceFeature.getDate(sourceAttr.getName());
                             Date targetTimestamp = targetFeature.getDate(sourceAttr.getName());
                             assertEquals(
                                     String.format("Feature %03d attribute %s", i, sourceAttr.getName()),
                                     sourceTimestamp,
                                     targetTimestamp
                                     sourceFeature.get(sourceAttr.getName()),
                                     targetFeature.getTimestamp(sourceAttr.getName())
                             );
                             break;
                         case DataTypes.TIME:
                             assertEquals(
                                     String.format("Feature %03d attribute %s", i, sourceAttr.getName()),
                                     sourceFeature.getDate(sourceAttr.getName()),
                                     targetFeature.getDate(sourceAttr.getName())
                                     sourceFeature.get(sourceAttr.getName()),
                                     targetFeature.getTime(sourceAttr.getName())
                             );
                             break;
                         case DataTypes.GEOMETRY:

+        }
         try {
           Date x = YYYYMMDDHHMMSS_DATE_FORMAT.parse(value);
           return x;
           return new java.sql.Timestamp(x.getTime());
         } catch (ParseException ex) {
           this.getLogger().warn("Can't parse value '" + value + "' as timestamp.", ex);
           return defaultValue;
-...
+        }
         try {
           Date x = HHMMSS_DATE_FORMAT.parse(value);
           return x;
           return new java.sql.Time(x.getTime());
         } catch (ParseException ex) {
           this.getLogger().warn("Can't parse value '" + value + "' as time.", ex);
           return defaultValue;
-...
+        }
         try {
           Date x = YYYYMMDD_DATE_FORMAT.parse(value);
           return x;
           return new java.sql.Date(x.getTime());
         } catch (ParseException ex) {
           this.getLogger().warn("Can't parse value '" + value + "' as date.", ex);
           return defaultValue;

                     break;
                 case DataTypes.TIMESTAMP:
                     featureProvider.set(index, formatter.parseTimestamp(value, (Date) defaultValue));
                     featureProvider.set(index, formatter.parseTimestamp(value, (java.sql.Timestamp) defaultValue));
                     break;
                 case DataTypes.TIME:
                     featureProvider.set(index, formatter.parseTime(value, (Date) defaultValue));
                     featureProvider.set(index, formatter.parseTime(value, (java.sql.Time) defaultValue));
                     break;
                 case DataTypes.DATE:
                     featureProvider.set(index, formatter.parseDate(value, (Date) defaultValue));
                     featureProvider.set(index, formatter.parseDate(value, (java.sql.Date) defaultValue));
                     break;
                 default: {

                 for (FeatureAttributeDescriptor sourceAttr : sourceStore.getDefaultFeatureType()) {
                     switch(sourceAttr.getType()) {
                         case DataTypes.TIMESTAMP:
                             assertEquals(
                                     String.format("Feature %03d attribute %s", i, sourceAttr.getName()),
                                     sourceFeature.get(sourceAttr.getName()),
                                     targetFeature.getTimestamp(sourceAttr.getName())
                             );
                             break;
                         case DataTypes.TIME:
                             assertEquals(
                                     String.format("Feature %03d attribute %s", i, sourceAttr.getName()),
                                     sourceFeature.getDate(sourceAttr.getName()),
                                     targetFeature.getDate(sourceAttr.getName())
                                     sourceFeature.get(sourceAttr.getName()),
                                     targetFeature.getTime(sourceAttr.getName())
                             );
                             break;
                         case DataTypes.STRING:

     import org.gvsig.fmap.dal.feature.spi.FeatureProvider;
     import org.gvsig.fmap.geom.Geometry;
     import org.gvsig.fmap.geom.primitive.Envelope;
     import org.gvsig.timesupport.Instant;
     import org.gvsig.timesupport.Interval;
     import org.gvsig.timesupport.Time;
     import org.gvsig.tools.ToolsLocator;
     import org.gvsig.tools.dataTypes.CoercionException;
     import org.gvsig.tools.dataTypes.DataTypesManager;
-...
             return geom;
+        }
     //    @Override
     //    public Time getDefaultTime() {
     //    	Time time = this.data.getDefaultTime();
     //        if( time == null ) {
     //            int i = this.data.getType().getDefaultTimeAttributeIndex();
     //            Object x = this.get(i);
     //            if( x instanceof Time ) {
     //                time = (Time) x;
     //            } else {
     //                time = this.getTime(i);
     //            }
     //        }
     //        return time;
     //    }
     //
         @Override
         public Time getDefaultTime() {
         	Time time = this.data.getDefaultTime();
             if( time == null ) {
                 int i = this.data.getType().getDefaultTimeAttributeIndex();
                 Object x = this.get(i);
                 if( x instanceof Time ) {
                     time = (Time) x;
                 } else {
                     time = this.getTime(i);
+                }
+            }
             return time;
+        }
         @Override
         public IProjection getDefaultSRS() {
             IProjection srs = this.data.getType().getDefaultSRS();
             if( srs == null ) {
-...
         @Override
         public Date getDate(int index) {
             Date value = ((Date) this.get(index,Date.class,DataTypes.DATE));
             Date value = ((Date) this.get(index,java.sql.Date.class,DataTypes.DATE));
             return value;
+        }
         @Override
         public Date getTime(String name) {
             return this.getTime(this.data.getType().getIndex(name));
+        }
         @Override
         public Date getTime(int index) {
             Date value = ((Date) this.get(index,java.sql.Time.class,DataTypes.TIME));
             return value;
+        }
         @Override
         public Date getTimestamp(String name) {
             return this.getTimestamp(this.data.getType().getIndex(name));
+        }
         @Override
         public Date getTimestamp(int index) {
             Date value = ((Date) this.get(index,java.sql.Timestamp.class,DataTypes.TIMESTAMP));
             return value;
+        }
         @Override
         public double getDouble(String name) {
             return this.getDouble(this.data.getType().getIndex(name));
+        }
-...
             return this.data.getType().getIndex(name) >= 0;
+        }
     //    @Override
     //    public Time getTime(int index) {
     //        return ((Time) this.get(index,Time.class,DataTypes.INSTANT));
     //    }
     //
     //    @Override
     //    public Time getTime(String name) {
     //        return this.getInstant(this.data.getType().getIndex(name));
     //    }
     //
     //    @Override
     //    public Instant getInstant(int index) {
     //        return ((Instant) this.get(index,Instant.class,DataTypes.INSTANT));
     //    }
     //
     //    @Override
     //    public Instant getInstant(String name) {
     //        return this.getInstant(this.data.getType().getIndex(name));
     //    }
     //
     //    @Override
     //    public Interval getInterval(int index) {
     //        return ((Interval) this.get(index,Interval.class,DataTypes.INTERVAL));
     //    }
     //
     //    @Override
     //    public Interval getInterval(String name) {
     //        return this.getInterval(this.data.getType().getIndex(name));
     //    }
     //
         @Override
         public Time getTime(int index) {
             return ((Time) this.get(index,Time.class,DataTypes.INSTANT));
+        }
         @Override
         public Time getTime(String name) {
             return this.getInstant(this.data.getType().getIndex(name));
+        }
         @Override
         public Instant getInstant(int index) {
             return ((Instant) this.get(index,Instant.class,DataTypes.INSTANT));
+        }
         @Override
         public Instant getInstant(String name) {
             return this.getInstant(this.data.getType().getIndex(name));
+        }
         @Override
         public Interval getInterval(int index) {
             return ((Interval) this.get(index,Interval.class,DataTypes.INTERVAL));
+        }
         @Override
         public Interval getInterval(String name) {
             return this.getInterval(this.data.getType().getIndex(name));
+        }
         @Override
         public DynObject getAsDynObject() {
             DynObjectFeatureFacade facade = new DynObjectFeatureFacade(this);
             return facade;

         public JDBCFormatter(Formatter<Value> formatter) {
             this.formatters = new Formatter[]{
                 new Exists(this),
                 new Select(this)
                 new Exists(formatter),
                 new Select(formatter)
             };
+        }

             this.builder = builder;
             this.formatters = new Formatter[]{
                 new BaseFormatter(this),
                 new JDBCFormatter(this),
                 new IfNull(this.builder, this),
                 new IsNotNull(this.builder, this),
                 new IsNull(this.builder, this),
-...
                 new Decode(this.builder, this),
                 new ILike(this.builder, this),
                 new Constant(this.builder, this),
                 new ST_AsBinary(this.builder, this)
                 new ST_AsBinary(this.builder, this),
                 new Exists(this.builder, this),
                 new BaseFormatter(this),
                 new JDBCFormatter(this),
             };
+        }

     import org.gvsig.expressionevaluator.swing.ExpressionPickerController;
     import org.gvsig.fmap.dal.feature.FeatureStore;
     import org.gvsig.fmap.dal.swing.DALSwingLocator;
     import org.gvsig.fmap.dal.swing.searchpanel.AbstractSearchConditionPanel;
     import org.gvsig.fmap.dal.swing.searchpanel.SearchConditionPanel;
     import org.gvsig.tools.swing.api.ChangeListenerHelper;
     import org.gvsig.tools.swing.api.ToolsSwingLocator;
-...
+     *
      * @author jjdelcerro
      */
     public class SearchConditionPanelAdvanced implements SearchConditionPanel {
     public class SearchConditionPanelAdvanced
         extends AbstractSearchConditionPanel
         implements SearchConditionPanel
+      {
         @Override
         public JComponent asJComponent() {

     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.dal.swing.searchpanel.AbstractSearchConditionPanel;
     import org.gvsig.fmap.dal.swing.searchpanel.SearchConditionPanel;
     import org.gvsig.tools.ToolsLocator;
     import org.gvsig.tools.i18n.I18nManager;
-...
+     *
      * @author jjdelcerro
      */
     public class SearchConditionPanelSimplified implements SearchConditionPanel {
     public class SearchConditionPanelSimplified
         extends AbstractSearchConditionPanel
         implements SearchConditionPanel
+      {
       private static final Logger LOGGER = LoggerFactory.getLogger(SearchConditionPanelSimplified.class);
-...
       @Override
       public boolean isValid(StringBuilder message) {
         return true;
         boolean valid = true;
         for (SearchConditionFieldController searchField : searchFields) {
           if( !searchField.isValid(message) ) {
             valid = false;
+          }
+        }
         return valid;
+      }
       private void initComponents() {

         return null;
+      }
       public boolean isValid(StringBuilder message) {
         Object value = this.getValue();
         if (value == null) {
           return true;
+        }
         Field field = this.getCurrentField();
         if (field == null) {
           return true;
+        }
         if (field.getPath().length > 2) {
           message.append("Invalid field '").append(field.getLabel()).append("'.\n");
           return false;
+        }
         FeatureAttributeDescriptor descriptor = field.getDescriptor();
         switch(this.getRelationalOperator()) {
           case ExpressionBuilder.OPERATOR_EQ:
           case ExpressionBuilder.OPERATOR_NE:
           case ExpressionBuilder.OPERATOR_GT:
           case ExpressionBuilder.OPERATOR_GE:
           case ExpressionBuilder.OPERATOR_LT:
           case ExpressionBuilder.OPERATOR_LE:
             try {
               descriptor.getDataType().coerce(value);
             } catch (CoercionException ex) {
               message.append("Invalid value '")
                       .append(Objects.toString(value))
                       .append("' for field '")
                       .append(descriptor.getLabel())
                       .append("'.");
               message.append("\n");
               message.append(ex.getMessage());
               message.append("\n");
               return false;
+            }
             break;
           default:
           case ExpressionBuilder.OPERATOR_ILIKE:
             break;
+        }
         return true;
+      }
       public ExpressionBuilder.Value getFilter() {
         ExpressionBuilder.Value filter = null;
-...
+        }
         Field field = this.getCurrentField();
         if (field == null) {
           return filter;
           return null;
+        }
         if (field.getPath().length > 2) {
           // No soportado
-...
         DALExpressionBuilder builder = dataManager.createDALExpressionBuilder();
         FeatureAttributeDescriptor parentDescriptor = field.getParentDescriptor();
         FeatureAttributeDescriptor descriptor = field.getDescriptor();
         ExpressionBuilder.Constant value_constant = null;
         switch(this.getRelationalOperator()) {
           case ExpressionBuilder.OPERATOR_EQ:
           case ExpressionBuilder.OPERATOR_NE:
           case ExpressionBuilder.OPERATOR_GT:
           case ExpressionBuilder.OPERATOR_GE:
           case ExpressionBuilder.OPERATOR_LT:
           case ExpressionBuilder.OPERATOR_LE:
             try {
               value_constant = builder.expression().constant(
                   descriptor.getDataType().coerce(value)
               );
             } catch (CoercionException ex) {
               return null;
+            }
             break;
           default:
           case ExpressionBuilder.OPERATOR_ILIKE:
             value_constant = builder.expression().constant(value);
             break;
+        }
         if (parentDescriptor == null) {
           // Se busca en campos de la misma tabla.
           filter = builder.expression().binaryOperator(
                   this.getRelationalOperator(),
                   builder.expression().column(descriptor.getName()),
                   builder.expression().constant(value)
                   value_constant
           );
         } else {
           // Se busca en campos de una tabla relacionada.
-...
             case DynField.RELATION_TYPE_IDENTITY:
               filter = builder.expression().binaryOperator(
                       this.getRelationalOperator(),
                       builder.expression().column(descriptor.getName()),
                       builder.foreing_value(
                               parentDescriptor.getName(),
                               descriptor.getName()
+                      )
                       ),
                       value_constant
               );
               break;
-...
                                       builder.expression().binaryOperator(
                                               this.getRelationalOperator(),
                                               builder.expression().column(descriptor.getName()),
                                               builder.expression().constant(this.getValue())
                                               value_constant
+                                      )
+                              )
+                      )

     package org.gvsig.fmap.dal.swing.searchpanel;
     /**
+     *
      * @author jjdelcerro
      */
     public abstract class AbstractSearchConditionPanel implements SearchConditionPanel {
+    }

     import org.gvsig.fmap.dal.exception.DataException;
     import org.gvsig.fmap.geom.Geometry;
     import org.gvsig.fmap.geom.primitive.Envelope;
     import org.gvsig.timesupport.Instant;
     import org.gvsig.timesupport.Interval;
     import org.gvsig.timesupport.Time;
     //import org.gvsig.timesupport.Instant;
     //import org.gvsig.timesupport.Interval;
     //import org.gvsig.timesupport.Time;
     import org.gvsig.tools.dynobject.DynObject;
     import org.gvsig.tools.evaluator.Evaluator;
     import org.gvsig.tools.evaluator.EvaluatorData;
-...
        * @return value of the specified attribute
        */
       public Date getDate(int index);
       public Date getTime(String name);
       public Date getTime(int index);
       public Date getTimestamp(String name);
       public Date getTimestamp(int index);
       /**
        * Returns the String value of an attribute given its name.
-...
        */
       public List getSRSs();
       public Time getDefaultTime();
     //  public Time getDefaultTime();
     //
     //  public Time getTime(int index);
     //
     //  public Time getTime(String name);
     //
     //  /**
     //   * Returns the instant value of an attribute given its position.
     //   *
     //   * @param index position of the attribute
     //   * @return value of the specified attribute
     //   */
     //  public Instant getInstant(int index);
     //
     //  /**
     //   * Returns the instant value of an attribute given its name.
     //   *
     //   * @param name a string containing the name of the attribute
     //   * @return value of the specified attribute
     //   */
     //  public Instant getInstant(String name);
     //
     //  /**
     //   * Returns the interval value of an attribute given its position.
     //   *
     //   * @param index position of the attribute
     //   * @return value of the specified attribute
     //   */
     //  public Interval getInterval(int index);
     //
     //  /**
     //   * Returns the interval value of an attribute given its name.
     //   *
     //   * @param name a string containing the name of the attribute
     //   * @return value of the specified attribute
     //   */
     //  public Interval getInterval(String name);
       public Time getTime(int index);
       public Time getTime(String name);
       /**
        * Returns the instant value of an attribute given its position.
+       *
        * @param index position of the attribute
        * @return value of the specified attribute
        */
       public Instant getInstant(int index);
       /**
        * Returns the instant value of an attribute given its name.
+       *
        * @param name a string containing the name of the attribute
        * @return value of the specified attribute
        */
       public Instant getInstant(String name);
       /**
        * Returns the interval value of an attribute given its position.
+       *
        * @param index position of the attribute
        * @return value of the specified attribute
        */
       public Interval getInterval(int index);
       /**
        * Returns the interval value of an attribute given its name.
+       *
        * @param name a string containing the name of the attribute
        * @return value of the specified attribute
        */
       public Interval getInterval(String name);
       public DynObject getAsDynObject();
       /**

             <jython.artifactId>jython-standalone</jython.artifactId>
             <!-- External project versions -->
             <gvsig.tools.version>3.0.222</gvsig.tools.version>
             <gvsig.tools.version>3.0.224</gvsig.tools.version>
             <gvsig.proj.version>1.0.8</gvsig.proj.version>
             <gvsig.projection.api.version>2.0.30</gvsig.projection.api.version>

         private final Formatter<ExpressionBuilder.Value>[] formatters;
         public BaseFormatter() {
           this(null);
+        }
         public BaseFormatter(Formatter<Value> formatter) {
             if( formatter==null || ExpressionBuilder.EMPTY_FORMATTER==formatter ) {
               formatter = this;
+            }
             this.formatters = new Formatter[]{
                 new Time(this),
                 new Date(this),
                 new Timestamp(this),
                 new Extract(this),
                 new Getattr(this),
                 new Tuple(this)
                 new Time(formatter),
                 new Date(formatter),
                 new Timestamp(formatter),
                 new Extract(formatter),
                 new Getattr(formatter),
                 new Tuple(formatter)
             };
+        }

+            }
         };
         public static final Formatter<Value> BASE_FORMATTER = new BaseFormatter(EMPTY_FORMATTER);
         public static final Formatter<Value> BASE_FORMATTER = new BaseFormatter();
         public String quote_for_identifiers();

Application: gvSIG desktop

Revision 44767