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/18 16:21:14 UTC
svn commit: r1611658 [2/6] - in
/xmlgraphics/fop/branches/FOP-2393_gradient-rendering: ./ lib/
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/a...
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/afp/ptoca/PtocaBuilder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/afp/ptoca/PtocaBuilder.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/afp/ptoca/PtocaBuilder.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/afp/ptoca/PtocaBuilder.java Fri Jul 18 14:21:06 2014
@@ -51,16 +51,16 @@ public abstract class PtocaBuilder imple
private int currentFont = Integer.MIN_VALUE;
/** the current orientation */
- private int currentOrientation = 0;
+ private int currentOrientation;
/** the current color */
private Color currentColor = Color.BLACK;
/** the current variable space increment */
- private int currentVariableSpaceCharacterIncrement = 0;
+ private int currentVariableSpaceCharacterIncrement;
/** the current inter character adjustment */
- private int currentInterCharacterAdjustment = 0;
+ private int currentInterCharacterAdjustment;
/**
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/afp/svg/AFPTextHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/afp/svg/AFPTextHandler.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/afp/svg/AFPTextHandler.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/afp/svg/AFPTextHandler.java Fri Jul 18 14:21:06 2014
@@ -48,7 +48,7 @@ public class AFPTextHandler extends FOPT
private static Log log = LogFactory.getLog(AFPTextHandler.class);
/** Overriding FontState */
- protected Font overrideFont = null;
+ protected Font overrideFont;
/** Font information */
private final FontInfo fontInfo;
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/afp/util/StructuredFieldReader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/afp/util/StructuredFieldReader.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/afp/util/StructuredFieldReader.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/afp/util/StructuredFieldReader.java Fri Jul 18 14:21:06 2014
@@ -43,7 +43,7 @@ public class StructuredFieldReader {
/**
* The input stream to read
*/
- private InputStream inputStream = null;
+ private InputStream inputStream;
/**
* The constructor for the StructuredFieldReader
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/apps/FOUserAgent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/apps/FOUserAgent.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/apps/FOUserAgent.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/apps/FOUserAgent.java Fri Jul 18 14:21:06 2014
@@ -97,12 +97,12 @@ public class FOUserAgent {
private float targetResolution = FopFactoryConfig.DEFAULT_TARGET_RESOLUTION;
private Map rendererOptions = new java.util.HashMap();
- private File outputFile = null;
- private IFDocumentHandler documentHandlerOverride = null;
- private Renderer rendererOverride = null;
- private FOEventHandler foEventHandlerOverride = null;
+ private File outputFile;
+ private IFDocumentHandler documentHandlerOverride;
+ private Renderer rendererOverride;
+ private FOEventHandler foEventHandlerOverride;
private boolean locatorEnabled = true; // true by default (for error messages).
- private boolean conserveMemoryPolicy = false;
+ private boolean conserveMemoryPolicy;
private EventBroadcaster eventBroadcaster = new FOPEventBroadcaster();
private StructureTreeEventHandler structureTreeEventHandler
= DummyStructureTreeEventHandler.INSTANCE;
@@ -115,21 +115,21 @@ public class FOUserAgent {
/** Creator: Metadata element for the user that created the
* document. (Some renderers can store this in the document.)
*/
- protected String creator = null;
+ protected String creator;
/** Creation Date: Override of the date the document was created.
* (Some renderers can store this in the document.)
*/
- protected Date creationDate = null;
+ protected Date creationDate;
/** Author of the content of the document. */
- protected String author = null;
+ protected String author;
/** Title of the document. */
- protected String title = null;
+ protected String title;
/** Subject of the document. */
- protected String subject = null;
+ protected String subject;
/** Set of keywords applicable to this document. */
- protected String keywords = null;
+ protected String keywords;
private final ImageSessionContext imageSessionContext;
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/apps/Fop.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/apps/Fop.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/apps/Fop.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/apps/Fop.java Fri Jul 18 14:21:06 2014
@@ -46,16 +46,16 @@ import org.apache.fop.fo.FOTreeBuilder;
public class Fop {
// desired output format: MIME type such as "application/pdf", "application/postscript" etc.
- private String outputFormat = null;
+ private String outputFormat;
// output stream to send results to
- private OutputStream stream = null;
+ private OutputStream stream;
// FOUserAgent object to set processing options
private final FOUserAgent foUserAgent;
// FOTreeBuilder object to maintain reference for access to results
- private FOTreeBuilder foTreeBuilder = null;
+ private FOTreeBuilder foTreeBuilder;
/**
* Constructor for use with already-created FOUserAgents. It uses MIME types to select the
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/apps/FopFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/apps/FopFactory.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/apps/FopFactory.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/apps/FopFactory.java Fri Jul 18 14:21:06 2014
@@ -103,7 +103,7 @@ public final class FopFactory implements
/**
* Map of configured names of hyphenation pattern file names: ll_CC => name
*/
- private Map/*<String,String>*/ hyphPatNames = null;
+ private Map/*<String,String>*/ hyphPatNames;
/**
* FOP has the ability, for some FO's, to continue processing even if the
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/apps/FormattingResults.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/apps/FormattingResults.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/apps/FormattingResults.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/apps/FormattingResults.java Fri Jul 18 14:21:06 2014
@@ -28,8 +28,8 @@ import org.apache.fop.fo.pagination.Abst
*/
public class FormattingResults {
- private int pageCount = 0;
- private List pageSequences = null;
+ private int pageCount;
+ private List pageSequences;
/**
* Constructor for the FormattingResults object
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/AreaTreeHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/AreaTreeHandler.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/AreaTreeHandler.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/AreaTreeHandler.java Fri Jul 18 14:21:06 2014
@@ -65,7 +65,7 @@ public class AreaTreeHandler extends FOE
private static Log log = LogFactory.getLog(AreaTreeHandler.class);
// Recorder of debug statistics
- private Statistics statistics = null;
+ private Statistics statistics;
// The LayoutManager maker
private LayoutManagerMaker lmMaker;
@@ -87,7 +87,7 @@ public class AreaTreeHandler extends FOE
private TopLevelLayoutManager prevPageSeqLM;
- private int idGen = 0;
+ private int idGen;
/**
* Constructor.
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/AreaTreeModel.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/AreaTreeModel.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/AreaTreeModel.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/AreaTreeModel.java Fri Jul 18 14:21:06 2014
@@ -37,8 +37,8 @@ import org.apache.commons.logging.LogFac
* the life of the area tree model.
*/
public class AreaTreeModel {
- private List<PageSequence> pageSequenceList = null;
- private int currentPageIndex = 0;
+ private List<PageSequence> pageSequenceList;
+ private int currentPageIndex;
/** the current page sequence */
protected PageSequence currentPageSequence;
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/AreaTreeObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/AreaTreeObject.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/AreaTreeObject.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/AreaTreeObject.java Fri Jul 18 14:21:06 2014
@@ -35,10 +35,10 @@ import org.apache.fop.fo.extensions.Exte
public abstract class AreaTreeObject implements Cloneable {
/** Foreign attributes */
- protected Map<QName, String> foreignAttributes = null;
+ protected Map<QName, String> foreignAttributes;
/** Extension attachments */
- protected List<ExtensionAttachment> extensionAttachments = null;
+ protected List<ExtensionAttachment> extensionAttachments;
/** {@inheritDoc} */
public Object clone() throws CloneNotSupportedException {
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/BeforeFloat.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/BeforeFloat.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/BeforeFloat.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/BeforeFloat.java Fri Jul 18 14:21:06 2014
@@ -30,7 +30,7 @@ public class BeforeFloat extends BlockPa
// this is an optional block area that will be rendered
// as the separator only if there are float areas
- private Block separator = null;
+ private Block separator;
/**
* Set the separator area for this before float.
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/BlockParent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/BlockParent.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/BlockParent.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/BlockParent.java Fri Jul 18 14:21:06 2014
@@ -38,19 +38,19 @@ public class BlockParent extends Area {
* Used for relative (serves as left-offset trait) and absolute positioning
* (serves as left-position trait).
*/
- protected int xOffset = 0;
+ protected int xOffset;
/**
* The y offset position of this block parent.
* Used for relative (serves as top-offset trait) and absolute positioning
* (serves as top-position trait).
*/
- protected int yOffset = 0;
+ protected int yOffset;
/**
* The children of this block parent area.
*/
- protected List<Area> children = null;
+ protected List<Area> children;
/** {@inheritDoc} */
@Override
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/BlockViewport.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/BlockViewport.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/BlockViewport.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/BlockViewport.java Fri Jul 18 14:21:06 2014
@@ -31,7 +31,7 @@ public class BlockViewport extends Block
private static final long serialVersionUID = -7840580922580735157L;
// clipping for this viewport
- private boolean clip = false;
+ private boolean clip;
// transform if rotated or absolute
private CTM viewportCTM;
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/BookmarkData.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/BookmarkData.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/BookmarkData.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/BookmarkData.java Fri Jul 18 14:21:06 2014
@@ -35,7 +35,7 @@ public class BookmarkData extends Abstra
private List<BookmarkData> subData = new java.util.ArrayList<BookmarkData>();
// bookmark-title for this fo:bookmark
- private String bookmarkTitle = null;
+ private String bookmarkTitle;
// indicator of whether to initially display/hide child bookmarks of this object
private boolean showChildren = true;
@@ -44,7 +44,7 @@ public class BookmarkData extends Abstra
private String idRef;
// PageViewport that the idRef item refers to
- private PageViewport pageRef = null;
+ private PageViewport pageRef;
// unresolved idrefs by this bookmark and child bookmarks below it
private Map<String, List<Resolvable>> unresolvedIDRefs
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/DestinationData.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/DestinationData.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/DestinationData.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/DestinationData.java Fri Jul 18 14:21:06 2014
@@ -34,7 +34,7 @@ public class DestinationData extends Abs
private String[] idRefs;
// PageViewport that the idRef item refers to
- private PageViewport pageRef = null;
+ private PageViewport pageRef;
/**
* Create a new pdf destination data object.
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/Footnote.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/Footnote.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/Footnote.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/Footnote.java Fri Jul 18 14:21:06 2014
@@ -30,7 +30,7 @@ public class Footnote extends BlockParen
private static final long serialVersionUID = -7907428219886367161L;
- private Block separator = null;
+ private Block separator;
// footnote has an optional separator
// and a list of sub block areas that can be added/removed
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/LineArea.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/LineArea.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/LineArea.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/LineArea.java Fri Jul 18 14:21:06 2014
@@ -75,7 +75,7 @@ public class LineArea extends Area {
}
}
- private LineAdjustingInfo adjustingInfo = null;
+ private LineAdjustingInfo adjustingInfo;
// this class can contain the dominant char styling info
// this means that many renderers can optimise a bit
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/LinkResolver.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/LinkResolver.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/LinkResolver.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/LinkResolver.java Fri Jul 18 14:21:06 2014
@@ -30,10 +30,10 @@ public class LinkResolver implements Res
private static final long serialVersionUID = -7102134165192960718L;
- private boolean resolved = false;
+ private boolean resolved;
private String idRef;
private Area area;
- private transient List<Resolvable> dependents = null;
+ private transient List<Resolvable> dependents;
/**
* Create a new link resolver.
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/Page.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/Page.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/Page.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/Page.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/PageViewport.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/PageViewport.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/PageViewport.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/PageViewport.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/RegionViewport.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/RegionViewport.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/RegionViewport.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/RegionViewport.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/Trait.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/Trait.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/Trait.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/Trait.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/inline/AbstractTextArea.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/inline/AbstractTextArea.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/inline/AbstractTextArea.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/inline/AbstractTextArea.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/inline/InlineArea.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/inline/InlineArea.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/inline/InlineArea.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/inline/InlineArea.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/inline/InlineBlockParent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/inline/InlineBlockParent.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/inline/InlineBlockParent.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/inline/InlineBlockParent.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/inline/InlineViewport.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/inline/InlineViewport.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/inline/InlineViewport.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/inline/InlineViewport.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/cli/CommandLineOptions.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/cli/CommandLineOptions.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/cli/CommandLineOptions.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/cli/CommandLineOptions.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/cli/InputHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/cli/InputHandler.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/cli/InputHandler.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/cli/InputHandler.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/complexscripts/fonts/GlyphMappingTable.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/complexscripts/fonts/GlyphMappingTable.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/complexscripts/fonts/GlyphMappingTable.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/complexscripts/fonts/GlyphMappingTable.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/complexscripts/util/CharScript.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/complexscripts/util/CharScript.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/complexscripts/util/CharScript.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/complexscripts/util/CharScript.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/datatypes/KeepValue.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/datatypes/KeepValue.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/datatypes/KeepValue.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/datatypes/KeepValue.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/datatypes/ValidationPercentBaseContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/datatypes/ValidationPercentBaseContext.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/datatypes/ValidationPercentBaseContext.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/datatypes/ValidationPercentBaseContext.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/ElementMapping.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/ElementMapping.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/ElementMapping.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/ElementMapping.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/FOPropertyMapping.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/FOPropertyMapping.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/FOPropertyMapping.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/FOPropertyMapping.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/FOText.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/FOText.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/FOText.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/FOText.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/FOTreeBuilder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/FOTreeBuilder.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/FOTreeBuilder.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/FOTreeBuilder.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/FOTreeBuilderContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/FOTreeBuilderContext.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/FOTreeBuilderContext.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/FOTreeBuilderContext.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/FObj.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/FObj.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/FObj.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/FObj.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/FObjMixed.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/FObjMixed.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/FObjMixed.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/FObjMixed.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/PropertyList.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/PropertyList.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/PropertyList.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/PropertyList.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/RecursiveCharIterator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/RecursiveCharIterator.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/RecursiveCharIterator.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/RecursiveCharIterator.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/XMLObj.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/XMLObj.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/XMLObj.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/XMLObj.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/XMLWhiteSpaceHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/XMLWhiteSpaceHandler.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/XMLWhiteSpaceHandler.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/XMLWhiteSpaceHandler.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/expr/PropertyTokenizer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/expr/PropertyTokenizer.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/expr/PropertyTokenizer.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/expr/PropertyTokenizer.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/expr/RelativeNumericProperty.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/expr/RelativeNumericProperty.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/expr/RelativeNumericProperty.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/expr/RelativeNumericProperty.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/AbstractListItemPart.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/AbstractListItemPart.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/AbstractListItemPart.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/AbstractListItemPart.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/BasicLink.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/BasicLink.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/BasicLink.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/BasicLink.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/Block.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/Block.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/Block.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/Block.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/BlockContainer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/BlockContainer.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/BlockContainer.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/BlockContainer.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/Float.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/Float.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/Float.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/Float.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/Footnote.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/Footnote.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/Footnote.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/Footnote.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/Inline.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/Inline.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/Inline.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/Inline.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/ListBlock.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/ListBlock.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/ListBlock.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/ListBlock.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/ListItem.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/ListItem.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/ListItem.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/ListItem.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/MultiProperties.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/MultiProperties.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/MultiProperties.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/MultiProperties.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/MultiPropertySet.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/MultiPropertySet.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/MultiPropertySet.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/MultiPropertySet.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/MultiToggle.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/MultiToggle.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/MultiToggle.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/MultiToggle.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/Wrapper.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/Wrapper.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/Wrapper.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/Wrapper.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/table/CollapsingBorderResolver.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/table/CollapsingBorderResolver.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/table/CollapsingBorderResolver.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/table/CollapsingBorderResolver.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/table/FixedColRowGroupBuilder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/table/FixedColRowGroupBuilder.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/table/FixedColRowGroupBuilder.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/table/FixedColRowGroupBuilder.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/table/GridUnit.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/table/GridUnit.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/table/GridUnit.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/table/GridUnit.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/table/Table.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/table/Table.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/table/Table.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/table/Table.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/table/TableCaption.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/table/TableCaption.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/table/TableCaption.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/table/TableCaption.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/table/TableCell.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/table/TableCell.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/table/TableCell.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/table/TableCell.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/table/TableColumn.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/table/TableColumn.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/table/TableColumn.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/table/TableColumn.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/table/TablePart.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/table/TablePart.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/table/TablePart.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/flow/table/TablePart.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/pagination/AbstractPageSequence.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/pagination/AbstractPageSequence.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/pagination/AbstractPageSequence.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/pagination/AbstractPageSequence.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/pagination/Declarations.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/pagination/Declarations.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/pagination/Declarations.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/pagination/Declarations.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/pagination/Flow.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/pagination/Flow.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/pagination/Flow.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/pagination/Flow.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/pagination/PageNumberGenerator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/pagination/PageNumberGenerator.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/pagination/PageNumberGenerator.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/pagination/PageNumberGenerator.java Fri Jul 18 14:21:06 2014
@@ -21,8 +21,6 @@ package org.apache.fop.fo.pagination;
import org.apache.fop.complexscripts.util.NumberConverter;
-// CSOFF: LineLengthCheck
-
/**
* <p>This class uses the 'format', 'groupingSeparator', 'groupingSize',
* and 'letterValue' properties on fo:page-sequence to return a String
@@ -49,8 +47,10 @@ public class PageNumberGenerator {
* @param language (may be null or empty, which is treated as null)
* @param country (may be null or empty, which is treated as null)
*/
- public PageNumberGenerator(String format, int groupingSeparator, int groupingSize, int letterValue, String features, String language, String country) {
- this.converter = new NumberConverter(format, groupingSeparator, groupingSize, letterValue, features, language, country);
+ public PageNumberGenerator(String format, int groupingSeparator, int groupingSize,
+ int letterValue, String features, String language, String country) {
+ this.converter = new NumberConverter(format, groupingSeparator, groupingSize,
+ letterValue, features, language, country);
}
/**
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/pagination/PageSequence.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/pagination/PageSequence.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/pagination/PageSequence.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/pagination/PageSequence.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java Fri Jul 18 14:21:06 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/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/pagination/Root.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/pagination/Root.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/pagination/Root.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/fo/pagination/Root.java Fri Jul 18 14:21:06 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
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org