Index: trunk/src/com/kitfox/svg/xml/Base64InputStream.java =================================================================== --- trunk/src/com/kitfox/svg/xml/Base64InputStream.java (revision 4256) +++ trunk/src/com/kitfox/svg/xml/Base64InputStream.java (revision 6002) @@ -1,5 +1,34 @@ /* - * To change this template, choose Tools | Templates - * and open the template in the editor. + * 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: + * + * - 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 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 */ Index: trunk/src/com/kitfox/svg/xml/Base64OutputStream.java =================================================================== --- trunk/src/com/kitfox/svg/xml/Base64OutputStream.java (revision 4256) +++ trunk/src/com/kitfox/svg/xml/Base64OutputStream.java (revision 6002) @@ -1,5 +1,34 @@ /* - * To change this template, choose Tools | Templates - * and open the template in the editor. + * 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: + * + * - 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 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 */ Index: trunk/src/com/kitfox/svg/xml/Base64Util.java =================================================================== --- trunk/src/com/kitfox/svg/xml/Base64Util.java (revision 4256) +++ trunk/src/com/kitfox/svg/xml/Base64Util.java (revision 6002) @@ -1,5 +1,34 @@ /* - * To change this template, choose Tools | Templates - * and open the template in the editor. + * 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: + * + * - 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 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 */ Index: trunk/src/com/kitfox/svg/xml/ColorTable.java =================================================================== --- trunk/src/com/kitfox/svg/xml/ColorTable.java (revision 4256) +++ trunk/src/com/kitfox/svg/xml/ColorTable.java (revision 6002) @@ -1,25 +1,34 @@ /* - * ColorTable.java - * - * - * The Salamander Project - 2D and 3D graphics libraries in Java - * Copyright (C) 2004 Mark McKay - * - * 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 + * 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: + * + * - 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 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, 4:34 AM Index: trunk/src/com/kitfox/svg/xml/NumberWithUnits.java =================================================================== --- trunk/src/com/kitfox/svg/xml/NumberWithUnits.java (revision 4256) +++ trunk/src/com/kitfox/svg/xml/NumberWithUnits.java (revision 6002) @@ -1,25 +1,34 @@ /* - * NumberWithUnits.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, 2:43 PM Index: trunk/src/com/kitfox/svg/xml/ReadableXMLElement.java =================================================================== --- trunk/src/com/kitfox/svg/xml/ReadableXMLElement.java (revision 4256) +++ trunk/src/com/kitfox/svg/xml/ReadableXMLElement.java (revision 6002) @@ -1,25 +1,34 @@ /* - * LoadableObject.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 1, 2003, 1:46 AM Index: trunk/src/com/kitfox/svg/xml/StyleAttribute.java =================================================================== --- trunk/src/com/kitfox/svg/xml/StyleAttribute.java (revision 4256) +++ trunk/src/com/kitfox/svg/xml/StyleAttribute.java (revision 6002) @@ -1,25 +1,34 @@ /* - * StyleAttribute.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 27, 2004, 2:53 PM @@ -28,7 +37,10 @@ package com.kitfox.svg.xml; +import com.kitfox.svg.SVGConst; import java.awt.*; +import java.io.*; import java.net.*; -import java.io.*; +import java.util.logging.Level; +import java.util.logging.Logger; import java.util.regex.*; @@ -41,5 +53,5 @@ public static final long serialVersionUID = 0; - static final Matcher matchUrl = Pattern.compile("\\s*url\\((.*)\\)\\s*").matcher(""); + static final Pattern patternUrl = Pattern.compile("\\s*url\\((.*)\\)\\s*"); static final Matcher matchFpNumUnits = Pattern.compile("\\s*([-+]?((\\d*\\.\\d+)|(\\d+))([-+]?[eE]\\d+)?)\\s*(px|cm|mm|in|pc|pt|em|ex)\\s*").matcher(""); @@ -68,8 +80,18 @@ } - public String getName() { return name; } - public StyleAttribute setName(String name) { this.name = name; return this; } - - public String getStringValue() { return stringValue; } + public String getName() { + return name; + } + + public StyleAttribute setName(String name) + { + this.name = name; + return this; + } + + public String getStringValue() + { + return stringValue; + } public String[] getStringList() @@ -177,6 +199,9 @@ public String parseURLFn() { - matchUrl.reset(stringValue); - if (!matchUrl.matches()) return null; + Matcher matchUrl = patternUrl.matcher(stringValue); + if (!matchUrl.matches()) + { + return null; + } return matchUrl.group(1); } @@ -191,5 +216,5 @@ catch (Exception e) { - e.printStackTrace(); + Logger.getLogger(SVGConst.SVG_LOGGER).log(Level.WARNING, null, e); return null; } @@ -206,5 +231,5 @@ catch (Exception e) { - e.printStackTrace(); + Logger.getLogger(SVGConst.SVG_LOGGER).log(Level.WARNING, null, e); return null; } @@ -264,5 +289,5 @@ catch (Exception e) { - e.printStackTrace(); + Logger.getLogger(SVGConst.SVG_LOGGER).log(Level.WARNING, null, e); return null; } @@ -285,5 +310,5 @@ catch (Exception e) { - e.printStackTrace(); + Logger.getLogger(SVGConst.SVG_LOGGER).log(Level.WARNING, null, e); } } Index: trunk/src/com/kitfox/svg/xml/StyleSheet.java =================================================================== --- trunk/src/com/kitfox/svg/xml/StyleSheet.java (revision 6002) +++ trunk/src/com/kitfox/svg/xml/StyleSheet.java (revision 6002) @@ -0,0 +1,67 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.kitfox.svg.xml; + +import com.kitfox.svg.SVGConst; +import java.util.HashMap; +import java.util.logging.Level; +import java.util.logging.Logger; + +/** + * + * @author kitfox + */ +public class StyleSheet +{ + HashMap ruleMap = new HashMap(); + + public static StyleSheet parseSheet(String src) + { + //Implement CS parser later + Logger.getLogger(SVGConst.SVG_LOGGER).log(Level.WARNING, + "CSS parser not implemented yet"); + return null; + } + + public void addStyleRule(StyleSheetRule rule, String value) + { + ruleMap.put(rule, value); + } + + public boolean getStyle(StyleAttribute attrib, String tagName, String cssClass) + { + StyleSheetRule rule = new StyleSheetRule(attrib.getName(), tagName, cssClass); + String value = (String)ruleMap.get(rule); + + if (value != null) + { + attrib.setStringValue(value); + return true; + } + + //Try again using just class name + rule = new StyleSheetRule(attrib.getName(), null, cssClass); + value = (String)ruleMap.get(rule); + + if (value != null) + { + attrib.setStringValue(value); + return true; + } + + //Try again using just tag name + rule = new StyleSheetRule(attrib.getName(), tagName, null); + value = (String)ruleMap.get(rule); + + if (value != null) + { + attrib.setStringValue(value); + return true; + } + + return false; + } + +} Index: trunk/src/com/kitfox/svg/xml/StyleSheetRule.java =================================================================== --- trunk/src/com/kitfox/svg/xml/StyleSheetRule.java (revision 6002) +++ trunk/src/com/kitfox/svg/xml/StyleSheetRule.java (revision 6002) @@ -0,0 +1,59 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.kitfox.svg.xml; + +/** + * + * @author kitfox + */ +public class StyleSheetRule +{ + final String styleName; + final String tag; + final String className; + + public StyleSheetRule(String styleName, String tag, String className) + { + this.styleName = styleName; + this.tag = tag; + this.className = className; + } + + public int hashCode() + { + int hash = 7; + hash = 13 * hash + (this.styleName != null ? this.styleName.hashCode() : 0); + hash = 13 * hash + (this.tag != null ? this.tag.hashCode() : 0); + hash = 13 * hash + (this.className != null ? this.className.hashCode() : 0); + return hash; + } + + public boolean equals(Object obj) + { + if (obj == null) + { + return false; + } + if (getClass() != obj.getClass()) + { + return false; + } + final StyleSheetRule other = (StyleSheetRule) obj; + if ((this.styleName == null) ? (other.styleName != null) : !this.styleName.equals(other.styleName)) + { + return false; + } + if ((this.tag == null) ? (other.tag != null) : !this.tag.equals(other.tag)) + { + return false; + } + if ((this.className == null) ? (other.className != null) : !this.className.equals(other.className)) + { + return false; + } + return true; + } + +} Index: trunk/src/com/kitfox/svg/xml/WritableXMLElement.java =================================================================== --- trunk/src/com/kitfox/svg/xml/WritableXMLElement.java (revision 4256) +++ trunk/src/com/kitfox/svg/xml/WritableXMLElement.java (revision 6002) @@ -1,25 +1,34 @@ /* - * LoadableObject.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 1, 2003, 1:46 AM 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)); } Index: trunk/src/com/kitfox/svg/xml/cpx/CPXConsts.java =================================================================== --- trunk/src/com/kitfox/svg/xml/cpx/CPXConsts.java (revision 4256) +++ trunk/src/com/kitfox/svg/xml/cpx/CPXConsts.java (revision 6002) @@ -1,25 +1,34 @@ /* - * CPXConst.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 12, 2004, 12:51 PM Index: trunk/src/com/kitfox/svg/xml/cpx/CPXInputStream.java =================================================================== --- trunk/src/com/kitfox/svg/xml/cpx/CPXInputStream.java (revision 4256) +++ trunk/src/com/kitfox/svg/xml/cpx/CPXInputStream.java (revision 6002) @@ -1,25 +1,34 @@ /* - * CPXInputStream.java - * - * - * The Salamander Project - 2D and 3D graphics libraries in Java - * Copyright (C) 2004 Mark McKay - * - * 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 + * 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: + * + * - 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 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 12, 2004, 10:34 AM @@ -28,8 +37,11 @@ package com.kitfox.svg.xml.cpx; +import com.kitfox.svg.SVGConst; import java.io.*; import java.util.*; import java.util.zip.*; import java.security.*; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.crypto.*; @@ -201,5 +213,5 @@ catch (Exception e) { - e.printStackTrace(); + Logger.getLogger(SVGConst.SVG_LOGGER).log(Level.WARNING, null, e); return -1; } @@ -207,5 +219,6 @@ if (!inflater.finished()) { - new Exception("Inflation incomplete").printStackTrace(); + Logger.getLogger(SVGConst.SVG_LOGGER).log(Level.WARNING, + "Inflation imncomplete"); } @@ -213,10 +226,11 @@ } - try { + try + { return inflater.inflate(b, off, len); } catch (DataFormatException e) { - e.printStackTrace(); + Logger.getLogger(SVGConst.SVG_LOGGER).log(Level.WARNING, null, e); return -1; } Index: trunk/src/com/kitfox/svg/xml/cpx/CPXOutputStream.java =================================================================== --- trunk/src/com/kitfox/svg/xml/cpx/CPXOutputStream.java (revision 4256) +++ trunk/src/com/kitfox/svg/xml/cpx/CPXOutputStream.java (revision 6002) @@ -1,25 +1,34 @@ /* - * CPXOutputStream.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 12, 2004, 12:50 PM Index: trunk/src/com/kitfox/svg/xml/cpx/CPXTest.java =================================================================== --- trunk/src/com/kitfox/svg/xml/cpx/CPXTest.java (revision 4256) +++ trunk/src/com/kitfox/svg/xml/cpx/CPXTest.java (revision 6002) @@ -1,25 +1,34 @@ /* - * CPXTest.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 12, 2004, 2:45 PM @@ -28,6 +37,8 @@ package com.kitfox.svg.xml.cpx; +import com.kitfox.svg.SVGConst; import java.io.*; -import java.net.*; +import java.util.logging.Level; +import java.util.logging.Logger; /** @@ -65,5 +76,5 @@ catch (Exception e) { - e.printStackTrace(); + Logger.getLogger(SVGConst.SVG_LOGGER).log(Level.WARNING, null, e); } } @@ -87,5 +98,5 @@ catch (Exception e) { - e.printStackTrace(); + Logger.getLogger(SVGConst.SVG_LOGGER).log(Level.WARNING, null, e); } } @@ -94,5 +105,6 @@ * @param args the command line arguments */ - public static void main(String[] args) { + public static void main(String[] args) + { new CPXTest(); }