deweese 2004/10/30 09:54:54
Modified: contrib/jsvg JSVG.java
contrib/scroll ScrollExample.java
resources/org/apache/batik/apps/svgbrowser/resources
ThumbnailDialog.properties
resources/org/apache/batik/apps/svgpp/resources
Messages.properties
resources/org/apache/batik/bridge BrokenLink.svg
resources/org/apache/batik/bridge/resources
Messages.properties
resources/org/apache/batik/css/engine/resources
Messages.properties
resources/org/apache/batik/css/engine/value/resources
Messages.properties
sources/org/apache/batik/apps/svgbrowser
JSVGViewerFrame.java Main.java
sources/org/apache/batik/bridge DocumentJarClassLoader.java
sources/org/apache/batik/ext/awt/image/codec/tiff
TIFFDirectory.java
sources/org/apache/batik/svggen SVGEllipse.java SVGPath.java
SVGShape.java
sources/org/apache/batik/swing JSVGCanvas.java
sources/org/apache/batik/swing/svg
SVGUserAgentGUIAdapter.java
sources/org/apache/batik/util SVGConstants.java
sources/org/apache/batik/util/gui CSSMediaPanel.java
test-references/org/apache/batik/svggen BasicShapes2.svg
ContextBasicShapes2.svg
Log:
1) Arc2D now translated to path with elliptical arc commands.
2) Fixed some of the J2SE 1.5 compile problems.
3) Fixed some more Apache headers.
PR:30925
Revision Changes Path
1.2 +15 -47 xml-batik/contrib/jsvg/JSVG.java
Index: JSVG.java
===================================================================
RCS file: /home/cvs/xml-batik/contrib/jsvg/JSVG.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JSVG.java 29 Oct 2003 00:28:00 -0000 1.1
+++ JSVG.java 30 Oct 2004 16:54:53 -0000 1.2
@@ -1,52 +1,20 @@
/*
- ============================================================================
- The Apache Software License, Version 1.1
- ============================================================================
+ Copyright 2001-2003 The Apache Software Foundation
- Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
- Redistribution and use in source and binary forms, with or without modifica-
- tion, are permitted provided that the following conditions are met:
+ http://www.apache.org/licenses/LICENSE-2.0
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
- 2. 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.
-
- 3. The end-user documentation included with the redistribution, if any, must
- include the following acknowledgment: "This product includes software
- developed by the Apache Software Foundation (http://www.apache.org/)."
- Alternately, this acknowledgment may appear in the software itself, if
- and wherever such third-party acknowledgments normally appear.
-
- 4. The names "Batik" and "Apache Software Foundation" must not be
- used to endorse or promote products derived from this software without
- prior written permission. For written permission, please contact
- [EMAIL PROTECTED]
-
- 5. Products derived from this software may not be called "Apache", nor may
- "Apache" appear in their name, without prior written permission of the
- Apache Software Foundation.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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
- APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
- DING, 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.
-
- This software consists of voluntary contributions made by many individuals
- on behalf of the Apache Software Foundation. For more information on the
- Apache Software Foundation, please see <http://www.apache.org/>.
-
-*/
+ */
package org.apache.batik.apps.jsvg;
1.3 +103 -135 xml-batik/contrib/scroll/ScrollExample.java
Index: ScrollExample.java
===================================================================
RCS file: /home/cvs/xml-batik/contrib/scroll/ScrollExample.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ScrollExample.java 5 Feb 2004 02:53:44 -0000 1.2
+++ ScrollExample.java 30 Oct 2004 16:54:53 -0000 1.3
@@ -1,135 +1,103 @@
-/*
-
- ============================================================================
- The Apache Software License, Version 1.1
- ============================================================================
-
- Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modifica-
- tion, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. 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.
-
- 3. The end-user documentation included with the redistribution, if any, must
- include the following acknowledgment: "This product includes software
- developed by the Apache Software Foundation (http://www.apache.org/)."
- Alternately, this acknowledgment may appear in the software itself, if
- and wherever such third-party acknowledgments normally appear.
-
- 4. The names "Batik" and "Apache Software Foundation" must not be
- used to endorse or promote products derived from this software without
- prior written permission. For written permission, please contact
- [EMAIL PROTECTED]
-
- 5. Products derived from this software may not be called "Apache", nor may
- "Apache" appear in their name, without prior written permission of the
- Apache Software Foundation.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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
- APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
- DING, 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.
-
- This software consists of voluntary contributions made by many individuals
- on behalf of the Apache Software Foundation. For more information on the
- Apache Software Foundation, please see <http://www.apache.org/>.
-
-*/
-
-package org.test;
-
-import java.awt.Dimension;
-import java.io.File;
-import java.net.URL;
-import java.net.MalformedURLException;
-import javax.swing.JFrame;
-import javax.swing.WindowConstants;
-
-import org.apache.batik.swing.*;
-
-/**
-* A very simple example class that demonstrates the
-* XJSVGCanvas and XJSVGScroller classes.
-* <p>
-* Usage: ScrollExample [svg file name]
-* <p>
-* @author Zach DelProposto
-*
-*
-*
-*/
-public class ScrollExample
-{
-
- /** Command-line start */
- public static void main(String args[])
- {
- if(args.length != 1)
- {
- System.out.println("No or multiple SVG files were specified.");
- System.out.println("Usage: ScrollExample svgFileName");
- System.exit(1);
- }
-
- // get the file
- File file = new File(args[0]);
- if(!file.exists())
- {
- System.out.println("File "+file+" does not exist!");
- System.exit(1);
- }
-
- try
- {
- new ScrollExample(file.toURL());
- }
- catch(MalformedURLException e)
- {
- System.out.println("Cannot convert file to a valid URL...");
- System.out.println(e);
- System.exit(1);
- }
-
- }// main()
-
-
- /** Construct the Example */
- private ScrollExample(URL url)
- {
- JFrame frame = new JFrame("ScrollExample: "+url.getFile());
- frame.setResizable(true);
- frame.setSize(new Dimension(500,500));
- frame.addWindowListener(new java.awt.event.WindowAdapter() {
- public void windowClosing
- (java.awt.event.WindowEvent e) {
- System.exit(0);
- }
- });
-
- // frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
-
- JSVGCanvas canvas = new JSVGCanvas();
- JSVGScrollPane scroller = new JSVGScrollPane(canvas);
- canvas.setURI(url.toString());
-
- frame.getContentPane().add(scroller);
- frame.setVisible(true);
- }// ScrollExample()
-
-
-
-
-}// class ScrollExample
-
+/*
+
+ Copyright 2001-2003 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ */
+
+package org.test;
+
+import java.awt.Dimension;
+import java.io.File;
+import java.net.URL;
+import java.net.MalformedURLException;
+import javax.swing.JFrame;
+import javax.swing.WindowConstants;
+
+import org.apache.batik.swing.*;
+
+/**
+* A very simple example class that demonstrates the
+* XJSVGCanvas and XJSVGScroller classes.
+* <p>
+* Usage: ScrollExample [svg file name]
+* <p>
+* @author Zach DelProposto
+*
+*
+*
+*/
+public class ScrollExample
+{
+
+ /** Command-line start */
+ public static void main(String args[])
+ {
+ if(args.length != 1)
+ {
+ System.out.println("No or multiple SVG files were specified.");
+ System.out.println("Usage: ScrollExample svgFileName");
+ System.exit(1);
+ }
+
+ // get the file
+ File file = new File(args[0]);
+ if(!file.exists())
+ {
+ System.out.println("File "+file+" does not exist!");
+ System.exit(1);
+ }
+
+ try
+ {
+ new ScrollExample(file.toURL());
+ }
+ catch(MalformedURLException e)
+ {
+ System.out.println("Cannot convert file to a valid URL...");
+ System.out.println(e);
+ System.exit(1);
+ }
+
+ }// main()
+
+
+ /** Construct the Example */
+ private ScrollExample(URL url)
+ {
+ JFrame frame = new JFrame("ScrollExample: "+url.getFile());
+ frame.setResizable(true);
+ frame.setSize(new Dimension(500,500));
+ frame.addWindowListener(new java.awt.event.WindowAdapter() {
+ public void windowClosing
+ (java.awt.event.WindowEvent e) {
+ System.exit(0);
+ }
+ });
+
+ // frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
+
+ JSVGCanvas canvas = new JSVGCanvas();
+ JSVGScrollPane scroller = new JSVGScrollPane(canvas);
+ canvas.setURI(url.toString());
+
+ frame.getContentPane().add(scroller);
+ frame.setVisible(true);
+ }// ScrollExample()
+
+
+
+
+}// class ScrollExample
+
1.3 +15 -46
xml-batik/resources/org/apache/batik/apps/svgbrowser/resources/ThumbnailDialog.properties
Index: ThumbnailDialog.properties
===================================================================
RCS file:
/home/cvs/xml-batik/resources/org/apache/batik/apps/svgbrowser/resources/ThumbnailDialog.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ThumbnailDialog.properties 8 Aug 2003 11:39:28 -0000 1.2
+++ ThumbnailDialog.properties 30 Oct 2004 16:54:53 -0000 1.3
@@ -1,49 +1,18 @@
-###############################################################################
-# The Apache Software License, Version 1.1 #
-###############################################################################
+#
+# Copyright 2001-2003 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
#
-# Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modifica-
-# tion, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# 2. 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.
-#
-# 3. The end-user documentation included with the redistribution, if any, must
-# include the following acknowledgment: "This product includes software
-# developed by the Apache Software Foundation (http://www.apache.org/)."
-# Alternately, this acknowledgment may appear in the software itself, if
-# and wherever such third-party acknowledgments normally appear.
-#
-# 4. The names "Batik" and "Apache Software Foundation" must not be
-# used to endorse or promote products derived from this software without
-# prior written permission. For written permission, please contact
-# [EMAIL PROTECTED]
-#
-# 5. Products derived from this software may not be called "Apache", nor may
-# "Apache" appear in their name, without prior written permission of the
-# Apache Software Foundation.
-#
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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
-# APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
-# DING, 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.
-#
-# This software consists of voluntary contributions made by many individuals
-# on behalf of the Apache Software Foundation. For more information on the
-# Apache Software Foundation, please see <http://www.apache.org/>.
-###############################################################################
#
# ThumbnailDialog properties file
1.5 +15 -45
xml-batik/resources/org/apache/batik/apps/svgpp/resources/Messages.properties
Index: Messages.properties
===================================================================
RCS file:
/home/cvs/xml-batik/resources/org/apache/batik/apps/svgpp/resources/Messages.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Messages.properties 8 Aug 2003 11:39:28 -0000 1.4
+++ Messages.properties 30 Oct 2004 16:54:53 -0000 1.5
@@ -1,49 +1,19 @@
-###############################################################################
-# The Apache Software License, Version 1.1 #
-###############################################################################
+#
+# Copyright 2001-2003 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
#
-# Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modifica-
-# tion, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# 2. 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.
-#
-# 3. The end-user documentation included with the redistribution, if any, must
-# include the following acknowledgment: "This product includes software
-# developed by the Apache Software Foundation (http://www.apache.org/)."
-# Alternately, this acknowledgment may appear in the software itself, if
-# and wherever such third-party acknowledgments normally appear.
-#
-# 4. The names "Batik" and "Apache Software Foundation" must not be
-# used to endorse or promote products derived from this software without
-# prior written permission. For written permission, please contact
-# [EMAIL PROTECTED]
-#
-# 5. Products derived from this software may not be called "Apache", nor may
-# "Apache" appear in their name, without prior written permission of the
-# Apache Software Foundation.
-#
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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
-# APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
-# DING, 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.
-#
-# This software consists of voluntary contributions made by many individuals
-# on behalf of the Apache Software Foundation. For more information on the
-# Apache Software Foundation, please see <http://www.apache.org/>.
-###############################################################################
+
#
# The messages for the SVG pretty printer.
#
1.8 +13 -47 xml-batik/resources/org/apache/batik/bridge/BrokenLink.svg
Index: BrokenLink.svg
===================================================================
RCS file: /home/cvs/xml-batik/resources/org/apache/batik/bridge/BrokenLink.svg,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BrokenLink.svg 17 Oct 2003 18:10:22 -0000 1.7
+++ BrokenLink.svg 30 Oct 2004 16:54:53 -0000 1.8
@@ -3,53 +3,19 @@
"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd";>
<!--
-
- ============================================================================
- The Apache Software License, Version 1.1
- ============================================================================
-
- Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modifica-
- tion, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. 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.
-
- 3. The end-user documentation included with the redistribution, if any, must
- include the following acknowledgment: "This product includes software
- developed by the Apache Software Foundation (http://www.apache.org/)."
- Alternately, this acknowledgment may appear in the software itself, if
- and wherever such third-party acknowledgments normally appear.
-
- 4. The names "Batik" and "Apache Software Foundation" must not be
- used to endorse or promote products derived from this software without
- prior written permission. For written permission, please contact
- [EMAIL PROTECTED]
-
- 5. Products derived from this software may not be called "Apache", nor may
- "Apache" appear in their name, without prior written permission of the
- Apache Software Foundation.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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
- APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
- DING, 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.
-
- This software consists of voluntary contributions made by many individuals
- on behalf of the Apache Software Foundation. For more information on the
- Apache Software Foundation, please see <http://www.apache.org/>.
-
+ Copyright 2001-2003 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<svg viewBox="0 0 55.521 60.508" preserveAspectRatio="none"
1.17 +14 -45
xml-batik/resources/org/apache/batik/bridge/resources/Messages.properties
Index: Messages.properties
===================================================================
RCS file:
/home/cvs/xml-batik/resources/org/apache/batik/bridge/resources/Messages.properties,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Messages.properties 17 Oct 2003 18:10:22 -0000 1.16
+++ Messages.properties 30 Oct 2004 16:54:53 -0000 1.17
@@ -1,49 +1,18 @@
-###############################################################################
-# The Apache Software License, Version 1.1 #
-###############################################################################
+#
+# Copyright 2001-2003 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
#
-# Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modifica-
-# tion, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# 2. 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.
-#
-# 3. The end-user documentation included with the redistribution, if any, must
-# include the following acknowledgment: "This product includes software
-# developed by the Apache Software Foundation (http://www.apache.org/)."
-# Alternately, this acknowledgment may appear in the software itself, if
-# and wherever such third-party acknowledgments normally appear.
-#
-# 4. The names "Batik" and "Apache Software Foundation" must not be
-# used to endorse or promote products derived from this software without
-# prior written permission. For written permission, please contact
-# [EMAIL PROTECTED]
-#
-# 5. Products derived from this software may not be called "Apache", nor may
-# "Apache" appear in their name, without prior written permission of the
-# Apache Software Foundation.
-#
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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
-# APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
-# DING, 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.
-#
-# This software consists of voluntary contributions made by many individuals
-# on behalf of the Apache Software Foundation. For more information on the
-# Apache Software Foundation, please see <http://www.apache.org/>.
-###############################################################################
attribute.missing = \
{0}:{1}\n\
1.3 +16 -46
xml-batik/resources/org/apache/batik/css/engine/resources/Messages.properties
Index: Messages.properties
===================================================================
RCS file:
/home/cvs/xml-batik/resources/org/apache/batik/css/engine/resources/Messages.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Messages.properties 8 Aug 2003 11:39:28 -0000 1.2
+++ Messages.properties 30 Oct 2004 16:54:53 -0000 1.3
@@ -1,49 +1,19 @@
-###############################################################################
-# The Apache Software License, Version 1.1 #
-###############################################################################
+#
+# Copyright 2001-2003 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
#
-# Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modifica-
-# tion, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# 2. 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.
-#
-# 3. The end-user documentation included with the redistribution, if any, must
-# include the following acknowledgment: "This product includes software
-# developed by the Apache Software Foundation (http://www.apache.org/)."
-# Alternately, this acknowledgment may appear in the software itself, if
-# and wherever such third-party acknowledgments normally appear.
-#
-# 4. The names "Batik" and "Apache Software Foundation" must not be
-# used to endorse or promote products derived from this software without
-# prior written permission. For written permission, please contact
-# [EMAIL PROTECTED]
-#
-# 5. Products derived from this software may not be called "Apache", nor may
-# "Apache" appear in their name, without prior written permission of the
-# Apache Software Foundation.
-#
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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
-# APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
-# DING, 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.
-#
-# This software consists of voluntary contributions made by many individuals
-# on behalf of the Apache Software Foundation. For more information on the
-# Apache Software Foundation, please see <http://www.apache.org/>.
-###############################################################################
+
#
# $Id$
#
1.3 +14 -45
xml-batik/resources/org/apache/batik/css/engine/value/resources/Messages.properties
Index: Messages.properties
===================================================================
RCS file:
/home/cvs/xml-batik/resources/org/apache/batik/css/engine/value/resources/Messages.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Messages.properties 8 Aug 2003 11:39:28 -0000 1.2
+++ Messages.properties 30 Oct 2004 16:54:53 -0000 1.3
@@ -1,49 +1,18 @@
-###############################################################################
-# The Apache Software License, Version 1.1 #
-###############################################################################
+#
+# Copyright 2001-2003 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
#
-# Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modifica-
-# tion, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# 2. 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.
-#
-# 3. The end-user documentation included with the redistribution, if any, must
-# include the following acknowledgment: "This product includes software
-# developed by the Apache Software Foundation (http://www.apache.org/)."
-# Alternately, this acknowledgment may appear in the software itself, if
-# and wherever such third-party acknowledgments normally appear.
-#
-# 4. The names "Batik" and "Apache Software Foundation" must not be
-# used to endorse or promote products derived from this software without
-# prior written permission. For written permission, please contact
-# [EMAIL PROTECTED]
-#
-# 5. Products derived from this software may not be called "Apache", nor may
-# "Apache" appear in their name, without prior written permission of the
-# Apache Software Foundation.
-#
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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
-# APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
-# DING, 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.
-#
-# This software consists of voluntary contributions made by many individuals
-# on behalf of the Apache Software Foundation. For more information on the
-# Apache Software Foundation, please see <http://www.apache.org/>.
-###############################################################################
invalid.access = \
The invoked method is not enabled for the "{0}" property.
1.105 +11 -10
xml-batik/sources/org/apache/batik/apps/svgbrowser/JSVGViewerFrame.java
Index: JSVGViewerFrame.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/apps/svgbrowser/JSVGViewerFrame.java,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- JSVGViewerFrame.java 23 Oct 2004 17:11:03 -0000 1.104
+++ JSVGViewerFrame.java 30 Oct 2004 16:54:53 -0000 1.105
@@ -869,9 +869,10 @@
public void actionPerformed(ActionEvent e){
AboutDialog dlg = new AboutDialog(JSVGViewerFrame.this);
- dlg.setSize(dlg.getPreferredSize()); // Work around pack() bug on some
platforms
+ // Work around pack() bug on some platforms
+ dlg.setSize(dlg.getPreferredSize());
dlg.setLocationRelativeTo(JSVGViewerFrame.this);
- dlg.show();
+ dlg.setVisible(true);
dlg.toFront();
}
}
@@ -1457,7 +1458,7 @@
ta.setDocument(doc);
ta.setEditable(false);
ta.setBackground(Color.white);
- fr.show();
+ fr.setVisible(true);
} catch (Exception ex) {
userAgent.displayError(ex);
}
@@ -1734,7 +1735,7 @@
memoryMonitorFrame.setLocation(fr.x + (fr.width - md.width) / 2,
fr.y + (fr.height - md.height) / 2);
}
- memoryMonitorFrame.show();
+ memoryMonitorFrame.setVisible(true);
}
}
@@ -1753,7 +1754,7 @@
findDialog.setLocation(fr.x + (fr.width - td.width) / 2,
fr.y + (fr.height - td.height) / 2);
}
- findDialog.show();
+ findDialog.setVisible(true);
}
}
@@ -1774,7 +1775,7 @@
}
thumbnailDialog.setInteractionEnabled
(!svgCanvas.getDisableInteractions());
- thumbnailDialog.show();
+ thumbnailDialog.setVisible(true);
}
}
@@ -1823,7 +1824,7 @@
domViewer.setLocation(fr.x + (fr.width - td.width) / 2,
fr.y + (fr.height - td.height) / 2);
}
- domViewer.show();
+ domViewer.setVisible(true);
}
}
@@ -2302,7 +2303,7 @@
new JOptionPane(message, JOptionPane.ERROR_MESSAGE);
JDialog dialog = pane.createDialog(JSVGViewerFrame.this, "ERROR");
dialog.setModal(false);
- dialog.show();
+ dialog.setVisible(true);
}
/**
@@ -2316,7 +2317,7 @@
new JErrorPane(ex, JOptionPane.ERROR_MESSAGE);
JDialog dialog = pane.createDialog(JSVGViewerFrame.this, "ERROR");
dialog.setModal(false);
- dialog.show();
+ dialog.setVisible(true);
}
/**
1.51 +2 -2 xml-batik/sources/org/apache/batik/apps/svgbrowser/Main.java
Index: Main.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/apps/svgbrowser/Main.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- Main.java 18 Aug 2004 07:12:27 -0000 1.50
+++ Main.java 30 Oct 2004 16:54:53 -0000 1.51
@@ -591,7 +591,7 @@
resources.getInteger("Frame.height"));
mainFrame.setIconImage(frameIcon.getImage());
mainFrame.setTitle(resources.getString("Frame.title"));
- mainFrame.show();
+ mainFrame.setVisible(true);
viewerFrames.add(mainFrame);
setPreferences(mainFrame);
return mainFrame;
1.5 +4 -2
xml-batik/sources/org/apache/batik/bridge/DocumentJarClassLoader.java
Index: DocumentJarClassLoader.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/bridge/DocumentJarClassLoader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DocumentJarClassLoader.java 18 Aug 2004 07:12:31 -0000 1.4
+++ DocumentJarClassLoader.java 30 Oct 2004 16:54:53 -0000 1.5
@@ -20,6 +20,7 @@
import java.net.URL;
import java.net.URLClassLoader;
import java.security.CodeSource;
+import java.security.cert.Certificate;
import java.security.Permission;
import java.security.PermissionCollection;
import java.security.Policy;
@@ -52,7 +53,8 @@
super(new URL[]{jarURL});
if (documentURL != null) {
- documentCodeSource = new CodeSource(documentURL, null);
+ documentCodeSource = new CodeSource
+ (documentURL, (Certificate[])null);
}
}
1.6 +7 -6
xml-batik/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFDirectory.java
Index: TIFFDirectory.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFDirectory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TIFFDirectory.java 18 Aug 2004 07:13:55 -0000 1.5
+++ TIFFDirectory.java 30 Oct 2004 16:54:53 -0000 1.6
@@ -19,8 +19,9 @@
import java.io.IOException;
import java.io.Serializable;
-import java.util.Enumeration;
-import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.HashMap;
+import java.util.Map;
import java.util.Vector;
import org.apache.batik.ext.awt.image.codec.SeekableStream;
@@ -58,7 +59,7 @@
TIFFField[] fields;
/** A Hashtable indexing the fields by tag number. */
- Hashtable fieldIndex = new Hashtable();
+ Map fieldIndex = new HashMap();
/** The offset of this IFD. */
long IFDOffset = 8;
@@ -375,11 +376,11 @@
*/
public int[] getTags() {
int[] tags = new int[fieldIndex.size()];
- Enumeration enum = fieldIndex.keys();
+ Iterator iter = fieldIndex.keySet().iterator();
int i = 0;
- while (enum.hasMoreElements()) {
- tags[i++] = ((Integer)enum.nextElement()).intValue();
+ while (iter.hasNext()) {
+ tags[i++] = ((Integer)iter.next()).intValue();
}
return tags;
1.10 +5 -3 xml-batik/sources/org/apache/batik/svggen/SVGEllipse.java
Index: SVGEllipse.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGEllipse.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SVGEllipse.java 18 Aug 2004 07:15:00 -0000 1.9
+++ SVGEllipse.java 30 Oct 2004 16:54:53 -0000 1.10
@@ -40,8 +40,6 @@
*/
public SVGEllipse(SVGGeneratorContext generatorContext) {
super(generatorContext);
-
- svgLine = new SVGLine(generatorContext);
}
/**
@@ -100,6 +98,8 @@
// Degenerate to a line
Line2D line = new Line2D.Double(ellipse.getX(), ellipse.getY(),
ellipse.getX(),
ellipse.getY() + ellipse.getHeight());
+ if (svgLine == null)
+ svgLine = new SVGLine(generatorContext);
return svgLine.toSVG(line);
}
else if(ellipse.getWidth() > 0 && ellipse.getHeight() == 0){
@@ -107,6 +107,8 @@
Line2D line = new Line2D.Double(ellipse.getX(), ellipse.getY(),
ellipse.getX() + ellipse.getWidth(),
ellipse.getY());
+ if (svgLine == null)
+ svgLine = new SVGLine(generatorContext);
return svgLine.toSVG(line);
}
return null;
1.16 +3 -4 xml-batik/sources/org/apache/batik/svggen/SVGPath.java
Index: SVGPath.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGPath.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- SVGPath.java 18 Aug 2004 07:15:08 -0000 1.15
+++ SVGPath.java 30 Oct 2004 16:54:53 -0000 1.16
@@ -66,9 +66,8 @@
return null;
}
- Element svgPath =
- generatorContext.domFactory.createElementNS(SVG_NAMESPACE_URI,
- SVG_PATH_TAG);
+ Element svgPath = generatorContext.domFactory.createElementNS
+ (SVG_NAMESPACE_URI, SVG_PATH_TAG);
svgPath.setAttributeNS(null, SVG_D_ATTRIBUTE, dAttr);
// Set winding rule if different than SVG's default
1.9 +14 -9 xml-batik/sources/org/apache/batik/svggen/SVGShape.java
Index: SVGShape.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGShape.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SVGShape.java 18 Aug 2004 07:15:08 -0000 1.8
+++ SVGShape.java 30 Oct 2004 16:54:53 -0000 1.9
@@ -19,6 +19,7 @@
import java.awt.Polygon;
import java.awt.Shape;
+import java.awt.geom.Arc2D;
import java.awt.geom.Ellipse2D;
import java.awt.geom.Line2D;
import java.awt.geom.Rectangle2D;
@@ -45,22 +46,24 @@
/*
* Subconverts, for each type of Shape class
*/
- private SVGPolygon svgPolygon;
+ private SVGArc svgArc;
+ private SVGEllipse svgEllipse;
+ private SVGLine svgLine;
+ private SVGPath svgPath;
+ private SVGPolygon svgPolygon;
private SVGRectangle svgRectangle;
- private SVGEllipse svgEllipse;
- private SVGLine svgLine;
- private SVGPath svgPath;
/**
* @param generatorContext used to build Elements
*/
public SVGShape(SVGGeneratorContext generatorContext) {
super(generatorContext);
- svgPolygon = new SVGPolygon(generatorContext);
+ svgArc = new SVGArc(generatorContext);
+ svgEllipse = new SVGEllipse(generatorContext);
+ svgLine = new SVGLine(generatorContext);
+ svgPath = new SVGPath(generatorContext);
+ svgPolygon = new SVGPolygon(generatorContext);
svgRectangle = new SVGRectangle(generatorContext);
- svgEllipse = new SVGEllipse(generatorContext);
- svgLine = new SVGLine(generatorContext);
- svgPath = new SVGPath(generatorContext);
}
/**
@@ -77,6 +80,8 @@
return svgEllipse.toSVG((Ellipse2D)shape);
else if(shape instanceof Line2D)
return svgLine.toSVG((Line2D)shape);
+ else if(shape instanceof Arc2D)
+ return svgArc.toSVG((Arc2D)shape);
else
return svgPath.toSVG(shape);
}
1.47 +3 -3 xml-batik/sources/org/apache/batik/swing/JSVGCanvas.java
Index: JSVGCanvas.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/swing/JSVGCanvas.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- JSVGCanvas.java 18 Aug 2004 07:15:32 -0000 1.46
+++ JSVGCanvas.java 30 Oct 2004 16:54:54 -0000 1.47
@@ -950,7 +950,7 @@
JDialog dialog =
pane.createDialog(JSVGCanvas.this, "ERROR");
dialog.setModal(false);
- dialog.show(); // Safe to be called from any thread
+ dialog.setVisible(true); // Safe to be called from any thread
}
}
@@ -965,7 +965,7 @@
new JErrorPane(ex, JOptionPane.ERROR_MESSAGE);
JDialog dialog = pane.createDialog(JSVGCanvas.this, "ERROR");
dialog.setModal(false);
- dialog.show(); // Safe to be called from any thread
+ dialog.setVisible(true); // Safe to be called from any thread
}
}
1.2 +3 -3
xml-batik/sources/org/apache/batik/swing/svg/SVGUserAgentGUIAdapter.java
Index: SVGUserAgentGUIAdapter.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/swing/svg/SVGUserAgentGUIAdapter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SVGUserAgentGUIAdapter.java 25 Sep 2003 00:45:11 -0000 1.1
+++ SVGUserAgentGUIAdapter.java 30 Oct 2004 16:54:54 -0000 1.2
@@ -77,7 +77,7 @@
JOptionPane pane = new JOptionPane(message, JOptionPane.ERROR_MESSAGE);
JDialog dialog = pane.createDialog(parentComponent, "ERROR");
dialog.setModal(false);
- dialog.show();
+ dialog.setVisible(true);
}
/**
@@ -87,7 +87,7 @@
JErrorPane pane = new JErrorPane(ex, JOptionPane.ERROR_MESSAGE);
JDialog dialog = pane.createDialog(parentComponent, "ERROR");
dialog.setModal(false);
- dialog.show();
+ dialog.setVisible(true);
}
/**
1.74 +15 -14 xml-batik/sources/org/apache/batik/util/SVGConstants.java
Index: SVGConstants.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/util/SVGConstants.java,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- SVGConstants.java 1 Sep 2004 09:35:23 -0000 1.73
+++ SVGConstants.java 30 Oct 2004 16:54:54 -0000 1.74
@@ -828,20 +828,21 @@
///////////////////////////////////////////////////////////////////
String TRANSFORM_TRANSLATE = "translate";
- String TRANSFORM_ROTATE = "rotate";
- String TRANSFORM_SCALE = "scale";
- String TRANSFORM_SKEWX = "skewX";
- String TRANSFORM_SKEWY = "skewY";
- String TRANSFORM_MATRIX = "matrix";
+ String TRANSFORM_ROTATE = "rotate";
+ String TRANSFORM_SCALE = "scale";
+ String TRANSFORM_SKEWX = "skewX";
+ String TRANSFORM_SKEWY = "skewY";
+ String TRANSFORM_MATRIX = "matrix";
- String PATH_CLOSE = "Z";
- String PATH_CUBIC_TO = "C";
- String PATH_MOVE = "M";
- String PATH_LINE_TO = "L";
- String PATH_VERTICAL_LINE_TO = "V";
+ String PATH_ARC = "A";
+ String PATH_CLOSE = "Z";
+ String PATH_CUBIC_TO = "C";
+ String PATH_MOVE = "M";
+ String PATH_LINE_TO = "L";
+ String PATH_VERTICAL_LINE_TO = "V";
String PATH_HORIZONTAL_LINE_TO = "H";
- String PATH_QUAD_TO = "Q";
- String PATH_SMOOTH_QUAD_TO = "T";
+ String PATH_QUAD_TO = "Q";
+ String PATH_SMOOTH_QUAD_TO = "T";
///////////////////////////////////////////////////////////////////
// event constants
1.6 +7 -7 xml-batik/sources/org/apache/batik/util/gui/CSSMediaPanel.java
Index: CSSMediaPanel.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/util/gui/CSSMediaPanel.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CSSMediaPanel.java 18 Aug 2004 07:15:53 -0000 1.5
+++ CSSMediaPanel.java 30 Oct 2004 16:54:54 -0000 1.6
@@ -206,9 +206,9 @@
*/
public List getMedia() {
List media = new ArrayList(listModel.size());
- Enumeration enum = listModel.elements();
- while (enum.hasMoreElements()) {
- media.add(enum.nextElement());
+ Enumeration e = listModel.elements();
+ while (e.hasMoreElements()) {
+ media.add(e.nextElement());
}
return media;
}
@@ -218,9 +218,9 @@
*/
public String getMediaAsString() {
StringBuffer buffer = new StringBuffer();
- Enumeration enum = listModel.elements();
- while (enum.hasMoreElements()) {
- buffer.append((String)enum.nextElement());
+ Enumeration e = listModel.elements();
+ while (e.hasMoreElements()) {
+ buffer.append((String)e.nextElement());
buffer.append(" ");
}
return buffer.toString();
1.16 +1 -1
xml-batik/test-references/org/apache/batik/svggen/BasicShapes2.svg
Index: BasicShapes2.svg
===================================================================
RCS file:
/home/cvs/xml-batik/test-references/org/apache/batik/svggen/BasicShapes2.svg,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- BasicShapes2.svg 5 Jul 2003 14:18:29 -0000 1.15
+++ BasicShapes2.svg 30 Oct 2004 16:54:54 -0000 1.16
@@ -7,7 +7,7 @@
<g>
<g text-rendering="optimizeLegibility">
<text xml:space="preserve" x="10" y="20" stroke="none">Arc2D</text>
- <path fill="none" d="M60 50 C60 38.9543037414551 48.8071174621582 30 35 30
C21.1928806304932 30 10 38.9543037414551 10 50 C10 61.0456962585449 21.1928806304932
70 35 70 L35 50 Z" />
+ <path fill="none" d="M60 50 A25 20 0 1 0 35 70L 35 50 Z" />
<text xml:space="preserve" x="10" y="20" transform="translate(0,90)"
stroke="none">Ellipse</text>
<ellipse transform="translate(0,90)" fill="none" rx="50" cx="60" ry="20"
cy="50" />
<text xml:space="preserve" x="10" y="20" transform="translate(150,0)"
stroke="none">GeneralPath, lineTo</text>
1.17 +1 -1
xml-batik/test-references/org/apache/batik/svggen/ContextBasicShapes2.svg
Index: ContextBasicShapes2.svg
===================================================================
RCS file:
/home/cvs/xml-batik/test-references/org/apache/batik/svggen/ContextBasicShapes2.svg,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ContextBasicShapes2.svg 5 Jul 2003 14:18:29 -0000 1.16
+++ ContextBasicShapes2.svg 30 Oct 2004 16:54:54 -0000 1.17
@@ -50,7 +50,7 @@
</defs>
<g class="testC1">
<text xml:space="preserve" x="10" y="20" class="testC2">Arc2D</text>
- <path class="testC3" d="M60 50 C60 38.9543 48.8071 30 35 30 C21.1929 30 10
38.9543 10 50 C10 61.0457 21.1929 70 35 70 L35 50 Z" />
+ <path class="testC3" d="M60 50 A25 20 0 1 0 35 70L 35 50 Z" />
<text xml:space="preserve" x="10" y="20" class="testC4"
transform="translate(0,90)">Ellipse</text>
<ellipse transform="translate(0,90)" rx="50" cx="60" class="testC5" ry="20"
cy="50" />
<text xml:space="preserve" x="10" y="20" class="testC6"
transform="translate(150,0)">GeneralPath, lineTo</text>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
