JDK 1.1.x changes. Thanks to Art Welch.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@193920 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.xml b/build.xml
index 782fc737c4185e21b5d5b9f11400fcbfce5026d7..6141cf4b02f98841322c6233daa98967b772d6ea 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -253,7 +253,7 @@ Sometimes ant gives out this warnings, but the build is finished without any pro
   <!-- compiles hyphenation patterns                                       -->
   <!-- =================================================================== -->
 
-  <target name="hyphenation" depends="prepare,compile" >
+  <target name="hyphenation" depends="prepare" >
     <serHyph includes="*.xml" 
              sourceDir="./hyph" 
              targetDir="${build.dest}/hyph" /> 

diff --git a/src/org/apache/fop/configuration/ConfigurationParser.java b/src/org/apache/fop/configuration/ConfigurationParser.java
index df59ca40f4e31e77c4e151844a3636aa2872e62b..a78a5677da87f56e91af67530f3046bbb2e540a6 100644 (file)
--- a/src/org/apache/fop/configuration/ConfigurationParser.java
+++ b/src/org/apache/fop/configuration/ConfigurationParser.java
@@ -193,7 +193,7 @@ public class ConfigurationParser extends DefaultHandler {
                 datatype = STRING;
                 break;
             case IN_LIST + IN_VALUE:
-                list.add(text);
+                list.addElement(text);
                 datatype = LIST;
                 break;
             case IN_LIST + IN_SUBENTRY + IN_VALUE:

diff --git a/src/org/apache/fop/fo/FONode.java b/src/org/apache/fop/fo/FONode.java
index 87f7e55ce8fb5a18520fb3c19b1d03f103a7d4c3..c0245c59efcb7295751afaf2fb76b3b500e5a440 100644 (file)
--- a/src/org/apache/fop/fo/FONode.java
+++ b/src/org/apache/fop/fo/FONode.java
@@ -258,7 +258,8 @@ abstract public class FONode {
         */
        public void rollback(Vector snapshot)
        {
-               this.marker = ((Integer)snapshot.remove(0)).intValue();
+               this.marker = ((Integer)snapshot.elementAt(0)).intValue();
+               snapshot.removeElementAt(0);
 
                if (this.marker == START)
                {

diff --git a/src/org/apache/fop/fo/expr/PropertyTokenizer.java b/src/org/apache/fop/fo/expr/PropertyTokenizer.java
index 47169fe594c68f39e8b98a5603710279d2c7deb2..667ac6ea89a5882a98f3c5037d44c086440e52fc 100644 (file)
--- a/src/org/apache/fop/fo/expr/PropertyTokenizer.java
+++ b/src/org/apache/fop/fo/expr/PropertyTokenizer.java
@@ -83,7 +83,7 @@ class PropertyTokenizer {
   protected int currentUnitLength = 0;
 
   private int currentTokenStartIndex = 0;
-  private final String expr;
+  private /*final*/ String expr;
   private int exprIndex = 0;
   private int exprLength;
   private boolean recognizeOperator = false;

diff --git a/src/org/apache/fop/layout/hyphenation/PatternParser.java b/src/org/apache/fop/layout/hyphenation/PatternParser.java
index 96495b0b814d0674ca50ee3c7d8d68a4609f8c4f..e8d33a5c467376b8b22eeca19cb0f6a63a1c8d28 100644 (file)
--- a/src/org/apache/fop/layout/hyphenation/PatternParser.java
+++ b/src/org/apache/fop/layout/hyphenation/PatternParser.java
@@ -195,7 +195,10 @@ public class PatternParser extends DefaultHandler implements PatternConsumer {
             else
                break;
          if ( space ) {
-            chars.delete(0,i);
+            //chars.delete(0,i);
+                       for ( int countr = i ; countr < chars.length() ; countr++ )
+                               chars.setCharAt(countr - i, chars.charAt(countr));
+                       chars.setLength(chars.length() - i);
             if ( token.length() > 0 ) {
                word = token.toString();
                token.setLength(0);
@@ -209,8 +212,11 @@ public class PatternParser extends DefaultHandler implements PatternConsumer {
                break;
             }
          }
-         token.append(chars.substring(0,i));
-         chars.delete(0,i);
+         token.append(chars.toString().substring(0,i));
+         //chars.delete(0,i);
+                for ( int countr = i ; countr < chars.length() ; countr++ )
+                       chars.setCharAt(countr - i, chars.charAt(countr));
+                chars.setLength(chars.length() - i);
          if ( space ) {
             word = token.toString();
             token.setLength(0);

diff --git a/src/org/apache/fop/layout/hyphenation/TernaryTree.java b/src/org/apache/fop/layout/hyphenation/TernaryTree.java
index ec01994f3d58db438f55f87695fa150361d7c888..f61531e97d6115a9638b3d0963d483a219067a17 100644 (file)
--- a/src/org/apache/fop/layout/hyphenation/TernaryTree.java
+++ b/src/org/apache/fop/layout/hyphenation/TernaryTree.java
@@ -534,7 +534,7 @@ public class TernaryTree implements Cloneable, Serializable {
 
             public void rewind()
             {
-               ns.clear();
+               ns.removeAllElements();
                ks.setLength(0);
                cur = root;
                run();

diff --git a/src/org/apache/fop/pdf/PDFStream.java b/src/org/apache/fop/pdf/PDFStream.java
index 4ac8b75e2ac863b5e59a4b99aba3f151915dd3cb..b374b062cd3bc303c9e14c32d58d981fd6c90d0e 100644 (file)
--- a/src/org/apache/fop/pdf/PDFStream.java
+++ b/src/org/apache/fop/pdf/PDFStream.java
@@ -110,7 +110,7 @@ public class PDFStream extends PDFObject {
     public void addFilter(PDFFilter filter) 
     {
        if (filter != null) {
-           _filters.add(filter);
+           _filters.addElement(filter);
        }
 
     }
@@ -233,7 +233,7 @@ public class PDFStream extends PDFObject {
     }
     */
     public byte[] toPDF() {
-       throw new UnsupportedOperationException();
+       throw new RuntimeException();
     }
     
 
@@ -301,8 +301,8 @@ public class PDFStream extends PDFObject {
                    filter.setApplied(true);
                }
                // place the names in our local vector in reverse order
-               names.add(0, filter.getName()); 
-               parms.add(0, filter.getDecodeParms());
+               names.insertElementAt(filter.getName(), 0); 
+               parms.insertElementAt(filter.getDecodeParms(), 0);
            }
                    
            // now build up the filter entries for the dictionary