diff options
| -rw-r--r-- | src/java/org/apache/fop/area/inline/InlineArea.java | 2 | ||||
| -rw-r--r-- | src/java/org/apache/fop/area/inline/InlineParent.java | 7 | ||||
| -rw-r--r-- | src/java/org/apache/fop/fo/FObj.java | 8 | ||||
| -rw-r--r-- | src/java/org/apache/fop/layoutmgr/BalancingColumnBreakingAlgorithm.java | 4 | ||||
| -rw-r--r-- | status.xml | 3 |
5 files changed, 14 insertions, 10 deletions
diff --git a/src/java/org/apache/fop/area/inline/InlineArea.java b/src/java/org/apache/fop/area/inline/InlineArea.java index d92ea4f4f..399bd1f1e 100644 --- a/src/java/org/apache/fop/area/inline/InlineArea.java +++ b/src/java/org/apache/fop/area/inline/InlineArea.java @@ -278,7 +278,7 @@ public class InlineArea extends Area { storedIPDVariation += ipdVariation; } } - + /** * Returns the offset that this area would have if its offset and size were taking * children areas into account. The bpd of an inline area is taken from its nominal diff --git a/src/java/org/apache/fop/area/inline/InlineParent.java b/src/java/org/apache/fop/area/inline/InlineParent.java index 4d3f27b30..1be3aff0f 100644 --- a/src/java/org/apache/fop/area/inline/InlineParent.java +++ b/src/java/org/apache/fop/area/inline/InlineParent.java @@ -19,10 +19,9 @@ package org.apache.fop.area.inline; -import java.util.Iterator; import java.util.ArrayList; +import java.util.Iterator; import java.util.List; -import java.lang.Math; import org.apache.fop.area.Area; @@ -41,10 +40,10 @@ public class InlineParent extends InlineArea { /** Controls whether the IPD is automatically adjusted based on the area's children. */ protected transient boolean autoSize; - + /** The offset of the <q>beforest</q> child area of this area. */ protected int minChildOffset; - + /** * The offset of the <q>afterest</q> child area of this area. Offset from the * before-edge of this area's content-rectangle and the after-edge of the child area's diff --git a/src/java/org/apache/fop/fo/FObj.java b/src/java/org/apache/fop/fo/FObj.java index d50e18b0e..b19ccbe20 100644 --- a/src/java/org/apache/fop/fo/FObj.java +++ b/src/java/org/apache/fop/fo/FObj.java @@ -25,6 +25,7 @@ import java.util.Iterator; import java.util.List; import java.util.ListIterator; import java.util.Map; +import java.util.Map.Entry; import java.util.NoSuchElementException; import java.util.Set; @@ -132,12 +133,13 @@ public abstract class FObj extends FONode implements Constants { private void warnOnUnknownProperties(Attributes attlist, String objName, PropertyList propertyList) throws FOPException { Map<String, Property> unknowns = propertyList.getUnknownPropertyValues(); - for (String propertyValue : unknowns.keySet()) { + for (Entry<String, Property> value : unknowns.entrySet()) { + String unknownProperty = value.getKey(); FOValidationEventProducer producer = FOValidationEventProducer.Provider.get(getUserAgent() .getEventBroadcaster()); producer.invalidPropertyValue(this, objName, - getAttributeNameForValue(attlist, unknowns.get(propertyValue), propertyList), - propertyValue, null, + getAttributeNameForValue(attlist, unknowns.get(unknownProperty), propertyList), + unknownProperty, null, getLocator()); } } diff --git a/src/java/org/apache/fop/layoutmgr/BalancingColumnBreakingAlgorithm.java b/src/java/org/apache/fop/layoutmgr/BalancingColumnBreakingAlgorithm.java index f40a44d0e..06c3c538d 100644 --- a/src/java/org/apache/fop/layoutmgr/BalancingColumnBreakingAlgorithm.java +++ b/src/java/org/apache/fop/layoutmgr/BalancingColumnBreakingAlgorithm.java @@ -63,8 +63,8 @@ public class BalancingColumnBreakingAlgorithm extends PageBreakingAlgorithm { return demerits; } for (int breakPos = 0; breakPos < curPossibility.size(); breakPos++) { - if (curPossibility.get(breakPos) != 0 && - !curPossibility.get(breakPos).equals(idealBreaks.get(breakPos))) { + if (curPossibility.get(breakPos) != 0 + && !curPossibility.get(breakPos).equals(idealBreaks.get(breakPos))) { notIdeal = true; break; } diff --git a/status.xml b/status.xml index cd7feb080..394c0bf89 100644 --- a/status.xml +++ b/status.xml @@ -59,6 +59,9 @@ documents. Example: the fix of marks layering will be such a case when it's done. --> <release version="FOP Trunk" date="TBD"> + <action context="Code" dev="GA" type="fix" fixes-bug="FOP-2179" due-to="Robert Meyer"> + Fix checkstyle and findbugs warnings. + </action> <action context="Layout" dev="GA" type="fix" fixes-bug="FOP-2160" due-to="Robert Meyer"> Fix NPE when rl writing mode is used in certain contexts. </action> |