Changeset 11525 in josm for trunk/src/com/kitfox/svg/SVGRoot.java

Timestamp:

2017-02-02T00:08:08+01:00 (7 years ago)

Author:

Don-vip

Message:

see #14319 - update to latest version of svgSalamander (2017-01-07, patched)

File:

• trunk/src/com/kitfox/svg/SVGRoot.java (modified) (10 diffs)

trunk/src/com/kitfox/svg/SVGRoot.java

@@ -93 +93 @@
     }
 
+    @Override
     public String getTagName()
     {
@@ -98 +99 @@
     }
     
+    @Override
     public void build() throws SVGException
     {
@@ -163 +165 @@
     }
 
+    @Override
     public SVGRoot getRoot()
     {
@@ -262 +265 @@
     {
         prepareViewport();
-
+        
         Rectangle targetViewport = g.getClipBounds();
-
+//
+//        if (targetViewport == null)
+//        {
+//            Dimension size = Toolkit.getDefaultToolkit().getScreenSize();
+//            targetViewport = new Rectangle(0, 0, size.width, size.height);
+//        }
+//        clipRect.setRect(targetViewport);
+
+        
         Rectangle deviceViewport = diagram.getDeviceViewport();
         if (width != null && height != null)
@@ -294 +305 @@
         else
         {
+//            Dimension size = Toolkit.getDefaultToolkit().getScreenSize();
+//            targetViewport = new Rectangle(0, 0, size.width, size.height);
             targetViewport = new Rectangle(deviceViewport);
         }
@@ -319 +332 @@
     }
 
-    public void pick(Rectangle2D pickArea, AffineTransform ltw, boolean boundingBox, List retVec) throws SVGException
+    @Override
+    public void pick(Rectangle2D pickArea, AffineTransform ltw, boolean boundingBox, List<List<SVGElement>> retVec) throws SVGException
     {
         if (viewXform != null)
@@ -330 +344 @@
     }
     
-    public void pick(Point2D point, boolean boundingBox, List retVec) throws SVGException
+    @Override
+    public void pick(Point2D point, boolean boundingBox, List<List<SVGElement>> retVec) throws SVGException
     {
         Point2D xPoint = new Point2D.Double(point.getX(), point.getY());
@@ -347 +362 @@
     }
 
+    @Override
     public Shape getShape()
     {
@@ -353 +369 @@
     }
 
+    @Override
     public Rectangle2D getBoundingBox() throws SVGException
     {
@@ -381 +398 @@
      * update
      */
+    @Override
     public boolean updateTime(double curTime) throws SVGException
     {