Revision 45008 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/JDBCStoreProviderBase.java

View differences:

JDBCStoreProviderBase.java
470 470
            );
471 471
        fetchFeatureType.perform();
472 472

  
473
        if( !StringUtils.isBlank(params.getDefaultGeometryField()) ) {
474
            if( !params.getDefaultGeometryField().equalsIgnoreCase(type.getDefaultGeometryAttributeName()) ) {
475
                type.setDefaultGeometryAttributeName(params.getDefaultGeometryField());
476
                EditableFeatureAttributeDescriptor attr = (EditableFeatureAttributeDescriptor) type.getDefaultGeometryAttribute();
477
                attr.setGeometryType(Geometry.TYPES.GEOMETRY, Geometry.SUBTYPES.GEOM2D);
473
        if (!StringUtils.isBlank(params.getDefaultGeometryField())) {
474
            if (!params.getDefaultGeometryField().equalsIgnoreCase(type.getDefaultGeometryAttributeName())) {
475
                if (type.getAttributeDescriptor(params.getDefaultGeometryField()) != null) {
476
                    type.setDefaultGeometryAttributeName(params.getDefaultGeometryField());
477
                } else {
478
                    type.setDefaultGeometryAttributeName(null);
479
                }
480
                if (type.getDefaultGeometryAttribute() != null) {
481
                    EditableFeatureAttributeDescriptor attr = (EditableFeatureAttributeDescriptor) type.getDefaultGeometryAttribute();
482
                    attr.setGeometryType(Geometry.TYPES.GEOMETRY, Geometry.SUBTYPES.GEOM2D);
483
                }
484
            } else {
485
                type.setDefaultGeometryAttributeName(null);
478 486
            }
479 487
        }
488
        
480 489
        FeatureType defaultType = type.getNotEditableCopy();
481 490
        List<FeatureType> types = Collections.singletonList(defaultType);
482 491
        this.getStoreServices().setFeatureTypes(types, defaultType);

Also available in: Unified diff