Changeset 6002 in josm for trunk/src/com/kitfox/svg/Ellipse.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/Ellipse.java (modified) (9 diffs)

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

@@ -1 +1 @@
 /*
- * Rect.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, 5:25 PM
  */
-
 package com.kitfox.svg;
 
 import com.kitfox.svg.xml.StyleAttribute;
-import com.kitfox.svg.xml.*;
-import org.xml.sax.*;
-
-import java.awt.*;
-import java.awt.geom.*;
+import java.awt.Graphics2D;
+import java.awt.Shape;
+import java.awt.geom.Ellipse2D;
+import java.awt.geom.Rectangle2D;
 
 /**
@@ -39 +46 @@
  * @author <a href="mailto:mark@kitfox.com">Mark McKay</a>
  */
-public class Ellipse extends ShapeElement {
+public class Ellipse extends ShapeElement
+{
 
+    public static final String TAG_NAME = "ellipse";
     float cx = 0.0f;
     float cy = 0.0f;
     float rx = 0.0f;
     float ry = 0.0f;
-
     Ellipse2D.Float ellipse = new Ellipse2D.Float();
 
-    /** Creates a new instance of Rect */
-    public Ellipse() {
+    /**
+     * Creates a new instance of Rect
+     */
+    public Ellipse()
+    {
     }
-/*
-    protected void init(String idIn, Style parentStyle, String cx, String cy, String rx, String ry) {
-        super.init(idIn, parentStyle);
 
-        this.cx = parseDouble(cx);
-        this.cy = parseDouble(cy);
-        this.rx = parseDouble(rx);
-        this.ry = parseDouble(ry);
+    public String getTagName()
+    {
+        return TAG_NAME;
+    }
 
-        setBounds(this.cx - this.rx, this.cy - this.ry, this.rx * 2.0, this.ry * 2.0);
-    }
-*/
-    /*
-    public void loaderStartElement(SVGLoaderHelper helper, Attributes attrs, SVGElement parent)
-    {
-                //Load style string
-        super.loaderStartElement(helper, attrs, parent);
-
-        String cx = attrs.getValue("cx");
-        String cy = attrs.getValue("cy");
-        String rx = attrs.getValue("rx");
-        String ry = attrs.getValue("ry");
-
-        this.cx = XMLParseUtil.parseDouble(cx);
-        this.cy = XMLParseUtil.parseDouble(cy);
-        this.rx = XMLParseUtil.parseDouble(rx);
-        this.ry = XMLParseUtil.parseDouble(ry);
-
-        build();
-    }
-    */
-    
-    /*
-    public void loaderEndElement(SVGLoaderHelper helper)
-    {
-        super.loaderEndElement(helper);
-
-        build();
-    }
-     */
-    
     protected void build() throws SVGException
     {
         super.build();
-        
+
         StyleAttribute sty = new StyleAttribute();
-        
-        if (getPres(sty.setName("cx"))) cx = sty.getFloatValueWithUnits();
-        
-        if (getPres(sty.setName("cy"))) cy = sty.getFloatValueWithUnits();
-        
-        if (getPres(sty.setName("rx"))) rx = sty.getFloatValueWithUnits();
-        
-        if (getPres(sty.setName("ry"))) ry = sty.getFloatValueWithUnits();
-        
+
+        if (getPres(sty.setName("cx")))
+        {
+            cx = sty.getFloatValueWithUnits();
+        }
+
+        if (getPres(sty.setName("cy")))
+        {
+            cy = sty.getFloatValueWithUnits();
+        }
+
+        if (getPres(sty.setName("rx")))
+        {
+            rx = sty.getFloatValueWithUnits();
+        }
+
+        if (getPres(sty.setName("ry")))
+        {
+            ry = sty.getFloatValueWithUnits();
+        }
+
         ellipse.setFrame(cx - rx, cy - ry, rx * 2f, ry * 2f);
     }
@@ -125 +113 @@
         return boundsToParent(includeStrokeInBounds(ellipse.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
@@ -140 +129 @@
         StyleAttribute sty = new StyleAttribute();
         boolean shapeChange = false;
-        
+
         if (getPres(sty.setName("cx")))
         {
@@ -150 +139 @@
             }
         }
-        
+
         if (getPres(sty.setName("cy")))
         {
@@ -160 +149 @@
             }
         }
-        
+
         if (getPres(sty.setName("rx")))
         {
@@ -170 +159 @@
             }
         }
-        
+
         if (getPres(sty.setName("ry")))
         {
@@ -180 +169 @@
             }
         }
-        
+
         if (shapeChange)
         {
@@ -187 +176 @@
 //            return true;
         }
-        
+
         return changeState || shapeChange;
     }