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/Group.java | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) (limited to 'src/main/java/com/kitfox/svg/Group.java') diff --git a/src/main/java/com/kitfox/svg/Group.java b/src/main/java/com/kitfox/svg/Group.java index ff13629..3c3b6ee 100644 --- a/src/main/java/com/kitfox/svg/Group.java +++ b/src/main/java/com/kitfox/svg/Group.java @@ -27,20 +27,25 @@ package com.kitfox.svg; -import java.awt.*; -import java.awt.geom.*; -import java.util.*; +import com.kitfox.svg.xml.StyleAttribute; +import java.awt.Graphics2D; +import java.awt.Rectangle; +import java.awt.Shape; +import java.awt.geom.AffineTransform; +import java.awt.geom.Area; +import java.awt.geom.NoninvertibleTransformException; +import java.awt.geom.Point2D; +import java.awt.geom.Rectangle2D; +import java.util.Iterator; +import java.util.List; -import com.kitfox.svg.xml.*; -import org.xml.sax.*; /** * @author Mark McKay * @author Mark McKay */ -public class Group extends ShapeElement { - -// final Vector members = new Vector(); +public class Group extends ShapeElement +{ //Cache bounding box for faster clip testing Rectangle2D boundingBox; @@ -93,7 +98,7 @@ public class Group extends ShapeElement { return true; } - void pick(Point2D point, boolean boundingBox, Vector retVec) throws SVGException + void pick(Point2D point, boolean boundingBox, List retVec) throws SVGException { Point2D xPoint = new Point2D.Double(point.getX(), point.getY()); if (xform != null) @@ -121,7 +126,7 @@ public class Group extends ShapeElement { } } - void pick(Rectangle2D pickArea, AffineTransform ltw, boolean boundingBox, Vector retVec) throws SVGException + void pick(Rectangle2D pickArea, AffineTransform ltw, boolean boundingBox, List retVec) throws SVGException { if (xform != null) { -- cgit v1.2.3-55-g7522