Revision 88
| org.gvsig.lrs/trunk/org.gvsig.lrs/org.gvsig.lrs.swing/org.gvsig.lrs.swing.impl/src/main/java/org/gvsig/lrs/swing/impl/JLrsUtils.java | ||
|---|---|---|
| 129 | 129 |
if (!correctCurveLayerFound) {
|
| 130 | 130 |
logger.debug( |
| 131 | 131 |
"Finding a M curve layer with at least one non-geometrical field"); |
| 132 |
if (lyrVect.getGeometryType().isSubTypeOf(Geometry.SUBTYPES.GEOM2DM) |
|
| 133 |
|| lyrVect.getGeometryType().isSubTypeOf(Geometry.SUBTYPES.GEOM3DM)) {
|
|
| 132 |
GeometryType geometryType = lyrVect.getGeometryType(); |
|
| 133 |
if (geometryType != null && (geometryType.isSubTypeOf(Geometry.SUBTYPES.GEOM2DM) |
|
| 134 |
|| geometryType.isSubTypeOf(Geometry.SUBTYPES.GEOM3DM))) {
|
|
| 134 | 135 |
|
| 135 | 136 |
correctCurveLayerFound = CurveLayerFoundWithOneNonGeomField(lyrVect); |
| 136 | 137 |
} |
| ... | ... | |
| 191 | 192 |
*/ |
| 192 | 193 |
private static boolean CurveLayerFoundWithOneNonGeomField(FLyrVect lyrVect) throws ReadException{
|
| 193 | 194 |
boolean correctCurveLayerFound = false; |
| 194 |
if (lyrVect!=null&&(lyrVect.getGeometryType().isTypeOf(Geometry.TYPES.CURVE) |
|
| 195 |
|| lyrVect.getGeometryType() |
|
| 195 |
GeometryType geometryType = lyrVect.getGeometryType(); |
|
| 196 |
if (lyrVect!=null && geometryType!=null && (geometryType.isTypeOf(Geometry.TYPES.CURVE) |
|
| 197 |
|| geometryType |
|
| 196 | 198 |
.isTypeOf(Geometry.TYPES.MULTICURVE))) {
|
| 197 | 199 |
|
| 198 | 200 |
FeatureStore featureStore = lyrVect.getFeatureStore(); |
| ... | ... | |
| 227 | 229 |
*/ |
| 228 | 230 |
private static boolean isPointLayerWithNonGeomAndNumericFields(FLyrVect lyrVect) throws ReadException{
|
| 229 | 231 |
boolean correctPointLayerFound=false; |
| 230 |
if (lyrVect!=null&&(lyrVect.getGeometryType().isTypeOf(Geometry.TYPES.POINT) |
|
| 231 |
|| lyrVect.getGeometryType().isTypeOf(Geometry.TYPES.MULTIPOINT))) {
|
|
| 232 |
GeometryType geometryType = lyrVect.getGeometryType(); |
|
| 233 |
if (lyrVect!=null && geometryType!=null && (geometryType.isTypeOf(Geometry.TYPES.POINT) |
|
| 234 |
|| geometryType.isTypeOf(Geometry.TYPES.MULTIPOINT))) {
|
|
| 232 | 235 |
FeatureStore featureStore = lyrVect.getFeatureStore(); |
| 233 | 236 |
try {
|
| 234 | 237 |
FeatureType type = featureStore.getDefaultFeatureType(); |
| ... | ... | |
| 286 | 289 |
try {
|
| 287 | 290 |
if (lyrVect != null) {
|
| 288 | 291 |
GeometryType layerGeometryType = lyrVect.getGeometryType(); |
| 289 |
if (((layerGeometryType.isTypeOf(Geometry.TYPES.CURVE) || layerGeometryType
|
|
| 290 |
.isTypeOf(Geometry.TYPES.MULTICURVE)))
|
|
| 291 |
&& (layerGeometryType.isSubTypeOf(Geometry.SUBTYPES.GEOM2DM) || layerGeometryType |
|
| 292 |
if (layerGeometryType!=null && (
|
|
| 293 |
(layerGeometryType.isTypeOf(Geometry.TYPES.CURVE) || layerGeometryType.isTypeOf(Geometry.TYPES.MULTICURVE))
|
|
| 294 |
) && (layerGeometryType.isSubTypeOf(Geometry.SUBTYPES.GEOM2DM) || layerGeometryType
|
|
| 292 | 295 |
.isSubTypeOf(Geometry.SUBTYPES.GEOM3DM))) {
|
| 293 | 296 |
FeatureStore featureStore = lyrVect.getFeatureStore(); |
| 294 | 297 |
try {
|
| ... | ... | |
| 369 | 372 |
try {
|
| 370 | 373 |
if (lyrVect != null) {
|
| 371 | 374 |
|
| 372 |
if ((lyrVect.getGeometryType().isTypeOf(Geometry.TYPES.CURVE) || lyrVect.getGeometryType().isTypeOf( |
|
| 375 |
GeometryType geometryType = lyrVect.getGeometryType(); |
|
| 376 |
if (geometryType!=null && (geometryType.isTypeOf(Geometry.TYPES.CURVE) || geometryType.isTypeOf( |
|
| 373 | 377 |
Geometry.TYPES.MULTICURVE)) |
| 374 |
&& (lyrVect.getGeometryType().isSubTypeOf(Geometry.SUBTYPES.GEOM2DM) || lyrVect.getGeometryType()
|
|
| 378 |
&& (geometryType.isSubTypeOf(Geometry.SUBTYPES.GEOM2DM) || geometryType
|
|
| 375 | 379 |
.isSubTypeOf(Geometry.SUBTYPES.GEOM3DM))) {
|
| 376 | 380 |
// At least a feature must be selected |
| 377 | 381 |
return hasSelectedFeatures(lyrVect); |
Also available in: Unified diff