diff options
author | Steve Coffman <gears@apache.org> | 2000-10-26 14:33:37 +0000 |
---|---|---|
committer | Steve Coffman <gears@apache.org> | 2000-10-26 14:33:37 +0000 |
commit | bacbe7a0915fbb7b4c22b623f97a11352cf5d0b1 (patch) | |
tree | 53f8bc745c9f0060633b436a49250165e411af50 /src/org | |
parent | 69883544bc9e2e7071f41359523a2b59bed4f88b (diff) | |
download | xmlgraphics-fop-bacbe7a0915fbb7b4c22b623f97a11352cf5d0b1.tar.gz xmlgraphics-fop-bacbe7a0915fbb7b4c22b623f97a11352cf5d0b1.zip |
Adds textdeko.fo file example. Applies Art Welch's JDK 1.1.x compatibility
fixes.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@193739 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/org')
-rw-r--r-- | src/org/apache/fop/dom/css/CSSStyleRuleImpl.java | 2 | ||||
-rw-r--r-- | src/org/apache/fop/dom/css/CSSStyleSheetImpl.java | 2 | ||||
-rw-r--r-- | src/org/apache/fop/image/analyser/ImageReaderFactory.java | 24 | ||||
-rw-r--r-- | src/org/apache/fop/messaging/MessageHandler.java | 2 | ||||
-rw-r--r-- | src/org/apache/fop/svg/Symbol.java | 8 |
5 files changed, 19 insertions, 19 deletions
diff --git a/src/org/apache/fop/dom/css/CSSStyleRuleImpl.java b/src/org/apache/fop/dom/css/CSSStyleRuleImpl.java index c035f6084..5d6e37a35 100644 --- a/src/org/apache/fop/dom/css/CSSStyleRuleImpl.java +++ b/src/org/apache/fop/dom/css/CSSStyleRuleImpl.java @@ -188,7 +188,7 @@ public class CSSStyleRuleImpl implements CSSStyleRule { } } if(current != null) - selectors.add(current); + selectors.addElement(current); } } diff --git a/src/org/apache/fop/dom/css/CSSStyleSheetImpl.java b/src/org/apache/fop/dom/css/CSSStyleSheetImpl.java index 87c347e5e..97ee8ef3f 100644 --- a/src/org/apache/fop/dom/css/CSSStyleSheetImpl.java +++ b/src/org/apache/fop/dom/css/CSSStyleSheetImpl.java @@ -115,7 +115,7 @@ public class CSSStyleSheetImpl implements CSSStyleSheet { public void deleteRule(int index) throws DOMException { - rules.remove(index); + rules.removeElementAt(index); } public String getType() diff --git a/src/org/apache/fop/image/analyser/ImageReaderFactory.java b/src/org/apache/fop/image/analyser/ImageReaderFactory.java index f4f36a6df..d811eacb6 100644 --- a/src/org/apache/fop/image/analyser/ImageReaderFactory.java +++ b/src/org/apache/fop/image/analyser/ImageReaderFactory.java @@ -44,8 +44,8 @@ package org.apache.fop.image.analyser; import java.io.InputStream; import java.io.BufferedInputStream; import java.io.IOException; -import java.util.Iterator; -import java.util.ArrayList; +import java.util.Enumeration; +import java.util.Vector; // FOP import org.apache.fop.image.FopImageException; @@ -56,7 +56,7 @@ import org.apache.fop.image.FopImageException; * @version 1.0 */ public class ImageReaderFactory { - static protected ArrayList formats = null; + static protected Vector formats = null; /** * ImageReader maker. @@ -69,20 +69,20 @@ public class ImageReaderFactory { throws FopImageException { // need to use a config file and remove static methods - formats = new ArrayList(); - formats.add(new JPEGReader()); - formats.add(new BMPReader()); - formats.add(new GIFReader()); - formats.add(new PNGReader()); - formats.add(new SVGReader()); + formats = new Vector(); + formats.addElement(new JPEGReader()); + formats.addElement(new BMPReader()); + formats.addElement(new GIFReader()); + formats.addElement(new PNGReader()); + formats.addElement(new SVGReader()); // ImageReader reader; BufferedInputStream bis = new BufferedInputStream(in); - Iterator itr = formats.iterator(); + Enumeration itr = formats.elements(); try { - while (itr.hasNext()) { - reader = (ImageReader) itr.next(); + while (itr.hasMoreElements()) { + reader = (ImageReader) itr.nextElement(); if (reader.verifySignature(bis)) { return reader; } diff --git a/src/org/apache/fop/messaging/MessageHandler.java b/src/org/apache/fop/messaging/MessageHandler.java index 5fe7f758b..981cf5b0e 100644 --- a/src/org/apache/fop/messaging/MessageHandler.java +++ b/src/org/apache/fop/messaging/MessageHandler.java @@ -52,7 +52,7 @@ package org.apache.fop.messaging; import java.io.*; import java.util.*; -import javax.swing.*; +//import javax.swing.*; /** The class MessageHandler contains the static methods log and error which * should be used for any end user information instead of System.out.print() or diff --git a/src/org/apache/fop/svg/Symbol.java b/src/org/apache/fop/svg/Symbol.java index 5463055ff..f119e220e 100644 --- a/src/org/apache/fop/svg/Symbol.java +++ b/src/org/apache/fop/svg/Symbol.java @@ -118,16 +118,16 @@ public class Symbol extends SVGObj { float height = 0; try { if(st.hasMoreTokens()) { - x = Float.parseFloat(st.nextToken()); + x = Double.valueOf(st.nextToken()).floatValue(); } if(st.hasMoreTokens()) { - y = Float.parseFloat(st.nextToken()); + y = Double.valueOf(st.nextToken()).floatValue(); } if(st.hasMoreTokens()) { - width = Float.parseFloat(st.nextToken()); + width = Double.valueOf(st.nextToken()).floatValue(); } if(st.hasMoreTokens()) { - height = Float.parseFloat(st.nextToken()); + height = Double.valueOf(st.nextToken()).floatValue(); } } catch(Exception e) { } |