Author: gadams
Date: Mon Dec 31 14:46:01 2012
New Revision: 1427143
URL: http://svn.apache.org/viewvc?rev=1427143&view=rev
Log:
FOP-2179: Fix checkstyle and findbugs warnings.
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineParent.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BalancingColumnBreakingAlgorithm.java
xmlgraphics/fop/trunk/status.xml
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java?rev=1427143&r1=1427142&r2=1427143&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java
Mon Dec 31 14:46:01 2012
@@ -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
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineParent.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineParent.java?rev=1427143&r1=1427142&r2=1427143&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineParent.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineParent.java
Mon Dec 31 14:46:01 2012
@@ -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 Inline
/** 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
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java?rev=1427143&r1=1427142&r2=1427143&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java Mon Dec 31
14:46:01 2012
@@ -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 FONod
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());
}
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BalancingColumnBreakingAlgorithm.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BalancingColumnBreakingAlgorithm.java?rev=1427143&r1=1427142&r2=1427143&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BalancingColumnBreakingAlgorithm.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BalancingColumnBreakingAlgorithm.java
Mon Dec 31 14:46:01 2012
@@ -63,8 +63,8 @@ public class BalancingColumnBreakingAlgo
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;
}
Modified: xmlgraphics/fop/trunk/status.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/status.xml?rev=1427143&r1=1427142&r2=1427143&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Mon Dec 31 14:46:01 2012
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
