From 0c00a3fa56b7988a28932499f1546378c9a93d3b Mon Sep 17 00:00:00 2001 From: kitfox Date: Wed, 10 Mar 2010 17:09:17 +0000 Subject: Fixed bug where chained 'move' path commands were not switching to 'line' after first path segment. Switched from using Vector to List. Added new project containing example files. git-svn-id: https://svn.java.net/svn/svgsalamander~svn/trunk/svg-core@70 7dc7fa77-23fb-e6ad-8e2e-c86bd48ed22b --- src/main/java/com/kitfox/svg/ShapeElement.java | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'src/main/java/com/kitfox/svg/ShapeElement.java') diff --git a/src/main/java/com/kitfox/svg/ShapeElement.java b/src/main/java/com/kitfox/svg/ShapeElement.java index b346b97..6446d11 100644 --- a/src/main/java/com/kitfox/svg/ShapeElement.java +++ b/src/main/java/com/kitfox/svg/ShapeElement.java @@ -27,13 +27,21 @@ package com.kitfox.svg; - import com.kitfox.svg.xml.StyleAttribute; -import java.net.*; -import java.awt.*; -import java.awt.geom.*; -import com.kitfox.svg.xml.*; -import java.util.Vector; +import java.awt.AlphaComposite; +import java.awt.BasicStroke; +import java.awt.Color; +import java.awt.Composite; +import java.awt.Graphics2D; +import java.awt.Paint; +import java.awt.Shape; +import java.awt.geom.AffineTransform; +import java.awt.geom.Point2D; +import java.awt.geom.Rectangle2D; +import java.net.URI; +import java.util.List; + + /** * Parent of shape objects @@ -64,7 +72,7 @@ abstract public class ShapeElement extends RenderableElement } */ - void pick(Point2D point, boolean boundingBox, Vector retVec) throws SVGException + void pick(Point2D point, boolean boundingBox, List retVec) throws SVGException { StyleAttribute styleAttrib = new StyleAttribute(); // if (getStyle(styleAttrib.setName("fill")) && getShape().contains(point)) @@ -74,7 +82,7 @@ abstract public class ShapeElement extends RenderableElement } } - void pick(Rectangle2D pickArea, AffineTransform ltw, boolean boundingBox, Vector retVec) throws SVGException + void pick(Rectangle2D pickArea, AffineTransform ltw, boolean boundingBox, List retVec) throws SVGException { StyleAttribute styleAttrib = new StyleAttribute(); // if (getStyle(styleAttrib.setName("fill")) && getShape().contains(point)) -- cgit v1.2.3-55-g7522