Revision 24759 branches/v2_0_0_prep/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/layout/fframes/FFrameBasic.java

View differences:

FFrameBasic.java
55 55

  
56 56
import javax.print.attribute.PrintRequestAttributeSet;
57 57

  
58
import org.gvsig.fmap.data.ReadException;
58
import org.gvsig.fmap.dal.exception.ReadException;
59 59
import org.gvsig.fmap.geom.Geometry;
60 60
import org.gvsig.fmap.mapcontext.rendering.symbols.IFillSymbol;
61 61
import org.gvsig.fmap.mapcontext.rendering.symbols.SimpleLineSymbol;
......
128 128
    public void draw(Graphics2D g, AffineTransform at, Rectangle2D rv,
129 129
        BufferedImage imgBase) throws ReadException {
130 130
    	fframeGraphics.draw(g,at,rv,imgBase);
131
    	if (fframe!=null)
132
    		fframe.draw(g,at,rv,imgBase);
131
    	if (fframe!=null) {
132
			fframe.draw(g,at,rv,imgBase);
133
		}
133 134
    }
134 135

  
135 136
    /**
......
144 145
    public XMLEntity getXMLEntity() throws SaveException {
145 146
        XMLEntity xml = super.getXMLEntity();
146 147
        xml.addChild(fframeGraphics.getXMLEntity());
147
        if (fframe!=null)
148
        	xml.addChild(fframe.getXMLEntity());
148
        if (fframe!=null) {
149
			xml.addChild(fframe.getXMLEntity());
150
		}
149 151
        return xml;
150 152
    }
151 153

  
......
226 228
	public IFFrame cloneFFrame(Layout layout) {
227 229
		FFrameBasic basic=new FFrameBasic();
228 230
		basic.setFframeGraphics((FFrameGraphics)fframeGraphics.cloneFFrame(layout));
229
		if (fframe!=null)
231
		if (fframe!=null) {
230 232
			basic.setFframe(fframe.cloneFFrame(layout));
233
		}
231 234
		return basic;
232 235
	}
233 236

  
......
292 295
	}
293 296

  
294 297
	public void setBoundBox(Rectangle2D r) {
295
		if (getFframeGraphics()!=null)
298
		if (getFframeGraphics()!=null) {
296 299
			getFframeGraphics().setBoundBox(r);
297
		if (getFframe() != null)
300
		}
301
		if (getFframe() != null) {
298 302
			getFframe().setBoundBox(r);
299 303
		//super.setBoundBox(r);
304
		}
300 305
	}
301 306

  
302 307
	public void setLevel(int l) {

Also available in: Unified diff