Revision 774 2.1/trunk/org.gvsig.view3d/org.gvsig.view3d.vector/org.gvsig.view3d.vector.lib/org.gvsig.view3d.vector.lib.impl/src/main/java/org/gvsig/view3d/vector/lib/impl/vector/DefaultVectorLoader.java

View differences:

DefaultVectorLoader.java
23 23
 */
24 24
package org.gvsig.view3d.vector.lib.impl.vector;
25 25

  
26
import org.gvsig.fmap.dal.exception.DataException;
27 26
import org.gvsig.fmap.dal.feature.FeatureStore;
28
import org.gvsig.fmap.dal.feature.FeatureType;
29
import org.gvsig.fmap.geom.Geometry.TYPES;
30
import org.gvsig.fmap.geom.type.GeometryType;
31 27
import org.gvsig.fmap.mapcontext.layers.FLayer;
32 28
import org.gvsig.fmap.mapcontext.layers.vectorial.FLyrVect;
33 29
import org.gvsig.fmap.mapcontext.rendering.legend.IVectorLegend;
......
65 61
        if (layerVect.getLegend() instanceof IVectorLegend) {
66 62
            vectorLegend = (IVectorLegend) layerVect.getLegend();
67 63
        }
68
        
69
        FeatureType featureType = null;
70
        try {
71
            featureType = featureStore.getDefaultFeatureType();
72
        } catch (DataException e) {
73
            throw new LoadException(String.format("feature type of %1s", featureStore.getFullName()), e);
74
        }
75
        
76
        GeometryType geomType = featureType.getDefaultGeometryAttribute().getGeomType();
77
        if(geomType.isTypeOf(TYPES.LINE) || geomType.isTypeOf(TYPES.MULTILINE)) {
78
            return new DefaultVectorLineRenderableLayer((VectorLoaderParameters) parameters, featureStore, vectorLegend);
79
        } else if(geomType.isTypeOf(TYPES.POINT) || geomType.isTypeOf(TYPES.MULTIPOINT)) {
80
            return new DefaultVectorPointRenderableLayer((VectorLoaderParameters) parameters, featureStore, vectorLegend);
81
        } else if(geomType.isTypeOf(TYPES.POLYGON) || geomType.isTypeOf(TYPES.MULTIPOLYGON)) {
82
            return new DefaultVectorPolygonRenderableLayer((VectorLoaderParameters) parameters, featureStore, vectorLegend);
83
        } else {
84
            return new DefaultGeometryRenderableLayer()
85
        }
64
        return new DefaultVectorRenderableLayer((VectorLoaderParameters) parameters, featureStore, vectorLegend);
86 65
    }
87 66
}

Also available in: Unified diff