diff options
Diffstat (limited to 'src/java/org/apache/fop/layoutmgr')
33 files changed, 92 insertions, 92 deletions
diff --git a/src/java/org/apache/fop/layoutmgr/AbstractBaseLayoutManager.java b/src/java/org/apache/fop/layoutmgr/AbstractBaseLayoutManager.java index 635e267c1..8830278b4 100644 --- a/src/java/org/apache/fop/layoutmgr/AbstractBaseLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/AbstractBaseLayoutManager.java @@ -39,9 +39,9 @@ public abstract class AbstractBaseLayoutManager implements LayoutManager, PercentBaseContext { /** Indicator if this LM generates reference areas. */ - protected boolean generatesReferenceArea = false; + protected boolean generatesReferenceArea; /** Indicator if this LM generates block areas. */ - protected boolean generatesBlockArea = false; + protected boolean generatesBlockArea; /** The formatting object for this LM. */ protected final FObj fobj; diff --git a/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java b/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java index 408a02b04..f0d9126a8 100644 --- a/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java +++ b/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java @@ -96,9 +96,9 @@ public abstract class AbstractBreaker { private static final long serialVersionUID = -5348831120146774118L; /** Number of elements to ignore at the beginning of the list. */ - int ignoreAtStart = 0; + int ignoreAtStart; /** Number of elements to ignore at the end of the list. */ - int ignoreAtEnd = 0; + int ignoreAtEnd; /** * startOn represents where on the page/which page layout diff --git a/src/java/org/apache/fop/layoutmgr/AbstractPageSequenceLayoutManager.java b/src/java/org/apache/fop/layoutmgr/AbstractPageSequenceLayoutManager.java index 53de9e1ed..a1a2735a2 100644 --- a/src/java/org/apache/fop/layoutmgr/AbstractPageSequenceLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/AbstractPageSequenceLayoutManager.java @@ -59,9 +59,9 @@ public abstract class AbstractPageSequenceLayoutManager extends AbstractLayoutMa protected Page curPage; /** the current page number */ - protected int currentPageNum = 0; + protected int currentPageNum; /** The stating page number */ - protected int startPageNum = 0; + protected int startPageNum; /** * Constructor diff --git a/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java b/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java index 3da6974a6..9ce113d11 100644 --- a/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java @@ -66,7 +66,7 @@ public class BlockContainerLayoutManager extends SpacedBorderedPaddedBlockLayout // When viewport should grow with the content. private boolean autoHeight = true; - private boolean inlineElementList = false; + private boolean inlineElementList; /* holds the (one-time use) fo:block space-before and -after properties. Large fo:blocks are split @@ -81,8 +81,8 @@ public class BlockContainerLayoutManager extends SpacedBorderedPaddedBlockLayout private MinOptMax foBlockSpaceAfter; private int horizontalOverflow; - private double contentRectOffsetX = 0; - private double contentRectOffsetY = 0; + private double contentRectOffsetX; + private double contentRectOffsetY; /** * Create a new block container layout manager. diff --git a/src/java/org/apache/fop/layoutmgr/BlockKnuthSequence.java b/src/java/org/apache/fop/layoutmgr/BlockKnuthSequence.java index 68d64199a..83c1ae585 100644 --- a/src/java/org/apache/fop/layoutmgr/BlockKnuthSequence.java +++ b/src/java/org/apache/fop/layoutmgr/BlockKnuthSequence.java @@ -29,7 +29,7 @@ public class BlockKnuthSequence extends KnuthSequence { private static final long serialVersionUID = 1648962416582509095L; - private boolean isClosed = false; + private boolean isClosed; /** * Creates a new and empty list. diff --git a/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java b/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java index 4cf15f3a0..d57588db8 100644 --- a/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java +++ b/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java @@ -123,9 +123,9 @@ public abstract class BreakingAlgorithm { /** Force the algorithm to find a set of breakpoints, even if no feasible breakpoints * exist. */ - private boolean force = false; + private boolean force; /** If set to true, doesn't ignore break possibilities which are definitely too short. */ - protected boolean considerTooShort = false; + protected boolean considerTooShort; /** When in forced mode, the best node leading to a too long line. The line will be * too long anyway, but this one will lead to a paragraph with fewest demerits. @@ -162,12 +162,12 @@ public abstract class BreakingAlgorithm { /** * The lowest available line in the set of active nodes. */ - protected int startLine = 0; + protected int startLine; /** * The highest + 1 available line in the set of active nodes. */ - protected int endLine = 0; + protected int endLine; /** * The total width of all elements handled so far. @@ -177,12 +177,12 @@ public abstract class BreakingAlgorithm { /** * The total stretch of all elements handled so far. */ - protected int totalStretch = 0; + protected int totalStretch; /** * The total shrink of all elements handled so far. */ - protected int totalShrink = 0; + protected int totalShrink; /** * Best records. @@ -268,7 +268,7 @@ public abstract class BreakingAlgorithm { * Holds the number of subsequent recovery attempty that are made to get content fit * into a line. */ - public int fitRecoveryCounter = 0; + public int fitRecoveryCounter; /** * Construct node. diff --git a/src/java/org/apache/fop/layoutmgr/ElementListObserver.java b/src/java/org/apache/fop/layoutmgr/ElementListObserver.java index d5c6f5527..17cdd1462 100644 --- a/src/java/org/apache/fop/layoutmgr/ElementListObserver.java +++ b/src/java/org/apache/fop/layoutmgr/ElementListObserver.java @@ -32,7 +32,7 @@ public final class ElementListObserver { private ElementListObserver() { } - private static List activeObservers = null; + private static List activeObservers; /** * Adds a new Observer to the list. diff --git a/src/java/org/apache/fop/layoutmgr/InlineKnuthSequence.java b/src/java/org/apache/fop/layoutmgr/InlineKnuthSequence.java index df84aff20..1b38b9d8f 100644 --- a/src/java/org/apache/fop/layoutmgr/InlineKnuthSequence.java +++ b/src/java/org/apache/fop/layoutmgr/InlineKnuthSequence.java @@ -34,7 +34,7 @@ public class InlineKnuthSequence extends KnuthSequence { private static final long serialVersionUID = 1354774188859946549L; - private boolean isClosed = false; + private boolean isClosed; /** * Creates a new and empty list. diff --git a/src/java/org/apache/fop/layoutmgr/KnuthBlockBox.java b/src/java/org/apache/fop/layoutmgr/KnuthBlockBox.java index e76a8a06c..530c6609a 100644 --- a/src/java/org/apache/fop/layoutmgr/KnuthBlockBox.java +++ b/src/java/org/apache/fop/layoutmgr/KnuthBlockBox.java @@ -37,7 +37,7 @@ public class KnuthBlockBox extends KnuthBox { private int bpd; private List<FootnoteBodyLayoutManager> footnoteList; /** List of Knuth elements. This is a list of LinkedList elements. */ - private List elementLists = null; + private List elementLists; /** * Creates a new box. diff --git a/src/java/org/apache/fop/layoutmgr/LMiter.java b/src/java/org/apache/fop/layoutmgr/LMiter.java index d3ad30485..373a61a1c 100644 --- a/src/java/org/apache/fop/layoutmgr/LMiter.java +++ b/src/java/org/apache/fop/layoutmgr/LMiter.java @@ -29,7 +29,7 @@ public class LMiter implements ListIterator<LayoutManager> { /** list of layout managers */ protected List<LayoutManager> listLMs; /** current position in iteration */ - protected int curPos = 0; + protected int curPos; /** The LayoutManager to which this LMiter is attached **/ private LayoutManager lp; diff --git a/src/java/org/apache/fop/layoutmgr/LayoutContext.java b/src/java/org/apache/fop/layoutmgr/LayoutContext.java index 763407132..bb240e637 100644 --- a/src/java/org/apache/fop/layoutmgr/LayoutContext.java +++ b/src/java/org/apache/fop/layoutmgr/LayoutContext.java @@ -94,28 +94,28 @@ public final class LayoutContext { private List pendingBeforeMarks; /** Current hyphenation context. May be null. */ - private HyphContext hyphContext = null; + private HyphContext hyphContext; /** Alignment in BP direction */ private int bpAlignment = Constants.EN_START; /** Stretch or shrink value when making areas. */ - private double ipdAdjust = 0.0; + private double ipdAdjust; /** Stretch or shrink value when adding spaces. */ - private double dSpaceAdjust = 0.0; + private double dSpaceAdjust; - private AlignmentContext alignmentContext = null; + private AlignmentContext alignmentContext; /** Amount of space before / start */ - private int spaceBefore = 0; + private int spaceBefore; /** Amount of space after / end */ - private int spaceAfter = 0; + private int spaceAfter; /** Amount of space to reserve at the beginning of each line */ - private int lineStartBorderAndPaddingWidth = 0; + private int lineStartBorderAndPaddingWidth; /** Amount of space to reserve at the end of each line */ - private int lineEndBorderAndPaddingWidth = 0; + private int lineEndBorderAndPaddingWidth; private int breakBefore; private int breakAfter; diff --git a/src/java/org/apache/fop/layoutmgr/LocalBreaker.java b/src/java/org/apache/fop/layoutmgr/LocalBreaker.java index bcb86e501..a37f82643 100644 --- a/src/java/org/apache/fop/layoutmgr/LocalBreaker.java +++ b/src/java/org/apache/fop/layoutmgr/LocalBreaker.java @@ -30,7 +30,7 @@ public abstract class LocalBreaker extends AbstractBreaker { protected BlockStackingLayoutManager lm; private int displayAlign; private int ipd; - private int overflow = 0; + private int overflow; public LocalBreaker(BlockStackingLayoutManager lm, int ipd, int displayAlign) { this.lm = lm; diff --git a/src/java/org/apache/fop/layoutmgr/PageBreaker.java b/src/java/org/apache/fop/layoutmgr/PageBreaker.java index ec0d4e990..faff4ee17 100644 --- a/src/java/org/apache/fop/layoutmgr/PageBreaker.java +++ b/src/java/org/apache/fop/layoutmgr/PageBreaker.java @@ -52,9 +52,9 @@ public class PageBreaker extends AbstractBreaker { * The FlowLayoutManager object, which processes * the single fo:flow of the fo:page-sequence */ - private FlowLayoutManager childFLM = null; + private FlowLayoutManager childFLM; - private StaticContentLayoutManager footnoteSeparatorLM = null; + private StaticContentLayoutManager footnoteSeparatorLM; /** * Construct page breaker. diff --git a/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java b/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java index be9de298a..cdd9a703a 100644 --- a/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java +++ b/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java @@ -43,33 +43,33 @@ class PageBreakingAlgorithm extends BreakingAlgorithm { private final PageProvider pageProvider; private final PageBreakingLayoutListener layoutListener; /** List of PageBreakPosition elements. */ - private LinkedList<PageBreakPosition> pageBreaks = null; + private LinkedList<PageBreakPosition> pageBreaks; /** Footnotes which are cited between the currently considered active node (previous * break) and the current considered break. Its type is * List<List<KnuthElement>>, it contains the sequences of KnuthElement * representing the footnotes bodies. */ - private List<List<KnuthElement>> footnotesList = null; + private List<List<KnuthElement>> footnotesList; /** Cumulated bpd of unhandled footnotes. */ - private List<Integer> lengthList = null; + private List<Integer> lengthList; /** Length of all the footnotes which will be put on the current page. */ - private int totalFootnotesLength = 0; + private int totalFootnotesLength; /** * Length of all the footnotes which have already been inserted, up to the currently * considered element. That is, footnotes from the currently considered page plus * footnotes from its preceding pages. */ - private int insertedFootnotesLength = 0; + private int insertedFootnotesLength; /** True if footnote citations have been met since the beginning of the page sequence. */ - private boolean footnotesPending = false; + private boolean footnotesPending; /** True if the elements met after the previous break point contain footnote citations. */ - private boolean newFootnotes = false; + private boolean newFootnotes; /** Index of the first footnote met after the previous break point. */ - private int firstNewFootnoteIndex = 0; + private int firstNewFootnoteIndex; /** Index of the last footnote inserted on the current page. */ - private int footnoteListIndex = 0; + private int footnoteListIndex; /** Index of the last element of the last footnote inserted on the current page. */ private int footnoteElementIndex = -1; @@ -77,20 +77,20 @@ class PageBreakingAlgorithm extends BreakingAlgorithm { private final int splitFootnoteDemerits = 5000; // demerits for a page break that defers a whole footnote to the following page private final int deferredFootnoteDemerits = 10000; - private MinOptMax footnoteSeparatorLength = null; + private MinOptMax footnoteSeparatorLength; // the method noBreakBetween(int, int) uses these variables // to store parameters and result of the last call, in order // to reuse them and take less time private int storedPrevBreakIndex = -1; private int storedBreakIndex = -1; - private boolean storedValue = false; + private boolean storedValue; //Controls whether overflows should be warned about or not - private boolean autoHeight = false; + private boolean autoHeight; //Controls whether a single part should be forced if possible (ex. block-container) - private boolean favorSinglePart = false; + private boolean favorSinglePart; private int ipdDifference; private KnuthNode bestNodeForIPDChange; diff --git a/src/java/org/apache/fop/layoutmgr/SpaceSpecifier.java b/src/java/org/apache/fop/layoutmgr/SpaceSpecifier.java index 394477658..dd525e16f 100644 --- a/src/java/org/apache/fop/layoutmgr/SpaceSpecifier.java +++ b/src/java/org/apache/fop/layoutmgr/SpaceSpecifier.java @@ -33,7 +33,7 @@ import org.apache.fop.traits.SpaceVal; public class SpaceSpecifier implements Cloneable { private boolean startsReferenceArea; - private boolean hasForcing = false; + private boolean hasForcing; private List spaceVals = new ArrayList(); /** diff --git a/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java b/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java index 7caa31cfb..83fa63151 100644 --- a/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java @@ -41,7 +41,7 @@ public class StaticContentLayoutManager extends BlockStackingLayoutManager { private Block targetBlock; private SideRegion regionFO; - private int contentAreaIPD = 0; + private int contentAreaIPD; private int contentAreaBPD = -1; /** diff --git a/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java index 7ed910473..c959ee7be 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java @@ -49,7 +49,7 @@ public class CharacterLayoutManager extends LeafNodeLayoutManager { private MinOptMax letterSpaceIPD; private int hyphIPD; private Font font; - private CommonBorderPaddingBackground borderProps = null; + private CommonBorderPaddingBackground borderProps; /** * Constructor diff --git a/src/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java index c067b040f..83b9502f2 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java @@ -61,7 +61,7 @@ public class ContentLayoutManager extends AbstractBaseLayoutManager private Area holder; private int stackSize; private LayoutManager parentLM; - private InlineLevelLayoutManager childLM = null; + private InlineLevelLayoutManager childLM; /** * Constructs a new ContentLayoutManager diff --git a/src/java/org/apache/fop/layoutmgr/inline/HyphContext.java b/src/java/org/apache/fop/layoutmgr/inline/HyphContext.java index ffc57fa16..fcbde26e5 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/HyphContext.java +++ b/src/java/org/apache/fop/layoutmgr/inline/HyphContext.java @@ -29,8 +29,8 @@ package org.apache.fop.layoutmgr.inline; */ public class HyphContext { private int[] hyphPoints; - private int currentOffset = 0; - private int currentIndex = 0; + private int currentOffset; + private int currentIndex; /** * @param hyphPoints number of hyphenation points diff --git a/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java index 61dcf45c9..0a0658b4d 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java @@ -72,11 +72,11 @@ public class InlineLayoutManager extends InlineStackingLayoutManager { */ private static Log log = LogFactory.getLog(InlineLayoutManager.class); - private CommonMarginInline inlineProps = null; - private CommonBorderPaddingBackground borderProps = null; + private CommonMarginInline inlineProps; + private CommonBorderPaddingBackground borderProps; - private boolean areaCreated = false; - private LayoutManager lastChildLM = null; // Set when return last breakposs; + private boolean areaCreated; + private LayoutManager lastChildLM; // Set when return last breakposs; private Font font; @@ -93,7 +93,7 @@ public class InlineLayoutManager extends InlineStackingLayoutManager { /** The keep-together property */ //private KeepProperty keepTogether; - private AlignmentContext alignmentContext = null; + private AlignmentContext alignmentContext; /** * Create an inline layout manager. diff --git a/src/java/org/apache/fop/layoutmgr/inline/KnuthInlineBox.java b/src/java/org/apache/fop/layoutmgr/inline/KnuthInlineBox.java index e786acdd3..e8bec8f4d 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/KnuthInlineBox.java +++ b/src/java/org/apache/fop/layoutmgr/inline/KnuthInlineBox.java @@ -28,8 +28,8 @@ import org.apache.fop.layoutmgr.Position; */ public class KnuthInlineBox extends KnuthBox { - private FootnoteBodyLayoutManager footnoteBodyLM = null; - private AlignmentContext alignmentContext = null; + private FootnoteBodyLayoutManager footnoteBodyLM; + private AlignmentContext alignmentContext; /** * Create a new KnuthBox. diff --git a/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java index f0ae4170d..5f65a5969 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java @@ -51,12 +51,12 @@ import org.apache.fop.traits.MinOptMax; */ public class LeaderLayoutManager extends LeafNodeLayoutManager { private Leader fobj; - private Font font = null; + private Font font; - private List contentList = null; - private ContentLayoutManager clm = null; + private List contentList; + private ContentLayoutManager clm; - private int contentAreaIPD = 0; + private int contentAreaIPD; /** * Constructor diff --git a/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java index 001fde817..ae337b0d0 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java @@ -57,16 +57,16 @@ public abstract class LeafNodeLayoutManager extends AbstractLayoutManager protected static final Log log = LogFactory.getLog(LeafNodeLayoutManager.class); /** The inline area that this leafnode will add. */ - protected InlineArea curArea = null; + protected InlineArea curArea; /** Any border, padding and background properties applying to this area */ - protected CommonBorderPaddingBackground commonBorderPaddingBackground = null; + protected CommonBorderPaddingBackground commonBorderPaddingBackground; /** The alignment context applying to this area */ - protected AlignmentContext alignmentContext = null; + protected AlignmentContext alignmentContext; /** Flag to indicate if something was changed as part of the getChangeKnuthElements sequence */ - protected boolean somethingChanged = false; + protected boolean somethingChanged; /** Our area info for the Knuth elements */ - protected AreaInfo areaInfo = null; + protected AreaInfo areaInfo; /** * Store information about the inline area diff --git a/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java index 20d04c6d5..aa8815ffc 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java @@ -168,7 +168,7 @@ public class LineLayoutManager extends InlineStackingLayoutManager private LineLayoutPossibilities lineLayouts; private LineLayoutPossibilities[] lineLayoutsList; - private int ipd = 0; + private int ipd; /** * When layout must be re-started due to a change of IPD, there is no need * to perform hyphenation on the remaining Knuth sequence once again. @@ -196,9 +196,9 @@ public class LineLayoutManager extends InlineStackingLayoutManager private static final long serialVersionUID = 5862072380375189105L; /** Number of elements to ignore at the beginning of the list. */ - private int ignoreAtStart = 0; + private int ignoreAtStart; /** Number of elements to ignore at the end of the list. */ - private int ignoreAtEnd = 0; + private int ignoreAtEnd; // space at the end of the last line (in millipoints) private MinOptMax lineFiller; diff --git a/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java index 625b43ee5..9d12348ad 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java @@ -98,9 +98,9 @@ public class TextLayoutManager extends LeafNodeLayoutManager { private final MinOptMax[] letterSpaceAdjustArray; //size = textArray.length + 1 /** Font used for the space between words. */ - private Font spaceFont = null; + private Font spaceFont; /** Start index of next TextArea */ - private int nextStart = 0; + private int nextStart; /** size of a space character (U+0020) glyph in current font */ private int spaceCharIPD; private MinOptMax wordSpaceIPD; @@ -108,24 +108,24 @@ public class TextLayoutManager extends LeafNodeLayoutManager { /** size of the hyphen character glyph in current font */ private int hyphIPD; - private boolean hasChanged = false; + private boolean hasChanged; private int[] returnedIndices = {0, 0}; - private int changeOffset = 0; - private int thisStart = 0; - private int tempStart = 0; + private int changeOffset; + private int thisStart; + private int tempStart; private List changeList = new LinkedList(); - private AlignmentContext alignmentContext = null; + private AlignmentContext alignmentContext; /** * The width to be reserved for border and padding at the start of the line. */ - private int lineStartBAP = 0; + private int lineStartBAP; /** * The width to be reserved for border and padding at the end of the line. */ - private int lineEndBAP = 0; + private int lineEndBAP; private boolean keepTogether; diff --git a/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java b/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java index 4df716899..6404e9feb 100644 --- a/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java @@ -71,10 +71,10 @@ public class ListItemLayoutManager extends SpacedBorderedPaddedBlockLayoutManage private ListItemContentLayoutManager label; private ListItemContentLayoutManager body; - private Block curBlockArea = null; + private Block curBlockArea; - private List<ListElement> labelList = null; - private List<ListElement> bodyList = null; + private List<ListElement> labelList; + private List<ListElement> bodyList; private Keep keepWithNextPendingOnLabel; private Keep keepWithNextPendingOnBody; diff --git a/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java b/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java index 36d42dbbe..81841b246 100644 --- a/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java +++ b/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java @@ -76,7 +76,7 @@ class ActiveCell { private Keep keepWithNext; - private int spanIndex = 0; + private int spanIndex; private Step previousStep; private Step nextStep; diff --git a/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModel.java b/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModel.java index 048f83269..a4c8570e8 100644 --- a/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModel.java +++ b/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModel.java @@ -48,7 +48,7 @@ public abstract class CollapsingBorderModel { //public static final int LAST_ROW_IN_GROUP = 8; //These statics are used singleton-style. No MT issues here. - private static CollapsingBorderModel collapse = null; + private static CollapsingBorderModel collapse; // private static CollapsingBorderModel collapseWithPrecedence = null; /** diff --git a/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java b/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java index 1d1a44349..8fae90849 100644 --- a/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java +++ b/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java @@ -50,7 +50,7 @@ public class ColumnSetup { private List columns = new java.util.ArrayList(); private List colWidths = new java.util.ArrayList(); - private int maxColIndexReferenced = 0; + private int maxColIndexReferenced; /** * Main Constructor. diff --git a/src/java/org/apache/fop/layoutmgr/table/RowPainter.java b/src/java/org/apache/fop/layoutmgr/table/RowPainter.java index 6b0ef6ebb..4c45e62f8 100644 --- a/src/java/org/apache/fop/layoutmgr/table/RowPainter.java +++ b/src/java/org/apache/fop/layoutmgr/table/RowPainter.java @@ -50,9 +50,9 @@ import org.apache.fop.layoutmgr.TraitSetter; class RowPainter { private static Log log = LogFactory.getLog(RowPainter.class); private int colCount; - private int currentRowOffset = 0; + private int currentRowOffset; /** Currently handled row (= last encountered row). */ - private EffRow currentRow = null; + private EffRow currentRow; private LayoutContext layoutContext; /** * Index of the first row of the current part present on the current page. @@ -79,7 +79,7 @@ class RowPainter { private CellPart[] lastCellParts; /** y-offset of the current table part. */ - private int tablePartOffset = 0; + private int tablePartOffset; /** See {@link RowPainter#registerPartBackgroundArea(Block)}. */ private CommonBorderPaddingBackground tablePartBackground; /** See {@link RowPainter#registerPartBackgroundArea(Block)}. */ diff --git a/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java b/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java index 62324a339..f15ef74ed 100644 --- a/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java @@ -69,8 +69,8 @@ public class TableContentLayoutManager implements PercentBaseContext { private TableRowIterator footerIter; private LinkedList headerList; private LinkedList footerList; - private int headerNetHeight = 0; - private int footerNetHeight = 0; + private int headerNetHeight; + private int footerNetHeight; private int startXOffset; private int usedBPD; diff --git a/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java b/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java index 89af63449..c733d1d7e 100644 --- a/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java @@ -75,7 +75,7 @@ public class TableLayoutManager extends SpacedBorderedPaddedBlockLayoutManager private static Log log = LogFactory.getLog(TableLayoutManager.class); private TableContentLayoutManager contentLM; - private ColumnSetup columns = null; + private ColumnSetup columns; private Block curBlockArea; diff --git a/src/java/org/apache/fop/layoutmgr/table/TableRowIterator.java b/src/java/org/apache/fop/layoutmgr/table/TableRowIterator.java index 35cba6da6..47561f3c9 100644 --- a/src/java/org/apache/fop/layoutmgr/table/TableRowIterator.java +++ b/src/java/org/apache/fop/layoutmgr/table/TableRowIterator.java @@ -51,7 +51,7 @@ public class TableRowIterator { private Iterator rowGroupsIter; - private int rowIndex = 0; + private int rowIndex; /** * Creates a new TableRowIterator. |