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

View differences:

FFrameGraphics.java
54 54

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

  
57
import org.gvsig.data.ReadException;
57 58
import org.gvsig.fmap.geom.Geometry;
58 59

  
59
import org.gvsig.fmap.core.shapes.FShape;
60
import org.gvsig.fmap.core.shapes.adapters.CircleAdapter;
61
import org.gvsig.fmap.core.shapes.adapters.GeometryAdapter;
62
import org.gvsig.fmap.core.shapes.adapters.PointAdapter;
63
import org.gvsig.fmap.core.shapes.adapters.PolyLineAdapter;
64
import org.gvsig.fmap.core.shapes.adapters.PolygonAdapter;
65
import org.gvsig.fmap.core.shapes.adapters.RectangleAdapter;
66 60
import org.gvsig.fmap.mapcontext.rendering.symbols.IMarkerSymbol;
67 61
import org.gvsig.fmap.mapcontext.rendering.symbols.ISymbol;
68 62
import org.gvsig.fmap.mapcontext.rendering.symbols.SymbologyFactory;
69 63

  
70
import com.hardcode.gdbms.driver.exceptions.ReadDriverException;
71 64
import com.iver.andami.PluginServices;
72 65
import com.iver.cit.gvsig.project.documents.exceptions.SaveException;
73 66
import com.iver.cit.gvsig.project.documents.layout.fframes.gui.dialogs.FFrameGraphicsDialog;
74 67
import com.iver.cit.gvsig.project.documents.layout.fframes.gui.dialogs.IFFrameDialog;
68
import com.iver.cit.gvsig.project.documents.layout.geometryadapters.CircleAdapter;
69
import com.iver.cit.gvsig.project.documents.layout.geometryadapters.GeometryAdapter;
70
import com.iver.cit.gvsig.project.documents.layout.geometryadapters.PointAdapter;
71
import com.iver.cit.gvsig.project.documents.layout.geometryadapters.PolyLineAdapter;
72
import com.iver.cit.gvsig.project.documents.layout.geometryadapters.PolygonAdapter;
73
import com.iver.cit.gvsig.project.documents.layout.geometryadapters.RectangleAdapter;
75 74
import com.iver.cit.gvsig.project.documents.layout.gui.Layout;
76 75
import com.iver.utiles.XMLEntity;
77 76

  
......
187 186
        */
188 187
        switch (m_type) {
189 188
        case (POINT):
190
        	shapeType = FShape.POINT;
189
        	shapeType = Geometry.TYPES.POINT;
191 190
            break;
192 191

  
193 192
        case (RECTANGLE):
194 193
        case (POLYGON):
195 194
        case (CIRCLE):
196
        	shapeType = FShape.POLYGON;
195
        	shapeType = Geometry.TYPES.SURFACE;
197 196
            break;
198 197

  
199 198
        case (LINE):
200 199
        case (POLYLINE):
201
        	shapeType = FShape.LINE;
200
        	shapeType = Geometry.TYPES.CURVE;
202 201
            break;
203 202
        }
204 203
        m_symbol = SymbologyFactory.createDefaultSymbolByShapeType(shapeType);
......
234 233
     * @param imgBase DOCUMENT ME!
235 234
     */
236 235
    public void draw(Graphics2D g, AffineTransform at, Rectangle2D rv,
237
        BufferedImage imgBase) throws ReadDriverException {
236
        BufferedImage imgBase) throws ReadException {
238 237
        Rectangle2D.Double rect = getBoundingBox(at);
239 238
        g.rotate(Math.toRadians(getRotation()), rect.x + (rect.width / 2),
240 239
            rect.y + (rect.height / 2));
......
676 675
		return new FFrameGraphicsDialog(getLayout(),this);
677 676
	}
678 677

  
679
	public void print(Graphics2D g, AffineTransform at, Geometry geom, PrintRequestAttributeSet printingProperties) throws ReadDriverException {
678
	public void print(Graphics2D g, AffineTransform at, Geometry geom, PrintRequestAttributeSet printingProperties) throws ReadException {
680 679
		 Rectangle2D.Double rect = getBoundingBox(at);
681 680
	     g.rotate(Math.toRadians(getRotation()), rect.x + (rect.width / 2),
682 681
	            rect.y + (rect.height / 2));

Also available in: Unified diff