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

trunk/src/com/kitfox/svg/Style.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 September 19, 2004, 1:56 AM
  */
-
 package com.kitfox.svg;
 
 import com.kitfox.svg.xml.StyleAttribute;
-import com.kitfox.svg.xml.*;
-import org.xml.sax.*;
-
+import com.kitfox.svg.xml.StyleSheet;
 
 /**
@@ -39 +45 @@
  * @author <a href="mailto:mark@kitfox.com">Mark McKay</a>
  */
-public class Style extends SVGElement {
+public class Style extends SVGElement
+{
 
+    public static final String TAG_NAME = "style";
     //Should be set to "text/css"
     String type;
     StringBuffer text = new StringBuffer();
 
-    /** Creates a new instance of Stop */
-    public Style() {
+    StyleSheet styleSheet;
+    
+    /**
+     * Creates a new instance of Stop
+     */
+    public Style()
+    {
     }
-/*
-    public void loaderStartElement(SVGLoaderHelper helper, Attributes attrs, SVGElement parent)
+
+    public String getTagName()
     {
-                //Load style string
-        super.loaderStartElement(helper, attrs, parent);
+        return TAG_NAME;
+    }
 
-        this.type = attrs.getValue("type");
-    }
-*/
     /**
      * Called during load process to add text scanned within a tag
@@ -63 +73 @@
     {
         this.text.append(text);
+        
+        //Invalidate style sheet
+        styleSheet = null;
     }
 
-    
     protected void build() throws SVGException
     {
         super.build();
-        
+
         StyleAttribute sty = new StyleAttribute();
-        
-        if (getPres(sty.setName("type"))) type = sty.getStringValue();
+
+        if (getPres(sty.setName("type")))
+        {
+            type = sty.getStringValue();
+        }
     }
-    
+
     public boolean updateTime(double curTime) throws SVGException
     {
         //Style sheet doesn't change
         return false;
-    }    
-    
+    }
+
+    public StyleSheet getStyleSheet()
+    {
+        if (styleSheet == null && text.length() > 0)
+        {
+            styleSheet = StyleSheet.parseSheet(text.toString());
+        }
+        return styleSheet;
+    }
 }