Index: trunk/src/com/kitfox/svg/xml/XMLParseUtil.java =================================================================== --- trunk/src/com/kitfox/svg/xml/XMLParseUtil.java (revision 4256) +++ trunk/src/com/kitfox/svg/xml/XMLParseUtil.java (revision 6002) @@ -1,25 +1,34 @@ /* - * XMLParseUtil.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 February 18, 2004, 1:49 PM @@ -28,4 +37,5 @@ package com.kitfox.svg.xml; +import com.kitfox.svg.SVGConst; import org.w3c.dom.*; import java.awt.*; @@ -34,4 +44,6 @@ import java.util.regex.*; import java.lang.reflect.*; +import java.util.logging.Level; +import java.util.logging.Logger; /** @@ -140,6 +152,6 @@ catch (StringIndexOutOfBoundsException e) { - System.err.println("XMLParseUtil: regex parse problem: '" + val + "'"); - e.printStackTrace(); + Logger.getLogger(SVGConst.SVG_LOGGER).log(Level.WARNING, + "XMLParseUtil: regex parse problem: '" + val + "'", e); } @@ -537,6 +549,13 @@ ReadableXMLElement newObj = null; - try { newObj = (ReadableXMLElement)classType.newInstance(); } - catch (Exception e) { e.printStackTrace(); continue; } + try + { + newObj = (ReadableXMLElement)classType.newInstance(); + } + catch (Exception e) + { + Logger.getLogger(SVGConst.SVG_LOGGER).log(Level.WARNING, null, e); + continue; + } newObj.read(ele, docRoot); @@ -567,11 +586,4 @@ HashMap retMap = new HashMap(); -/* - Class[] params = {Element.class, URL.class}; - Method loadMethod = null; - try { loadMethod = classType.getMethod("load", params); } - catch (Exception e) { e.printStackTrace(); return null; } - - */ NodeList nl = root.getChildNodes(); int size = nl.getLength(); @@ -584,14 +596,15 @@ ReadableXMLElement newObj = null; - try { newObj = (ReadableXMLElement)classType.newInstance(); } - catch (Exception e) { e.printStackTrace(); continue; } + try + { + newObj = (ReadableXMLElement)classType.newInstance(); + } + catch (Exception e) + { + Logger.getLogger(SVGConst.SVG_LOGGER).log(Level.WARNING, null, e); + continue; + } newObj.read(ele, docRoot); -/* - Object[] args = {ele, source}; - Object obj = null; - try { obj = loadMethod.invoke(null, args); } - catch (Exception e) { e.printStackTrace(); } - - */ + if (newObj == null) continue; @@ -614,11 +627,4 @@ HashSet retSet = new HashSet(); - - /* - Class[] params = {Element.class, URL.class}; - Method loadMethod = null; - try { loadMethod = classType.getMethod("load", params); } - catch (Exception e) { e.printStackTrace(); return null; } - */ NodeList nl = root.getChildNodes(); @@ -632,15 +638,19 @@ ReadableXMLElement newObj = null; - try { newObj = (ReadableXMLElement)classType.newInstance(); } - catch (Exception e) { e.printStackTrace(); continue; } + try + { + newObj = (ReadableXMLElement)classType.newInstance(); + } + catch (Exception e) + { + Logger.getLogger(SVGConst.SVG_LOGGER).log(Level.WARNING, null, e); + continue; + } newObj.read(ele, docRoot); - /* - Object[] args = {ele, source}; - Object obj = null; - try { obj = loadMethod.invoke(null, args); } - catch (Exception e) { e.printStackTrace(); } - */ - - if (newObj == null) continue; + + if (newObj == null) + { + continue; + } retSet.add(newObj); @@ -672,6 +682,13 @@ ReadableXMLElement newObj = null; - try { newObj = (ReadableXMLElement)classType.newInstance(); } - catch (Exception e) { e.printStackTrace(); continue; } + try + { + newObj = (ReadableXMLElement)classType.newInstance(); + } + catch (Exception e) + { + Logger.getLogger(SVGConst.SVG_LOGGER).log(Level.WARNING, null, e); + continue; + } newObj.read(ele, docRoot); @@ -790,8 +807,4 @@ public static HashMap parseStyle(String styleString, HashMap map) { final Pattern patSemi = Pattern.compile(";"); - final Pattern patColonSpace = Pattern.compile(":"); - - //Strips left and right whitespace - final Matcher matcherContent = Pattern.compile("\\s*([^\\s](.*[^\\s])?)\\s*").matcher(""); String[] styles = patSemi.split(styleString); @@ -804,15 +817,14 @@ } - String[] vals = patColonSpace.split(styles[i]); - - matcherContent.reset(vals[0]); - matcherContent.matches(); - vals[0] = matcherContent.group(1); - - matcherContent.reset(vals[1]); - matcherContent.matches(); - vals[1] = matcherContent.group(1); - - map.put(vals[0], new StyleAttribute(vals[0], vals[1])); + int colon = styles[i].indexOf(':'); + if (colon == -1) + { + continue; + } + + String key = styles[i].substring(0, colon).trim(); + String value = styles[i].substring(colon + 1).trim(); + + map.put(key, new StyleAttribute(key, value)); }