Minor corrections for jdk 1.3.1 compatibility

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

diff --git a/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java b/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
index 50281ef448f71fe1556c86968f520eeed8ea26c0..85474abfda753be1756a542a3c5e8383af9fa907 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
@@ -609,9 +609,9 @@ public class BlockContainerLayoutManager extends BlockStackingLayoutManager
             //Rendering all parts (not just the first) at once for the case where the parts that 
             //overflow should be visible.
             //TODO Check if this has any unwanted side-effects. Feels a bit like a hack.
-            addAreas(this.deferredAlg, 
-                    /*1*/ this.deferredAlg.getPageBreaks().size(), 
-                    this.deferredOriginalList, this.deferredEffectiveList);
+            this.addAreas(this.deferredAlg, 
+                          /*1*/ this.deferredAlg.getPageBreaks().size(), 
+                          this.deferredOriginalList, this.deferredEffectiveList);
         }
         
     }

diff --git a/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java b/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java
index 34da18505be6e3328358ccf20c066900fafa5621..6a8608955f7eebd2e267ffb85e7c81c68c283e11 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java
@@ -321,7 +321,7 @@ public class StaticContentLayoutManager extends BlockStackingLayoutManager {
         protected void doPhase3(PageBreakingAlgorithm alg, int partCount, 
                 BlockSequence originalList, BlockSequence effectiveList) {
             //Directly add areas after finding the breaks
-            addAreas(alg, partCount, originalList, effectiveList);
+            this.addAreas(alg, partCount, originalList, effectiveList);
             if (partCount > 1) {
                 overflow = true;
             }

diff --git a/test/java/org/apache/fop/visual/BatchDiffer.java b/test/java/org/apache/fop/visual/BatchDiffer.java
index ae0d1a5fc8fab2a6cca8ff2e7f20507b5cac92a3..71d6ebb60a171d7ebbbab0dc2374bcfb9c84caaf 100644 (file)
--- a/test/java/org/apache/fop/visual/BatchDiffer.java
+++ b/test/java/org/apache/fop/visual/BatchDiffer.java
@@ -159,7 +159,8 @@ public class BatchDiffer {
                     context.setTemplates(context.getTransformerFactory().newTemplates(
                             new StreamSource(xslt)));
                 } catch (TransformerConfigurationException e) {
-                    throw new RuntimeException("Error setting up stylesheet", e);
+                    // throw new RuntimeException("Error setting up stylesheet", e); // This is JDK 1.4 or later specific
+                    throw new RuntimeException("Error setting up stylesheet");
                 }
             }
             BitmapProducer[] producers = getProducers(cfg.getChild("producers"));
@@ -251,7 +252,8 @@ public class BatchDiffer {
                 producers[i] = (BitmapProducer)clazz.newInstance();
                 ContainerUtil.configure(producers[i], children[i]);
             } catch (Exception e) {
-                throw new RuntimeException("Error while setting up producers", e);
+                // throw new RuntimeException("Error while setting up producers", e); // This is JDK 1.4 or later specific
+                throw new RuntimeException("Error while setting up producers");
             }
         }
         return producers;