Revision 45968 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.impl/src/main/java/org/gvsig/fmap/dal/feature/impl/DefaultFeatureAttributeDescriptor.java

View differences:

DefaultFeatureAttributeDescriptor.java
166 166
    private int relationType = RELATION_TYPE_NONE;
167 167
    protected Locale locale;
168 168
    protected int displaySize;
169
    
170
    protected String defaultFormat;
169 171

  
170 172
    public DefaultFeatureAttributeDescriptor() {
171 173
        // Usada en la persistencia
......
775 777
        availableValuesExpression = (Expression) state.get("availableValuesExpression");
776 778
        avoidCachingAvailableValues = state.getBoolean("avoidCachingAvailableValues", false);
777 779
        availableValuesCache = null;
778

  
780
        defaultFormat = state.getString("defaultFormat");
779 781
    }
780 782

  
781 783
    @Override
......
864 866
        state.set("displaySize", displaySize);
865 867
        state.set("availableValuesExpression", availableValuesExpression);
866 868
        state.set("avoidCachingAvailableValues", avoidCachingAvailableValues);
869
        state.set("defaultFormat", defaultFormat);
867 870
    }
868 871

  
869 872
    private static final String FEATATTRDESC_PERSISTENCE_DEFINITION_NAME = "FeatureAttributeDescriptor";
......
934 937
            definition.addDynFieldObject("availableValuesExpression")
935 938
                    .setClassOfValue(Expression.class)
936 939
                    .setMandatory(false);
940
            definition.addDynFieldString("defaultFormat").setMandatory(false);
937 941
        }
938 942
    }
939 943

  
......
2233 2237
        builder.add("tags", tags);
2234 2238
        builder.add("availableValues", availableValues);
2235 2239
        builder.add("additionalInfo", this.additionalInfo);
2240
        builder.add("defaultFormat", this.defaultFormat);
2236 2241
        return builder;
2237 2242
    }
2238 2243

  
......
2291 2296
        } else {
2292 2297
            this.foreingKey = null;
2293 2298
        }
2299
        this.description = json.getString("defaultFormat",null);
2294 2300
    }
2295 2301

  
2296 2302
    private static class TheJsonSerializer implements JsonManager.JsonSerializer {
......
2321 2327
        Json.registerSerializer(new TheJsonSerializer());
2322 2328
    }
2323 2329

  
2330
    @Override
2331
    public String getDefaultFormat() {
2332
        return this.defaultFormat;
2333
    }
2334

  
2335
    @Override
2336
    public String format(Object value) {
2337
        try {
2338
            if( this.defaultFormat == null ) {
2339
                return DataTypeUtils.toString(value, Objects.toString(value, ""));
2340
            }
2341
            return String.format(this.defaultFormat, value);
2342
        } catch(Exception ex) {
2343
            return Objects.toString(value, "");
2344
        }
2345
    }
2346

  
2347
    
2324 2348
}

Also available in: Unified diff