/ - Diff - Application: gvSIG desktop - gvSIG

                 StringUtils.defaultIfBlank(this.txtDescription.getText(), null)
             );
             this.tagsController.fetch(type.getTags());
             type.setCheckFeaturesAtInsert(this.chkRulesValidateFeatureBeforeInsert.isSelected());
             type.setCheckFeaturesAtFinishEditing(this.chkRulesValidateFeaturesAtFinishEditing.isSelected());
             return type;
+        }
-...
             if (type == null) {
                 this.store = null;
                 this.rulesController.setModel(new FeatureRulesModel());
                 this.chkRuleCheckAtFinishEditing.setSelected(false);
                 this.chkRuleCheckAtUpdate.setSelected(true);
                 this.chkRulesValidateFeatureBeforeInsert.setSelected(true);
                 this.chkRulesValidateFeaturesAtFinishEditing.setSelected(false);
             } else {
                 FeatureType ftypeToCompare = type.getOriginalFeatureType();
                 if (ftypeToCompare == null) {
-...
                 this.originalFeatureType = ftypeToCompare.getCopy();
                 this.featureType = (EditableFeatureType) type.getCopy();
                 this.rulesController.setModel(new FeatureRulesModel(this.featureType.getRules()));
                 this.chkRuleCheckAtFinishEditing.setSelected(type.isCheckFeaturesAtFinishEditing());
                 this.chkRuleCheckAtUpdate.setSelected(type.isCheckFeaturesAtInsert());
                 this.chkRulesValidateFeatureBeforeInsert.setSelected(type.isCheckFeaturesAtInsert());
                 this.chkRulesValidateFeaturesAtFinishEditing.setSelected(type.isCheckFeaturesAtFinishEditing());
                 // Nos quedamos una referencia para evitar que se destruya, ya que
                 // el featureType se guarda solo una WeakReference.
                 this.store = type.getStore();

             this.availableValues = (DynObjectValueItem[]) Json.toArray(json, "availableValues", new DynObjectValueItem[0]);
             this.dataProfile = json.getString("dataProfile", null);
             try {
                 this.defaultValue = this.coerce(json.getString("defaultValue", null));
                 this.defaultValue = json.getString("defaultValue", null);
                 if(!ExpressionUtils.isDynamicText((String) this.defaultValue)){
                     this.defaultValue = this.coerce(this.defaultValue);
+                }
             } catch (Exception ex) {
                 LOGGER.warn("Can't retrive default value for attribute '" + this.name + "'.", ex);
+            }

         @Override
         public void copyFrom(JsonObject values, Predicate<FeatureAttributeDescriptor> filter) {
           // iterate over the attributes and copy one by one
           boolean geometryCopied = false;
             for (FeatureAttributeDescriptor attr : this.getType()) {
                 if (attr==null  ) {
                     continue;
-...
                             switch(attr.getType()) {
                                 case DataTypes.GEOMETRY:
                                     value = GeometryUtils.createFrom(s);
                                     geometryCopied = true;
                                     break;
                                 case DataTypes.TIMESTAMP:
                                     try {
-...
                     // Ignore
+                }
+            }
             if (this.getType().getDefaultGeometryAttribute()!=null && this.getDefaultGeometry()==null) {
                 GeometryType geomType = this.getType().getDefaultGeometryAttribute().getGeomType();
                 Set<String> keys = values.keySet();
                 for (String key : keys) {
                     try {
                         String wkt = values.getString(key);
                         Geometry geometry = GeometryUtils.createFrom(wkt);
                         if (GeometryUtils.isSubtype(geomType.getType(), geometry.getType()) || GeometryUtils.canAggregate(geomType.getType(), geometry.getType())) {
                             this.setDefaultGeometry(geometry);
                             break;
+                        }
                     } catch (Throwable tr) {
                         LOG.trace("Can't get geometry from field {}.", new Object[]{key});
                     };
             FeatureAttributeDescriptor attr = this.getType().getDefaultGeometryAttribute();
             if (attr!=null && !geometryCopied) {
                 if( filter==null || filter.test(attr) ) {
                     GeometryType geomType = this.getType().getDefaultGeometryAttribute().getGeomType();
                     Set<String> keys = values.keySet();
                     for (String key : keys) {
                         try {
                             String wkt = values.getString(key);
                             Geometry geometry = GeometryUtils.createFrom(wkt);
                             if (GeometryUtils.isSubtype(geomType.getType(), geometry.getType()) || GeometryUtils.canAggregate(geomType.getType(), geometry.getType())) {
                                 this.setDefaultGeometry(geometry);
                                 break;
+                            }
                         } catch (Throwable tr) {
                             LOG.trace("Can't get geometry from field {}.", new Object[]{key});
                         };
+                    }
+                }
+            }
+        }

             this.allowAtomaticValues = false;
             this.tags = new DefaultTags();
             this.extraColumns = new DefaultFeatureExtraColumns();
             this.checkFeaturesAtFinishEditing = true;
             this.checkFeaturesAtFinishEditing = false;
             this.checkFeaturesAtInsert = true;
+        }

             preferredSize.height += ToolsSwingUtils.rows2px(4);
             preferredSize.width += ToolsSwingUtils.cols2px(2);
             ToolsSwingUtils.ensureRowsCols(fopen, -1, -1, 30, 100);
             fopen.setPreferredSize(preferredSize);
             application.message(null,JOptionPane.INFORMATION_MESSAGE);

             this.setLayout(new BorderLayout());
             this.add(this.view, BorderLayout.CENTER);
             ToolsSwingUtils.ensureRowsCols(this, 30, 90);
             ToolsSwingUtils.ensureRowsCols(this, 22, 90, 25, 100);
+        }
         private void initializePickerConnection() {

                     Object value = interpreter.run(code);
                     values[i] = Objects.toString(value, "");
                 } else {
                     Code code = compiler.compileExpression(theSource.substring(1));
                     Code code = compiler.compileExpression(theSource.substring(0));
                     writer.getBuffer().setLength(0);
                     interpreter.run(code);
                     values[i] = writer.toString();

Application: gvSIG desktop

Revision 45778