Added <a> tag recognition to parser.

git-svn-id: https://svn.java.net/svn/svgsalamander~svn/trunk/svg-core@37 7dc7fa77-23fb-e6ad-8e2e-c86bd48ed22b

5 files changed, 209 insertions, 37 deletions

diff --git a/build.xml b/build.xml
index 17e83f7..a2414c7 100755
--- a/build.xml
+++ b/build.xml
@@ -13,6 +13,7 @@
         <tstamp/>

 

         <property name="build.dir" location="build"/>

+        <property name="www.dir" location="../www"/>

         <property name="gen.main.src.dir" location="${build.dir}/gen/src/main/java"/>

         <property name="gen.main.res.dir" location="${build.dir}/gen/src/main/res"/>

         <property name="classes.main.dir" location="${build.dir}/classes/main"/>

@@ -28,6 +29,9 @@
         <property name="project.title" value="SVG Salamander"/>

         <property name="version" value="1"/>

         <property name="project.jar" location="${jar.dir}/${project.name}.jar"/>

+        <property name="project.complete.jar" value="${jar.dir}/svgSalamander.jar"/>

+        <property name="project.tiny.jar" value="${www.dir}/binaries/svgSalamander-tiny.jar"/>

+        <property name="project.www.jar" value="${www.dir}/binaries/svgSalamander.jar"/>

 

         <property name="project.debug.mainClass" value="com.kitfox.svg.app.MainFrame"/>

         <property name="project.debug.jvm" location="C:\bin\jdk1.6.0\fastdebug/bin/java"/>

@@ -41,6 +45,10 @@
         <property name="animtime.jjtree" location="${src.main.dir}/com/kitfox/svg/animation/AnimTimeParser.jjt"/>

         <property name="animtime.outdir" location="${gen.main.src.dir}/com/kitfox/svg/animation/parser"/>

         

+        <property name="key.user" value="kitfox"/>

+        <property name="key.password" value="anonymous"/>

+        <property name="key.location" location="tempKeystore"/>

+        

     	<path id="lib.include">

             <pathelement path="${netbeans.home}/modules/org-jdesktop-layout.jar"/>

             <fileset dir="lib/include">

@@ -159,36 +167,101 @@
     </target>

 

     <target name="release" depends="init,jar,generateKey" description="Obfuscates and sign jar, copies result to binaries directory.">

-        <proguard

-            defaultpackage=""

-            printmapping="${project.obfuscated.names}"

-            overloadaggressively="false"

-            usemixedcaseclassnames="false"

-            verbose="true"

-            shrink="false"

-            optimize="false"

-            obfuscate="false"

-            ignorewarnings="true">

-

-            <libraryjar>

-                <pathelement path="${java.home}/lib/rt.jar"/>

-                <!--pathelement path="C:\Program Files\Java\jdk1.6.0\jre\lib/rt.jar"/-->

-                <path refid="lib.library"/>

-            </libraryjar>

-

-            <injar file="${project.jar}"/>

-            <injar filter="!META-INF/MANIFEST.MF">

-                <path refid="lib.include"/>

-            </injar>

-

-            <outjar file="${project.obfuscated.jar}"/>

-

-            <keep access="public" type="class" name="${project.run.mainClass}">

-                <method name="main"/>

-            </keep>

-        </proguard>

-

-        <signjar jar="${project.obfuscated.jar}" alias="${key.user}" storepass="${key.password}" keystore="${key.location}"/>

+        <xslt in="${res.main.dir}/xml/about.xml" style="${res.main.dir}/xml/about.xsl" out="${res.main.dir}/res/help/about/about.html" force="true"/>

+        <!--

+        <replace file="${res.dir}/res/help/about/about.html" token="&lt;META http-equiv=&quot;Content-Type&quot; content=&quot;text/html; charset=ISO-8859-1&quot;&gt;"/>

+        -->

+        <replace file="${res.main.dir}/res/help/about/about.html" token="; charset=ISO-8859-1"/>

+        

+        <jar compress="true" jarfile="${project.complete.jar}" manifest="${manifest.file}">

+            <manifest>

+                <attribute name="Main-Class" value="${project.run.mainClass}"/>

+                <!--attribute name="Class-Path" value="kitfoxUtilities.jar"/-->

+                <attribute name="Built-By" value="${user.name}"/>

+                <section name="common">

+                    <attribute name="Specification-Title" value="SVG Salamander Utilities"/>

+                    <attribute name="Specification-Version" value="${version}"/>

+                    <attribute name="Specification-Vendor" value="Kitfox - Mark McKay"/>

+                    <attribute name="Implementation-Title" value="SVG Salamander"/>

+                    <attribute name="Implementation-Version" value="Version ${version}, Date ${TODAY}"/>

+                    <attribute name="Implementation-Vendor" value="Kitfox - Mark McKay"/>

+                </section>

+                <section name="com/kitfox/svg/SVGUniverse.class">

+                    <attribute name="Java-Bean" value="true"/>

+                </section>

+                <section name="com/kitfox/svg/app/beans/SVGIcon.class">

+                    <attribute name="Java-Bean" value="true"/>

+                </section>

+                <section name="com/kitfox/svg/app/beans/SVGPanel.class">

+                    <attribute name="Java-Bean" value="true"/>

+                </section>

+                <section name="com/kitfox/svg/app/beans/ProportionalLayoutPanel.class">

+                    <attribute name="Java-Bean" value="true"/>

+                </section>

+            </manifest>

+        

+            <fileset dir="${classes.main.dir}">

+                <include name="**/*.class"/>

+            </fileset>

+            <fileset dir=".">

+                <include name="lgpl.txt"/>

+                <include name="readme.txt"/>

+            </fileset>

+            <fileset dir="${res.main.dir}">

+                <include name="res/**"/>

+            </fileset>

+        </jar>

+

+        <jar compress="true" jarfile="${project.tiny.jar}">

+            <manifest>

+                <attribute name="Main-Class" value="${project.run.mainClass}"/>

+                <!--attribute name="Class-Path" value="kitfoxUtilities.jar"/-->

+                <attribute name="Built-By" value="${user.name}"/>

+                <section name="common">

+                    <attribute name="Specification-Title" value="SVG Salamander Utilities"/>

+                    <attribute name="Specification-Version" value="${version}"/>

+                    <attribute name="Specification-Vendor" value="Kitfox - Mark McKay"/>

+                    <attribute name="Implementation-Title" value="SVG Salamander"/>

+                    <attribute name="Implementation-Version" value="Version ${version}, Date ${TODAY}"/>

+                    <attribute name="Implementation-Vendor" value="Kitfox - Mark McKay"/>

+                </section>

+                <section name="com/kitfox/svg/SVGUniverse.class">

+                    <attribute name="Java-Bean" value="true"/>

+                </section>

+                <section name="com/kitfox/svg/app/beans/SVGIcon.class">

+                    <attribute name="Java-Bean" value="true"/>

+                </section>

+                <section name="com/kitfox/svg/app/beans/SVGPanel.class">

+                    <attribute name="Java-Bean" value="true"/>

+                </section>

+                <section name="com/kitfox/svg/app/beans/ProportionalLayoutPanel.class">

+                    <attribute name="Java-Bean" value="true"/>

+                </section>

+            </manifest>

+        

+            <fileset dir="${classes.main.dir}">

+                <include name="**/*.class"/>

+            </fileset>

+            <fileset dir=".">

+                <include name="lgpl.txt"/>

+                <include name="readme.txt"/>

+            </fileset>

+        </jar>

+

+        <!-- 

+        Signing a jar depends upon you having a keystore to sign the jar 

+        with.  If you have an existing keystore, update the key.user, 

+        key.password and key.location properties to reflect your key entry.  

+        If you don't have a keystore, you can create a default keystore for 

+        the purposes for signing this file by running the generateKey task 

+        in this ant file. 

+        -->

+        <antcall target="generateKey"/>

+        <signjar jar="${project.complete.jar}" alias="${key.user}" storepass="${key.password}" keystore="${key.location}"/>

+        

+        <copy file="${project.complete.jar}" toFile="${project.www.jar}"/>

+        

+        <copy file="${javadoc.zip}" toFile="${javadoc.www.zip}" failonerror="false"/>

     </target>

 

     <target name="clean" depends="init" description="Clean all build products.">

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 @@
             <!-- Do not use Project Properties customizer when editing this file manually. -->

             <name>svg-salamander-core</name>

             <properties>

-                <property name="src.main.dir">C:/dev/svn.dev.java.net/svgsalamander/trunk/svg-core/src/main/java</property>

-                <property name="src.test.dir">C:/dev/svn.dev.java.net/svgsalamander/trunk/svg-core/src/test/java</property>

+                <property name="src.main.dir">src/main/java</property>

+                <property name="src.test.dir">src/test/java</property>

             </properties>

             <folders>

                 <source-folder>

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 <a href="mailto:mark@kitfox.com">Mark McKay</a>

+ */

+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<br>

     http://www.kitfox.com<br>

 <br>

-    Last built: 2007, April, 18 02:09<br>

+    Last built: 2007, June, 6 06:53<br>

 </div>

 </body>

 </html>