From 1c591f20fce3ad83e43d26b7a9bee83167f98bf8 Mon Sep 17 00:00:00 2001
From: kitfox
Date: Mon, 11 Feb 2008 03:49:23 +0000
Subject: Changed InputStream readers to handle European characters.
Reorganised build process
git-svn-id: https://svn.java.net/svn/svgsalamander~svn/trunk/svg-core@49 7dc7fa77-23fb-e6ad-8e2e-c86bd48ed22b
---
build.xml | 371 ++++----------
hotspot.log | 25 -
lib/library/ant.jar | Bin 999966 -> 0 bytes
lib/library/javacc.jar | Bin 378781 -> 0 bytes
lib/library/junit.jar | Bin 121070 -> 0 bytes
manifest.mf | 14 -
nbproject/build-impl.xml | 671 ++++++++++++++++++++++++++
nbproject/genfiles.properties | 8 +
nbproject/private/private.xml | 4 -
nbproject/project.properties | 78 +++
nbproject/project.xml | 246 +---------
src/main/java/com/kitfox/svg/SVGUniverse.java | 26 +-
12 files changed, 894 insertions(+), 549 deletions(-)
delete mode 100644 hotspot.log
delete mode 100644 lib/library/ant.jar
delete mode 100755 lib/library/javacc.jar
delete mode 100755 lib/library/junit.jar
delete mode 100755 manifest.mf
create mode 100755 nbproject/build-impl.xml
create mode 100755 nbproject/genfiles.properties
delete mode 100755 nbproject/private/private.xml
create mode 100755 nbproject/project.properties
diff --git a/build.xml b/build.xml
index a1feedf..16e2b14 100755
--- a/build.xml
+++ b/build.xml
@@ -1,281 +1,116 @@
-
-
- Java 2D graphics pipeline inspired by SVG
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ Builds, tests, and runs the project svg-salamander-core.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
-
+
diff --git a/hotspot.log b/hotspot.log
deleted file mode 100644
index ce1ff2f..0000000
--- a/hotspot.log
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-Java HotSpot(TM) Client VM
-
-
-1.6.0-rc-fastdebug-b99-debug
-
-
-Java HotSpot(TM) Client VM (1.6.0-rc-fastdebug-b99) for windows-x86, built on Sep 15 2006 02:26:51 by "java_re" with unknown MS VC++:1310
-
-
-
-
--Xdebug -Xnoagent -Djava.compiler=none -Xrunjdwp:transport=dt_socket,address=localhost:4663
-
-
-com.kitfox.svg.zip.ZipTestMain
-
-
-SUN_STANDARD
-
-
-
diff --git a/lib/library/ant.jar b/lib/library/ant.jar
deleted file mode 100644
index 3a67607..0000000
Binary files a/lib/library/ant.jar and /dev/null differ
diff --git a/lib/library/javacc.jar b/lib/library/javacc.jar
deleted file mode 100755
index 5506008..0000000
Binary files a/lib/library/javacc.jar and /dev/null differ
diff --git a/lib/library/junit.jar b/lib/library/junit.jar
deleted file mode 100755
index 674d71e..0000000
Binary files a/lib/library/junit.jar and /dev/null differ
diff --git a/manifest.mf b/manifest.mf
deleted file mode 100755
index 9960bbc..0000000
--- a/manifest.mf
+++ /dev/null
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Ant-Version: Apache Ant 1.7.0Beta3
-Created-By: 1.6.0-b105 (Sun Microsystems Inc.)
-Main-Class: com.kitfox.Main
-Built-By: kitfox
-
-Name: common
-Specification-Title: SVG Salamander
-Specification-Version: 1
-Specification-Vendor: Kitfox
-Implementation-Title: svg-salamander-core
-Implementation-Version: Version 1, Date May 29 2007
-Implementation-Vendor: Mark McKay, mark@kitfox.com
-
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
new file mode 100755
index 0000000..1bf7540
--- /dev/null
+++ b/nbproject/build-impl.xml
@@ -0,0 +1,671 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must set src.dir
+ Must set src.java.dir
+ Must set src.res.dir
+ Must set res.dir
+ Must set test.src.dir
+ Must set test.res.dir
+ Must set build.dir
+ Must set dist.dir
+ Must set build.classes.dir
+ Must set dist.javadoc.dir
+ Must set build.test.classes.dir
+ Must set build.test.results.dir
+ Must set build.classes.excludes
+ Must set dist.jar
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must set javac.includes
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must select some files in the IDE or set javac.includes
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ To run this application from the command line without Ant, try:
+
+
+
+
+
+
+ java -cp "${run.classpath.with.dist.jar}" ${main.class}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ To run this application from the command line without Ant, try:
+
+ java -jar "${dist.jar.resolved}"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must select one file in the IDE or set run.class
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must select one file in the IDE or set debug.class
+
+
+
+
+ Must set fix.includes
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must select some files in the IDE or set javac.includes
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Some tests failed; see details above.
+
+
+
+
+
+
+
+
+ Must select some files in the IDE or set test.includes
+
+
+
+ Some tests failed; see details above.
+
+
+
+
+ Must select one file in the IDE or set test.class
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must select one file in the IDE or set applet.url
+
+
+
+
+
+
+
+
+ Must select one file in the IDE or set applet.url
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
new file mode 100755
index 0000000..345b3d4
--- /dev/null
+++ b/nbproject/genfiles.properties
@@ -0,0 +1,8 @@
+build.xml.data.CRC32=16a7c89c
+build.xml.script.CRC32=91ddbaab
+build.xml.stylesheet.CRC32=be360661
+# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
+# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
+nbproject/build-impl.xml.data.CRC32=f852a4d9
+nbproject/build-impl.xml.script.CRC32=7235f0eb
+nbproject/build-impl.xml.stylesheet.CRC32=e327d66c
diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
deleted file mode 100755
index cc2c0e5..0000000
--- a/nbproject/private/private.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/nbproject/project.properties b/nbproject/project.properties
new file mode 100755
index 0000000..5bb10d9
--- /dev/null
+++ b/nbproject/project.properties
@@ -0,0 +1,78 @@
+application.title=svg-salamander-core
+application.vendor=kitfox
+build.classes.dir=${build.dir}/classes
+build.classes.excludes=**/*.java,**/*.form
+# This directory is removed when the project is cleaned:
+build.dir=build
+build.generated.dir=${build.dir}/generated
+# Only compile against the classpath explicitly listed here:
+build.sysclasspath=ignore
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+debug.classpath=\
+ ${run.classpath}
+debug.test.classpath=\
+ ${run.test.classpath}
+# This directory is removed when the project is cleaned:
+dist.dir=dist
+dist.jar=${dist.dir}/svg-salamander-core.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+excludes=
+file.reference.ant.jar=..\\libraries\\ant.jar
+file.reference.javacc.jar=..\\libraries\\javacc.jar
+file.reference.main-java=src/main/java
+file.reference.main-res=src/main/res
+file.reference.test-java=src/test/java
+file.reference.test-res=src/test/res
+includes=**
+jar.compress=true
+javac.classpath=\
+ ${file.reference.ant.jar}:\
+ ${file.reference.javacc.jar}
+# Space-separated list of extra javac options
+javac.compilerargs=
+javac.deprecation=false
+javac.source=1.4
+javac.target=1.4
+javac.test.classpath=\
+ ${javac.classpath}:\
+ ${build.classes.dir}:\
+ ${libs.junit.classpath}:\
+ ${libs.junit_4.classpath}
+javadoc.additionalparam=
+javadoc.author=false
+javadoc.encoding=${source.encoding}
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=
+jnlp.codebase.type=user
+jnlp.codebase.user=https://svgsalamander.dev.java.net/binaries/
+jnlp.enabled=false
+jnlp.offline-allowed=true
+jnlp.signed=true
+main.class=com.kitfox.svg.app.SVGPlayer
+manifest.file=manifest.mf
+meta.inf.dir=${src.dir}/META-INF
+platform.active=default_platform
+res.dir=${file.reference.main-res}
+run.classpath=\
+ ${javac.classpath}:\
+ ${build.classes.dir}
+# Space-separated list of JVM arguments used when running the project
+# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
+# or test-sys-prop.name=value to set system properties for unit tests):
+run.jvmargs=
+run.test.classpath=\
+ ${javac.test.classpath}:\
+ ${build.test.classes.dir}
+source.encoding=UTF-8
+src.dir=${file.reference.main-java}
+src.java.dir=src\\gen\\java
+src.res.dir=src\\gen\\res
+test.res.dir=${file.reference.test-res}
+test.src.dir=${file.reference.test-java}
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 349af95..289b995 100755
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -1,235 +1,23 @@
- org.netbeans.modules.ant.freeform
+ org.netbeans.modules.java.j2seproject
-
-
+
svg-salamander-core
-
- src/main/java
- src/test/java
-
-
-
-
- java
- src/main/java
-
-
-
- java
- src/main/res
-
-
-
- java
- src/test/java
-
-
-
- java
- src/test/res
-
-
-
- java
- ../www
-
-
-
- ../www
-
-
-
-
- build
-
-
- clean
-
-
- javadoc
-
-
- run
-
-
- checkintest
-
-
- clean
- build
-
-
- debug
-
-
- compile-selected-files
-
- files
- ${src.main.dir}
- \.java$
- relative-path
-
- ,
-
-
-
-
- compile-selected-files-test
-
- files
- ${src.test.dir}
- \.java$
- relative-path
-
- ,
-
-
-
-
- run-selected-files
-
- classname
- ${src.main.dir}
- \.java$
- java-name
-
-
-
-
-
-
- run-selected-files-test
-
- classname
- ${src.test.dir}
- \.java$
- java-name
-
-
-
-
-
-
- debug-selected-files
-
- classname
- ${src.main.dir}
- \.java$
- java-name
-
-
-
-
-
-
- debug-selected-files-test
-
- classname
- ${src.test.dir}
- \.java$
- java-name
-
-
-
-
-
-
- debug-fix
-
- fix.file
- ${src.main.dir}
- \.java$
- relative-path-noext
-
-
-
-
-
-
- test-selected-files
-
- classname
- ${src.main.dir}
- \.java$
- java-name
-
-
-
-
-
-
-
- jar
- build/jar/svg-salamander-core.jar
- build
-
-
-
-
-
- src/main/java
-
-
-
- src/main/res
-
-
-
- src/test/java
-
-
-
- src/test/res
-
-
-
- ../www
-
-
- build.xml
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- src/main/java
- lib/library/javacc.jar;lib/library/junit.jar
- build/jar/svg-salamander-core.jar
- 1.5
-
-
- src/main/res
- 1.5
-
-
- src/test/java
-
- lib/library/javacc.jar;lib/library/junit.jar;build/jar/svg-salamander-core.jar
- 1.5
-
-
- src/test/res
-
- 1.5
-
-
- ../www
-
- 1.5
-
-
+ 1.6.5
+
+
+
+
+
+
+
+
+
+
+
+
+ ..\libraries\nblibraries.properties
+
diff --git a/src/main/java/com/kitfox/svg/SVGUniverse.java b/src/main/java/com/kitfox/svg/SVGUniverse.java
index 13c8988..c6b3e58 100644
--- a/src/main/java/com/kitfox/svg/SVGUniverse.java
+++ b/src/main/java/com/kitfox/svg/SVGUniverse.java
@@ -317,8 +317,15 @@ public class SVGUniverse implements Serializable
return null;
}
-
- private InputStreamReader createDocumentReader(InputStream is) throws IOException
+ /**
+ * Wraps input stream in a BufferedInputStream. If it is detected that this
+ * input stream is GZIPped, also wraps in a GZIPInputStream for inflation.
+ *
+ * @param is Raw input stream
+ * @return Uncompressed stream of SVG data
+ * @throws java.io.IOException
+ */
+ private InputStream createDocumentInputStream(InputStream is) throws IOException
{
BufferedInputStream bin = new BufferedInputStream(is);
bin.mark(2);
@@ -330,12 +337,12 @@ public class SVGUniverse implements Serializable
if ((b1 << 8 | b0) == GZIPInputStream.GZIP_MAGIC)
{
GZIPInputStream iis = new GZIPInputStream(bin);
- return new InputStreamReader(iis);
+ return iis;
}
else
{
//Plain text
- return new InputStreamReader(bin);
+ return bin;
}
}
@@ -360,7 +367,7 @@ public class SVGUniverse implements Serializable
if (loadedDocs.containsKey(uri) && !forceLoad) return uri;
InputStream is = docRoot.openStream();
- return loadSVG(uri, createDocumentReader(is));
+ return loadSVG(uri, new InputSource(createDocumentInputStream(is)));
}
catch (Throwable t)
{
@@ -378,7 +385,7 @@ public class SVGUniverse implements Serializable
public URI loadSVG(InputStream is, String name, boolean forceLoad) throws IOException
{
- return loadSVG(createDocumentReader(is), name, forceLoad);
+ return loadSVG(createDocumentInputStream(is), name, forceLoad);
}
public URI loadSVG(Reader reader, String name)
@@ -422,7 +429,7 @@ public class SVGUniverse implements Serializable
if (uri == null) return null;
if (loadedDocs.containsKey(uri) && !forceLoad) return uri;
- return loadSVG(uri, reader);
+ return loadSVG(uri, new InputSource(reader));
}
/**
@@ -448,7 +455,8 @@ public class SVGUniverse implements Serializable
}
- protected URI loadSVG(URI xmlBase, Reader is)
+// protected URI loadSVG(URI xmlBase, InputStream is)
+ protected URI loadSVG(URI xmlBase, InputSource is)
{
// Use an instance of ourselves as the SAX event handler
SVGLoader handler = new SVGLoader(xmlBase, this, verbose);
@@ -479,7 +487,7 @@ public class SVGUniverse implements Serializable
}
);
reader.setContentHandler(handler);
- reader.parse(new InputSource(new BufferedReader(is)));
+ reader.parse(is);
// SAXParser saxParser = factory.newSAXParser();
// saxParser.parse(new InputSource(new BufferedReader(is)), handler);
--
cgit v1.2.3-55-g7522