Revision 45154 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/DefaultFeatureType.java
DefaultFeatureType.java | ||
---|---|---|
23 | 23 |
*/ |
24 | 24 |
package org.gvsig.fmap.dal.feature.impl; |
25 | 25 |
|
26 |
import org.gvsig.fmap.dal.JsonUtils; |
|
26 | 27 |
import java.io.File; |
27 | 28 |
import java.lang.ref.WeakReference; |
28 | 29 |
import java.util.ArrayList; |
... | ... | |
36 | 37 |
import java.util.Set; |
37 | 38 |
import java.util.function.Predicate; |
38 | 39 |
import java.util.zip.CRC32; |
40 |
import javax.json.Json; |
|
41 |
import javax.json.JsonObject; |
|
42 |
import javax.json.JsonObjectBuilder; |
|
39 | 43 |
import org.apache.commons.lang3.ArrayUtils; |
40 | 44 |
import org.apache.commons.lang3.StringUtils; |
41 | 45 |
|
... | ... | |
106 | 110 |
private String description; |
107 | 111 |
private String label; |
108 | 112 |
private Tags tags; |
109 |
// private List<FeatureAttributeDescriptor> descriptors; |
|
110 |
private FeatureExtraColumns extraColumn; |
|
113 |
private FeatureExtraColumns extraColumns; |
|
111 | 114 |
|
112 | 115 |
public DefaultFeatureType() { |
113 | 116 |
// Usado en la persistencia. |
... | ... | |
122 | 125 |
this.defaultTimeAttributeIndex = -1; |
123 | 126 |
this.allowAtomaticValues = false; |
124 | 127 |
this.tags = new DefaultTags(); |
125 |
this.extraColumn = new DefaultFeatureExtraColumns(); |
|
128 |
this.extraColumns = new DefaultFeatureExtraColumns();
|
|
126 | 129 |
} |
127 | 130 |
|
128 | 131 |
protected DefaultFeatureType(FeatureStore store, String id) { |
... | ... | |
189 | 192 |
this.internalID = other.internalID; |
190 | 193 |
this.label = other.label; |
191 | 194 |
this.description = other.description; |
192 |
this.extraColumn = other.extraColumn.getCopy();
|
|
195 |
this.extraColumns = other.extraColumns.getCopy();
|
|
193 | 196 |
try { |
194 | 197 |
this.tags = (Tags) other.tags.clone(); |
195 | 198 |
} catch (CloneNotSupportedException ex) { |
... | ... | |
410 | 413 |
|
411 | 414 |
@Override |
412 | 415 |
public FeatureExtraColumns getExtraColumns() { |
413 |
return extraColumn; |
|
416 |
return extraColumns;
|
|
414 | 417 |
} |
415 | 418 |
|
416 | 419 |
public void setExtraColumn(FeatureExtraColumns extraColumn) { //List<FeatureAttributeDescriptor> descriptors) { |
417 |
this.extraColumn = extraColumn; |
|
420 |
this.extraColumns = extraColumn;
|
|
418 | 421 |
} |
419 | 422 |
|
420 | 423 |
class SubtypeFeatureType extends DefaultFeatureType { |
... | ... | |
1271 | 1274 |
throw new RuntimeException("Can't write as DAL file ("+Objects.toString(file)+").", ex); |
1272 | 1275 |
} |
1273 | 1276 |
} |
1277 |
|
|
1278 |
@Override |
|
1279 |
public JsonObject toJson() { |
|
1280 |
return this.toJsonBuilder().build(); |
|
1281 |
} |
|
1282 |
|
|
1283 |
@Override |
|
1284 |
public JsonObjectBuilder toJsonBuilder() { |
|
1285 |
JsonObjectBuilder builder = Json.createObjectBuilder(); |
|
1286 |
JsonUtils.builder_add(builder, "id",id); |
|
1287 |
JsonUtils.builder_add(builder, "internalID",internalID); |
|
1288 |
JsonUtils.builder_add(builder, "label",label); |
|
1289 |
JsonUtils.builder_add(builder, "description",description); |
|
1290 |
JsonUtils.builder_add(builder, "allowAtomaticValues",allowAtomaticValues); |
|
1291 |
JsonUtils.builder_add(builder, "hasOID",hasOID); |
|
1292 |
JsonUtils.builder_add(builder, "defaultGeometryAttributeName",defaultGeometryAttributeName); |
|
1293 |
JsonUtils.builder_add(builder, "defaultTimeAttributeName",defaultTimeAttributeName); |
|
1294 |
JsonUtils.builder_add(builder, "tags", tags); |
|
1295 |
JsonUtils.builder_add(builder, "extraColumns", this.extraColumns); |
|
1296 |
JsonUtils.builder_add(builder, "descriptors", this); |
|
1297 |
|
|
1298 |
return builder; |
|
1299 |
} |
|
1274 | 1300 |
} |
Also available in: Unified diff