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

Timestamp:

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

Author:

Don-vip

Message:

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

File:

• trunk/src/com/kitfox/svg/SVGLoader.java (modified) (23 diffs)

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

@@ -4 +4 @@
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or 
+ * Redistribution and use in source and binary forms, with or
  * without modification, are permitted provided that the following
  * conditions are met:
  *
- *   - Redistributions of source code must retain the above 
+ *   - 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 
+ *     disclaimer in the documentation and/or other materials
  *     provided with the distribution.
  *
@@ -27 +27 @@
  * 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. 
- * 
+ * 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
@@ -38 +38 @@
 
 
-import java.util.*;
-import java.net.*;
-import org.xml.sax.*;
-import org.xml.sax.helpers.DefaultHandler;
-
+import java.net.URI;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
 
 /**
@@ -52 +55 @@
 public class SVGLoader extends DefaultHandler
 {
-    final HashMap nodeClasses = new HashMap();
+    final HashMap<String, Class<?>> nodeClasses = new HashMap<>();
     //final HashMap attribClasses = new HashMap();
-    final LinkedList buildStack = new LinkedList();
-
-    final HashSet ignoreClasses = new HashSet();
+    final LinkedList<SVGElement> buildStack = new LinkedList<>();
+
+    final HashSet<String> ignoreClasses = new HashSet<>();
 
     final SVGLoaderHelper helper;
@@ -73 +76 @@
 
     final boolean verbose;
-    
+
     /** Creates a new instance of SVGLoader */
     public SVGLoader(URI xmlBase, SVGUniverse universe)
@@ -79 +82 @@
         this(xmlBase, universe, false);
     }
-    
+
     public SVGLoader(URI xmlBase, SVGUniverse universe, boolean verbose)
     {
         this.verbose = verbose;
-        
+
         diagram = new SVGDiagram(xmlBase, universe);
 
@@ -138 +141 @@
         return sb.toString();
     }
-    
+
+    @Override
     public void startDocument() throws SAXException
     {
@@ -146 +150 @@
     }
 
+    @Override
     public void endDocument() throws SAXException
     {
@@ -151 +156 @@
     }
 
+    @Override
     public void startElement(String namespaceURI, String sName, String qName, Attributes attrs) throws SAXException
     {
@@ -158 +164 @@
         }
         indent++;
-        
+
         if (skipNonSVGTagDepth != 0 || (!namespaceURI.equals("") && !namespaceURI.equals(SVGElement.SVG_NS)))
         {
@@ -164 +170 @@
             return;
         }
-        
+
         sName = sName.toLowerCase();
 
@@ -187 +193 @@
 
         try {
-            Class cls = (Class)obj;
+            Class<?> cls = (Class<?>)obj;
             SVGElement svgEle = (SVGElement)cls.newInstance();
 
             SVGElement parent = null;
-            if (buildStack.size() != 0) parent = (SVGElement)buildStack.getLast();
+            if (buildStack.size() != 0) parent = buildStack.getLast();
             svgEle.loaderStartElement(helper, attrs, parent);
 
@@ -198 +204 @@
         catch (Exception e)
         {
-            Logger.getLogger(SVGConst.SVG_LOGGER).log(Level.WARNING, 
+            Logger.getLogger(SVGConst.SVG_LOGGER).log(Level.WARNING,
                 "Could not load", e);
             throw new SAXException(e);
@@ -205 +211 @@
     }
 
+    @Override
     public void endElement(String namespaceURI, String sName, String qName)
         throws SAXException
@@ -213 +220 @@
             System.err.println(printIndent(indent, " ") + "Ending parse of tag " + sName+ ": " + namespaceURI);
         }
-        
+
         if (skipNonSVGTagDepth != 0)
         {
@@ -219 +226 @@
             return;
         }
-        
+
         sName = sName.toLowerCase();
 
@@ -230 +237 @@
 
         try {
-            SVGElement svgEle = (SVGElement)buildStack.removeLast();
+            SVGElement svgEle = buildStack.removeLast();
 
             svgEle.loaderEndElement(helper);
@@ -237 +244 @@
             if (buildStack.size() != 0)
             {
-                parent = (SVGElement)buildStack.getLast();
+                parent = buildStack.getLast();
             }
             //else loadRoot = (SVGElement)svgEle;
@@ -253 +260 @@
         catch (Exception e)
         {
-            Logger.getLogger(SVGConst.SVG_LOGGER).log(Level.WARNING, 
+            Logger.getLogger(SVGConst.SVG_LOGGER).log(Level.WARNING,
                 "Could not parse", e);
             throw new SAXException(e);
@@ -259 +266 @@
     }
 
+    @Override
     public void characters(char buf[], int offset, int len)
         throws SAXException
@@ -269 +277 @@
         if (buildStack.size() != 0)
         {
-            SVGElement parent = (SVGElement)buildStack.getLast();
+            SVGElement parent = buildStack.getLast();
             String s = new String(buf, offset, len);
             parent.loaderAddText(helper, s);
@@ -275 +283 @@
     }
 
+    @Override
     public void processingInstruction(String target, String data)
         throws SAXException
@@ -280 +289 @@
         //Check for external style sheet
     }
-    
+
 //    public SVGElement getLoadRoot() { return loadRoot; }
     public SVGDiagram getLoadedDiagram() { return diagram; }