Revision 43511 trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.labeling.app/org.gvsig.labeling.app.mainplugin/src/main/java/org/gvsig/labeling/placements/MultiShapePlacement.java

View differences:

MultiShapePlacement.java
72 72 
				(MultiShapePlacementConstraints) placementConstraints;
73 73 

  		




  74
  74
  
    
		GeometryType gt = geom.getGeometryType();


  		




  75
  
  
    
		if (gt.getType() == TYPES.POINT || gt.getType() == TYPES.MULTIPOINT) {


  		




  76
  
  
    
			if (pointPlacement != null) {


  		




  77
  
  
    
				return pointPlacement.guess(lc, geom, pc.getPointConstraints(), cartographicSymbolSize, cancel,vp);


  		




  78
  
  
    
			}


  		




  79
  
  
    
		} else {


  		




  80
  
  
    
			if (gt.isTypeOf(TYPES.CURVE) || gt.getType() == TYPES.MULTICURVE) {


  		




  81
  
  
    
				if (linePlacement != null) {


  		




  82
  
  
    
					return linePlacement.guess(lc, geom, pc.getLineConstraints(), cartographicSymbolSize, cancel,vp);


  		




  83
  
  
    
				}


  		




  84
  
  
    
			} else {


  		




  85
  
  
    
				if (gt.isTypeOf(TYPES.SURFACE) || gt.getType() == TYPES.MULTISURFACE) {


  		




  86
  
  
    
					if (polygonPlacement != null) {


  		




  87
  
  
    
						return polygonPlacement.guess(lc, geom, pc.getPolygonConstraints(), cartographicSymbolSize, cancel,vp);


  		




  88
  
  
    
					}


  		




  89
  
  
    
				}


  		




  90
  
  
    
			}


  		




  91
  
  
    
		}


  		




  92
  
  
    
		return CannotPlaceLabel.NO_PLACES;


  		




  
  75
  
    
        if( gt.isTypeOf(TYPES.POINT) || gt.isTypeOf(TYPES.MULTIPOINT) ) {


  		




  
  76
  
    
            if( pointPlacement != null ) {


  		




  
  77
  
    
                return pointPlacement.guess(lc, geom, pc.getPointConstraints(), cartographicSymbolSize, cancel, vp);


  		




  
  78
  
    
            }


  		




  
  79
  
    
        } else if( gt.isTypeOf(TYPES.CURVE) || gt.isTypeOf(TYPES.MULTICURVE) ) {


  		




  
  80
  
    
            if( linePlacement != null ) {


  		




  
  81
  
    
                return linePlacement.guess(lc, geom, pc.getLineConstraints(), cartographicSymbolSize, cancel, vp);


  		




  
  82
  
    
            }


  		




  
  83
  
    

  		




  
  84
  
    
        } else if( gt.isTypeOf(TYPES.SURFACE) || gt.isTypeOf(TYPES.MULTISURFACE) ) {


  		




  
  85
  
    
            if( polygonPlacement != null ) {


  		




  
  86
  
    
                return polygonPlacement.guess(lc, geom, pc.getPolygonConstraints(), cartographicSymbolSize, cancel, vp);


  		




  
  87
  
    
            }


  		




  
  88
  
    

  		




  
  89
  
    
        }


  		




  
  90
  
    
        return CannotPlaceLabel.NO_PLACES;


  		




  93
  91
  
    
	}


  		




  94
  92
  
    

  		




  95
  93
  
    
    @Override


  		












Also available in:  Unified diff