Revision 43510 trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.symbology/org.gvsig.symbology.swing/org.gvsig.symbology.swing.api/src/main/java/org/gvsig/app/gui/styling/MultiShapeSymbolSelector.java

View differences:

MultiShapeSymbolSelector.java
98 98 
    private MultiShapeSymbolSelector() throws BaseException {
99 99 

  		




  100
  100
  
    
        GeometryType


  		




  101
  
  
    
        gt = getGeomManager().getGeometryType(Geometry.TYPES.POINT,


  		




  102
  
  
    
            SUBTYPES.GEOM2D);


  		




  
  101
  
    
        gt = getGeomManager().getGeometryType(Geometry.TYPES.POINT, SUBTYPES.GEOM2D);


  		




  103
  102
  
    
        markerSelector = new SymbolSelectorBrowser(gt, true);


  		




  104
  
  
    
        gt = getGeomManager().getGeometryType(Geometry.TYPES.CURVE,


  		




  105
  
  
    
            SUBTYPES.GEOM2D);


  		




  
  103
  
    
        gt = getGeomManager().getGeometryType(Geometry.TYPES.CURVE, SUBTYPES.GEOM2D);


  		




  106
  104
  
    
        lineSelector = new SymbolSelectorBrowser(gt, true);


  		




  107
  
  
    
        gt = getGeomManager().getGeometryType(Geometry.TYPES.SURFACE,


  		




  108
  
  
    
            SUBTYPES.GEOM2D);


  		




  
  105
  
    
        gt = getGeomManager().getGeometryType(Geometry.TYPES.SURFACE, SUBTYPES.GEOM2D);


  		




  109
  106
  
    
        fillSelector = new SymbolSelectorBrowser(gt, true);


  		




  110
  107
  
    

  		




  111
  108
  
    
        initialize(true);


  		




  ......




  116
  113
  
    
		this.wi = wi;


  		




  117
  114
  
    
	}


  		




  118
  115
  
    
	


  		




  119
  
  
    
	MultiShapeSymbolSelector(Object currSymbol) {


  		




  120
  
  
    
                IMultiShapeSymbol sym = null;


  		




  121
  
  
    
                try {


  		




  122
  
  
    
                    sym = (IMultiShapeSymbol) currSymbol;


  		




  123
  
  
    
                } catch(Exception ex) {


  		




  124
  
  
    
                    logger.warn("Incorrect symbol type, use default.",ex);


  		




  125
  
  
    
                }


  		




  126
  
  
    
		if (sym == null) {


  		




  127
  
  
    
			markerSelector = (SymbolSelector) SymbolSelector


  		




  128
  
  
    
					.createSymbolSelector(null, Geometry.TYPES.POINT);


  		




  129
  
  
    
			lineSelector = (SymbolSelector) SymbolSelector


  		




  130
  
  
    
					.createSymbolSelector(null, Geometry.TYPES.CURVE);


  		




  131
  
  
    
			fillSelector = (SymbolSelector) SymbolSelector


  		




  132
  
  
    
					.createSymbolSelector(null, Geometry.TYPES.SURFACE);


  		




  133
  
  
    
		} else {


  		




  134
  
  
    
			markerSelector = (SymbolSelector) SymbolSelector


  		




  135
  
  
    
					.createSymbolSelector(sym.getMarkerSymbol(),


  		




  136
  
  
    
							Geometry.TYPES.POINT);


  		




  137
  
  
    
			lineSelector = (SymbolSelector) SymbolSelector


  		




  138
  
  
    
					.createSymbolSelector(sym.getLineSymbol(),


  		




  139
  
  
    
							Geometry.TYPES.CURVE);


  		




  140
  
  
    
			fillSelector = (SymbolSelector) SymbolSelector


  		




  141
  
  
    
					.createSymbolSelector(sym.getFillSymbol(),


  		




  142
  
  
    
							Geometry.TYPES.SURFACE);


  		




  143
  
  
    
		}


  		




  144
  
  
    
		initialize(false);


  		




  145
  
  
    
	}


  		




  
  116
  
    
    MultiShapeSymbolSelector(Object currSymbol) {


  		




  
  117
  
    
        IMultiShapeSymbol sym = null;


  		




  
  118
  
    
        try {


  		




  
  119
  
    
            sym = (IMultiShapeSymbol) currSymbol;


  		




  
  120
  
    
        } catch (Exception ex) {


  		




  
  121
  
    
            logger.warn("Incorrect symbol type, use default.", ex);


  		




  
  122
  
    
        }


  		




  
  123
  
    
        if( sym == null ) {


  		




  
  124
  
    
            markerSelector = (SymbolSelector) SymbolSelector.createSymbolSelector(null, Geometry.TYPES.POINT);


  		




  
  125
  
    
            lineSelector = (SymbolSelector) SymbolSelector.createSymbolSelector(null, Geometry.TYPES.CURVE);


  		




  
  126
  
    
            fillSelector = (SymbolSelector) SymbolSelector.createSymbolSelector(null, Geometry.TYPES.SURFACE);


  		




  
  127
  
    
        } else {


  		




  
  128
  
    
            markerSelector = (SymbolSelector) SymbolSelector.createSymbolSelector(sym.getMarkerSymbol(), Geometry.TYPES.POINT);


  		




  
  129
  
    
            lineSelector = (SymbolSelector) SymbolSelector.createSymbolSelector(sym.getLineSymbol(), Geometry.TYPES.CURVE);


  		




  
  130
  
    
            fillSelector = (SymbolSelector) SymbolSelector.createSymbolSelector(sym.getFillSymbol(), Geometry.TYPES.SURFACE);


  		




  
  131
  
    
        }


  		




  
  132
  
    
        initialize(false);


  		




  
  133
  
    
    }


  		




  146
  134
  
    

  		




  147
  135
  
    

  		




  148
  136
  
    
	private void initialize(boolean add_close_button) {


  		












Also available in:  Unified diff