Author: adelmelle
Date: Sun Jan 9 12:16:18 2011
New Revision: 1056924
URL: http://svn.apache.org/viewvc?rev=1056924&view=rev
Log:
Fix minor bug in validateChildNode() + make regions Map type-safe
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java?rev=1056924&r1=1056923&r2=1056924&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java
Sun Jan 9 12:16:18 2011
@@ -56,7 +56,7 @@ public class SimplePageMaster extends FO
/**
* Page regions (regionClass, Region)
*/
- private Map regions;
+ private Map<String, Region> regions;
// used for node validation
private boolean hasRegionBody = false;
@@ -99,7 +99,7 @@ public class SimplePageMaster extends FO
}
//Well, there are only 5 regions so we can save a bit of memory here
- regions = new HashMap(5);
+ regions = new HashMap<String, Region>(5);
}
/** {...@inheritdoc} */
@@ -135,7 +135,7 @@ public class SimplePageMaster extends FO
} else if (hasRegionEnd) {
nodesOutOfOrderError(loc, "fo:region-before",
"fo:region-end");
} else {
- hasRegionBody = true;
+ hasRegionBefore = true;
}
} else if (localName.equals("region-after")) {
if (!hasRegionBody) {
@@ -192,8 +192,7 @@ public class SimplePageMaster extends FO
* @param region region to add
*/
protected void addRegion(Region region) {
- String key = String.valueOf(region.getNameId());
- regions.put(key, region);
+ regions.put(String.valueOf(region.getNameId()), region);
}
/**
@@ -240,14 +239,14 @@ public class SimplePageMaster extends FO
* @return the region, null if it doesn't exist
*/
public Region getRegion(int regionId) {
- return (Region) regions.get(String.valueOf(regionId));
+ return regions.get(String.valueOf(regionId));
}
/**
* Returns a Map of regions associated with this simple-page-master
* @return the regions
*/
- public Map getRegions() {
+ public Map<String, Region> getRegions() {
return regions;
}
@@ -258,9 +257,7 @@ public class SimplePageMaster extends FO
* @return True if a region with this name exists
*/
protected boolean regionNameExists(String regionName) {
- for (Iterator regenum = regions.values().iterator();
- regenum.hasNext();) {
- Region r = (Region) regenum.next();
+ for (Region r : regions.values()) {
if (r.getRegionName().equals(regionName)) {
return true;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
