Changeset 6002 in josm for trunk/src/com/kitfox/svg/TransformableElement.java

Timestamp:

2013-06-11T01:01:28+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #8742 - update svgsalamander to release 0.1.18+patch (fix bug SVGSALAMANDER-26) -> allow to open more SVG files

File:

• trunk/src/com/kitfox/svg/TransformableElement.java (modified) (8 diffs)

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

@@ -1 +1 @@
 /*
- * BoundedElement.java
+ * SVG Salamander
+ * Copyright (c) 2004, Mark McKay
+ * All rights reserved.
  *
+ * Redistribution and use in source and binary forms, with or 
+ * without modification, are permitted provided that the following
+ * conditions are met:
  *
- *  The Salamander Project - 2D and 3D graphics libraries in Java
- *  Copyright (C) 2004 Mark McKay
+ *   - Redistributions of source code must retain the above 
+ *     copyright notice, this list of conditions and the following
+ *     disclaimer.
+ *   - Redistributions in binary form must reproduce the above
+ *     copyright notice, this list of conditions and the following
+ *     disclaimer in the documentation and/or other materials 
+ *     provided with the distribution.
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2.1 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
- *  projects can be found at http://www.kitfox.com
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE. 
+ * 
+ * Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
+ * projects can be found at http://www.kitfox.com
  *
  * Created on January 26, 2004, 9:00 AM
  */
-
 package com.kitfox.svg;
 
@@ -33 +41 @@
 import java.awt.geom.Rectangle2D;
 
-
 /**
  * Maintains bounding box for this element
@@ -40 +47 @@
  * @author <a href="mailto:mark@kitfox.com">Mark McKay</a>
  */
-public class TransformableElement extends SVGElement 
+abstract public class TransformableElement extends SVGElement
 {
+    AffineTransform xform = null;
 
-    AffineTransform xform = null;
-//    AffineTransform invXform = null;
-
-    /** Creates a new instance of BoundedElement */
-    public TransformableElement() {
+    /**
+     * Creates a new instance of BoundedElement
+     */
+    public TransformableElement()
+    {
     }
 
@@ -55 +63 @@
     }
 
+    /**
+     * Fetches a copy of the cached AffineTransform. Note that this value will
+     * only be valid after the node has been updated.
+     *
+     * @return
+     */
     public AffineTransform getXForm()
     {
-        return xform;
+        return xform != null ? new AffineTransform(xform) : null;
     }
-/*
-    public void loaderStartElement(SVGLoaderHelper helper, Attributes attrs, SVGElement parent)
-    {
-                //Load style string
-        super.loaderStartElement(helper, attrs, parent);
+    /*
+     public void loaderStartElement(SVGLoaderHelper helper, Attributes attrs, SVGElement parent)
+     {
+     //Load style string
+     super.loaderStartElement(helper, attrs, parent);
 
-        String transform = attrs.getValue("transform");
-        if (transform != null)
-        {
-            xform = parseTransform(transform);
-        }
-    }
-*/
-    
+     String transform = attrs.getValue("transform");
+     if (transform != null)
+     {
+     xform = parseTransform(transform);
+     }
+     }
+     */
+
     protected void build() throws SVGException
     {
         super.build();
-        
+
         StyleAttribute sty = new StyleAttribute();
-        
+
         if (getPres(sty.setName("transform")))
         {
@@ -84 +98 @@
         }
     }
-    
+
     protected Shape shapeToParent(Shape shape)
     {
-        if (xform == null) return shape;
+        if (xform == null)
+        {
+            return shape;
+        }
         return xform.createTransformedShape(shape);
     }
@@ -93 +110 @@
     protected Rectangle2D boundsToParent(Rectangle2D rect)
     {
-        if (xform == null) return rect;
+        if (xform == null)
+        {
+            return rect;
+        }
         return xform.createTransformedShape(rect).getBounds2D();
     }
 
     /**
-     * Updates all attributes in this diagram associated with a time event.
-     * Ie, all attributes with track information.
+     * Updates all attributes in this diagram associated with a time event. Ie,
+     * all attributes with track information.
+     *
      * @return - true if this node has changed state as a result of the time
      * update
@@ -106 +127 @@
     {
         StyleAttribute sty = new StyleAttribute();
-        
+
         if (getPres(sty.setName("transform")))
         {
@@ -116 +137 @@
             }
         }
-        
+
         return false;
     }