diff options
| author | Glenn Adams <gadams@apache.org> | 2012-03-02 21:34:30 +0000 |
|---|---|---|
| committer | Glenn Adams <gadams@apache.org> | 2012-03-02 21:34:30 +0000 |
| commit | 9826acf1e8c3552abc295ba34384292ae6db51b3 (patch) | |
| tree | fcca84f17d36fa77846b3d5313a73820cae01366 /src/java/org/apache/fop/layoutmgr/inline | |
| parent | 5494cc056a64aa2c66727087435cad880a896486 (diff) | |
| download | xmlgraphics-fop-9826acf1e8c3552abc295ba34384292ae6db51b3.tar.gz xmlgraphics-fop-9826acf1e8c3552abc295ba34384292ae6db51b3.zip | |
enable MultipleVariableDeclarations rule; fix violations
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1296483 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/fop/layoutmgr/inline')
| -rw-r--r-- | src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java | 3 | ||||
| -rw-r--r-- | src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java index f57b9367a..3b2f11ea2 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java @@ -1231,7 +1231,8 @@ public class LineLayoutManager extends InlineStackingLayoutManager ListIterator currParIterator = currPar.listIterator(currPar.ignoreAtStart); // list of TLM involved in hyphenation List updateList = new LinkedList(); - KnuthElement firstElement, nextElement; + KnuthElement firstElement; + KnuthElement nextElement; // current InlineLevelLayoutManager InlineLevelLayoutManager currLM = null; // number of KnuthBox elements containing word fragments diff --git a/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java index 1ac206ee8..4010777ad 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java @@ -1320,7 +1320,8 @@ public class TextLayoutManager extends LeafNodeLayoutManager { // Find the first and last positions in oldList that point to an AreaInfo // (i.e. getLeafPos() != -1) - LeafPosition startPos = null, endPos = null; + LeafPosition startPos = null; + LeafPosition endPos = null; ListIterator oldListIter; for (oldListIter = oldList.listIterator(); oldListIter.hasNext();) { Position pos = ((KnuthElement) oldListIter.next()).getPosition(); @@ -1346,7 +1347,8 @@ public class TextLayoutManager extends LeafNodeLayoutManager { int areaInfosRemoved = 0; if (!changeList.isEmpty()) { - int oldIndex = -1, changeIndex; + int oldIndex = -1; + int changeIndex; PendingChange currChange; ListIterator changeListIterator = changeList.listIterator(); while (changeListIterator.hasNext()) { |