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

Timestamp:

2013-06-11T01:01:28+02:00 (13 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/ClipPath.java (modified) (6 diffs)

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

@@ -1 +1 @@
 /*
- * Stop.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, 1:56 AM
  */
-
 package com.kitfox.svg;
 
@@ -37 +45 @@
  * @author <a href="mailto:mark@kitfox.com">Mark McKay</a>
  */
-public class ClipPath extends SVGElement 
+public class ClipPath extends SVGElement
 {
 
+    public static final String TAG_NAME = "clippath";
     public static final int CP_USER_SPACE_ON_USE = 0;
     public static final int CP_OBJECT_BOUNDING_BOX = 1;
-
     int clipPathUnits = CP_USER_SPACE_ON_USE;
 
-    /** Creates a new instance of Stop */
-    public ClipPath() {
+    /**
+     * Creates a new instance of Stop
+     */
+    public ClipPath()
+    {
     }
-/*
-    public void loaderStartElement(SVGLoaderHelper helper, Attributes attrs, SVGElement parent)
+
+    public String getTagName()
     {
-                //Load style string
-        super.loaderStartElement(helper, attrs, parent);
+        return TAG_NAME;
+    }
 
-        String clipPathUnits = attrs.getValue("clipPathUnits");
-
-        if (clipPathUnits.equals("objectBoundingBox")) this.clipPathUnits = CP_OBJECT_BOUNDING_BOX;
-
-    }
-*/
     /**
      * Called after the start element but before the end element to indicate
@@ -66 +71 @@
     public void loaderAddChild(SVGLoaderHelper helper, SVGElement child) throws SVGElementException
     {
-                super.loaderAddChild(helper, child);
-
-//        if (child instanceof ShapeElement) members.add(child);
+        super.loaderAddChild(helper, child);
     }
 
-    /*
-    public void loaderEndElement(SVGLoaderHelper helper)
-    {
-//        super.loaderEndElement(helper);
-
-//        build();
-    }
-    */
-    
     protected void build() throws SVGException
     {
         super.build();
-        
+
         StyleAttribute sty = new StyleAttribute();
-        
+
         clipPathUnits = (getPres(sty.setName("clipPathUnits"))
-            && sty.getStringValue().equals("objectBoundingBox")) 
-            ? CP_OBJECT_BOUNDING_BOX 
+            && sty.getStringValue().equals("objectBoundingBox"))
+            ? CP_OBJECT_BOUNDING_BOX
             : CP_USER_SPACE_ON_USE;
     }
-    
+
     public int getClipPathUnits()
     {
@@ -99 +93 @@
     public Shape getClipPathShape()
     {
-        if (children.size() == 0) return null;
-        if (children.size() == 1) return ((ShapeElement)children.get(0)).getShape();
+        if (children.isEmpty())
+        {
+            return null;
+        }
+        if (children.size() == 1)
+        {
+            return ((ShapeElement) children.get(0)).getShape();
+        }
 
         Area clipArea = null;
         for (Iterator it = children.iterator(); it.hasNext();)
         {
-            ShapeElement se = (ShapeElement)it.next();
+            ShapeElement se = (ShapeElement) it.next();
 
             if (clipArea == null)
             {
                 Shape shape = se.getShape();
-                if (shape != null) clipArea = new Area(se.getShape());
+                if (shape != null)
+                {
+                    clipArea = new Area(se.getShape());
+                }
                 continue;
             }
 
             Shape shape = se.getShape();
-            if (shape != null) clipArea.intersect(new Area(shape));
+            if (shape != null)
+            {
+                clipArea.intersect(new Area(shape));
+            }
         }
 
@@ -122 +128 @@
 
     /**
-     * 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
@@ -129 +136 @@
     public boolean updateTime(double curTime) throws SVGException
     {
-//        if (trackManager.getNumTracks() == 0) return false;
-
         //Get current values for parameters
         StyleAttribute sty = new StyleAttribute();
         boolean shapeChange = false;
 
-        
+
         if (getPres(sty.setName("clipPathUnits")))
         {
             String newUnitsStrn = sty.getStringValue();
             int newUnits = newUnitsStrn.equals("objectBoundingBox")
-                ? CP_OBJECT_BOUNDING_BOX 
+                ? CP_OBJECT_BOUNDING_BOX
                 : CP_USER_SPACE_ON_USE;
-                
+
             if (newUnits != clipPathUnits)
             {