Changeset 11525 in josm for trunk/src/com/kitfox/svg/Group.java
- Timestamp:
- 2017-02-02T00:08:08+01:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/com/kitfox/svg/Group.java
r8084 r11525 66 66 } 67 67 68 @Override 68 69 public String getTagName() 69 70 { … … 75 76 * each child tag that has been processed 76 77 */ 78 @Override 77 79 public void loaderAddChild(SVGLoaderHelper helper, SVGElement child) throws SVGElementException 78 80 { … … 98 100 } 99 101 100 void pick(Point2D point, boolean boundingBox, List retVec) throws SVGException 102 @Override 103 void pick(Point2D point, boolean boundingBox, List<List<SVGElement>> retVec) throws SVGException 101 104 { 102 105 Point2D xPoint = new Point2D.Double(point.getX(), point.getY()); … … 113 116 114 117 115 for (Iterator it = children.iterator(); it.hasNext();) 116 { 117 SVGElement ele = (SVGElement) it.next(); 118 for (SVGElement ele : children) { 118 119 if (ele instanceof RenderableElement) 119 120 { … … 125 126 } 126 127 127 void pick(Rectangle2D pickArea, AffineTransform ltw, boolean boundingBox, List retVec) throws SVGException 128 @Override 129 void pick(Rectangle2D pickArea, AffineTransform ltw, boolean boundingBox, List<List<SVGElement>> retVec) throws SVGException 128 130 { 129 131 if (xform != null) … … 134 136 135 137 136 for (Iterator it = children.iterator(); it.hasNext();) 137 { 138 SVGElement ele = (SVGElement) it.next(); 138 for (SVGElement ele : children) { 139 139 if (ele instanceof RenderableElement) 140 140 { … … 146 146 } 147 147 148 @Override 148 149 public void render(Graphics2D g) throws SVGException 149 150 { … … 169 170 beginLayer(g); 170 171 171 Iterator it = children.iterator();172 Iterator<SVGElement> it = children.iterator(); 172 173 173 174 // try … … 185 186 while (it.hasNext()) 186 187 { 187 SVGElement ele = (SVGElement)it.next();188 SVGElement ele = it.next(); 188 189 if (ele instanceof RenderableElement) 189 190 { … … 212 213 * Retrieves the cached bounding box of this group 213 214 */ 215 @Override 214 216 public Shape getShape() 215 217 { … … 225 227 Area retShape = new Area(); 226 228 227 for (Iterator it = children.iterator(); it.hasNext();) 228 { 229 SVGElement ele = (SVGElement) it.next(); 230 229 for (SVGElement ele : children) { 231 230 if (ele instanceof ShapeElement) 232 231 { … … 246 245 * Retrieves the cached bounding box of this group 247 246 */ 247 @Override 248 248 public Rectangle2D getBoundingBox() throws SVGException 249 249 { … … 262 262 public void calcBoundingBox() throws SVGException 263 263 { 264 // Rectangle2D retRect = new Rectangle2D.Float();265 264 Rectangle2D retRect = null; 266 265 267 for (Iterator it = children.iterator(); it.hasNext();) 268 { 269 SVGElement ele = (SVGElement) it.next(); 270 266 for (SVGElement ele : children) { 271 267 if (ele instanceof RenderableElement) 272 268 { … … 304 300 } 305 301 302 @Override 306 303 public boolean updateTime(double curTime) throws SVGException 307 304 { 308 305 boolean changeState = super.updateTime(curTime); 309 Iterator it = children.iterator();306 Iterator<SVGElement> it = children.iterator(); 310 307 311 308 //Distribute message to all members of this group 312 309 while (it.hasNext()) 313 310 { 314 SVGElement ele = (SVGElement)it.next();311 SVGElement ele = it.next(); 315 312 boolean updateVal = ele.updateTime(curTime); 316 313
Note:
See TracChangeset
for help on using the changeset viewer.