You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by vh...@apache.org on 2014/07/15 22:26:03 UTC
svn commit: r1610839 [3/4] - in /xmlgraphics/fop/trunk: ./
src/java/org/apache/fop/afp/ src/java/org/apache/fop/afp/fonts/
src/java/org/apache/fop/afp/goca/ src/java/org/apache/fop/afp/ioca/
src/java/org/apache/fop/afp/modca/ src/java/org/apache/fop/af...
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/Type1SubsetFile.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/Type1SubsetFile.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/Type1SubsetFile.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/Type1SubsetFile.java Tue Jul 15 20:25:58 2014
@@ -53,10 +53,10 @@ public class Type1SubsetFile {
/* The subset list of char strings */
private HashMap<String, byte[]> subsetCharStrings;
/* The list of character names in the subset font */
- private List<String> charNames = null;
+ private List<String> charNames;
/* A list of unique subroutines references */
private LinkedHashMap<Integer, byte[]> uniqueSubs;
- private SingleByteFont sbfont = null;
+ private SingleByteFont sbfont;
/* New line character */
private String eol = "\n";
/* An option to determine whether the subroutines are subset */
@@ -66,7 +66,7 @@ public class Type1SubsetFile {
private List<PSElement> headerSection;
private List<PSElement> mainSection;
//Determines whether the current font uses standard encoding
- private boolean standardEncoding = false;
+ private boolean standardEncoding;
//Type 1 operators
private static final int OP_SEAC = 6;
@@ -587,7 +587,7 @@ public class Type1SubsetFile {
public static final class BytesNumber {
private int number;
private int numBytes;
- private String name = null;
+ private String name;
public BytesNumber(int number, int numBytes) {
this.number = number;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/Hyphenator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/Hyphenator.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/Hyphenator.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/Hyphenator.java Tue Jul 15 20:25:58 2014
@@ -45,10 +45,10 @@ public final class Hyphenator {
/** logging instance */
protected static final Log log = LogFactory.getLog(Hyphenator.class);
- private static HyphenationTreeCache hTreeCache = null;
+ private static HyphenationTreeCache hTreeCache;
/** Enables a dump of statistics. Note: If activated content is sent to System.out! */
- private static boolean statisticsDump = false;
+ private static boolean statisticsDump;
/**
* Creates a new hyphenator.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/PatternParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/PatternParser.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/PatternParser.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/PatternParser.java Tue Jul 15 20:25:58 2014
@@ -52,7 +52,7 @@ public class PatternParser extends Defau
private ArrayList exception;
private char hyphenChar;
private String errMsg;
- private boolean hasClasses = false;
+ private boolean hasClasses;
static final int ELEM_CLASSES = 1;
static final int ELEM_EXCEPTIONS = 2;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/SerializeHyphPattern.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/SerializeHyphPattern.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/SerializeHyphPattern.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/SerializeHyphPattern.java Tue Jul 15 20:25:58 2014
@@ -31,7 +31,7 @@ import java.io.ObjectOutputStream;
*/
public class SerializeHyphPattern {
- private boolean errorDump = false;
+ private boolean errorDump;
/**
* Controls the amount of error information dumped.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBaseLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBaseLayoutManager.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBaseLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBaseLayoutManager.java Tue Jul 15 20:25:58 2014
@@ -39,9 +39,9 @@ public abstract class AbstractBaseLayout
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;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java Tue Jul 15 20:25:58 2014
@@ -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
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractPageSequenceLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractPageSequenceLayoutManager.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractPageSequenceLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractPageSequenceLayoutManager.java Tue Jul 15 20:25:58 2014
@@ -59,9 +59,9 @@ public abstract class AbstractPageSequen
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
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java Tue Jul 15 20:25:58 2014
@@ -66,7 +66,7 @@ public class BlockContainerLayoutManager
// 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
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.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockKnuthSequence.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockKnuthSequence.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockKnuthSequence.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockKnuthSequence.java Tue Jul 15 20:25:58 2014
@@ -29,7 +29,7 @@ public class BlockKnuthSequence extends
private static final long serialVersionUID = 1648962416582509095L;
- private boolean isClosed = false;
+ private boolean isClosed;
/**
* Creates a new and empty list.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java Tue Jul 15 20:25:58 2014
@@ -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.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/ElementListObserver.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/ElementListObserver.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/ElementListObserver.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/ElementListObserver.java Tue Jul 15 20:25:58 2014
@@ -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.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/InlineKnuthSequence.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/InlineKnuthSequence.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/InlineKnuthSequence.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/InlineKnuthSequence.java Tue Jul 15 20:25:58 2014
@@ -34,7 +34,7 @@ public class InlineKnuthSequence extends
private static final long serialVersionUID = 1354774188859946549L;
- private boolean isClosed = false;
+ private boolean isClosed;
/**
* Creates a new and empty list.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/KnuthBlockBox.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/KnuthBlockBox.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/KnuthBlockBox.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/KnuthBlockBox.java Tue Jul 15 20:25:58 2014
@@ -37,7 +37,7 @@ public class KnuthBlockBox extends Knuth
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.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LMiter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LMiter.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LMiter.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LMiter.java Tue Jul 15 20:25:58 2014
@@ -29,7 +29,7 @@ public class LMiter implements ListItera
/** 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;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LayoutContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LayoutContext.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LayoutContext.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LayoutContext.java Tue Jul 15 20:25:58 2014
@@ -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;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LocalBreaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LocalBreaker.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LocalBreaker.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LocalBreaker.java Tue Jul 15 20:25:58 2014
@@ -30,7 +30,7 @@ public abstract class LocalBreaker exten
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;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageBreaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageBreaker.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageBreaker.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageBreaker.java Tue Jul 15 20:25:58 2014
@@ -52,9 +52,9 @@ public class PageBreaker extends Abstrac
* 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.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java Tue Jul 15 20:25:58 2014
@@ -43,33 +43,33 @@ class PageBreakingAlgorithm extends Brea
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 Brea
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;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/SpaceSpecifier.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/SpaceSpecifier.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/SpaceSpecifier.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/SpaceSpecifier.java Tue Jul 15 20:25:58 2014
@@ -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();
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java Tue Jul 15 20:25:58 2014
@@ -41,7 +41,7 @@ public class StaticContentLayoutManager
private Block targetBlock;
private SideRegion regionFO;
- private int contentAreaIPD = 0;
+ private int contentAreaIPD;
private int contentAreaBPD = -1;
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java Tue Jul 15 20:25:58 2014
@@ -49,7 +49,7 @@ public class CharacterLayoutManager exte
private MinOptMax letterSpaceIPD;
private int hyphIPD;
private Font font;
- private CommonBorderPaddingBackground borderProps = null;
+ private CommonBorderPaddingBackground borderProps;
/**
* Constructor
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java Tue Jul 15 20:25:58 2014
@@ -61,7 +61,7 @@ public class ContentLayoutManager extend
private Area holder;
private int stackSize;
private LayoutManager parentLM;
- private InlineLevelLayoutManager childLM = null;
+ private InlineLevelLayoutManager childLM;
/**
* Constructs a new ContentLayoutManager
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/HyphContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/HyphContext.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/HyphContext.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/HyphContext.java Tue Jul 15 20:25:58 2014
@@ -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
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java Tue Jul 15 20:25:58 2014
@@ -72,11 +72,11 @@ public class InlineLayoutManager extends
*/
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
/** The keep-together property */
//private KeepProperty keepTogether;
- private AlignmentContext alignmentContext = null;
+ private AlignmentContext alignmentContext;
/**
* Create an inline layout manager.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/KnuthInlineBox.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/KnuthInlineBox.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/KnuthInlineBox.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/KnuthInlineBox.java Tue Jul 15 20:25:58 2014
@@ -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.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java Tue Jul 15 20:25:58 2014
@@ -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
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java Tue Jul 15 20:25:58 2014
@@ -57,16 +57,16 @@ public abstract class LeafNodeLayoutMana
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
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java Tue Jul 15 20:25:58 2014
@@ -168,7 +168,7 @@ public class LineLayoutManager extends I
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 I
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;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java Tue Jul 15 20:25:58 2014
@@ -98,9 +98,9 @@ public class TextLayoutManager extends L
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 L
/** 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;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java Tue Jul 15 20:25:58 2014
@@ -71,10 +71,10 @@ public class ListItemLayoutManager exten
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;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java Tue Jul 15 20:25:58 2014
@@ -76,7 +76,7 @@ class ActiveCell {
private Keep keepWithNext;
- private int spanIndex = 0;
+ private int spanIndex;
private Step previousStep;
private Step nextStep;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModel.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModel.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModel.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModel.java Tue Jul 15 20:25:58 2014
@@ -48,7 +48,7 @@ public abstract class CollapsingBorderMo
//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;
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java Tue Jul 15 20:25:58 2014
@@ -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.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/RowPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/RowPainter.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/RowPainter.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/RowPainter.java Tue Jul 15 20:25:58 2014
@@ -50,9 +50,9 @@ import org.apache.fop.layoutmgr.TraitSet
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)}. */
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java Tue Jul 15 20:25:58 2014
@@ -69,8 +69,8 @@ public class TableContentLayoutManager i
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;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java Tue Jul 15 20:25:58 2014
@@ -75,7 +75,7 @@ public class TableLayoutManager extends
private static Log log = LogFactory.getLog(TableLayoutManager.class);
private TableContentLayoutManager contentLM;
- private ColumnSetup columns = null;
+ private ColumnSetup columns;
private Block curBlockArea;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableRowIterator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableRowIterator.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableRowIterator.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableRowIterator.java Tue Jul 15 20:25:58 2014
@@ -51,7 +51,7 @@ public class TableRowIterator {
private Iterator rowGroupsIter;
- private int rowIndex = 0;
+ private int rowIndex;
/**
* Creates a new TableRowIterator.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/BitmapImage.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/BitmapImage.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/BitmapImage.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/BitmapImage.java Tue Jul 15 20:25:58 2014
@@ -34,7 +34,7 @@ public class BitmapImage implements PDFI
private PDFDeviceColorSpace colorSpace;
private byte[] bitmaps;
private PDFReference maskRef;
- private PDFColor transparent = null;
+ private PDFColor transparent;
private String key;
private PDFDocument pdfDoc;
private PDFFilter pdfFilter;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFilter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFilter.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFilter.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFilter.java Tue Jul 15 20:25:58 2014
@@ -45,7 +45,7 @@ public abstract class PDFFilter {
/**
* Marker to know if this filter has already been applied to the data
*/
- private boolean applied = false;
+ private boolean applied;
/**
* Check if this filter has been applied.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFilterList.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFilterList.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFilterList.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFilterList.java Tue Jul 15 20:25:58 2014
@@ -50,9 +50,9 @@ public class PDFFilterList {
private List<PDFFilter> filters = new java.util.ArrayList<PDFFilter>();
- private boolean ignoreASCIIFilters = false;
+ private boolean ignoreASCIIFilters;
- private boolean disableAllFilters = false;
+ private boolean disableAllFilters;
/**
* Default constructor.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFGoTo.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFGoTo.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFGoTo.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFGoTo.java Tue Jul 15 20:25:58 2014
@@ -32,9 +32,9 @@ public class PDFGoTo extends PDFAction {
* the pageReference
*/
private String pageReference;
- private String destination = null;
- private float xPosition = 0;
- private float yPosition = 0;
+ private String destination;
+ private float xPosition;
+ private float yPosition;
/**
* create a /GoTo object.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFGoToRemote.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFGoToRemote.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFGoToRemote.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFGoToRemote.java Tue Jul 15 20:25:58 2014
@@ -28,9 +28,9 @@ public class PDFGoToRemote extends PDFAc
* the file specification
*/
private PDFReference pdfFileSpec;
- private int pageReference = 0;
- private String destination = null;
- private boolean newWindow = false;
+ private int pageReference;
+ private String destination;
+ private boolean newWindow;
/**
* Create an GoToR object.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFInfo.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFInfo.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFInfo.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFInfo.java Tue Jul 15 20:25:58 2014
@@ -81,12 +81,12 @@ public class PDFInfo extends PDFObject {
*/
private String producer;
- private String title = null;
- private String author = null;
- private String subject = null;
- private String keywords = null;
- private Date creationDate = null;
- private Date modDate = null;
+ private String title;
+ private String author;
+ private String subject;
+ private String keywords;
+ private Date creationDate;
+ private Date modDate;
private Map<PDFName, String> customProperties;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFObject.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFObject.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFObject.java Tue Jul 15 20:25:58 2014
@@ -46,7 +46,7 @@ public abstract class PDFObject implemen
/**
* the object's generation (0 in new documents)
*/
- private int generation = 0;
+ private int generation;
/**
* the parent PDFDocument
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFOutline.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFOutline.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFOutline.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFOutline.java Tue Jul 15 20:25:58 2014
@@ -51,7 +51,7 @@ public class PDFOutline extends PDFObjec
private int count;
// whether to show this outline item's child outline items
- private boolean openItem = false;
+ private boolean openItem;
/**
* title to display for the bookmark entry
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPages.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPages.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPages.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPages.java Tue Jul 15 20:25:58 2014
@@ -39,7 +39,7 @@ public class PDFPages extends PDFObject
/**
* the number of /Page objects
*/
- protected int count = 0;
+ protected int count;
// private PDFPages parent;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPaintingState.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPaintingState.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPaintingState.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPaintingState.java Tue Jul 15 20:25:58 2014
@@ -248,17 +248,17 @@ public class PDFPaintingState extends or
private static final long serialVersionUID = 3527950647293177764L;
- private Paint paint = null;
- private Paint backPaint = null;
+ private Paint paint;
+ private Paint backPaint;
//private int lineCap = 0; //Disabled the ones that are not used, yet
//private int lineJoin = 0;
//private float miterLimit = 0;
//private int dashOffset = 0;
- private Shape clip = null;
- private PDFGState gstate = null;
+ private Shape clip;
+ private PDFGState gstate;
//text state
- private float characterSpacing = 0f;
+ private float characterSpacing;
/** {@inheritDoc} */
@Override
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPattern.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPattern.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPattern.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPattern.java Tue Jul 15 20:25:58 2014
@@ -41,7 +41,7 @@ public class PDFPattern extends PDFPathP
/**
* The resources associated with this pattern
*/
- protected PDFResources resources = null;
+ protected PDFResources resources;
/**
* Either one (1) for tiling, or two (2) for shading.
@@ -51,7 +51,7 @@ public class PDFPattern extends PDFPathP
/**
* The name of the pattern such as "Pa1" or "Pattern1"
*/
- protected String patternName = null;
+ protected String patternName;
/**
* 1 for colored pattern, 2 for uncolored
@@ -66,7 +66,7 @@ public class PDFPattern extends PDFPathP
/**
* List of Doubles representing the Bounding box rectangle
*/
- protected List bBox = null;
+ protected List bBox;
/**
* Horizontal spacing
@@ -81,29 +81,29 @@ public class PDFPattern extends PDFPathP
/**
* The Shading object comprising the Type 2 pattern
*/
- protected PDFShading shading = null;
+ protected PDFShading shading;
/**
* List of Integers represetning the Extended unique Identifier
*/
- protected List xUID = null;
+ protected List xUID;
/**
* TODO use PDFGState
* String representing the extended Graphics state.
* Probably will never be used like this.
*/
- protected StringBuffer extGState = null;
+ protected StringBuffer extGState;
/**
* List of Doubles representing the Transformation matrix.
*/
- protected List matrix = null;
+ protected List matrix;
/**
* The stream of a pattern
*/
- protected StringBuffer patternDataStream = null;
+ protected StringBuffer patternDataStream;
/**
* Create a tiling pattern (type 1).
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFShading.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFShading.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFShading.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFShading.java Tue Jul 15 20:25:58 2014
@@ -42,7 +42,7 @@ public class PDFShading extends PDFObjec
/**
* The name of the Shading e.g. "Shading1"
*/
- protected String shadingName = null;
+ protected String shadingName;
/**
* Required: The Type of shading (1,2,3,4,5,6,7)
@@ -52,24 +52,24 @@ public class PDFShading extends PDFObjec
/**
* A ColorSpace representing the colorspace. "DeviceRGB" is an example.
*/
- protected PDFDeviceColorSpace colorSpace = null;
+ protected PDFDeviceColorSpace colorSpace;
/**
* The background color. Since shading is opaque,
* this is very rarely used.
*/
- protected List background = null;
+ protected List background;
/**
* Optional: A List specifying the clipping rectangle
*/
- protected List bBox = null;
+ protected List bBox;
/**
* Optional: A flag whether or not to filter the shading function
* to prevent aliasing artifacts. Default is false.
*/
- protected boolean antiAlias = false;
+ protected boolean antiAlias;
/**
* Optional for Type 1: Array of four numbers, xmin, xmax, ymin, ymax.
@@ -79,19 +79,19 @@ public class PDFShading extends PDFObjec
* Optional for Type 3: An array of two numbers between which the blend
* varies between start and end points. Default is 0, 1.
*/
- protected List domain = null;
+ protected List domain;
/**
* Optional for Type 1: A transformation matrix
*/
- protected List matrix = null;
+ protected List matrix;
/**
* Required for Type 1, 2, and 3:
* The object of the color mapping function (usually type 2 or 3).
* Optional for Type 4,5,6, and 7: When it's nearly the same thing.
*/
- protected PDFFunction function = null;
+ protected PDFFunction function;
/**
* Required for Type 2: An Array of four numbers specifying
@@ -100,7 +100,7 @@ public class PDFShading extends PDFObjec
* specifying the centers and radii of
* the starting and ending circles.
*/
- protected List coords = null;
+ protected List coords;
/**
* Required for Type 2+3: An Array of two boolean values specifying
@@ -108,14 +108,14 @@ public class PDFShading extends PDFObjec
* and end points, respectively.
* Default is false, false.
*/
- protected List extend = null;
+ protected List extend;
/**
* Required for Type 4,5,6, and 7: Specifies the number of bits used
* to represent each vertex coordinate.
* Allowed to be 1,2,4,8,12,16,24, or 32.
*/
- protected int bitsPerCoordinate = 0;
+ protected int bitsPerCoordinate;
/**
* Required for Type 4,5,6, and 7: Specifies the number of bits used
@@ -123,7 +123,7 @@ public class PDFShading extends PDFObjec
* Allowed to be 2,4,or 8, while the Edge flag itself is allowed to
* be 0,1 or 2.
*/
- protected int bitsPerFlag = 0;
+ protected int bitsPerFlag;
/**
* Required for Type 4,5,6, and 7: Array of Doubles which specifies
@@ -132,20 +132,20 @@ public class PDFShading extends PDFObjec
* the spec.
* Page 303 in PDF Spec 1.3
*/
- protected List decode = null;
+ protected List decode;
/**
* Required for Type 4,5,6, and 7: Specifies the number of bits used
* to represent each color coordinate.
* Allowed to be 1,2,4,8,12, or 16
*/
- protected int bitsPerComponent = 0;
+ protected int bitsPerComponent;
/**
* Required for Type 5:The number of vertices in each "row" of
* the lattice; it must be greater than or equal to 2.
*/
- protected int verticesPerRow = 0;
+ protected int verticesPerRow;
/**
* Constructor for type function based shading
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFTextUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFTextUtil.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFTextUtil.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFTextUtil.java Tue Jul 15 20:25:58 2014
@@ -47,7 +47,7 @@ public abstract class PDFTextUtil {
/** PDF text rendering mode: Add text to path for clipping */
public static final int TR_CLIP = 7;
- private boolean inTextObject = false;
+ private boolean inTextObject;
private String startText;
private String endText;
private boolean useMultiByte;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractConfigurator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractConfigurator.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractConfigurator.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractConfigurator.java Tue Jul 15 20:25:58 2014
@@ -34,7 +34,7 @@ public abstract class AbstractConfigurat
private static final String MIME = "mime";
/** fop factory configuration */
- protected FOUserAgent userAgent = null;
+ protected FOUserAgent userAgent;
/**
* Default constructor
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java Tue Jul 15 20:25:58 2014
@@ -86,29 +86,29 @@ public abstract class AbstractRenderer
/**
* user agent
*/
- protected FOUserAgent userAgent = null;
+ protected FOUserAgent userAgent;
/**
* block progression position
*/
- protected int currentBPPosition = 0;
+ protected int currentBPPosition;
/**
* inline progression position
*/
- protected int currentIPPosition = 0;
+ protected int currentIPPosition;
/**
* the block progression position of the containing block used for
* absolutely positioned blocks
*/
- protected int containingBPPosition = 0;
+ protected int containingBPPosition;
/**
* the inline progression position of the containing block used for
* absolutely positioned blocks
*/
- protected int containingIPPosition = 0;
+ protected int containingIPPosition;
/** the currently active PageViewport */
protected PageViewport currentPageViewport;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/PrintRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/PrintRenderer.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/PrintRenderer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/PrintRenderer.java Tue Jul 15 20:25:58 2014
@@ -53,7 +53,7 @@ public abstract class PrintRenderer exte
protected FontInfo fontInfo;
/** list of fonts */
- protected List<EmbedFontInfo> embedFontInfoList = null;
+ protected List<EmbedFontInfo> embedFontInfoList;
/**
* Adds a font list to current list of fonts
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPDocumentHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPDocumentHandler.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPDocumentHandler.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPDocumentHandler.java Tue Jul 15 20:25:58 2014
@@ -92,7 +92,7 @@ public class AFPDocumentHandler extends
private Map<String, String> roundedCornerNameCache
= new HashMap<String, String>();
- private int roundedCornerCount = 0;
+ private int roundedCornerCount;
private static enum Location {
ELSEWHERE, IN_DOCUMENT_HEADER, FOLLOWING_PAGE_SEQUENCE, IN_PAGE_HEADER
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPSVGHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPSVGHandler.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPSVGHandler.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPSVGHandler.java Tue Jul 15 20:25:58 2014
@@ -64,7 +64,7 @@ import org.apache.fop.svg.font.Aggregati
*/
public class AFPSVGHandler extends AbstractGenericSVGHandler {
- private boolean paintAsBitmap = false;
+ private boolean paintAsBitmap;
/** {@inheritDoc} */
public void handleXML(RendererContext context,
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AFPPageOverlay.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AFPPageOverlay.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AFPPageOverlay.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AFPPageOverlay.java Tue Jul 15 20:25:58 2014
@@ -39,12 +39,12 @@ public class AFPPageOverlay extends AFPE
/**
* The x coordinate
*/
- private int x = 0;
+ private int x;
/**
* The y coordinate
*/
- private int y = 0;
+ private int y;
/**
* Default constructor.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/AWTRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/AWTRenderer.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/AWTRenderer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/AWTRenderer.java Tue Jul 15 20:25:58 2014
@@ -67,7 +67,7 @@ public class AWTRenderer extends Java2DR
/**
* Will be notified when rendering progresses
*/
- protected StatusListener statusListener = null;
+ protected StatusListener statusListener;
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/PreviewPanel.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/PreviewPanel.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/PreviewPanel.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/PreviewPanel.java Tue Jul 15 20:25:58 2014
@@ -116,10 +116,10 @@ public class PreviewPanel extends JPanel
*/
protected Renderable renderable;
/** The number of the page which is currently selected */
- private int currentPage = 0;
+ private int currentPage;
/** The index of the first page displayed on screen. */
- private int firstPage = 0;
+ private int firstPage;
/** The number of pages concurrently displayed on screen. */
private int pageRange = 1;
@@ -128,13 +128,13 @@ public class PreviewPanel extends JPanel
private int displayMode = SINGLE;
/** The component(s) that hold the rendered page(s) */
- private ImageProxyPanel[] pagePanels = null;
+ private ImageProxyPanel[] pagePanels;
/**
* Panel showing the page panels in a grid. Usually the dimensions
* of the grid are 1x1, nx1 or nx2.
*/
- private JPanel gridPanel = null;
+ private JPanel gridPanel;
/** Asynchronous reloader thread, used when reload() method is called. */
private Reloader reloader;
@@ -283,9 +283,9 @@ public class PreviewPanel extends JPanel
/** The viewport to be scrolled */
private final JViewport viewport;
/** Starting position of a mouse drag - X co-ordinate */
- private int startPosX = 0;
+ private int startPosX;
/** Starting position of a mouse drag - Y co-ordinate */
- private int startPosY = 0;
+ private int startPosY;
ViewportScroller(JViewport vp) {
viewport = vp;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRenderer.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRenderer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRenderer.java Tue Jul 15 20:25:58 2014
@@ -161,7 +161,7 @@ public class TIFFRenderer extends Java2D
private int count;
- private int current = 0;
+ private int current;
/**
* Main constructor
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFRenderer.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFRenderer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFRenderer.java Tue Jul 15 20:25:58 2014
@@ -122,7 +122,7 @@ public class IFRenderer extends Abstract
/** If not null, the XMLRenderer will mimic another renderer by using its font setup. */
protected Renderer mimic;
- private boolean inPageSequence = false;
+ private boolean inPageSequence;
private Stack graphicContextStack = new Stack();
private Stack viewportDimensionStack = new Stack();
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/extensions/ActionSet.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/extensions/ActionSet.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/extensions/ActionSet.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/extensions/ActionSet.java Tue Jul 15 20:25:58 2014
@@ -29,7 +29,7 @@ import java.util.Map;
*/
public class ActionSet {
- private int lastGeneratedID = 0;
+ private int lastGeneratedID;
private Map actionRegistry = new java.util.HashMap();
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/util/IFConcatenator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/util/IFConcatenator.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/util/IFConcatenator.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/util/IFConcatenator.java Tue Jul 15 20:25:58 2014
@@ -47,7 +47,7 @@ public class IFConcatenator {
private IFDocumentHandler targetHandler;
- private int nextPageIndex = 0;
+ private int nextPageIndex;
private boolean inFirstDocument = true;
/**
@@ -109,7 +109,7 @@ public class IFConcatenator {
private class IFPageSequenceFilter extends IFDocumentHandlerProxy {
- private boolean inPageSequence = false;
+ private boolean inPageSequence;
public IFPageSequenceFilter(IFDocumentHandler delegate) {
super(delegate);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DFontMetrics.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DFontMetrics.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DFontMetrics.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DFontMetrics.java Tue Jul 15 20:25:58 2014
@@ -59,29 +59,29 @@ public class Java2DFontMetrics {
/**
* The width of all 256 character, if requested
*/
- private int[] width = null;
+ private int[] width;
/**
* The typical height of a small cap latter (often derived from "x", value in mpt)
*/
- private int xHeight = 0;
+ private int xHeight;
/**
* The highest point of the font above the baseline (usually derived from "d", value in mpt)
*/
- private int ascender = 0;
+ private int ascender;
/**
* The lowest point of the font under the baseline (usually derived from "p", value in mpt)
*/
- private int descender = 0;
+ private int descender;
/**
* Buffered font.
* f1 is bufferd for metric measurements during layout.
* fSized is buffered for display purposes
*/
- private Font f1 = null; // , fSized = null;
+ private Font f1; // , fSized;
/**
* The family type of the font last used
@@ -91,17 +91,17 @@ public class Java2DFontMetrics {
/**
* The style of the font last used
*/
- private int style = 0;
+ private int style;
/**
* The size of the font last used
*/
- private float size = 0;
+ private float size;
/**
* The FontMetrics object used to calculate character width etc.
*/
- private FontMetrics fmt = null;
+ private FontMetrics fmt;
/** A LineMetrics to access high-resolution metrics information. */
private LineMetrics lineMetrics;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java Tue Jul 15 20:25:58 2014
@@ -116,16 +116,16 @@ public abstract class Java2DRenderer ext
protected double scaleFactor = 1;
/** The page width in pixels */
- protected int pageWidth = 0;
+ protected int pageWidth;
/** The page height in pixels */
- protected int pageHeight = 0;
+ protected int pageHeight;
/** List of Viewports */
protected List pageViewportList = new java.util.ArrayList();
/** The 0-based current page number */
- private int currentPageNumber = 0;
+ private int currentPageNumber;
/** true if anti-aliasing is set */
protected boolean antialiasing = true;
@@ -134,7 +134,7 @@ public abstract class Java2DRenderer ext
protected boolean qualityRendering = true;
/** false: paints a non-transparent white background, true: for a transparent background */
- protected boolean transparentPageBackground = false;
+ protected boolean transparentPageBackground;
/** The current state, holds a Graphics2D and its context */
protected Java2DGraphicsState state;
@@ -144,7 +144,7 @@ public abstract class Java2DRenderer ext
/** true if the renderer has finished rendering all the pages */
private boolean renderingDone;
- private GeneralPath currentPath = null;
+ private GeneralPath currentPath;
/**
* Default constructor
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLDocumentHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLDocumentHandler.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLDocumentHandler.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLDocumentHandler.java Tue Jul 15 20:25:58 2014
@@ -64,9 +64,9 @@ public class PCLDocumentHandler extends
private PCLPageDefinition currentPageDefinition;
/** contains the pageWith of the last printed page */
- private long pageWidth = 0;
+ private long pageWidth;
/** contains the pageHeight of the last printed page */
- private long pageHeight = 0;
+ private long pageHeight;
/** the current page image (only set when all-bitmap painting is activated) */
private BufferedImage currentImage;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLGenerator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLGenerator.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLGenerator.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLGenerator.java Tue Jul 15 20:25:58 2014
@@ -831,10 +831,10 @@ public class PCLGenerator {
private byte[] rle; //compressed (RLE)
private byte[] uncompressed; //uncompressed
private int lastcount = -1;
- private byte lastbyte = 0;
- private int rlewidth = 0;
- private byte ib = 0; //current image bits
- private int x = 0;
+ private byte lastbyte;
+ private int rlewidth;
+ private byte ib; //current image bits
+ private int x;
private boolean zeroRow = true;
public Encoder(RenderedImage img) {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLGraphics2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLGraphics2D.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLGraphics2D.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLGraphics2D.java Tue Jul 15 20:25:58 2014
@@ -56,7 +56,7 @@ public class PCLGraphics2D extends Abstr
protected PCLGenerator gen;
private final boolean failOnUnsupportedFeature = true;
- private boolean clippingDisabled = false;
+ private boolean clippingDisabled;
/**
* Create a new PCLGraphics2D.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLPainter.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLPainter.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLPainter.java Tue Jul 15 20:25:58 2014
@@ -67,7 +67,7 @@ public class PCLPainter extends Abstract
private PCLGenerator gen;
private PCLPageDefinition currentPageDefinition;
- private int currentPrintDirection = 0;
+ private int currentPrintDirection;
//private GeneralPath currentPath = null;
private Stack<GraphicContext> graphicContextStack = new Stack<GraphicContext>();
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLRenderingContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLRenderingContext.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLRenderingContext.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLRenderingContext.java Tue Jul 15 20:25:58 2014
@@ -35,7 +35,7 @@ public abstract class PCLRenderingContex
private PCLGenerator generator;
private PCLRenderingUtil pclUtil;
- private boolean sourceTransparency = false;
+ private boolean sourceTransparency;
/**
* Main constructor.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLRenderingUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLRenderingUtil.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLRenderingUtil.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLRenderingUtil.java Tue Jul 15 20:25:58 2014
@@ -54,19 +54,19 @@ public class PCLRenderingUtil {
* Controls whether all text should be painted as text. This is a fallback setting in case
* the mixture of native and bitmapped text does not provide the necessary quality.
*/
- private boolean allTextAsBitmaps = false;
+ private boolean allTextAsBitmaps;
/**
* Controls whether an RGB canvas is used when converting Java2D graphics to bitmaps.
* This can be used to work around problems with Apache Batik, for example, but setting
* this to true will increase memory consumption.
*/
- private boolean useColorCanvas = false;
+ private boolean useColorCanvas;
/**
* Controls whether the generation of PJL commands gets disabled.
*/
- private boolean disabledPJL = false;
+ private boolean disabledPJL;
PCLRenderingUtil(FOUserAgent userAgent) {
this.userAgent = userAgent;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/ImageRawCCITTFaxAdapter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/ImageRawCCITTFaxAdapter.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/ImageRawCCITTFaxAdapter.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/ImageRawCCITTFaxAdapter.java Tue Jul 15 20:25:58 2014
@@ -37,7 +37,7 @@ import org.apache.fop.pdf.PDFFilterList;
*/
public class ImageRawCCITTFaxAdapter extends AbstractImageAdapter {
- private PDFFilter pdfFilter = null;
+ private PDFFilter pdfFilter;
/**
* Creates a new PDFImage from an Image instance.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/ImageRawJPEGAdapter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/ImageRawJPEGAdapter.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/ImageRawJPEGAdapter.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/ImageRawJPEGAdapter.java Tue Jul 15 20:25:58 2014
@@ -46,7 +46,7 @@ import org.apache.fop.pdf.PDFFilterList;
*/
public class ImageRawJPEGAdapter extends AbstractImageAdapter {
- private PDFFilter pdfFilter = null;
+ private PDFFilter pdfFilter;
/**
* Creates a new PDFImage from an Image instance.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/ImageRenderedAdapter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/ImageRenderedAdapter.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/ImageRenderedAdapter.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/ImageRenderedAdapter.java Tue Jul 15 20:25:58 2014
@@ -52,7 +52,7 @@ public class ImageRenderedAdapter extend
private ImageEncodingHelper encodingHelper;
- private PDFFilter pdfFilter = null;
+ private PDFFilter pdfFilter;
private String maskRef;
private PDFReference softMask;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFContentGenerator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFContentGenerator.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFContentGenerator.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFContentGenerator.java Tue Jul 15 20:25:58 2014
@@ -281,7 +281,7 @@ public class PDFContentGenerator {
}
}
- private int ocNameIndex = 0;
+ private int ocNameIndex;
private void beginOptionalContent(String layerId) {
String name;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/extensions/PDFEmbeddedFileAttachment.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/extensions/PDFEmbeddedFileAttachment.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/extensions/PDFEmbeddedFileAttachment.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/extensions/PDFEmbeddedFileAttachment.java Tue Jul 15 20:25:58 2014
@@ -43,13 +43,13 @@ public class PDFEmbeddedFileAttachment e
private static final String ATT_DESC = "desc";
/** filename attribute */
- private String filename = null;
+ private String filename;
/** description attribute (optional) */
- private String desc = null;
+ private String desc;
/** source name attribute */
- private String src = null;
+ private String src;
/**
* No-argument contructor.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/print/PageableRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/print/PageableRenderer.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/print/PageableRenderer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/print/PageableRenderer.java Tue Jul 15 20:25:58 2014
@@ -61,7 +61,7 @@ public class PageableRenderer extends Ja
/** first valid page number (1-based) */
- protected int startNumber = 0;
+ protected int startNumber;
/** last valid page number (1-based) */
protected int endNumber = -1;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/AbstractPSTranscoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/AbstractPSTranscoder.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/AbstractPSTranscoder.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/AbstractPSTranscoder.java Tue Jul 15 20:25:58 2014
@@ -71,7 +71,7 @@ import org.apache.fop.svg.font.FOPFontFa
public abstract class AbstractPSTranscoder extends AbstractFOPTranscoder {
/** the root Graphics2D instance for generating PostScript */
- protected AbstractPSDocumentGraphics2D graphics = null;
+ protected AbstractPSDocumentGraphics2D graphics;
private FontInfo fontInfo;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/NativeTextHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/NativeTextHandler.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/NativeTextHandler.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/NativeTextHandler.java Tue Jul 15 20:25:58 2014
@@ -47,7 +47,7 @@ public class NativeTextHandler implement
protected Font font;
/** Overriding FontState */
- protected Font overrideFont = null;
+ protected Font overrideFont;
/** the current (internal) font name */
protected String currentFontName;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSDocumentHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSDocumentHandler.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSDocumentHandler.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSDocumentHandler.java Tue Jul 15 20:25:58 2014
@@ -89,7 +89,7 @@ public class PSDocumentHandler extends A
private static final TempResourceURIGenerator TEMP_URI_GENERATOR
= new TempResourceURIGenerator("ps-optimize");
- private int currentPageNumber = 0;
+ private int currentPageNumber;
private PageDefinition currentPageDefinition;
/** Is used to determine the document's bounding box */
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSPainter.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSPainter.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSPainter.java Tue Jul 15 20:25:58 2014
@@ -70,7 +70,7 @@ public class PSPainter extends AbstractI
private BorderPainter borderPainter;
- private boolean inTextMode = false;
+ private boolean inTextMode;
/**
* Default constructor.
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org