]> source.dussan.org Git - xmlgraphics-fop.git/commitdiff
Fixed indentation
authorVincent Hennebert <vhennebert@apache.org>
Fri, 27 Aug 2010 14:02:34 +0000 (14:02 +0000)
committerVincent Hennebert <vhennebert@apache.org>
Fri, 27 Aug 2010 14:02:34 +0000 (14:02 +0000)
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@990155 13f79535-47bb-0310-9956-ffa450edef68

src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java
src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java
src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
src/java/org/apache/fop/render/ps/PSBorderPainter.java

index e0b0cae11866101473e7c56999792b776cf1e7b3..7e54cbe432acc9fb8d327c3a9a261775f50775e0 100644 (file)
@@ -514,7 +514,7 @@ class PageBreakingAlgorithm extends BreakingAlgorithm {
                     footnoteElementIndex
                         = getFootnoteList(footnoteListIndex).size() - 1;
                 } else if (((canDeferOldFN = canDeferOldFootnotes // CSOK: InnerAssignment
-                             (pageNode, elementIndex)) 
+                             (pageNode, elementIndex))
                             || newFootnotes)
                            && (footnoteSplit = getFootnoteSplit // CSOK: InnerAssignment
                                (pageNode, getLineWidth(activeNode.line) - actualWidth,
@@ -1125,7 +1125,7 @@ class PageBreakingAlgorithm extends BreakingAlgorithm {
      */
     protected void addNode(int line, KnuthNode node) {
         if (node.position < par.size() - 1 && line > 0
-            && (ipdDifference = compareIPDs(line - 1)) != 0) {  // CSOK: InnerAssignment
+                && (ipdDifference = compareIPDs(line - 1)) != 0) {  // CSOK: InnerAssignment
             log.trace("IPD changes at page " + line);
             if (bestNodeForIPDChange == null
                     || node.totalDemerits < bestNodeForIPDChange.totalDemerits) {
index ed22886a4100a0c48cdc9424e0aaa493a5f921ef..66e162692b9e1081c6087189eb4713e157a81aea 100644 (file)
@@ -194,9 +194,8 @@ public class CharacterLayoutManager extends LeafNodeLayoutManager {
                                         areaInfo.alignmentContext,
                                         notifyPos(new LeafPosition(this, 0)), false));
             if (areaInfo.bHyphenated) {
-                returnList.add
-                    (new KnuthPenalty(hyphIPD, KnuthPenalty.FLAGGED_PENALTY, true,
-                                      new LeafPosition(this, -1), false));
+                returnList.add(new KnuthPenalty(hyphIPD, KnuthPenalty.FLAGGED_PENALTY, true,
+                        new LeafPosition(this, -1), false));
             }
         } else {
             // adjustable letter space
@@ -207,8 +206,8 @@ public class CharacterLayoutManager extends LeafNodeLayoutManager {
                     new LeafPosition(this, -1), true));
             returnList.add(new KnuthGlue(letterSpaceIPD.mult(areaInfo.iLScount),
                     new LeafPosition(this, -1), true));
-            returnList.add
-                (new KnuthInlineBox(0, null, notifyPos(new LeafPosition(this, -1)), true));
+            returnList.add (
+                    new KnuthInlineBox(0, null, notifyPos(new LeafPosition(this, -1)), true));
             if (areaInfo.bHyphenated) {
                 returnList.add(new KnuthPenalty(hyphIPD, KnuthPenalty.FLAGGED_PENALTY, true,
                         new LeafPosition(this, -1), false));
index 04978ad5422d8cdb789836c20c05fecd2f75d5ff..83d286c15990b4aae80758189a8d943a79a59577 100644 (file)
@@ -356,7 +356,7 @@ public class LineLayoutManager extends InlineStackingLayoutManager
             indent += (textAlign == Constants.EN_CENTER)
                       ? difference / 2 : (textAlign == Constants.EN_END) ? difference : 0;
             indent += (bestActiveNode.line == 1 && indentFirstPart && isFirstInBlock)
-                ? textIndent : 0;
+                      ? textIndent : 0;
             double ratio = (textAlign == Constants.EN_JUSTIFY
                 || difference < 0 && -difference <= bestActiveNode.availableShrink)
                         ? bestActiveNode.adjustRatio : 0;
@@ -711,7 +711,8 @@ public class LineLayoutManager extends InlineStackingLayoutManager
 
                     // finish last paragraph if it was closed with a linefeed
                     if (lastElement.isPenalty()
-                        && ((KnuthPenalty) lastElement).getPenalty() == -KnuthPenalty.INFINITE) {
+                            && ((KnuthPenalty) lastElement).getPenalty()
+                                == -KnuthPenalty.INFINITE) {
                         // a penalty item whose value is -inf
                         // represents a preserved linefeed,
                         // which forces a line break
index 2d881571aefc29cb755c2d4ea4d99af09fd20452..1e2964eedadf2008217e3522de4f453c4e02017e 100644 (file)
@@ -75,7 +75,7 @@ public class PSBorderPainter extends BorderPainter {
             PSGenerator gen,
             float x1, float y1, float x2, float y2, boolean horz,  // CSOK: JavadocMethod
             boolean startOrBefore, int style, Color col)           // CSOK: JavadocMethod
-        throws IOException {                                    // CSOK: JavadocMethod
+            throws IOException {                                   // CSOK: JavadocMethod
         float w = x2 - x1;
         float h = y2 - y1;
         if ((w < 0) || (h < 0)) {