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

View differences:

SimpleFill.java
135 135
import javax.swing.event.ChangeEvent;
136 136
import javax.swing.event.ChangeListener;
137 137

  
138
import org.gvsig.fmap.core.shapes.FShape;
138
import org.gvsig.fmap.geom.Geometry;
139 139
import org.gvsig.fmap.mapcontext.rendering.symbols.ILineSymbol;
140 140
import org.gvsig.fmap.mapcontext.rendering.symbols.ISymbol;
141 141
import org.gvsig.fmap.mapcontext.rendering.symbols.SimpleFillSymbol;
......
205 205
		aux.addComponent(PluginServices.getText(this, "fill_color"), jccFillColor);
206 206

  
207 207
		JPanel aux2 = new JPanel();
208
		btnOutline = new JSymbolPreviewButton(FShape.LINE);
208
		btnOutline = new JSymbolPreviewButton(Geometry.TYPES.CURVE);
209 209
		btnOutline.setPreferredSize(new Dimension(100, 35));
210 210
		aux2.add(btnOutline);
211 211

  
......
233 233

  
234 234
	public ISymbol getLayer() {
235 235
		SimpleFillSymbol layer = new SimpleFillSymbol();
236
		
236

  
237 237
		layer.setHasOutline(useBorder.isSelected());
238 238
		outline = (ILineSymbol) btnOutline.getSymbol();
239 239

  
......
243 243
		}
244 244

  
245 245
		layer.setOutline(outline);
246
		
246

  
247 247
		layer.setHasFill(jccFillColor.getUseColorisSelected());
248 248
		Color c = jccFillColor.getColor();
249 249
		if (c != null)
250 250
			c = new Color(c.getRed(), c.getGreen(), c.getBlue(), c.getAlpha());
251 251
		layer.setFillColor(c);
252
		
252

  
253 253
		return layer;
254 254
	}
255 255

  
......
274 274
				outline=sym.getOutline();
275 275
				btnOutline.setSymbol(outline);
276 276
				useBorder.setSelected(sym.hasOutline());
277
	
277

  
278 278
				if (outline != null) {
279 279
					outlineAlpha = outline.getAlpha();
280 280
					sldOutlineTransparency.setValue((int)((outlineAlpha/255D)*100));
......
308 308
			if (sym instanceof ILineSymbol) {
309 309
				ILineSymbol outline = (ILineSymbol) sym;
310 310
				if (outline != null)
311
					txtOutlineWidth.setDouble(outline.getLineWidth());	
311
					txtOutlineWidth.setDouble(outline.getLineWidth());
312 312
			}
313
			
313

  
314 314
		}
315 315

  
316 316

  

Also available in: Unified diff