gmazza 2004/11/10 03:13:34
Modified: src/java/org/apache/fop/area Page.java
src/java/org/apache/fop/layoutmgr
PageSequenceLayoutManager.java
Log:
Moved to an IllegalArgumentException for getRegionViewport.
Revision Changes Path
1.7 +2 -1 xml-fop/src/java/org/apache/fop/area/Page.java
Index: Page.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Page.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Page.java 29 Aug 2004 20:58:19 -0000 1.6
+++ Page.java 10 Nov 2004 11:13:33 -0000 1.7
@@ -83,7 +83,8 @@
} else if (areaclass == Constants.FO_REGION_AFTER) {
return regionAfter;
}
- return null;
+ throw new IllegalArgumentException("No such area class with ID = "
+ + areaclass);
}
/**
1.12 +1 -4
xml-fop/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
Index: PageSequenceLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PageSequenceLayoutManager.java 10 Nov 2004 11:01:03 -0000 1.11
+++ PageSequenceLayoutManager.java 10 Nov 2004 11:13:34 -0000 1.12
@@ -494,9 +494,6 @@
}
RegionViewport reg =
curPage.getPage().getRegionViewport(region.getNameId());
- if (reg == null) {
- log.error("no region viewport: shouldn't happen");
- }
StaticContentLayoutManager lm = getStaticContentLayoutManager(flow);
lm.initialize();
lm.setRegionReference(reg.getRegion());
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
