Revision 28367 trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/core/symbols/SimpleFillSymbol.java

View differences:

SimpleFillSymbol.java
129 129

  
130 130
import javax.print.attribute.PrintRequestAttributeSet;
131 131

  
132
import com.hardcode.gdbms.driver.exceptions.ReadDriverException;
133 132
import com.iver.cit.gvsig.fmap.MapContext;
134 133
import com.iver.cit.gvsig.fmap.core.FPolygon2D;
135 134
import com.iver.cit.gvsig.fmap.core.FShape;
......
206 205
	}
207 206

  
208 207
	public void drawInsideRectangle(Graphics2D g,
209
			AffineTransform scaleInstance, Rectangle r) throws SymbolDrawingException {
208
			AffineTransform scaleInstance, Rectangle r, PrintRequestAttributeSet properties) throws SymbolDrawingException {
210 209
		Rectangle rect = new Rectangle(r.x, r.y, r.width, r.height);
211 210
		rect.setFrame(((int) rect.getMinX())+1, ((int) rect.getMinY())+1, ((int) rect.getWidth())-2, ((int) rect.getHeight())-2);
212 211
		FShape shp = new FPolygon2D(new GeneralPathX(rect));
......
218 217
		}
219 218

  
220 219
		if (getOutline() != null && hasOutline())
221
			getOutline().draw(g, scaleInstance, shp, null);
220
			if (properties==null)
221
				getOutline().draw(g, scaleInstance, shp, null);
222
			else
223
				print(g, new AffineTransform(), shp, properties);
222 224
	}
223 225

  
224 226
	public String getClassName() {
......
258 260
			setHasOutline(xml.getBooleanProperty("hasOutline"));
259 261
	}
260 262

  
261
	public void print(Graphics2D g, AffineTransform at, FShape shape, PrintRequestAttributeSet properties) throws ReadDriverException {
263
	public void print(Graphics2D g, AffineTransform at, FShape shape, PrintRequestAttributeSet properties) {
262 264
		Color c = getFillColor();
263 265
		if (c!=null && hasFill()) {
264 266
			g.setColor(c);

Also available in: Unified diff