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 [2/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/area/Page.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Page.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Page.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Page.java Tue Jul 15 20:25:58 2014
@@ -59,17 +59,17 @@ public class Page extends AreaTreeObject
private static final long serialVersionUID = 6272157047421543866L;
// contains before, start, body, end and after regions
- private RegionViewport regionBefore = null;
- private RegionViewport regionStart = null;
- private RegionViewport regionBody = null;
- private RegionViewport regionEnd = null;
- private RegionViewport regionAfter = null;
+ private RegionViewport regionBefore;
+ private RegionViewport regionStart;
+ private RegionViewport regionBody;
+ private RegionViewport regionEnd;
+ private RegionViewport regionAfter;
// temporary map of unresolved objects used when serializing the page
- private Map<String, List<Resolvable>> unresolved = null;
+ private Map<String, List<Resolvable>> unresolved;
/** Set to true to make this page behave as if it were not empty. */
- private boolean fakeNonEmpty = false;
+ private boolean fakeNonEmpty;
/**
* Empty constructor
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/PageViewport.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/PageViewport.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/PageViewport.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/PageViewport.java Tue Jul 15 20:25:58 2014
@@ -62,7 +62,7 @@ public class PageViewport extends AreaTr
private String pageKey;
private int pageNumber = -1;
- private String pageNumberString = null;
+ private String pageNumberString;
private int pageIndex = -1; //-1 = undetermined
private boolean blank;
@@ -77,7 +77,7 @@ public class PageViewport extends AreaTr
private Map<String, List<Resolvable>> unresolvedIDRefs
= new java.util.HashMap<String, List<Resolvable>>();
- private Map<String, List<PageViewport>> pendingResolved = null;
+ private Map<String, List<PageViewport>> pendingResolved;
private Markers pageMarkers;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/RegionViewport.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/RegionViewport.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/RegionViewport.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/RegionViewport.java Tue Jul 15 20:25:58 2014
@@ -39,7 +39,7 @@ public class RegionViewport extends Area
// this rectangle is relative to the page
private RegionReference regionReference;
private Rectangle2D viewArea;
- private boolean clip = false;
+ private boolean clip;
/**
* Create a new region-viewport-area
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Trait.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Trait.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Trait.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Trait.java Tue Jul 15 20:25:58 2014
@@ -491,13 +491,13 @@ public final class Trait implements Seri
private static final long serialVersionUID = 8452078676273242870L;
/** The background color if any. */
- private Color color = null;
+ private Color color;
/** The background image url if any. */
- private String url = null;
+ private String url;
/** The background image if any. */
- private ImageInfo imageInfo = null;
+ private ImageInfo imageInfo;
/** Background repeat enum for images. */
private int repeat;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/AbstractTextArea.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/AbstractTextArea.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/AbstractTextArea.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/AbstractTextArea.java Tue Jul 15 20:25:58 2014
@@ -39,7 +39,7 @@ public abstract class AbstractTextArea e
* and the default width of a space according to the font
* (this is equivalent to the property word-spacing.optimum)
*/
- protected int spaceDifference = 0;
+ protected int spaceDifference;
/**
* Constructor
@@ -53,10 +53,10 @@ public abstract class AbstractTextArea e
}
}
- private int textWordSpaceAdjust = 0;
- private int textLetterSpaceAdjust = 0;
- private TextAdjustingInfo textAdjustingInfo = null;
- private int baselineOffset = 0;
+ private int textWordSpaceAdjust;
+ private int textLetterSpaceAdjust;
+ private TextAdjustingInfo textAdjustingInfo;
+ private int baselineOffset;
/**
* Default constructor
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java Tue Jul 15 20:25:58 2014
@@ -81,26 +81,26 @@ public class InlineArea extends Area {
/**
* offset position from before edge of parent area
*/
- protected int blockProgressionOffset = 0;
+ protected int blockProgressionOffset;
/**
* parent area
* it is needed in order to recompute adjust ratio and indents
* when a page-number or a page-number-citation is resolved
*/
- private Area parentArea = null;
+ private Area parentArea;
/**
* ipd variation of child areas: if this area has not already
* been added and cannot notify its parent area, store the variation
* and wait for the parent area to be set
*/
- private int storedIPDVariation = 0;
+ private int storedIPDVariation;
/**
* The adjustment information object
*/
- protected InlineAdjustingInfo adjustingInfo = null;
+ protected InlineAdjustingInfo adjustingInfo;
/**
* Default constructor for inline area.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineBlockParent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineBlockParent.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineBlockParent.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineBlockParent.java Tue Jul 15 20:25:58 2014
@@ -35,7 +35,7 @@ public class InlineBlockParent extends I
/**
* The list of inline areas added to this inline parent.
*/
- protected Block child = null;
+ protected Block child;
/**
* Create a new inline block parent to add areas to.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineViewport.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineViewport.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineViewport.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineViewport.java Tue Jul 15 20:25:58 2014
@@ -40,7 +40,7 @@ public class InlineViewport extends Inli
// contents could be container, foreign object or image
private Area content;
// clipping for the viewport
- private boolean clip = false;
+ private boolean clip;
// position of the child area relative to this area
private Rectangle2D contentPosition;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java Tue Jul 15 20:25:58 2014
@@ -36,7 +36,7 @@ public class UnresolvedPageNumber extend
private static final long serialVersionUID = -1758090835371647980L;
- private boolean resolved = false;
+ private boolean resolved;
private String pageIDRef;
private String text;
private boolean pageType;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/CommandLineOptions.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/CommandLineOptions.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/CommandLineOptions.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/CommandLineOptions.java Tue Jul 15 20:25:58 2014
@@ -89,31 +89,31 @@ public class CommandLineOptions {
/* for area tree XML output, only down to block area level */
private Boolean suppressLowLevelAreas = Boolean.FALSE;
/* user configuration file */
- private File userConfigFile = null;
+ private File userConfigFile;
/* input fo file */
- private File fofile = null;
+ private File fofile;
/* xsltfile (xslt transformation as input) */
- private File xsltfile = null;
+ private File xsltfile;
/* xml file (xslt transformation as input) */
- private File xmlfile = null;
+ private File xmlfile;
/* area tree input file */
- private File areatreefile = null;
+ private File areatreefile;
/* intermediate format input file */
- private File iffile = null;
+ private File iffile;
/* area tree input file */
- private File imagefile = null;
+ private File imagefile;
/* output file */
- private File outfile = null;
+ private File outfile;
/* input mode */
private int inputmode = NOT_SET;
/* output mode */
- private String outputmode = null;
+ private String outputmode;
/* true if System.in (stdin) should be used for the input file */
- private boolean useStdIn = false;
+ private boolean useStdIn;
/* true if System.out (stdout) should be used for the output file */
- private boolean useStdOut = false;
+ private boolean useStdOut;
/* true if a catalog resolver should be used for entity and uri resolution */
- private boolean useCatalogResolver = false;
+ private boolean useCatalogResolver;
/* rendering options (for the user agent) */
private Map renderingOptions = new java.util.HashMap();
/* target resolution (for the user agent) */
@@ -121,11 +121,11 @@ public class CommandLineOptions {
private boolean strictValidation = true;
/* control memory-conservation policy */
- private boolean conserveMemoryPolicy = false;
+ private boolean conserveMemoryPolicy;
/* true if a complex script features are enabled */
private boolean useComplexScriptFeatures = true;
/* set to true if -dpi used in command line */
- private boolean overrideTargetResolution = false;
+ private boolean overrideTargetResolution;
private FopFactory factory;
private FOUserAgent foUserAgent;
@@ -134,11 +134,11 @@ public class CommandLineOptions {
private Log log;
- private Vector xsltParams = null;
+ private Vector xsltParams;
- private String mimicRenderer = null;
+ private String mimicRenderer;
- private boolean flushCache = false;
+ private boolean flushCache;
private URI baseURI = new File(".").getAbsoluteFile().toURI();
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/InputHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/InputHandler.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/InputHandler.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/InputHandler.java Tue Jul 15 20:25:58 2014
@@ -64,8 +64,8 @@ public class InputHandler implements Err
protected File sourcefile;
private File stylesheet; // for XML/XSLT usage
private Vector xsltParams; // for XML/XSLT usage
- private EntityResolver entityResolver = null;
- private URIResolver uriResolver = null;
+ private EntityResolver entityResolver;
+ private URIResolver uriResolver;
/** the logger */
protected Log log = LogFactory.getLog(InputHandler.class);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphMappingTable.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphMappingTable.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphMappingTable.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphMappingTable.java Tue Jul 15 20:25:58 2014
@@ -125,9 +125,9 @@ public class GlyphMappingTable {
/** range mapping table base class */
protected abstract static class RangeMappingTable extends GlyphMappingTable {
- private int[] sa = null; // array of range (inclusive) starts
- private int[] ea = null; // array of range (inclusive) ends
- private int[] ma = null; // array of range mapped values
+ private int[] sa; // array of range (inclusive) starts
+ private int[] ea; // array of range (inclusive) ends
+ private int[] ma; // array of range mapped values
private int miMax = -1;
/**
* Construct range mapping table.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/CharScript.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/CharScript.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/CharScript.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/CharScript.java Tue Jul 15 20:25:58 2014
@@ -849,8 +849,8 @@ public final class CharScript {
}
}
- private static Map<Integer, String> scriptTagsMap = null;
- private static Map<String, Integer> scriptCodeMap = null;
+ private static Map<Integer, String> scriptTagsMap;
+ private static Map<String, Integer> scriptCodeMap;
private static void putScriptTag(Map tm, Map cm, int code, String tag) {
assert tag != null;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/KeepValue.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/KeepValue.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/KeepValue.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/KeepValue.java Tue Jul 15 20:25:58 2014
@@ -31,7 +31,7 @@ public class KeepValue {
/** constant for a user-settable keep-with value (??) */
public static final String KEEP_WITH_VALUE = "KEEP_WITH_VALUE";
private String type = KEEP_WITH_AUTO;
- private int value = 0;
+ private int value;
/**
* Constructor
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/ValidationPercentBaseContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/ValidationPercentBaseContext.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/ValidationPercentBaseContext.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/ValidationPercentBaseContext.java Tue Jul 15 20:25:58 2014
@@ -47,7 +47,7 @@ public final class ValidationPercentBase
return 100000;
}
- private static PercentBaseContext pseudoContextForValidation = null;
+ private static PercentBaseContext pseudoContextForValidation;
/** @return a base context for validation purposes. See class description. */
public static PercentBaseContext getPseudoContext() {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/ElementMapping.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/ElementMapping.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/ElementMapping.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/ElementMapping.java Tue Jul 15 20:25:58 2014
@@ -38,11 +38,11 @@ public abstract class ElementMapping {
public static final String DEFAULT = "<default>";
/** The HashMap table of formatting objects defined by the ElementMapping */
- protected HashMap<String, Maker> foObjs = null;
+ protected HashMap<String, Maker> foObjs;
//Please don't change that to java.util.Map as that can break extensions.
/** The namespace for the ElementMapping */
- protected String namespaceURI = null;
+ protected String namespaceURI;
/**
* Returns a HashMap of maker objects for this element mapping
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java Tue Jul 15 20:25:58 2014
@@ -86,23 +86,23 @@ public final class FOPropertyMapping imp
private static Map<String, Integer> subPropNames = new HashMap<String, Integer>();
private static Map<Integer, String> propIds = new HashMap<Integer, String>();
- private static PropertyMaker[] generics = null;
+ private static PropertyMaker[] generics;
// The rest is only used during the building of the generics array.
- private Property[] enums = null;
+ private Property[] enums;
- private PropertyMaker genericColor = null;
- private PropertyMaker genericBoolean = null;
- private PropertyMaker genericKeep = null;
- private PropertyMaker genericCondLength = null;
- private PropertyMaker genericCondPadding = null;
- private PropertyMaker genericPadding = null;
- private PropertyMaker genericCondBorderWidth = null;
- private PropertyMaker genericBorderWidth = null;
- private PropertyMaker genericBorderStyle = null;
- private PropertyMaker genericCondCornerRadius = null;
- private PropertyMaker genericBreak = null;
- private PropertyMaker genericSpace = null;
+ private PropertyMaker genericColor;
+ private PropertyMaker genericBoolean;
+ private PropertyMaker genericKeep;
+ private PropertyMaker genericCondLength;
+ private PropertyMaker genericCondPadding;
+ private PropertyMaker genericPadding;
+ private PropertyMaker genericCondBorderWidth;
+ private PropertyMaker genericBorderWidth;
+ private PropertyMaker genericBorderStyle;
+ private PropertyMaker genericCondCornerRadius;
+ private PropertyMaker genericBreak;
+ private PropertyMaker genericSpace;
/**
* Create the generic property maker templates. These templates
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOText.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOText.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOText.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOText.java Tue Jul 15 20:25:58 2014
@@ -71,19 +71,19 @@ public class FOText extends FONode imple
* Points to the previous FOText object created within the current
* block. If this is "null", this is the first such object.
*/
- private FOText prevFOTextThisBlock = null;
+ private FOText prevFOTextThisBlock;
/**
* Points to the next FOText object created within the current
* block. If this is "null", this is the last such object.
*/
- private FOText nextFOTextThisBlock = null;
+ private FOText nextFOTextThisBlock;
/**
* Points to the ancestor Block object. This is used to keep track of
* which FOText nodes are descendants of the same block.
*/
- private Block ancestorBlock = null;
+ private Block ancestorBlock;
/** Holds the text decoration values. May be null */
private CommonTextDecoration textDecoration;
@@ -507,10 +507,10 @@ public class FOText extends FONode imple
private class TextCharIterator extends CharIterator {
- private int currentPosition = 0;
+ private int currentPosition;
- private boolean canRemove = false;
- private boolean canReplace = false;
+ private boolean canRemove;
+ private boolean canReplace;
public TextCharIterator() {
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOTreeBuilder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOTreeBuilder.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOTreeBuilder.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOTreeBuilder.java Tue Jul 15 20:25:58 2014
@@ -60,7 +60,7 @@ public class FOTreeBuilder extends Defau
protected ElementMappingRegistry elementMappingRegistry;
/** The root of the formatting object tree */
- protected Root rootFObj = null;
+ protected Root rootFObj;
/** Main DefaultHandler that handles the FO namespace. */
protected MainFOHandler mainFOHandler;
@@ -80,7 +80,7 @@ public class FOTreeBuilder extends Defau
/** The user agent for this processing run. */
private FOUserAgent userAgent;
- private boolean used = false;
+ private boolean used;
private boolean empty = true;
private int depth;
@@ -242,13 +242,13 @@ public class FOTreeBuilder extends Defau
private class MainFOHandler extends DefaultHandler {
/** Current formatting object being handled */
- protected FONode currentFObj = null;
+ protected FONode currentFObj;
/** Current propertyList for the node being handled */
protected PropertyList currentPropertyList;
/** Current marker nesting-depth */
- private int nestedMarkerDepth = 0;
+ private int nestedMarkerDepth;
/** {@inheritDoc} */
public void startElement(String namespaceURI, String localName, String rawName,
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOTreeBuilderContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOTreeBuilderContext.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOTreeBuilderContext.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOTreeBuilderContext.java Tue Jul 15 20:25:58 2014
@@ -46,7 +46,7 @@ public class FOTreeBuilderContext {
/**
* Indicates whether processing descendants of a marker
*/
- private boolean inMarker = false;
+ private boolean inMarker;
/**
* Returns the set of ID references.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java Tue Jul 15 20:25:58 2014
@@ -58,15 +58,15 @@ public abstract class FObj extends FONod
protected FONode lastChild;
/** The list of extension attachments, null if none */
- private List<ExtensionAttachment> extensionAttachments = null;
+ private List<ExtensionAttachment> extensionAttachments;
/** The map of foreign attributes, null if none */
- private Map<QName, String> foreignAttributes = null;
+ private Map<QName, String> foreignAttributes;
/** Used to indicate if this FO is either an Out Of Line FO (see rec)
* or a descendant of one. Used during FO validation.
*/
- private boolean isOutOfLineFODescendant = false;
+ private boolean isOutOfLineFODescendant;
/** Markers added to this element. */
private Map<String, Marker> markers;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObjMixed.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObjMixed.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObjMixed.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObjMixed.java Tue Jul 15 20:25:58 2014
@@ -30,7 +30,7 @@ import org.apache.fop.apps.FOPException;
public abstract class FObjMixed extends FObj {
/** Represents accumulated, pending FO text. See {@link #flushText()}. */
- private FOText ft = null;
+ private FOText ft;
/** Used for white-space handling; start CharIterator at node ... */
protected FONode currentTextNode;
@@ -38,7 +38,7 @@ public abstract class FObjMixed extends
/** Used in creating pointers between subsequent {@link FOText} nodes
* in the same {@link org.apache.fop.fo.flow.Block}
* (for handling text-transform) */
- protected FOText lastFOTextProcessed = null;
+ protected FOText lastFOTextProcessed;
/**
* Base constructor
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/PropertyList.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/PropertyList.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/PropertyList.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/PropertyList.java Tue Jul 15 20:25:58 2014
@@ -56,8 +56,8 @@ public abstract class PropertyList {
private static boolean[] inheritableProperty;
/** reference to the parent FO's propertyList **/
- protected PropertyList parentPropertyList = null;
- private FObj fobj = null;
+ protected PropertyList parentPropertyList;
+ private FObj fobj;
private static Log log = LogFactory.getLog(PropertyList.class);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/RecursiveCharIterator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/RecursiveCharIterator.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/RecursiveCharIterator.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/RecursiveCharIterator.java Tue Jul 15 20:25:58 2014
@@ -32,12 +32,12 @@ public class RecursiveCharIterator exten
/** parent node for whose child nodes this iterator iterates */
private FONode fobj;
/** iterator for the child nodes */
- private Iterator childIter = null;
+ private Iterator childIter;
/** current child object that is being managed by childIter*/
private FONode curChild;
/** CharIterator for curChild's characters */
- private CharIterator curCharIter = null;
+ private CharIterator curCharIter;
/**
* Constructor which creates an iterator for all child nodes
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/XMLObj.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/XMLObj.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/XMLObj.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/XMLObj.java Tue Jul 15 20:25:58 2014
@@ -42,7 +42,7 @@ import org.apache.fop.util.XMLConstants;
public abstract class XMLObj extends FONode implements ObjectBuiltListener {
// temp reference for attributes
- private Attributes attr = null;
+ private Attributes attr;
/** DOM element representing this node */
protected Element element;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/XMLWhiteSpaceHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/XMLWhiteSpaceHandler.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/XMLWhiteSpaceHandler.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/XMLWhiteSpaceHandler.java Tue Jul 15 20:25:58 2014
@@ -63,7 +63,7 @@ import org.apache.fop.util.CharUtilities
public class XMLWhiteSpaceHandler {
/** True if we are in a run of white space */
- private boolean inWhiteSpace = false;
+ private boolean inWhiteSpace;
/** True if the last char was a linefeed */
private boolean afterLinefeed = true;
/** Counter, increased every time a non-white-space is encountered */
@@ -392,7 +392,7 @@ public class XMLWhiteSpaceHandler {
* the following child is a block-level FO)
*/
private class EOLchecker {
- private boolean nextIsEOL = false;
+ private boolean nextIsEOL;
private RecursiveCharIterator charIter;
EOLchecker(CharIterator charIter) {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/PropertyTokenizer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/PropertyTokenizer.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/PropertyTokenizer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/PropertyTokenizer.java Tue Jul 15 20:25:58 2014
@@ -48,12 +48,12 @@ class PropertyTokenizer {
static final int TOK_INTEGER = TOK_FLOAT + 1;
protected int currentToken = TOK_EOF;
- protected String currentTokenValue = null;
- protected int currentUnitLength = 0;
+ protected String currentTokenValue;
+ protected int currentUnitLength;
- private int currentTokenStartIndex = 0;
+ private int currentTokenStartIndex;
private /* final */ String expr;
- private int exprIndex = 0;
+ private int exprIndex;
private int exprLength;
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/RelativeNumericProperty.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/RelativeNumericProperty.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/RelativeNumericProperty.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/RelativeNumericProperty.java Tue Jul 15 20:25:58 2014
@@ -67,7 +67,7 @@ public class RelativeNumericProperty ext
/**
* The second operand.
*/
- private Numeric op2 = null;
+ private Numeric op2;
/**
* The dimension of the result.
*/
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/AbstractListItemPart.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/AbstractListItemPart.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/AbstractListItemPart.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/AbstractListItemPart.java Tue Jul 15 20:25:58 2014
@@ -45,7 +45,7 @@ public abstract class AbstractListItemPa
// End of property values
/** used for FO validation */
- private boolean blockItemFound = false;
+ private boolean blockItemFound;
/**
* Base constructor
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BasicLink.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BasicLink.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BasicLink.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BasicLink.java Tue Jul 15 20:25:58 2014
@@ -58,7 +58,7 @@ public class BasicLink extends InlineLev
// End of property values
// used only for FO validation
- private boolean blockOrInlineItemFound = false;
+ private boolean blockOrInlineItemFound;
/**
* Construct a BasicLink instance with the given {@link FONode}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Block.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Block.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Block.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Block.java Tue Jul 15 20:25:58 2014
@@ -51,8 +51,8 @@ public class Block extends FObjMixed imp
CommonAccessibilityHolder {
// used for FO validation
- private boolean blockOrInlineItemFound = false;
- private boolean initialPropertySetFound = false;
+ private boolean blockOrInlineItemFound;
+ private boolean initialPropertySetFound;
// The value of FO traits (refined properties) that apply to fo:block.
private CommonAccessibility commonAccessibility;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BlockContainer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BlockContainer.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BlockContainer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BlockContainer.java Tue Jul 15 20:25:58 2014
@@ -67,7 +67,7 @@ public class BlockContainer extends FObj
// End of FO trait values
/** used for FO validation */
- private boolean blockItemFound = false;
+ private boolean blockItemFound;
/**
* Creates a new BlockContainer instance as a child of
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Float.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Float.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Float.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Float.java Tue Jul 15 20:25:58 2014
@@ -38,7 +38,7 @@ public class Float extends FObj {
// private int clear;
// End of property values
- private static boolean notImplementedWarningGiven = false;
+ private static boolean notImplementedWarningGiven;
/**
* Base constructor
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Footnote.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Footnote.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Footnote.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Footnote.java Tue Jul 15 20:25:58 2014
@@ -37,7 +37,7 @@ public class Footnote extends FObj imple
private CommonAccessibility commonAccessibility;
- private Inline footnoteCitation = null;
+ private Inline footnoteCitation;
private FootnoteBody footnoteBody;
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Inline.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Inline.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Inline.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Inline.java Tue Jul 15 20:25:58 2014
@@ -47,7 +47,7 @@ public class Inline extends InlineLevel
// private int wrapOption;
// End of property values
// used for FO validation
- private boolean blockOrInlineItemFound = false;
+ private boolean blockOrInlineItemFound;
private boolean canHaveBlockLevelChildren = true;
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ListBlock.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ListBlock.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ListBlock.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ListBlock.java Tue Jul 15 20:25:58 2014
@@ -61,7 +61,7 @@ public class ListBlock extends FObj impl
private Length orphanContentLimit;
// used for child node validation
- private boolean hasListItem = false;
+ private boolean hasListItem;
/**
* Base constructor
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ListItem.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ListItem.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ListItem.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ListItem.java Tue Jul 15 20:25:58 2014
@@ -57,8 +57,8 @@ public class ListItem extends FObj imple
// private int relativeAlign;
// End of property values
- private ListItemLabel label = null;
- private ListItemBody body = null;
+ private ListItemLabel label;
+ private ListItemBody body;
/**
* Base constructor
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiProperties.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiProperties.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiProperties.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiProperties.java Tue Jul 15 20:25:58 2014
@@ -37,11 +37,11 @@ public class MultiProperties extends FOb
// private CommonAccessibility commonAccessibility;
// End of property values
- private static boolean notImplementedWarningGiven = false;
+ private static boolean notImplementedWarningGiven;
// used for input FO validation
- private boolean hasMultiPropertySet = false;
- private boolean hasWrapper = false;
+ private boolean hasMultiPropertySet;
+ private boolean hasWrapper;
/**
* Base constructor
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiPropertySet.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiPropertySet.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiPropertySet.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiPropertySet.java Tue Jul 15 20:25:58 2014
@@ -37,7 +37,7 @@ public class MultiPropertySet extends FO
// private ToBeImplementedProperty activeState;
// End of property values
- private static boolean notImplementedWarningGiven = false;
+ private static boolean notImplementedWarningGiven;
/**
* Base constructor
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiToggle.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiToggle.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiToggle.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiToggle.java Tue Jul 15 20:25:58 2014
@@ -39,7 +39,7 @@ public class MultiToggle extends FObj {
public StringProperty prSwitchTo;
// End of property values
- private static boolean notImplementedWarningGiven = false;
+ private static boolean notImplementedWarningGiven;
/**
* Base constructor
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Wrapper.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Wrapper.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Wrapper.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Wrapper.java Tue Jul 15 20:25:58 2014
@@ -40,7 +40,7 @@ import org.apache.fop.fo.properties.Comm
public class Wrapper extends FObjMixed implements CommonAccessibilityHolder {
// used for FO validation
- private boolean blockOrInlineItemFound = false;
+ private boolean blockOrInlineItemFound;
private CommonAccessibility commonAccessibility;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/CollapsingBorderResolver.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/CollapsingBorderResolver.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/CollapsingBorderResolver.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/CollapsingBorderResolver.java Tue Jul 15 20:25:58 2014
@@ -62,7 +62,7 @@ class CollapsingBorderResolver implement
/* TODO Temporary hack for resolved borders in header */
/* Currently the normal border is always used. */
- private List/*<GridUnit>*/ headerLastRow = null;
+ private List/*<GridUnit>*/ headerLastRow;
/* End of temporary hack */
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/FixedColRowGroupBuilder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/FixedColRowGroupBuilder.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/FixedColRowGroupBuilder.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/FixedColRowGroupBuilder.java Tue Jul 15 20:25:58 2014
@@ -37,7 +37,7 @@ class FixedColRowGroupBuilder extends Ro
/** Number of columns in the corresponding table. */
private int numberOfColumns;
- private TableRow currentTableRow = null;
+ private TableRow currentTableRow;
/** 0-based, index in the row group. */
private int currentRowIndex;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/GridUnit.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/GridUnit.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/GridUnit.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/GridUnit.java Tue Jul 15 20:25:58 2014
@@ -62,7 +62,7 @@ public class GridUnit {
private int rowSpanIndex;
/** flags for the grid unit */
- private byte flags = 0;
+ private byte flags;
/** the border-before specification */
ConditionalBorder borderBefore;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/Table.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/Table.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/Table.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/Table.java Tue Jul 15 20:25:58 2014
@@ -88,17 +88,17 @@ public class Table extends TableFObj imp
private ColumnNumberManager columnNumberManager = new ColumnNumberManager();
/** the table-header and -footer */
- private TableHeader tableHeader = null;
- private TableFooter tableFooter = null;
+ private TableHeader tableHeader;
+ private TableFooter tableFooter;
/** used for validation */
- private boolean tableColumnFound = false;
- private boolean tableHeaderFound = false;
- private boolean tableFooterFound = false;
- private boolean tableBodyFound = false;
+ private boolean tableColumnFound;
+ private boolean tableHeaderFound;
+ private boolean tableFooterFound;
+ private boolean tableBodyFound;
- private boolean hasExplicitColumns = false;
- private boolean columnsFinalized = false;
+ private boolean hasExplicitColumns;
+ private boolean columnsFinalized;
private RowGroupBuilder rowGroupBuilder;
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java Tue Jul 15 20:25:58 2014
@@ -55,11 +55,11 @@ public class TableAndCaption extends FOb
// private int textAlign;
// End of property values
- static boolean notImplementedWarningGiven = false;
+ static boolean notImplementedWarningGiven;
/** used for FO validation */
- private boolean tableCaptionFound = false;
- private boolean tableFound = false;
+ private boolean tableCaptionFound;
+ private boolean tableFound;
/**
* Create a TableAndCaption instance with the given {@link FONode}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableCaption.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableCaption.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableCaption.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableCaption.java Tue Jul 15 20:25:58 2014
@@ -52,9 +52,9 @@ public class TableCaption extends FObj i
// End of property values
/** used for FO validation */
- private boolean blockItemFound = false;
+ private boolean blockItemFound;
- static boolean notImplementedWarningGiven = false;
+ static boolean notImplementedWarningGiven;
/**
* Create a TableCaption instance with the given {@link FONode}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableCell.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableCell.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableCell.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableCell.java Tue Jul 15 20:25:58 2014
@@ -60,7 +60,7 @@ public class TableCell extends TableFObj
// End of property values
/** used for FO validation */
- private boolean blockItemFound = false;
+ private boolean blockItemFound;
private boolean hasRetrieveTableMarker;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableColumn.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableColumn.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableColumn.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableColumn.java Tue Jul 15 20:25:58 2014
@@ -51,7 +51,7 @@ public class TableColumn extends TableFO
// End of property values
private boolean implicitColumn;
- private PropertyList pList = null;
+ private PropertyList pList;
/**
* Create a TableColumn instance with the given {@link FONode}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TablePart.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TablePart.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TablePart.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TablePart.java Tue Jul 15 20:25:58 2014
@@ -47,13 +47,13 @@ public abstract class TablePart extends
// End of property values
/** table rows found */
- protected boolean tableRowsFound = false;
+ protected boolean tableRowsFound;
/** table cells found */
- protected boolean tableCellsFound = false;
+ protected boolean tableCellsFound;
private boolean firstRow = true;
- private boolean rowsStarted = false;
+ private boolean rowsStarted;
private boolean lastCellEndsRow = true;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/AbstractPageSequence.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/AbstractPageSequence.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/AbstractPageSequence.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/AbstractPageSequence.java Tue Jul 15 20:25:58 2014
@@ -53,7 +53,7 @@ public abstract class AbstractPageSequen
private PageNumberGenerator pageNumberGenerator;
/** starting page number */
- protected int startingPageNumber = 0;
+ protected int startingPageNumber;
/**
* Create an AbstractPageSequence that is a child
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Declarations.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Declarations.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Declarations.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Declarations.java Tue Jul 15 20:25:58 2014
@@ -41,7 +41,7 @@ import org.apache.fop.fo.ValidationExcep
*/
public class Declarations extends FObj {
- private Map<String, ColorProfile> colorProfiles = null;
+ private Map<String, ColorProfile> colorProfiles;
/**
* @param parent FONode that is the parent of this object
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Flow.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Flow.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Flow.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Flow.java Tue Jul 15 20:25:58 2014
@@ -44,7 +44,7 @@ public class Flow extends FObj implement
private CommonAccessibility commonAccessibility;
/** used for FO validation */
- private boolean blockItemFound = false;
+ private boolean blockItemFound;
/**
* Create a Flow instance that is a child of the given {@link FONode}.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequence.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequence.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequence.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequence.java Tue Jul 15 20:25:58 2014
@@ -75,7 +75,7 @@ public class PageSequence extends Abstra
/**
* The fo:flow object for this page-sequence.
*/
- private Flow mainFlow = null;
+ private Flow mainFlow;
/**
* Create a PageSequence instance that is a child of the
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java Tue Jul 15 20:25:58 2014
@@ -47,11 +47,11 @@ public class RepeatablePageMasterAlterna
private static final int INFINITE = -1;
- private int numberConsumed = 0;
+ private int numberConsumed;
private List<ConditionalPageMasterReference> conditionalPageMasterRefs;
- private boolean hasPagePositionLast = false;
- private boolean hasPagePositionOnly = false;
+ private boolean hasPagePositionLast;
+ private boolean hasPagePositionOnly;
/**
* Base constructor
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java Tue Jul 15 20:25:58 2014
@@ -48,7 +48,7 @@ public class RepeatablePageMasterReferen
private static final int INFINITE = -1;
- private int numberConsumed = 0;
+ private int numberConsumed;
/**
* Base constructor
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Root.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Root.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Root.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Root.java Tue Jul 15 20:25:58 2014
@@ -51,19 +51,19 @@ public class Root extends FObj implement
private LayoutMasterSet layoutMasterSet;
private Declarations declarations;
- private BookmarkTree bookmarkTree = null;
+ private BookmarkTree bookmarkTree;
private List<Destination> destinationList;
private List<PageSequence> pageSequences;
private Locale locale;
// temporary until above list populated
- private boolean pageSequenceFound = false;
+ private boolean pageSequenceFound;
/**
* Keeps count of page number from over PageSequence instances
*/
- private int endingPageNumberOfPreviousSequence = 0;
- private int totalPagesGenerated = 0;
+ private int endingPageNumberOfPreviousSequence;
+ private int totalPagesGenerated;
/**
* Context class used while building the FO tree.
@@ -73,7 +73,7 @@ public class Root extends FObj implement
/**
* FOEventHandler object for this FO Tree
*/
- private FOEventHandler foEventHandler = null;
+ private FOEventHandler foEventHandler;
/**
* Base constructor
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java Tue Jul 15 20:25:58 2014
@@ -59,11 +59,11 @@ public class SimplePageMaster extends FO
private Map<String, Region> regions;
// used for node validation
- private boolean hasRegionBody = false;
- private boolean hasRegionBefore = false;
- private boolean hasRegionAfter = false;
- private boolean hasRegionStart = false;
- private boolean hasRegionEnd = false;
+ private boolean hasRegionBody;
+ private boolean hasRegionBefore;
+ private boolean hasRegionAfter;
+ private boolean hasRegionStart;
+ private boolean hasRegionEnd;
/**
* Base constructor
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/BorderWidthPropertyMaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/BorderWidthPropertyMaker.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/BorderWidthPropertyMaker.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/BorderWidthPropertyMaker.java Tue Jul 15 20:25:58 2014
@@ -29,7 +29,7 @@ import org.apache.fop.fo.expr.PropertyEx
*/
public class BorderWidthPropertyMaker extends LengthProperty.Maker {
- private int borderStyleId = 0;
+ private int borderStyleId;
/**
* Create a length property which check the value of the border-*-style
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonHyphenation.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonHyphenation.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonHyphenation.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonHyphenation.java Tue Jul 15 20:25:58 2014
@@ -43,7 +43,7 @@ public final class CommonHyphenation {
private static final PropertyCache<CommonHyphenation> CACHE =
new PropertyCache<CommonHyphenation>();
- private int hash = 0;
+ private int hash;
/** The "language" property */
public final StringProperty language;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CompoundPropertyMaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CompoundPropertyMaker.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CompoundPropertyMaker.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CompoundPropertyMaker.java Tue Jul 15 20:25:58 2014
@@ -38,7 +38,7 @@ public class CompoundPropertyMaker exten
/**
* The first subproperty maker which has a setByShorthand of true.
*/
- private PropertyMaker shorthandMaker = null;
+ private PropertyMaker shorthandMaker;
/**
* Construct an instance of a CompoundPropertyMaker for the given property.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CondLengthProperty.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CondLengthProperty.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CondLengthProperty.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CondLengthProperty.java Tue Jul 15 20:25:58 2014
@@ -41,7 +41,7 @@ public class CondLengthProperty extends
private Property length;
private EnumProperty conditionality;
- private boolean isCached = false;
+ private boolean isCached;
private int hash = -1;
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/DimensionPropertyMaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/DimensionPropertyMaker.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/DimensionPropertyMaker.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/DimensionPropertyMaker.java Tue Jul 15 20:25:58 2014
@@ -28,7 +28,7 @@ import org.apache.fop.fo.expr.PropertyEx
*/
public class DimensionPropertyMaker extends CorrespondingPropertyMaker {
- private int[][] extraCorresponding = null;
+ private int[][] extraCorresponding;
/**
* Instantiate a dimension property maker.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/FontStretchPropertyMaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/FontStretchPropertyMaker.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/FontStretchPropertyMaker.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/FontStretchPropertyMaker.java Tue Jul 15 20:25:58 2014
@@ -32,7 +32,7 @@ public class FontStretchPropertyMaker
/* Ordered list of absolute font stretch properties so we can easily find the next /
* previous one */
- private Property[] orderedFontStretchValues = null;
+ private Property[] orderedFontStretchValues;
/**
* Create an enum property which can handle relative font stretches
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/IndentPropertyMaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/IndentPropertyMaker.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/IndentPropertyMaker.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/IndentPropertyMaker.java Tue Jul 15 20:25:58 2014
@@ -35,12 +35,12 @@ public class IndentPropertyMaker extends
/**
* The corresponding padding-* propIds
*/
- private int[] paddingCorresponding = null;
+ private int[] paddingCorresponding;
/**
* The corresponding border-*-width propIds
*/
- private int[] borderWidthCorresponding = null;
+ private int[] borderWidthCorresponding;
/**
* Create a start-indent or end-indent property maker.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/KeepProperty.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/KeepProperty.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/KeepProperty.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/KeepProperty.java Tue Jul 15 20:25:58 2014
@@ -33,7 +33,7 @@ public final class KeepProperty extends
private static final PropertyCache<KeepProperty> CACHE
= new PropertyCache<KeepProperty>();
- private boolean isCachedValue = false;
+ private boolean isCachedValue;
private Property withinLine;
private Property withinColumn;
private Property withinPage;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/LengthRangeProperty.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/LengthRangeProperty.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/LengthRangeProperty.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/LengthRangeProperty.java Tue Jul 15 20:25:58 2014
@@ -38,8 +38,8 @@ public class LengthRangeProperty extends
private static final int MINSET = 1;
private static final int OPTSET = 2;
private static final int MAXSET = 4;
- private int bfSet = 0; // bit field
- private boolean consistent = false;
+ private int bfSet; // bit field
+ private boolean consistent;
/**
* Converts this <code>LengthRangeProperty</code> to a <code>MinOptMax</code>.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PropertyMaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PropertyMaker.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PropertyMaker.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PropertyMaker.java Tue Jul 15 20:25:58 2014
@@ -50,16 +50,16 @@ public class PropertyMaker implements Cl
/** the property ID */
protected int propId;
private boolean inherited = true;
- private Map enums = null;
- private Map keywords = null;
+ private Map enums;
+ private Map keywords;
/** the default value for the maker */
- protected String defaultValue = null;
+ protected String defaultValue;
/** Indicates whether the property is context-dependant and therefore can't be cached. */
- protected boolean contextDep = false;
+ protected boolean contextDep;
/** Indicates whether the property is set through a shorthand. */
- protected boolean setByShorthand = false;
+ protected boolean setByShorthand;
private int percentBase = -1;
- private PropertyMaker[] shorthands = null;
+ private PropertyMaker[] shorthands;
private ShorthandParser datatypeParser;
/** default property **/
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontCache.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontCache.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontCache.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontCache.java Tue Jul 15 20:25:58 2014
@@ -75,14 +75,14 @@ public final class FontCache implements
* TTC file may contain more than 1 font.
* @serial
*/
- private Map<String, CachedFontFile> fontfileMap = null;
+ private Map<String, CachedFontFile> fontfileMap;
/**
* mapping of font url -> file modified date (for all fonts that have failed
* to load)
* @serial
*/
- private Map<String, Long> failedFontMap = null;
+ private Map<String, Long> failedFontMap;
/**
* Default constructor
@@ -494,7 +494,7 @@ public final class FontCache implements
/** file modify date (if available) */
private long lastModified = -1;
- private Map<String, EmbedFontInfo> filefontsMap = null;
+ private Map<String, EmbedFontInfo> filefontsMap;
public CachedFontFile(long lastModified) {
setLastModified(lastModified);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontInfo.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontInfo.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontInfo.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontInfo.java Tue Jul 15 20:25:58 2014
@@ -46,23 +46,23 @@ public class FontInfo {
protected static final Log log = LogFactory.getLog(FontInfo.class);
/** Map containing fonts that have been used */
- private Map<String, Typeface> usedFonts = null; //(String = font key)
+ private Map<String, Typeface> usedFonts; //(String = font key)
/** look up a font-triplet to find a font-name */
- private Map<FontTriplet, String> triplets = null; //(String = font key)
+ private Map<FontTriplet, String> triplets; //(String = font key)
/** look up a font-triplet to find its priority
* (only used inside addFontProperties()) */
- private Map<FontTriplet, Integer> tripletPriorities = null; //Map<FontTriplet,Integer>
+ private Map<FontTriplet, Integer> tripletPriorities; //Map<FontTriplet,Integer>
/** look up a font-name to get a font (that implements FontMetrics at least) */
- private Map<String, Typeface> fonts = null; //(String = font key)
+ private Map<String, Typeface> fonts; //(String = font key)
/** Cache for Font instances. */
- private Map<FontTriplet, Map<Integer, Font>> fontInstanceCache = null;
+ private Map<FontTriplet, Map<Integer, Font>> fontInstanceCache;
/** Event listener for font events */
- private FontEventListener eventListener = null;
+ private FontEventListener eventListener;
/**
* Main constructor
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontManager.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontManager.java Tue Jul 15 20:25:58 2014
@@ -44,10 +44,10 @@ public class FontManager {
private FontCacheManager fontCacheManager;
/** Font substitutions */
- private FontSubstitutions fontSubstitutions = null;
+ private FontSubstitutions fontSubstitutions;
/** Allows enabling kerning on the base 14 fonts, default is false */
- private boolean enableBase14Kerning = false;
+ private boolean enableBase14Kerning;
/** FontTriplet matcher for fonts that shall be referenced rather than embedded. */
private FontTriplet.Matcher referencedFontsMatcher;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/MultiByteFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/MultiByteFont.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/MultiByteFont.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/MultiByteFont.java Tue Jul 15 20:25:58 2014
@@ -72,7 +72,7 @@ public class MultiByteFont extends CIDFo
/** Contains the character bounding boxes for all characters in the font */
protected Rectangle[] boundingBoxes;
- private boolean isOTFFile = false;
+ private boolean isOTFFile;
// since for most users the most likely glyphs are in the first cmap segments we store their mapping.
private static final int NUM_MOST_LIKELY_GLYPHS = 256;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/SingleByteFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/SingleByteFont.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/SingleByteFont.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/SingleByteFont.java Tue Jul 15 20:25:58 2014
@@ -47,9 +47,9 @@ public class SingleByteFont extends Cust
private static Log log = LogFactory.getLog(SingleByteFont.class);
private SingleByteEncoding mapping;
- private boolean useNativeEncoding = false;
+ private boolean useNativeEncoding;
- private int[] width = null;
+ private int[] width;
private Rectangle[] boundingBoxes;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/Typeface.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/Typeface.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/Typeface.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/Typeface.java Tue Jul 15 20:25:58 2014
@@ -46,7 +46,7 @@ public abstract class Typeface implement
* is used as the trigger). This could just as well be a boolean but is a
* long out of statistical interest.
*/
- private long charMapOps = 0;
+ private long charMapOps;
/** An optional event listener that receives events such as missing glyphs etc. */
protected FontEventListener eventListener;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/base14/Base14FontCollection.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/base14/Base14FontCollection.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/base14/Base14FontCollection.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/base14/Base14FontCollection.java Tue Jul 15 20:25:58 2014
@@ -28,7 +28,7 @@ import org.apache.fop.fonts.FontInfo;
*/
public class Base14FontCollection implements FontCollection {
- private boolean kerning = false;
+ private boolean kerning;
/**
* Main constructor
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/substitute/FontQualifier.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/substitute/FontQualifier.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/substitute/FontQualifier.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/substitute/FontQualifier.java Tue Jul 15 20:25:58 2014
@@ -41,13 +41,13 @@ public class FontQualifier {
private static Log log = LogFactory.getLog(FontQualifier.class);
/** font family attribute value */
- private AttributeValue fontFamilyAttributeValue = null;
+ private AttributeValue fontFamilyAttributeValue;
/** font style attribute value */
- private AttributeValue fontStyleAttributeValue = null;
+ private AttributeValue fontStyleAttributeValue;
/** font weight attribute value */
- private AttributeValue fontWeightAttributeValue = null;
+ private AttributeValue fontWeightAttributeValue;
/**
* Default constructor
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/substitute/FontSubstitutionsConfigurator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/substitute/FontSubstitutionsConfigurator.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/substitute/FontSubstitutionsConfigurator.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/substitute/FontSubstitutionsConfigurator.java Tue Jul 15 20:25:58 2014
@@ -28,7 +28,7 @@ import org.apache.fop.apps.FOPException;
*/
public class FontSubstitutionsConfigurator {
- private Configuration cfg = null;
+ private Configuration cfg;
/**
* Main constructor
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/OFMtxEntry.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/OFMtxEntry.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/OFMtxEntry.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/OFMtxEntry.java Tue Jul 15 20:25:58 2014
@@ -33,7 +33,7 @@ class OFMtxEntry {
private List unicodeIndex = new java.util.ArrayList();
private int[] boundingBox = new int[4];
private long offset;
- private byte found = 0;
+ private byte found;
/**
* Returns a String representation of this object.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/OTFSubSetFile.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/OTFSubSetFile.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/OTFSubSetFile.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/OTFSubSetFile.java Tue Jul 15 20:25:58 2014
@@ -50,8 +50,8 @@ import org.apache.fop.fonts.cff.CFFDataR
public class OTFSubSetFile extends OTFFile {
private byte[] output;
- private int currentPos = 0;
- private int realSize = 0;
+ private int currentPos;
+ private int realSize;
/** A map containing each glyph to be included in the subset
* with their existing and new GID's **/
@@ -93,7 +93,7 @@ public class OTFSubSetFile extends OTFFi
private List<byte[]> stringIndexData = new ArrayList<byte[]>();
/** The CFF reader object used to read data and offsets from the original font file */
- private CFFDataReader cffReader = null;
+ private CFFDataReader cffReader;
/** The class used to represent this font **/
private MultiByteFont mbFont;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/OpenFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/OpenFont.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/OpenFont.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/OpenFont.java Tue Jul 15 20:25:58 2014
@@ -154,7 +154,7 @@ public abstract class OpenFont {
private static final short FIRST_CHAR = 0;
- protected boolean useKerning = false;
+ protected boolean useKerning;
private boolean isEmbeddable = true;
private boolean hasSerifs = true;
/**
@@ -174,7 +174,7 @@ public abstract class OpenFont {
/**
* Offset to last loca
*/
- protected long lastLoca = 0;
+ protected long lastLoca;
protected int numberOfGlyphs; // Number of glyphs in font (read from "maxp" table)
/**
@@ -188,32 +188,32 @@ public abstract class OpenFont {
protected final Set<String> familyNames = new HashSet<String>();
protected String subFamilyName = "";
- private long italicAngle = 0;
- private long isFixedPitch = 0;
- private int fontBBox1 = 0;
- private int fontBBox2 = 0;
- private int fontBBox3 = 0;
- private int fontBBox4 = 0;
- private int capHeight = 0;
- private int os2CapHeight = 0;
+ private long italicAngle;
+ private long isFixedPitch;
+ private int fontBBox1;
+ private int fontBBox2;
+ private int fontBBox3;
+ private int fontBBox4;
+ private int capHeight;
+ private int os2CapHeight;
private int underlinePosition;
private int underlineThickness;
private int strikeoutPosition;
private int strikeoutThickness;
- private int xHeight = 0;
- private int os2xHeight = 0;
+ private int xHeight;
+ private int os2xHeight;
//Effective ascender/descender
- private int ascender = 0;
- private int descender = 0;
+ private int ascender;
+ private int descender;
//Ascender/descender from hhea table
- private int hheaAscender = 0;
- private int hheaDescender = 0;
+ private int hheaAscender;
+ private int hheaDescender;
//Ascender/descender from OS/2 table
- private int os2Ascender = 0;
- private int os2Descender = 0;
- private int usWeightClass = 0;
+ private int os2Ascender;
+ private int os2Descender;
+ private int usWeightClass;
- private short lastChar = 0;
+ private short lastChar;
private int[] ansiWidth;
private Map<Integer, List<Integer>> ansiIndex;
@@ -226,7 +226,7 @@ public abstract class OpenFont {
private boolean isCFF;
// advanced typographic table support
- protected boolean useAdvanced = false;
+ protected boolean useAdvanced;
protected OTFAdvancedTypographicTableReader advancedTableReader;
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFSubSetFile.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFSubSetFile.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFSubSetFile.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFSubSetFile.java Tue Jul 15 20:25:58 2014
@@ -35,9 +35,9 @@ import java.util.SortedSet;
*/
public class TTFSubSetFile extends TTFFile {
- private byte[] output = null;
- private int realSize = 0;
- private int currentPos = 0;
+ private byte[] output;
+ private int realSize;
+ private int currentPos;
/*
* Offsets in name table to be filled out by table.
@@ -45,8 +45,8 @@ public class TTFSubSetFile extends TTFFi
*/
private Map<OFTableName, Integer> offsets = new HashMap<OFTableName, Integer>();
- private int checkSumAdjustmentOffset = 0;
- private int locaOffset = 0;
+ private int checkSumAdjustmentOffset;
+ private int locaOffset;
/** Stores the glyph offsets so that we can end strings at glyph boundaries */
private int[] glyphOffsets;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/PostscriptParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/PostscriptParser.java?rev=1610839&r1=1610838&r2=1610839&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/PostscriptParser.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/PostscriptParser.java Tue Jul 15 20:25:58 2014
@@ -177,12 +177,12 @@ class PostscriptParser {
/* The tokens parsed from the current element */
protected List<String> tokens;
/* Determines whether binary data is currently being read / parsed */
- protected boolean readBinary = false;
+ protected boolean readBinary;
/* The location of the element within the binary data */
private int startPoint = -1;
protected int endPoint = -1;
/* A flag to determine if unexpected postscript has been found in the element */
- private boolean foundUnexpected = false;
+ private boolean foundUnexpected;
public PSElement(String operator, int startPoint) {
this.operator = operator;
@@ -327,8 +327,8 @@ class PostscriptParser {
private String entry = "";
private String token = "";
- private boolean finished = false;
- protected int binaryLength = 0;
+ private boolean finished;
+ protected int binaryLength;
/* A list containing each entry and it's contents in the array */
private HashMap<Integer, String> entries;
private static final String READ_ONLY = "readonly";
@@ -441,7 +441,7 @@ class PostscriptParser {
* An object representing a Postscript array with a variable number of entries
*/
public class PSVariableArray extends PSElement {
- private int level = 0;
+ private int level;
private List<String> arrayItems;
private String entry = "";
@@ -536,7 +536,7 @@ class PostscriptParser {
private HashMap<String, String> entries;
private String entry = "";
private String token = "";
- protected int binaryLength = 0;
+ protected int binaryLength;
public PSDictionary(String operator, int startPoint) {
super(operator, startPoint);
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org