Author: lbernardo
Date: Mon Oct 15 00:04:26 2012
New Revision: 1398155
URL: http://svn.apache.org/viewvc?rev=1398155&view=rev
Log:
fix findbugs issues introduced with revision 1391502
Modified:
xmlgraphics/fop/trunk/findbugs-exclude.xml
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Markers.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
Modified: xmlgraphics/fop/trunk/findbugs-exclude.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/findbugs-exclude.xml?rev=1398155&r1=1398154&r2=1398155&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/findbugs-exclude.xml (original)
+++ xmlgraphics/fop/trunk/findbugs-exclude.xml Mon Oct 15 00:04:26 2012
@@ -3304,6 +3304,11 @@
<Bug pattern="BC_UNCONFIRMED_CAST"/>
</Match>
<Match>
+ <Class
name="org.apache.fop.layoutmgr.LayoutManagerMapping$RetrieveTableMarkerLayoutManagerMaker"/>
+ <Method name="make"/>
+ <Bug pattern="BC_UNCONFIRMED_CAST"/>
+ </Match>
+ <Match>
<Class
name="org.apache.fop.layoutmgr.LayoutManagerMapping$WrapperLayoutManagerMaker"/>
<Method name="make"/>
<Bug pattern="BC_UNCONFIRMED_CAST"/>
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Markers.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Markers.java?rev=1398155&r1=1398154&r2=1398155&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Markers.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Markers.java Mon Oct
15 00:04:26 2012
@@ -20,8 +20,8 @@
package org.apache.fop.fo.flow;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
+import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -81,16 +81,18 @@ public final class Markers {
firstQualifyingIsFirst = new HashMap<String, Marker>();
}
// first on scope: only put in new values, leave current
- for (Iterator<String> iter = marks.keySet().iterator();
iter.hasNext();) {
- String key = iter.next();
+ Set<Map.Entry<String, Marker>> entries = marks.entrySet();
+ for (Map.Entry<String, Marker> entry : entries) {
+ String key = entry.getKey();
+ Marker marker = entry.getValue();
if (!firstQualifyingIsFirst.containsKey(key)) {
- firstQualifyingIsFirst.put(key, marks.get(key));
+ firstQualifyingIsFirst.put(key, marker);
if (log.isTraceEnabled()) {
log.trace("Adding marker " + key + " to
firstQualifyingIsFirst");
}
}
if (!firstQualifyingIsAny.containsKey(key)) {
- firstQualifyingIsAny.put(key, marks.get(key));
+ firstQualifyingIsAny.put(key, marker);
if (log.isTraceEnabled()) {
log.trace("Adding marker " + key + " to
firstQualifyingIsAny");
}
@@ -106,10 +108,12 @@ public final class Markers {
}
} else {
// first on scope: only put in new values, leave current
- for (Iterator<String> iter = marks.keySet().iterator();
iter.hasNext();) {
- String key = iter.next();
+ Set<Map.Entry<String, Marker>> entries = marks.entrySet();
+ for (Map.Entry<String, Marker> entry : entries) {
+ String key = entry.getKey();
+ Marker marker = entry.getValue();
if (!firstQualifyingIsAny.containsKey(key)) {
- firstQualifyingIsAny.put(key, marks.get(key));
+ firstQualifyingIsAny.put(key, marker);
if (log.isTraceEnabled()) {
log.trace("Adding marker " + key + " to
firstQualifyingIsAny");
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java?rev=1398155&r1=1398154&r2=1398155&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
Mon Oct 15 00:04:26 2012
@@ -742,7 +742,7 @@ public class TableCellLayoutManager exte
return true;
}
- private class TableCellBreaker extends LocalBreaker {
+ private static class TableCellBreaker extends LocalBreaker {
public TableCellBreaker(TableCellLayoutManager lm, int ipd, int
displayAlign) {
super(lm, ipd, displayAlign);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
