From 6be2dddb3b0090f00c3a8f2b473adfa69929b0d0 Mon Sep 17 00:00:00 2001 From: kitfox Date: Wed, 6 Jun 2007 11:02:00 +0000 Subject: Added tag recognition to parser. git-svn-id: https://svn.java.net/svn/svgsalamander~svn/trunk/svg-core@37 7dc7fa77-23fb-e6ad-8e2e-c86bd48ed22b --- build.xml | 133 +++++++++++++++++++++------- nbproject/project.xml | 4 +- src/main/java/com/kitfox/svg/A.java | 102 +++++++++++++++++++++ src/main/java/com/kitfox/svg/SVGLoader.java | 5 +- src/main/res/res/help/about/about.html | 2 +- 5 files changed, 209 insertions(+), 37 deletions(-) create mode 100644 src/main/java/com/kitfox/svg/A.java diff --git a/build.xml b/build.xml index 17e83f7..a2414c7 100755 --- a/build.xml +++ b/build.xml @@ -13,6 +13,7 @@ + @@ -28,6 +29,9 @@ + + + @@ -41,6 +45,10 @@ + + + + @@ -159,36 +167,101 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + +
+ + + + + + +
+
+ +
+
+ +
+
+ +
+
+ +
+ + + + + + + + + + + + + + + + + + + +
+ + + + + + +
+
+ +
+
+ +
+
+ +
+
+ +
+ + + + + + + + + + + + + + + + + + diff --git a/nbproject/project.xml b/nbproject/project.xml index 670ef97..349af95 100755 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -6,8 +6,8 @@ svg-salamander-core - C:/dev/svn.dev.java.net/svgsalamander/trunk/svg-core/src/main/java - C:/dev/svn.dev.java.net/svgsalamander/trunk/svg-core/src/test/java + src/main/java + src/test/java diff --git a/src/main/java/com/kitfox/svg/A.java b/src/main/java/com/kitfox/svg/A.java new file mode 100644 index 0000000..52b94b5 --- /dev/null +++ b/src/main/java/com/kitfox/svg/A.java @@ -0,0 +1,102 @@ +/* + * Stop.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 + * + * Created on January 26, 2004, 1:56 AM + */ + +package com.kitfox.svg; + +import com.kitfox.svg.xml.StyleAttribute; +import java.awt.*; +import java.net.URI; + +/** + * @author Mark McKay + * @author Mark McKay + */ +public class A extends SVGElement { + + URI href; + String title; + + /** Creates a new instance of Stop */ + public A() { + } +/* + public void loaderStartElement(SVGLoaderHelper helper, Attributes attrs, SVGElement parent) + { + //Load style string + super.loaderStartElement(helper, attrs, parent); + + String offset = attrs.getValue("offset"); + this.offset = (float)XMLParseUtil.parseRatio(offset); + + buildStop(); + } + */ + + protected void build() throws SVGException + { + super.build(); + + StyleAttribute sty = new StyleAttribute(); + + if (getPres(sty.setName("xlink:href"))) + { + href = sty.getURIValue(getXMLBase()); + } + + if (getPres(sty.setName("xlink:title"))) + { + title = sty.getStringValue(); + } + } + + /** + * 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 + */ + public boolean updateTime(double curTime) throws SVGException + { +// if (trackManager.getNumTracks() == 0) return false; + + //Get current values for parameters + StyleAttribute sty = new StyleAttribute(); + boolean shapeChange = false; + + if (getPres(sty.setName("xlink:href"))) + { + href = sty.getURIValue(getXMLBase()); + } + + if (getPres(sty.setName("xlink:title"))) + { + title = sty.getStringValue(); + } + + return shapeChange; + } +} diff --git a/src/main/java/com/kitfox/svg/SVGLoader.java b/src/main/java/com/kitfox/svg/SVGLoader.java index 7f81c18..4b12339 100644 --- a/src/main/java/com/kitfox/svg/SVGLoader.java +++ b/src/main/java/com/kitfox/svg/SVGLoader.java @@ -29,13 +29,9 @@ package com.kitfox.svg; import java.util.*; -import java.io.*; import java.net.*; import org.xml.sax.*; import org.xml.sax.helpers.DefaultHandler; -import javax.xml.parsers.SAXParserFactory; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.parsers.SAXParser; import com.kitfox.svg.animation.*; @@ -80,6 +76,7 @@ public class SVGLoader extends DefaultHandler diagram = new SVGDiagram(xmlBase, universe); //Compile a list of important builder classes + nodeClasses.put("a", A.class); nodeClasses.put("animate", Animate.class); nodeClasses.put("animatecolor", AnimateColor.class); nodeClasses.put("animatemotion", AnimateMotion.class); diff --git a/src/main/res/res/help/about/about.html b/src/main/res/res/help/about/about.html index 8923f65..4a6a716 100644 --- a/src/main/res/res/help/about/about.html +++ b/src/main/res/res/help/about/about.html @@ -13,7 +13,7 @@ http://svgsalamander.dev.java.net
http://www.kitfox.com

- Last built: 2007, April, 18 02:09
+ Last built: 2007, June, 6 06:53
-- cgit v1.2.3-55-g7522