/ - Diff - Application: gvSIG desktop - gvSIG

     import java.text.DateFormat;
     import java.util.HashMap;
     import java.util.Iterator;
     import java.util.LinkedHashMap;
     import java.util.List;
     import java.util.Map;
     import java.util.Map.Entry;
-...
     //        FIXME: dateFormat;
             state.set("defaultValue", Objects.toString(defaultValue));
             state.set("defaultValue", Objects.toString(defaultValue, null));
             state.set("index", index);
             state.set("maximumOccurrences", maximumOccurrences);
-...
             if( values == null ) {
                 return Objects.toString(value, "");
+            }
             Map<Object, String> map = new HashMap<>();
             Map<Object, String> map = new LinkedHashMap<>();
             for (DynObjectValueItem theValue : values) {
                 map.put(theValue.getValue(), theValue.getLabel());
+            }

trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.jdbc/src/main/java/org/gvsig/fmap/dal/store/jdbc2/spi/operations/CalculateEnvelopeOfColumnOperation.java
86	86	)
87	87	)
88	88	);
89
	89	sqlbuilder.select().group_by(expbuilder.column(columnName));
90	90	sqlbuilder.select().from().table()
91	91	.database(this.table.getDatabase())
92	92	.schema(this.table.getSchema())

                     builder.append(" FROM ");
                     builder.append(this.from.toString(formatter));
+                }
                 if( this.has_group_by() ) {
                     builder.append(" GROUP BY ");
                     builder.append(this.groupColumn.get(0).name());
                     for (int i = 1; i < groupColumn.size(); i++) {
                         builder.append(", ");
                         builder.append(this.groupColumn.get(i).name());
+                    }
+                }
                 if ( this.has_where() ) {
                     builder.append(" WHERE ");
                     builder.append(this.where.toString(formatter));

             public OrderByBuilder order_by();
             public SelectBuilder group_by(Variable... column);
             public SelectBuilder distinct();
             public SelectBuilder limit(long limit);
-...
             public boolean has_order_by();
             public boolean has_group_by();
             public boolean has_limit();
             public boolean has_offset();

             protected List<SelectColumnBuilder> columns;
             protected List<OrderByBuilder> order_by;
             protected boolean distinct;
             protected List<Variable> groupColumn;
             public SelectBuilderBase() {
                 this.columns = new ArrayList<>();
-...
+            }
             @Override
             public SelectBuilder group_by(Variable... columns) {
                 if( this.groupColumn==null ) {
                     this.groupColumn = new ArrayList<>();
+                }
                 for (Variable column : columns) {
                     this.groupColumn.add(column);
+                }
                 return this;
+            }
             @Override
             public void accept(Visitor visitor, VisitorFilter filter) {
                 if (filter.accept(this)) {
                     visitor.visit(this);
-...
+                }
                 return !this.order_by.isEmpty();
+            }
             @Override
             public boolean has_group_by() {
                 if (this.groupColumn == null) {
                     return false;
+                }
                 return !this.groupColumn.isEmpty();
+            }
             protected boolean isValid(StringBuilder message) {
                 if (message == null) {
                     message = new StringBuilder();
-...
                     builder.append(" FROM ");
                     builder.append(this.from.toString(formatter));
+                }
                 if( this.has_group_by() ) {
                     builder.append(" GROUP BY ");
                     builder.append(this.groupColumn.get(0).name());
                     for (int i = 1; i < groupColumn.size(); i++) {
                         builder.append(", ");
                         builder.append(this.groupColumn.get(i).name());
+                    }
+                }
                 if (this.has_where()) {
                     builder.append(" WHERE ");
                     builder.append(this.where.toString(formatter));

Application: gvSIG desktop

Revision 44349