Author: adelmelle
Date: Sun Jan 9 12:20:21 2011
New Revision: 1056926
URL: http://svn.apache.org/viewvc?rev=1056926&view=rev
Log:
Switch to type-safe collections (+ related cleanup of redundant casts,
for-loops...)
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Declarations.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequence.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Root.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/SubSequenceSpecifier.java
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Declarations.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Declarations.java?rev=1056926&r1=1056925&r2=1056926&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Declarations.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Declarations.java
Sun Jan 9 12:20:21 2011
@@ -41,7 +41,7 @@ import org.apache.fop.fo.ValidationExcep
*/
public class Declarations extends FObj {
- private Map colorProfiles = null;
+ private Map<String, ColorProfile> colorProfiles = null;
/**
* @param parent FONode that is the parent of this object
@@ -98,7 +98,7 @@ public class Declarations extends FObj {
private void addColorProfile(ColorProfile cp) {
if (colorProfiles == null) {
- colorProfiles = new java.util.HashMap();
+ colorProfiles = new java.util.HashMap<String, ColorProfile>();
}
if (colorProfiles.get(cp.getColorProfileName()) != null) {
// duplicate names
@@ -132,7 +132,7 @@ public class Declarations extends FObj {
public ColorProfile getColorProfile(String cpName) {
ColorProfile profile = null;
if (this.colorProfiles != null) {
- profile = (ColorProfile)this.colorProfiles.get(cpName);
+ profile = this.colorProfiles.get(cpName);
}
return profile;
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java?rev=1056926&r1=1056925&r2=1056926&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java
Sun Jan 9 12:20:21 2011
@@ -44,8 +44,8 @@ import org.apache.fop.fo.ValidationExcep
*/
public class LayoutMasterSet extends FObj {
- private Map simplePageMasters;
- private Map pageSequenceMasters;
+ private Map<String, SimplePageMaster> simplePageMasters;
+ private Map<String, PageSequenceMaster> pageSequenceMasters;
/**
* Create a LayoutMasterSet instance that is a child of the given
@@ -65,8 +65,8 @@ public class LayoutMasterSet extends FOb
/** {...@inheritdoc} */
protected void startOfNode() throws FOPException {
getRoot().setLayoutMasterSet(this);
- simplePageMasters = new java.util.HashMap();
- pageSequenceMasters = new java.util.HashMap();
+ simplePageMasters = new java.util.HashMap<String, SimplePageMaster>();
+ pageSequenceMasters = new java.util.HashMap<String,
PageSequenceMaster>();
}
/** {...@inheritdoc} */
@@ -98,18 +98,13 @@ public class LayoutMasterSet extends FOb
*/
private void checkRegionNames() throws ValidationException {
// (user-entered) region-name to default region map.
- Map allRegions = new java.util.HashMap();
- for (Iterator spm = simplePageMasters.values().iterator();
- spm.hasNext();) {
- SimplePageMaster simplePageMaster
- = (SimplePageMaster)spm.next();
- Map spmRegions = simplePageMaster.getRegions();
- for (Iterator e = spmRegions.values().iterator();
- e.hasNext();) {
- Region region = (Region) e.next();
+ Map<String, String> allRegions = new java.util.HashMap<String,
String>();
+ for (SimplePageMaster simplePageMaster : simplePageMasters.values()) {
+ Map<String, Region> spmRegions = simplePageMaster.getRegions();
+ for (Region region : spmRegions.values()) {
if (allRegions.containsKey(region.getRegionName())) {
String defaultRegionName
- = (String) allRegions.get(region.getRegionName());
+ = allRegions.get(region.getRegionName());
if
(!defaultRegionName.equals(region.getDefaultRegionName())) {
getFOValidationEventProducer().regionNameMappedToMultipleRegionClasses(this,
region.getRegionName(),
@@ -118,7 +113,7 @@ public class LayoutMasterSet extends FOb
}
}
allRegions.put(region.getRegionName(),
- region.getDefaultRegionName());
+ region.getDefaultRegionName());
}
}
}
@@ -155,7 +150,7 @@ public class LayoutMasterSet extends FOb
* @return the requested simple-page-master
*/
public SimplePageMaster getSimplePageMaster(String masterName) {
- return (SimplePageMaster)this.simplePageMasters.get(masterName);
+ return this.simplePageMasters.get(masterName);
}
/**
@@ -185,7 +180,7 @@ public class LayoutMasterSet extends FOb
* @return the requested PageSequenceMaster instance
*/
public PageSequenceMaster getPageSequenceMaster(String masterName) {
- return (PageSequenceMaster)this.pageSequenceMasters.get(masterName);
+ return this.pageSequenceMasters.get(masterName);
}
/**
@@ -194,9 +189,8 @@ public class LayoutMasterSet extends FOb
* @return true when the region name specified has a region in this
LayoutMasterSet
*/
public boolean regionNameExists(String regionName) {
- for (Iterator e = simplePageMasters.values().iterator();
- e.hasNext();) {
- if (((SimplePageMaster)e.next()).regionNameExists(regionName)) {
+ for (SimplePageMaster spm : simplePageMasters.values()) {
+ if (spm.regionNameExists(regionName)) {
return true;
}
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequence.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequence.java?rev=1056926&r1=1056925&r2=1056926&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequence.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequence.java
Sun Jan 9 12:20:21 2011
@@ -48,7 +48,7 @@ public class PageSequence extends Abstra
// the set of flows includes StaticContent flows also
/** Map of flows to their flow name (flow-name, Flow) */
- private Map/*<String, Flow>*/ flowMap;
+ private Map<String, Flow> flowMap;
/**
* The currentSimplePageMaster is either the page master for the
@@ -96,7 +96,7 @@ public class PageSequence extends Abstra
/** {...@inheritdoc} */
protected void startOfNode() throws FOPException {
super.startOfNode();
- flowMap = new java.util.HashMap/*<String, Flow>*/();
+ flowMap = new java.util.HashMap<String, Flow>();
this.simplePageMaster
=
getRoot().getLayoutMasterSet().getSimplePageMaster(masterReference);
@@ -167,7 +167,7 @@ public class PageSequence extends Abstra
break;
case FO_STATIC_CONTENT:
addFlow((StaticContent)child);
- flowMap.put(((StaticContent)child).getFlowName(), child);
+ flowMap.put(((Flow)child).getFlowName(), (Flow)child);
break;
default:
super.addChildNode(child);
@@ -239,7 +239,7 @@ public class PageSequence extends Abstra
}
/** @return the flow map for this page-sequence */
- public Map getFlowMap() {
+ public Map<String, Flow> getFlowMap() {
return this.flowMap;
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java?rev=1056926&r1=1056925&r2=1056926&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java
Sun Jan 9 12:20:21 2011
@@ -44,7 +44,7 @@ public class PageSequenceMaster extends
// End of property values
private LayoutMasterSet layoutMasterSet;
- private List subSequenceSpecifiers;
+ private List<SubSequenceSpecifier> subSequenceSpecifiers;
private SubSequenceSpecifier currentSubSequence;
private int currentSubSequenceNumber = -1;
@@ -76,7 +76,7 @@ public class PageSequenceMaster extends
/** {...@inheritdoc} */
protected void startOfNode() throws FOPException {
- subSequenceSpecifiers = new java.util.ArrayList();
+ subSequenceSpecifiers = new
java.util.ArrayList<SubSequenceSpecifier>();
layoutMasterSet = parent.getRoot().getLayoutMasterSet();
layoutMasterSet.addPageSequenceMaster(masterName, this);
}
@@ -121,8 +121,7 @@ public class PageSequenceMaster extends
currentSubSequenceNumber++;
if (currentSubSequenceNumber >= 0
&& currentSubSequenceNumber < subSequenceSpecifiers.size()) {
- return (SubSequenceSpecifier)subSequenceSpecifiers
- .get(currentSubSequenceNumber);
+ return subSequenceSpecifiers.get(currentSubSequenceNumber);
}
return null;
}
@@ -134,8 +133,8 @@ public class PageSequenceMaster extends
currentSubSequenceNumber = -1;
currentSubSequence = null;
if (subSequenceSpecifiers != null) {
- for (int i = 0; i < subSequenceSpecifiers.size(); i++) {
- ((SubSequenceSpecifier)subSequenceSpecifiers.get(i)).reset();
+ for (SubSequenceSpecifier subSequenceSpecifier :
subSequenceSpecifiers) {
+ subSequenceSpecifier.reset();
}
}
}
@@ -150,7 +149,7 @@ public class PageSequenceMaster extends
if (!success) {
if (currentSubSequenceNumber > 0) {
currentSubSequenceNumber--;
- currentSubSequence =
(SubSequenceSpecifier)subSequenceSpecifiers
+ currentSubSequence = subSequenceSpecifiers
.get(currentSubSequenceNumber);
} else {
currentSubSequence = null;
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java?rev=1056926&r1=1056925&r2=1056926&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java
Sun Jan 9 12:20:21 2011
@@ -48,7 +48,7 @@ public class RepeatablePageMasterAlterna
private int numberConsumed = 0;
- private List conditionalPageMasterRefs;
+ private List<ConditionalPageMasterReference> conditionalPageMasterRefs;
private boolean hasPagePositionLast = false;
private boolean hasPagePositionOnly = false;
@@ -68,7 +68,7 @@ public class RepeatablePageMasterAlterna
/** {...@inheritdoc} */
protected void startOfNode() throws FOPException {
- conditionalPageMasterRefs = new java.util.ArrayList();
+ conditionalPageMasterRefs = new
java.util.ArrayList<ConditionalPageMasterReference>();
assert parent.getName().equals("fo:page-sequence-master");
//Validation by the parent
PageSequenceMaster pageSequenceMaster = (PageSequenceMaster)parent;
@@ -128,9 +128,7 @@ public class RepeatablePageMasterAlterna
numberConsumed++;
}
- for (int i = 0; i < conditionalPageMasterRefs.size(); i++) {
- ConditionalPageMasterReference cpmr
- =
(ConditionalPageMasterReference)conditionalPageMasterRefs.get(i);
+ for (ConditionalPageMasterReference cpmr : conditionalPageMasterRefs) {
if (cpmr.isValid(isOddPage, isFirstPage, isLastPage, isBlankPage))
{
return cpmr.getMasterReference();
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Root.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Root.java?rev=1056926&r1=1056925&r2=1056926&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Root.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Root.java Sun
Jan 9 12:20:21 2011
@@ -47,8 +47,8 @@ public class Root extends FObj {
private LayoutMasterSet layoutMasterSet;
private Declarations declarations;
private BookmarkTree bookmarkTree = null;
- private List destinationList;
- private List pageSequences;
+ private List<Destination> destinationList;
+ private List<PageSequence> pageSequences;
// temporary until above list populated
private boolean pageSequenceFound = false;
@@ -77,7 +77,7 @@ public class Root extends FObj {
*/
public Root(FONode parent) {
super(parent);
- pageSequences = new java.util.ArrayList();
+ pageSequences = new java.util.ArrayList<PageSequence>();
}
/** {...@inheritdoc} */
@@ -243,7 +243,7 @@ public class Root extends FObj {
return null;
}
if (currentIndex < (pageSequences.size() - 1)) {
- return (PageSequence)pageSequences.get(currentIndex + 1);
+ return pageSequences.get(currentIndex + 1);
} else {
return null;
}
@@ -295,7 +295,7 @@ public class Root extends FObj {
*/
public void addDestination(Destination destination) {
if (destinationList == null) {
- destinationList = new java.util.ArrayList();
+ destinationList = new java.util.ArrayList<Destination>();
}
destinationList.add(destination);
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/SubSequenceSpecifier.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/SubSequenceSpecifier.java?rev=1056926&r1=1056925&r2=1056926&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/SubSequenceSpecifier.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/SubSequenceSpecifier.java
Sun Jan 9 12:20:21 2011
@@ -28,6 +28,7 @@ public interface SubSequenceSpecifier {
/**
* Returns the name of the next page master.
+ *
* @param isOddPage True if the next page number is odd
* @param isFirstPage True if the next page is the first
* @param isLastPage True if the next page is the last
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
