diff options
3 files changed, 8 insertions, 6 deletions
diff --git a/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java b/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java index 50281ef44..85474abfd 100644 --- 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 34da18505..6a8608955 100644 --- 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 ae0d1a5fc..71d6ebb60 100644 --- 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; |