Revision 21299 branches/v2_0_0_prep/applications/appgvSIG/src/com/iver/cit/gvsig/gui/styling/SymbolEditor.java

View differences:

SymbolEditor.java
175 175
import javax.swing.JPanel;
176 176
import javax.swing.JTabbedPane;
177 177

  
178
import org.gvsig.fmap.core.shapes.FShape;
178
import org.gvsig.fmap.geom.Geometry;
179 179
import org.gvsig.fmap.mapcontext.rendering.symbols.CartographicSupport;
180 180
import org.gvsig.fmap.mapcontext.rendering.symbols.FSymbol;
181 181
import org.gvsig.fmap.mapcontext.rendering.symbols.IMultiLayerSymbol;
......
230 230
	 */
231 231
	public SymbolEditor(ISymbol symbol, int shapeType) {
232 232
//////////	/-------------------------------------
233
		if (shapeType == FShape.TEXT) {
233
		if (shapeType == Geometry.TYPES.TEXT) {
234 234
			this.symbol = symbol == null ? new SimpleTextSymbol(): symbol;
235 235
		} else {
236 236
//////////	/-------------------------------------
......
254 254
			} else {
255 255
				this.symbol = symbol;
256 256
			}
257
			
257

  
258 258
			// apply units and reference system to comboboxes
259 259
			if (this.symbol instanceof CartographicSupport) {
260 260
				CartographicSupport cs = (CartographicSupport) this.symbol;
261 261
				getCmbUnits().setSelectedUnitIndex(cs.getUnit());
262 262
				getCmbUnitsReferenceSystem().
263 263
					setSelectedIndex(cs.getReferenceSystem());
264
				
264

  
265 265
			}
266
			
266

  
267 267
		}
268 268
		this.oldSymbolProperties = this.symbol.getXMLEntity();
269 269
		this.shapeType = shapeType;
......
405 405
		return wi;
406 406
	}
407 407

  
408
	public ISymbol getSymbol() { 
408
	public ISymbol getSymbol() {
409 409
		if (symbol instanceof CartographicSupport) {
410 410
			CartographicSupport cs = (CartographicSupport) symbol;
411 411
			cs.setUnit(getUnit());
......
572 572
	public int getUnit() {
573 573
		return getCmbUnits().getSelectedUnitIndex();
574 574
	}
575
	
575

  
576 576
	public int getReferenceSystem() {
577 577
		return getCmbUnitsReferenceSystem().getSelectedIndex();
578 578
	}

Also available in: Unified diff