From c411c5fb578593a402c2e93eff73f17dd10dd819 Mon Sep 17 00:00:00 2001 From: Vincent Hennebert Date: Tue, 15 Jul 2014 20:25:58 +0000 Subject: Enabled Checkstyle ExplicitInitializationCheck and fixed resulting warnings That check had been agreed upon but left disabled because of the number of warnings too high to fix manually git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1610839 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/fop/afp/AFPGraphics2D.java | 10 ++++---- src/java/org/apache/fop/afp/AFPLineDataInfo.java | 2 +- src/java/org/apache/fop/afp/AFPPaintingState.java | 22 ++++++++--------- src/java/org/apache/fop/afp/AFPResourceInfo.java | 8 +++---- src/java/org/apache/fop/afp/AFPResourceLevel.java | 2 +- .../org/apache/fop/afp/AFPResourceManager.java | 2 +- src/java/org/apache/fop/afp/DataStream.java | 12 +++++----- src/java/org/apache/fop/afp/Factory.java | 28 +++++++++++----------- .../apache/fop/afp/fonts/AbstractOutlineFont.java | 2 +- .../apache/fop/afp/fonts/CharacterSetBuilder.java | 2 +- .../org/apache/fop/afp/fonts/FopCharacterSet.java | 2 +- src/java/org/apache/fop/afp/fonts/RasterFont.java | 2 +- .../apache/fop/afp/goca/AbstractGraphicsCoord.java | 4 ++-- .../AbstractGraphicsDrawingOrderContainer.java | 4 ++-- .../org/apache/fop/afp/goca/GraphicsAreaBegin.java | 2 +- src/java/org/apache/fop/afp/goca/GraphicsData.java | 2 +- .../apache/fop/afp/ioca/IDEStructureParameter.java | 4 ++-- .../org/apache/fop/afp/ioca/ImageCellPosition.java | 4 ++-- src/java/org/apache/fop/afp/ioca/ImageContent.java | 4 ++-- .../apache/fop/afp/ioca/ImageOutputControl.java | 6 ++--- src/java/org/apache/fop/afp/ioca/ImageSegment.java | 2 +- .../apache/fop/afp/ioca/ImageSizeParameter.java | 8 +++---- .../apache/fop/afp/modca/AbstractDataObject.java | 2 +- .../apache/fop/afp/modca/AbstractDescriptor.java | 8 +++---- .../fop/afp/modca/AbstractEnvironmentGroup.java | 2 +- .../fop/afp/modca/AbstractNamedAFPObject.java | 2 +- .../apache/fop/afp/modca/AbstractPageObject.java | 8 +++---- .../AbstractResourceEnvironmentGroupContainer.java | 2 +- .../afp/modca/AbstractResourceGroupContainer.java | 4 ++-- .../fop/afp/modca/ActiveEnvironmentGroup.java | 10 ++++---- .../org/apache/fop/afp/modca/GraphicsObject.java | 4 ++-- .../org/apache/fop/afp/modca/IMImageObject.java | 8 +++---- src/java/org/apache/fop/afp/modca/ImageObject.java | 2 +- .../org/apache/fop/afp/modca/IncludeObject.java | 4 ++-- .../apache/fop/afp/modca/IncludePageOverlay.java | 6 ++--- .../org/apache/fop/afp/modca/MapCodedFont.java | 2 +- .../org/apache/fop/afp/modca/MapPageOverlay.java | 2 +- .../org/apache/fop/afp/modca/MapPageSegment.java | 2 +- src/java/org/apache/fop/afp/modca/PageSegment.java | 2 +- .../afp/modca/PreprocessPresentationObject.java | 2 +- .../fop/afp/modca/PresentationTextObject.java | 4 ++-- src/java/org/apache/fop/afp/modca/Registry.java | 2 +- .../fop/afp/modca/ResourceEnvironmentGroup.java | 4 ++-- .../fop/afp/modca/StreamedResourceGroup.java | 4 ++-- .../org/apache/fop/afp/ptoca/PtocaBuilder.java | 6 ++--- .../org/apache/fop/afp/svg/AFPTextHandler.java | 2 +- .../apache/fop/afp/util/StructuredFieldReader.java | 2 +- 47 files changed, 115 insertions(+), 115 deletions(-) (limited to 'src/java/org/apache/fop/afp') diff --git a/src/java/org/apache/fop/afp/AFPGraphics2D.java b/src/java/org/apache/fop/afp/AFPGraphics2D.java index 937cf68b0..3fc70f3a4 100644 --- a/src/java/org/apache/fop/afp/AFPGraphics2D.java +++ b/src/java/org/apache/fop/afp/AFPGraphics2D.java @@ -93,22 +93,22 @@ public class AFPGraphics2D extends AbstractGraphics2D implements NativeImageHand private static final int Y3 = 5; /** graphics object */ - private GraphicsObject graphicsObj = null; + private GraphicsObject graphicsObj; /** Fallback text handler */ protected TextHandler fallbackTextHandler = new StrokingTextHandler(); /** Custom text handler */ - protected TextHandler customTextHandler = null; + protected TextHandler customTextHandler; /** AFP resource manager */ - private AFPResourceManager resourceManager = null; + private AFPResourceManager resourceManager; /** AFP resource info */ - private AFPResourceInfo resourceInfo = null; + private AFPResourceInfo resourceInfo; /** Current AFP state */ - private AFPPaintingState paintingState = null; + private AFPPaintingState paintingState; /** AFP graphics configuration */ private final GraphicsConfigurationWithTransparency graphicsConfig = new GraphicsConfigurationWithTransparency(); diff --git a/src/java/org/apache/fop/afp/AFPLineDataInfo.java b/src/java/org/apache/fop/afp/AFPLineDataInfo.java index 108b98596..a0fddb6db 100644 --- a/src/java/org/apache/fop/afp/AFPLineDataInfo.java +++ b/src/java/org/apache/fop/afp/AFPLineDataInfo.java @@ -43,7 +43,7 @@ public class AFPLineDataInfo { private Color color; /** the rotation */ - private int rotation = 0; + private int rotation; /** * Default constructor diff --git a/src/java/org/apache/fop/afp/AFPPaintingState.java b/src/java/org/apache/fop/afp/AFPPaintingState.java index ea2ebe475..74506aa7e 100644 --- a/src/java/org/apache/fop/afp/AFPPaintingState.java +++ b/src/java/org/apache/fop/afp/AFPPaintingState.java @@ -42,13 +42,13 @@ public class AFPPaintingState extends org.apache.fop.util.AbstractPaintingState private static Log log = LogFactory.getLog("org.apache.xmlgraphics.afp"); /** the portrait rotation */ - private int portraitRotation = 0; + private int portraitRotation; /** the landscape rotation */ private int landscapeRotation = 270; /** color image support */ - private boolean colorImages = false; + private boolean colorImages; /** dithering quality setting (0.0f..1.0f) */ private float ditheringQuality; @@ -63,9 +63,9 @@ public class AFPPaintingState extends org.apache.fop.util.AbstractPaintingState * true if certain image formats may be embedded unchanged in their native * format. */ - private boolean nativeImagesSupported = false; + private boolean nativeImagesSupported; - private boolean canEmbedJpeg = false; + private boolean canEmbedJpeg; /** * true if CMYK images (requires IOCA FS45 suppport on the target platform) @@ -88,7 +88,7 @@ public class AFPPaintingState extends org.apache.fop.util.AbstractPaintingState /** determines whether GOCA is enabled or disabled */ private boolean gocaEnabled = true; /** determines whether to stroke text in GOCA mode or to use text operators where possible */ - private boolean strokeGocaText = false; + private boolean strokeGocaText; /** use page segment with F11 and F45 images*/ @@ -600,19 +600,19 @@ public class AFPPaintingState extends org.apache.fop.util.AbstractPaintingState */ private class AFPPagePaintingState implements Cloneable { /** page width */ - private int width = 0; + private int width; /** page height */ - private int height = 0; + private int height; /** page fonts */ private AFPPageFonts fonts = new AFPPageFonts(); /** page font count */ - private int fontCount = 0; + private int fontCount; /** page orientation */ - private int orientation = 0; + private int orientation; /** * Returns the page width @@ -726,9 +726,9 @@ public class AFPPaintingState extends org.apache.fop.util.AbstractPaintingState private static final long serialVersionUID = -1789481244175275686L; /** The current fill status */ - private boolean filled = false; + private boolean filled; - private String imageUri = null; + private String imageUri; /** {@inheritDoc} */ @Override diff --git a/src/java/org/apache/fop/afp/AFPResourceInfo.java b/src/java/org/apache/fop/afp/AFPResourceInfo.java index bbd552c67..7cad51596 100644 --- a/src/java/org/apache/fop/afp/AFPResourceInfo.java +++ b/src/java/org/apache/fop/afp/AFPResourceInfo.java @@ -33,22 +33,22 @@ public class AFPResourceInfo { = new AFPResourceLevel(ResourceType.PRINT_FILE); /** the URI of this resource */ - private String uri = null; + private String uri; /** * the image dimension in page coordinates (non-null only when page segments are * generated because the cannot be scaled for painting). */ - private Dimension imageDimension = null; + private Dimension imageDimension; /** the reference name of this resource */ - private String name = null; + private String name; /** the resource level of this resource */ private AFPResourceLevel level = DEFAULT_LEVEL; /** true when the resource level was changed */ - private boolean levelChanged = false; + private boolean levelChanged; /** * Sets the data object URI. diff --git a/src/java/org/apache/fop/afp/AFPResourceLevel.java b/src/java/org/apache/fop/afp/AFPResourceLevel.java index d56763050..8516521bb 100644 --- a/src/java/org/apache/fop/afp/AFPResourceLevel.java +++ b/src/java/org/apache/fop/afp/AFPResourceLevel.java @@ -66,7 +66,7 @@ public class AFPResourceLevel { } } - private URI extUri = null; + private URI extUri; private final ResourceType resourceType; /** diff --git a/src/java/org/apache/fop/afp/AFPResourceManager.java b/src/java/org/apache/fop/afp/AFPResourceManager.java index 2eb0b5596..6fa4a17b7 100644 --- a/src/java/org/apache/fop/afp/AFPResourceManager.java +++ b/src/java/org/apache/fop/afp/AFPResourceManager.java @@ -65,7 +65,7 @@ public class AFPResourceManager { private final AFPDataObjectFactory dataObjectFactory; /** Maintain a reference count of instream objects for referencing purposes */ - private int instreamObjectCount = 0; + private int instreamObjectCount; /** Mapping of resourceInfo to AbstractCachedObject */ private final Map includeObjectCache diff --git a/src/java/org/apache/fop/afp/DataStream.java b/src/java/org/apache/fop/afp/DataStream.java index 272c000bd..e9e574a6f 100644 --- a/src/java/org/apache/fop/afp/DataStream.java +++ b/src/java/org/apache/fop/afp/DataStream.java @@ -68,22 +68,22 @@ public class DataStream { protected static final Log LOG = LogFactory.getLog("org.apache.xmlgraphics.afp"); /** Boolean completion indicator */ - private boolean complete = false; + private boolean complete; /** The AFP document object */ - private Document document = null; + private Document document; /** The current page group object */ - private PageGroup currentPageGroup = null; + private PageGroup currentPageGroup; /** The current page object */ - private PageObject currentPageObject = null; + private PageObject currentPageObject; /** The current overlay object */ - private Overlay currentOverlay = null; + private Overlay currentOverlay; /** The current page */ - private AbstractPageObject currentPage = null; + private AbstractPageObject currentPage; /** The MO:DCA interchange set in use (default to MO:DCA-P IS/2 set) */ private InterchangeSet interchangeSet diff --git a/src/java/org/apache/fop/afp/Factory.java b/src/java/org/apache/fop/afp/Factory.java index 279abcd34..9e54ed84f 100644 --- a/src/java/org/apache/fop/afp/Factory.java +++ b/src/java/org/apache/fop/afp/Factory.java @@ -97,46 +97,46 @@ public class Factory { /** the page group count */ - private int pageGroupCount = 0; + private int pageGroupCount; /** the page count */ - private int pageCount = 0; + private int pageCount; /** the image count */ - private int imageCount = 0; + private int imageCount; /** the im image count */ - private int imImageCount = 0; + private int imImageCount; /** the image segment count */ - private int imageSegmentCount = 0; + private int imageSegmentCount; /** the graphic count */ - private int graphicCount = 0; + private int graphicCount; /** the object container count */ - private int objectContainerCount = 0; + private int objectContainerCount; /** the resource count */ - private int resourceCount = 0; + private int resourceCount; /** the resource group count */ - private int resourceGroupCount = 0; + private int resourceGroupCount; /** the overlay count */ - private int overlayCount = 0; + private int overlayCount; /** the presentation text object count */ - private int textObjectCount = 0; + private int textObjectCount; /** the active environment group count */ - private int activeEnvironmentGroupCount = 0; + private int activeEnvironmentGroupCount; /** the document count */ - private int documentCount = 0; + private int documentCount; /** the object environment group count */ - private int objectEnvironmentGroupCount = 0; + private int objectEnvironmentGroupCount; /** * Main constructor diff --git a/src/java/org/apache/fop/afp/fonts/AbstractOutlineFont.java b/src/java/org/apache/fop/afp/fonts/AbstractOutlineFont.java index edbdf5e95..2eaedc0c3 100644 --- a/src/java/org/apache/fop/afp/fonts/AbstractOutlineFont.java +++ b/src/java/org/apache/fop/afp/fonts/AbstractOutlineFont.java @@ -29,7 +29,7 @@ import org.apache.fop.afp.AFPEventProducer; public abstract class AbstractOutlineFont extends AFPFont { /** The character set for this font */ - protected CharacterSet charSet = null; + protected CharacterSet charSet; private final AFPEventProducer eventProducer; diff --git a/src/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java b/src/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java index a3b2ab8ec..6f19c64d5 100644 --- a/src/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java +++ b/src/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java @@ -622,7 +622,7 @@ public abstract class CharacterSetBuilder { private int dpi; private int unitsPerEm; - private boolean isRelative = false; + private boolean isRelative; public int getDpi() { return dpi; diff --git a/src/java/org/apache/fop/afp/fonts/FopCharacterSet.java b/src/java/org/apache/fop/afp/fonts/FopCharacterSet.java index b729a8995..b1210c6c1 100644 --- a/src/java/org/apache/fop/afp/fonts/FopCharacterSet.java +++ b/src/java/org/apache/fop/afp/fonts/FopCharacterSet.java @@ -31,7 +31,7 @@ import org.apache.fop.fonts.Typeface; public class FopCharacterSet extends CharacterSet { /** The character set for this font */ - private Typeface charSet = null; + private Typeface charSet; /** * Constructor for the CharacterSetMetric object, the character set is used diff --git a/src/java/org/apache/fop/afp/fonts/RasterFont.java b/src/java/org/apache/fop/afp/fonts/RasterFont.java index 1fd30e0ba..7a5107d04 100644 --- a/src/java/org/apache/fop/afp/fonts/RasterFont.java +++ b/src/java/org/apache/fop/afp/fonts/RasterFont.java @@ -43,7 +43,7 @@ public class RasterFont extends AFPFont { private final SortedMap charSets = new TreeMap(); private Map substitutionCharSets; - private CharacterSet charSet = null; + private CharacterSet charSet; /** * Constructor for the raster font requires the name, weight and style diff --git a/src/java/org/apache/fop/afp/goca/AbstractGraphicsCoord.java b/src/java/org/apache/fop/afp/goca/AbstractGraphicsCoord.java index 6f91e5809..01333f367 100644 --- a/src/java/org/apache/fop/afp/goca/AbstractGraphicsCoord.java +++ b/src/java/org/apache/fop/afp/goca/AbstractGraphicsCoord.java @@ -30,10 +30,10 @@ import org.apache.fop.afp.util.BinaryUtils; public abstract class AbstractGraphicsCoord extends AbstractGraphicsDrawingOrder { /** array of x/y coordinates */ - protected int[] coords = null; + protected int[] coords; /** if true, then uses relative drawing order */ - protected boolean relative = false; + protected boolean relative; /** * Constructor diff --git a/src/java/org/apache/fop/afp/goca/AbstractGraphicsDrawingOrderContainer.java b/src/java/org/apache/fop/afp/goca/AbstractGraphicsDrawingOrderContainer.java index a158fbe8f..5bd05fd4b 100644 --- a/src/java/org/apache/fop/afp/goca/AbstractGraphicsDrawingOrderContainer.java +++ b/src/java/org/apache/fop/afp/goca/AbstractGraphicsDrawingOrderContainer.java @@ -41,10 +41,10 @@ implements StructuredData, Completable, Startable { = new java.util.ArrayList/**/(); /** object is complete */ - private boolean complete = false; + private boolean complete; /** object has started */ - private boolean started = false; + private boolean started; /** * Default constructor diff --git a/src/java/org/apache/fop/afp/goca/GraphicsAreaBegin.java b/src/java/org/apache/fop/afp/goca/GraphicsAreaBegin.java index 7f569f233..19a5a8f2d 100644 --- a/src/java/org/apache/fop/afp/goca/GraphicsAreaBegin.java +++ b/src/java/org/apache/fop/afp/goca/GraphicsAreaBegin.java @@ -32,7 +32,7 @@ public class GraphicsAreaBegin extends AbstractGraphicsDrawingOrder { private static final int NO_BOUNDARY = 0; /** draw boundary lines around this area */ - private boolean drawBoundary = false; + private boolean drawBoundary; /** * Sets whether boundary lines are drawn diff --git a/src/java/org/apache/fop/afp/goca/GraphicsData.java b/src/java/org/apache/fop/afp/goca/GraphicsData.java index aa64c23c4..ed406b06e 100644 --- a/src/java/org/apache/fop/afp/goca/GraphicsData.java +++ b/src/java/org/apache/fop/afp/goca/GraphicsData.java @@ -36,7 +36,7 @@ public final class GraphicsData extends AbstractGraphicsDrawingOrderContainer { //+16 to avoid unnecessary, practically empty GraphicsData instances. /** the graphics segment */ - private GraphicsChainedSegment currentSegment = null; + private GraphicsChainedSegment currentSegment; private boolean segmentedData; diff --git a/src/java/org/apache/fop/afp/ioca/IDEStructureParameter.java b/src/java/org/apache/fop/afp/ioca/IDEStructureParameter.java index 9bcdeda88..ba616def4 100644 --- a/src/java/org/apache/fop/afp/ioca/IDEStructureParameter.java +++ b/src/java/org/apache/fop/afp/ioca/IDEStructureParameter.java @@ -40,10 +40,10 @@ public class IDEStructureParameter implements Streamable { public static final byte COLOR_MODEL_YCBCR = (byte)0x12; /** additive/subtractive setting for ASFLAG */ - private boolean subtractive = false; + private boolean subtractive; /** setting for GRAYCODE flag */ - private boolean grayCoding = false; + private boolean grayCoding; /** the image color model */ private byte colorModel = COLOR_MODEL_RGB; diff --git a/src/java/org/apache/fop/afp/ioca/ImageCellPosition.java b/src/java/org/apache/fop/afp/ioca/ImageCellPosition.java index 6de100245..216d8bcd5 100644 --- a/src/java/org/apache/fop/afp/ioca/ImageCellPosition.java +++ b/src/java/org/apache/fop/afp/ioca/ImageCellPosition.java @@ -32,10 +32,10 @@ import org.apache.fop.afp.util.BinaryUtils; public class ImageCellPosition extends AbstractAFPObject { /** offset of image cell in X direction */ - private int xOffset = 0; + private int xOffset; /** offset of image cell in Y direction */ - private int yOffset = 0; + private int yOffset; /** size of image cell in X direction */ private final byte[] xSize = new byte[] {(byte)0xFF, (byte)0xFF}; diff --git a/src/java/org/apache/fop/afp/ioca/ImageContent.java b/src/java/org/apache/fop/afp/ioca/ImageContent.java index 81b260bd4..f5dac7b33 100644 --- a/src/java/org/apache/fop/afp/ioca/ImageContent.java +++ b/src/java/org/apache/fop/afp/ioca/ImageContent.java @@ -57,10 +57,10 @@ public class ImageContent extends AbstractStructuredObject { public static final byte COMPID_JPEG = (byte)0x83; /** the image size parameter */ - private ImageSizeParameter imageSizeParameter = null; + private ImageSizeParameter imageSizeParameter; /** the IDE Structure parameter */ - private IDEStructureParameter ideStructureParameter = null; + private IDEStructureParameter ideStructureParameter; /** the image encoding */ private byte encoding = (byte)0x03; diff --git a/src/java/org/apache/fop/afp/ioca/ImageOutputControl.java b/src/java/org/apache/fop/afp/ioca/ImageOutputControl.java index 7ea84dfad..8e7ff750c 100644 --- a/src/java/org/apache/fop/afp/ioca/ImageOutputControl.java +++ b/src/java/org/apache/fop/afp/ioca/ImageOutputControl.java @@ -34,19 +34,19 @@ import org.apache.fop.afp.util.BinaryUtils; public class ImageOutputControl extends AbstractAFPObject { /** the orientation of the image */ - private int orientation = 0; + private int orientation; /** * Specifies the offset, along the X-axis, of the IM image object area * origin to the origin of the including page */ - private int xCoord = 0; + private int xCoord; /** * Specifies the offset, along the Y-axis, of the IM image object area * origin to the origin of the including page */ - private int yCoord = 0; + private int yCoord; /** map an image point to a single presentation device */ private boolean singlePoint = true; diff --git a/src/java/org/apache/fop/afp/ioca/ImageSegment.java b/src/java/org/apache/fop/afp/ioca/ImageSegment.java index 9965bb94a..a0d98f501 100644 --- a/src/java/org/apache/fop/afp/ioca/ImageSegment.java +++ b/src/java/org/apache/fop/afp/ioca/ImageSegment.java @@ -40,7 +40,7 @@ public class ImageSegment extends AbstractNamedAFPObject { /** * The ImageContent for the image segment */ - private ImageContent imageContent = null; + private ImageContent imageContent; private final Factory factory; diff --git a/src/java/org/apache/fop/afp/ioca/ImageSizeParameter.java b/src/java/org/apache/fop/afp/ioca/ImageSizeParameter.java index 38e7d9e56..6700462ec 100644 --- a/src/java/org/apache/fop/afp/ioca/ImageSizeParameter.java +++ b/src/java/org/apache/fop/afp/ioca/ImageSizeParameter.java @@ -30,10 +30,10 @@ import org.apache.fop.afp.util.BinaryUtils; */ public class ImageSizeParameter extends AbstractAFPObject { - private int hSize = 0; - private int vSize = 0; - private int hRes = 0; - private int vRes = 0; + private int hSize; + private int vSize; + private int hRes; + private int vRes; /** * Constructor for a ImageSizeParameter for the specified diff --git a/src/java/org/apache/fop/afp/modca/AbstractDataObject.java b/src/java/org/apache/fop/afp/modca/AbstractDataObject.java index a8bf09998..db4bf23a1 100644 --- a/src/java/org/apache/fop/afp/modca/AbstractDataObject.java +++ b/src/java/org/apache/fop/afp/modca/AbstractDataObject.java @@ -38,7 +38,7 @@ public abstract class AbstractDataObject extends AbstractNamedAFPObject implements Startable, Completable { /** the object environment group */ - protected ObjectEnvironmentGroup objectEnvironmentGroup = null; + protected ObjectEnvironmentGroup objectEnvironmentGroup; /** the object factory */ protected final Factory factory; diff --git a/src/java/org/apache/fop/afp/modca/AbstractDescriptor.java b/src/java/org/apache/fop/afp/modca/AbstractDescriptor.java index 8344bf0d1..0b87f45fc 100644 --- a/src/java/org/apache/fop/afp/modca/AbstractDescriptor.java +++ b/src/java/org/apache/fop/afp/modca/AbstractDescriptor.java @@ -25,13 +25,13 @@ package org.apache.fop.afp.modca; public abstract class AbstractDescriptor extends AbstractTripletStructuredObject { /** width of this descriptor */ - protected int width = 0; + protected int width; /** height of this descriptor */ - protected int height = 0; + protected int height; /** width resolution of this descriptor */ - protected int widthRes = 0; + protected int widthRes; /** height resolution of this descriptor */ - protected int heightRes = 0; + protected int heightRes; /** * Default constructor diff --git a/src/java/org/apache/fop/afp/modca/AbstractEnvironmentGroup.java b/src/java/org/apache/fop/afp/modca/AbstractEnvironmentGroup.java index d06311a47..6b193c072 100644 --- a/src/java/org/apache/fop/afp/modca/AbstractEnvironmentGroup.java +++ b/src/java/org/apache/fop/afp/modca/AbstractEnvironmentGroup.java @@ -33,7 +33,7 @@ public abstract class AbstractEnvironmentGroup extends AbstractNamedAFPObject { protected final List mapDataResources = null; /** the collection of MapPageOverlay objects */ - protected List mapPageOverlays = null; + protected List mapPageOverlays; /** * Main constructor diff --git a/src/java/org/apache/fop/afp/modca/AbstractNamedAFPObject.java b/src/java/org/apache/fop/afp/modca/AbstractNamedAFPObject.java index 83c720e58..0d1b7bc7e 100644 --- a/src/java/org/apache/fop/afp/modca/AbstractNamedAFPObject.java +++ b/src/java/org/apache/fop/afp/modca/AbstractNamedAFPObject.java @@ -34,7 +34,7 @@ public abstract class AbstractNamedAFPObject extends AbstractTripletStructuredOb /** * The actual name of the object */ - protected String name = null; + protected String name; /** * Default constructor diff --git a/src/java/org/apache/fop/afp/modca/AbstractPageObject.java b/src/java/org/apache/fop/afp/modca/AbstractPageObject.java index f429af28d..575697790 100644 --- a/src/java/org/apache/fop/afp/modca/AbstractPageObject.java +++ b/src/java/org/apache/fop/afp/modca/AbstractPageObject.java @@ -52,10 +52,10 @@ import org.apache.fop.afp.ptoca.PtocaProducer; public abstract class AbstractPageObject extends AbstractNamedAFPObject implements Completable { /** The active environment group for the page */ - protected ActiveEnvironmentGroup activeEnvironmentGroup = null; + protected ActiveEnvironmentGroup activeEnvironmentGroup; /** The current presentation text object */ - private PresentationTextObject currentPresentationTextObject = null; + private PresentationTextObject currentPresentationTextObject; /** The list of objects within this resource container */ protected List/**/ objects = new java.util.ArrayList(); @@ -67,10 +67,10 @@ public abstract class AbstractPageObject extends AbstractNamedAFPObject implemen private int height; /** The page rotation */ - protected int rotation = 0; + protected int rotation; /** The page state */ - protected boolean complete = false; + protected boolean complete; /** The width resolution */ private int widthRes; diff --git a/src/java/org/apache/fop/afp/modca/AbstractResourceEnvironmentGroupContainer.java b/src/java/org/apache/fop/afp/modca/AbstractResourceEnvironmentGroupContainer.java index 1319b3cdb..6e753b1e0 100644 --- a/src/java/org/apache/fop/afp/modca/AbstractResourceEnvironmentGroupContainer.java +++ b/src/java/org/apache/fop/afp/modca/AbstractResourceEnvironmentGroupContainer.java @@ -35,7 +35,7 @@ public abstract class AbstractResourceEnvironmentGroupContainer /** * The resource environment group used to store complex resources */ - protected ResourceEnvironmentGroup resourceEnvironmentGroup = null; + protected ResourceEnvironmentGroup resourceEnvironmentGroup; /** * Main constructor diff --git a/src/java/org/apache/fop/afp/modca/AbstractResourceGroupContainer.java b/src/java/org/apache/fop/afp/modca/AbstractResourceGroupContainer.java index 45499748c..f52ede652 100644 --- a/src/java/org/apache/fop/afp/modca/AbstractResourceGroupContainer.java +++ b/src/java/org/apache/fop/afp/modca/AbstractResourceGroupContainer.java @@ -36,10 +36,10 @@ public abstract class AbstractResourceGroupContainer extends AbstractPageObject implements Streamable { /** The container started state */ - protected boolean started = false; + protected boolean started; /** the resource group object */ - protected ResourceGroup resourceGroup = null; + protected ResourceGroup resourceGroup; /** * Default constructor diff --git a/src/java/org/apache/fop/afp/modca/ActiveEnvironmentGroup.java b/src/java/org/apache/fop/afp/modca/ActiveEnvironmentGroup.java index 97954b9de..05f48b47c 100644 --- a/src/java/org/apache/fop/afp/modca/ActiveEnvironmentGroup.java +++ b/src/java/org/apache/fop/afp/modca/ActiveEnvironmentGroup.java @@ -46,19 +46,19 @@ public final class ActiveEnvironmentGroup extends AbstractEnvironmentGroup { = new java.util.ArrayList/**/(); /** the collection of MapPageSegments objects */ - private List mapPageSegments = null; + private List mapPageSegments; /** the Object Area Descriptor for the active environment group */ - private ObjectAreaDescriptor objectAreaDescriptor = null; + private ObjectAreaDescriptor objectAreaDescriptor; /** the Object Area Position for the active environment group */ - private ObjectAreaPosition objectAreaPosition = null; + private ObjectAreaPosition objectAreaPosition; /** the PresentationTextDescriptor for the active environment group */ - private PresentationTextDescriptor presentationTextDataDescriptor = null; + private PresentationTextDescriptor presentationTextDataDescriptor; /** the PageDescriptor for the active environment group */ - private PageDescriptor pageDescriptor = null; + private PageDescriptor pageDescriptor; /** the resource manager */ private final Factory factory; diff --git a/src/java/org/apache/fop/afp/modca/GraphicsObject.java b/src/java/org/apache/fop/afp/modca/GraphicsObject.java index 79aa3147b..434d4f838 100644 --- a/src/java/org/apache/fop/afp/modca/GraphicsObject.java +++ b/src/java/org/apache/fop/afp/modca/GraphicsObject.java @@ -62,7 +62,7 @@ import org.apache.fop.afp.goca.GraphicsSetProcessColor; public class GraphicsObject extends AbstractDataObject { /** the graphics data */ - private GraphicsData currentData = null; + private GraphicsData currentData; /** list of objects contained within this container */ protected List objects @@ -73,7 +73,7 @@ public class GraphicsObject extends AbstractDataObject { /** color converter */ - private ColorConverter colorConverter = null; + private ColorConverter colorConverter; /** * Default constructor diff --git a/src/java/org/apache/fop/afp/modca/IMImageObject.java b/src/java/org/apache/fop/afp/modca/IMImageObject.java index a09042441..cf9363f33 100644 --- a/src/java/org/apache/fop/afp/modca/IMImageObject.java +++ b/src/java/org/apache/fop/afp/modca/IMImageObject.java @@ -45,22 +45,22 @@ public class IMImageObject extends AbstractNamedAFPObject { /** * The image output control */ - private ImageOutputControl imageOutputControl = null; + private ImageOutputControl imageOutputControl; /** * The image input descriptor */ - private ImageInputDescriptor imageInputDescriptor = null; + private ImageInputDescriptor imageInputDescriptor; /** * The image cell position */ - private ImageCellPosition imageCellPosition = null; + private ImageCellPosition imageCellPosition; /** * The image rastor data */ - private ImageRasterData imageRasterData = null; + private ImageRasterData imageRasterData; /** * Constructor for the image object with the specified name, diff --git a/src/java/org/apache/fop/afp/modca/ImageObject.java b/src/java/org/apache/fop/afp/modca/ImageObject.java index e42639248..610eacb08 100644 --- a/src/java/org/apache/fop/afp/modca/ImageObject.java +++ b/src/java/org/apache/fop/afp/modca/ImageObject.java @@ -39,7 +39,7 @@ public class ImageObject extends AbstractDataObject { private static final int MAX_DATA_LEN = 8192; /** the image segment */ - private ImageSegment imageSegment = null; + private ImageSegment imageSegment; /** * Constructor for the image object with the specified name, diff --git a/src/java/org/apache/fop/afp/modca/IncludeObject.java b/src/java/org/apache/fop/afp/modca/IncludeObject.java index 4dca1b357..90b8ad664 100644 --- a/src/java/org/apache/fop/afp/modca/IncludeObject.java +++ b/src/java/org/apache/fop/afp/modca/IncludeObject.java @@ -61,10 +61,10 @@ public class IncludeObject extends AbstractNamedAFPObject { private byte objectType = TYPE_OTHER; /** the X-axis origin of the object area */ - private int xoaOset = 0; + private int xoaOset; /** the Y-axis origin of the object area */ - private int yoaOset = 0; + private int yoaOset; /** the orientation of the referenced object */ private AxisOrientation oaOrent = AxisOrientation.RIGHT_HANDED_0; diff --git a/src/java/org/apache/fop/afp/modca/IncludePageOverlay.java b/src/java/org/apache/fop/afp/modca/IncludePageOverlay.java index 4806050cf..a45eba3ed 100644 --- a/src/java/org/apache/fop/afp/modca/IncludePageOverlay.java +++ b/src/java/org/apache/fop/afp/modca/IncludePageOverlay.java @@ -42,17 +42,17 @@ public class IncludePageOverlay extends AbstractNamedAFPObject { /** * The x coordinate */ - private int x = 0; + private int x; /** * The y coordinate */ - private int y = 0; + private int y; /** * The orientation */ - private int orientation = 0; + private int orientation; /** * Constructor for the Include Page Overlay diff --git a/src/java/org/apache/fop/afp/modca/MapCodedFont.java b/src/java/org/apache/fop/afp/modca/MapCodedFont.java index 69d8ccf31..38533652c 100644 --- a/src/java/org/apache/fop/afp/modca/MapCodedFont.java +++ b/src/java/org/apache/fop/afp/modca/MapCodedFont.java @@ -292,7 +292,7 @@ public class MapCodedFont extends AbstractStructuredObject { /** * The scale (only specified for outline fonts) */ - private int scale = 0; + private int scale; } } diff --git a/src/java/org/apache/fop/afp/modca/MapPageOverlay.java b/src/java/org/apache/fop/afp/modca/MapPageOverlay.java index 8b689de71..cde2e031d 100644 --- a/src/java/org/apache/fop/afp/modca/MapPageOverlay.java +++ b/src/java/org/apache/fop/afp/modca/MapPageOverlay.java @@ -39,7 +39,7 @@ public class MapPageOverlay extends AbstractAFPObject { /** * The collection of overlays (maximum of 254 stored as byte[]) */ - private List overLays = null; + private List overLays; /** * Constructor for the Map Page Overlay diff --git a/src/java/org/apache/fop/afp/modca/MapPageSegment.java b/src/java/org/apache/fop/afp/modca/MapPageSegment.java index 5ea533c6b..81d6f4724 100644 --- a/src/java/org/apache/fop/afp/modca/MapPageSegment.java +++ b/src/java/org/apache/fop/afp/modca/MapPageSegment.java @@ -39,7 +39,7 @@ public class MapPageSegment extends AbstractAFPObject { /** * The collection of page segments (maximum of 127 stored as String) */ - private Set pageSegments = null; + private Set pageSegments; /** * Constructor for the Map Page Overlay diff --git a/src/java/org/apache/fop/afp/modca/PageSegment.java b/src/java/org/apache/fop/afp/modca/PageSegment.java index 333608d7f..50c3a642c 100644 --- a/src/java/org/apache/fop/afp/modca/PageSegment.java +++ b/src/java/org/apache/fop/afp/modca/PageSegment.java @@ -31,7 +31,7 @@ import java.util.List; */ public class PageSegment extends AbstractNamedAFPObject { - private List/**/ objects = null; + private List/**/ objects; /** * Main constructor diff --git a/src/java/org/apache/fop/afp/modca/PreprocessPresentationObject.java b/src/java/org/apache/fop/afp/modca/PreprocessPresentationObject.java index a7ce0ea0b..db0bac905 100644 --- a/src/java/org/apache/fop/afp/modca/PreprocessPresentationObject.java +++ b/src/java/org/apache/fop/afp/modca/PreprocessPresentationObject.java @@ -35,7 +35,7 @@ public class PreprocessPresentationObject extends AbstractTripletStructuredObjec private static final byte TYPE_IMAGE = (byte)0xFB; private byte objType = TYPE_OTHER; - private byte objOrent = 0; // object always processed at 0 degree orientation + private byte objOrent; // object always processed at 0 degree orientation private int objXOffset = -1; private int objYOffset = -1; diff --git a/src/java/org/apache/fop/afp/modca/PresentationTextObject.java b/src/java/org/apache/fop/afp/modca/PresentationTextObject.java index f3b562d98..f4d4d93ed 100644 --- a/src/java/org/apache/fop/afp/modca/PresentationTextObject.java +++ b/src/java/org/apache/fop/afp/modca/PresentationTextObject.java @@ -53,12 +53,12 @@ public class PresentationTextObject extends AbstractNamedAFPObject { /** * The current presentation text data */ - private PresentationTextData currentPresentationTextData = null; + private PresentationTextData currentPresentationTextData; /** * The presentation text data list */ - private List/**/ presentationTextDataList = null; + private List/**/ presentationTextDataList; private PtocaBuilder builder = new DefaultBuilder(); diff --git a/src/java/org/apache/fop/afp/modca/Registry.java b/src/java/org/apache/fop/afp/modca/Registry.java index 64afce3b5..50aaca32c 100644 --- a/src/java/org/apache/fop/afp/modca/Registry.java +++ b/src/java/org/apache/fop/afp/modca/Registry.java @@ -48,7 +48,7 @@ public final class Registry { = Collections.synchronizedMap(new HashMap()); /** singleton instance */ - private static Registry instance = null; + private static Registry instance; /** * Returns a single instance of a MO:DCA Registry diff --git a/src/java/org/apache/fop/afp/modca/ResourceEnvironmentGroup.java b/src/java/org/apache/fop/afp/modca/ResourceEnvironmentGroup.java index 3f9258741..db9b5e1c9 100644 --- a/src/java/org/apache/fop/afp/modca/ResourceEnvironmentGroup.java +++ b/src/java/org/apache/fop/afp/modca/ResourceEnvironmentGroup.java @@ -35,10 +35,10 @@ public class ResourceEnvironmentGroup extends AbstractEnvironmentGroup implement private static final String DEFAULT_NAME = "REG00001"; /** the pre-process presentation objects contained in this resource environment group */ - private List/**/ preProcessPresentationObjects = null; + private List/**/ preProcessPresentationObjects; /** the resource environment group state */ - private boolean complete = false; + private boolean complete; /** * Default constructor diff --git a/src/java/org/apache/fop/afp/modca/StreamedResourceGroup.java b/src/java/org/apache/fop/afp/modca/StreamedResourceGroup.java index c79ffe299..ed9c82194 100644 --- a/src/java/org/apache/fop/afp/modca/StreamedResourceGroup.java +++ b/src/java/org/apache/fop/afp/modca/StreamedResourceGroup.java @@ -31,9 +31,9 @@ public class StreamedResourceGroup extends ResourceGroup implements Completable /** the outputstream to write to */ private final OutputStream os; - private boolean started = false; + private boolean started; - private boolean complete = false; + private boolean complete; /** * Main constructor diff --git a/src/java/org/apache/fop/afp/ptoca/PtocaBuilder.java b/src/java/org/apache/fop/afp/ptoca/PtocaBuilder.java index befd2cc1a..d6bd65609 100644 --- a/src/java/org/apache/fop/afp/ptoca/PtocaBuilder.java +++ b/src/java/org/apache/fop/afp/ptoca/PtocaBuilder.java @@ -51,16 +51,16 @@ public abstract class PtocaBuilder implements PtocaConstants { 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; /** diff --git a/src/java/org/apache/fop/afp/svg/AFPTextHandler.java b/src/java/org/apache/fop/afp/svg/AFPTextHandler.java index e8e391bdb..00831c985 100644 --- a/src/java/org/apache/fop/afp/svg/AFPTextHandler.java +++ b/src/java/org/apache/fop/afp/svg/AFPTextHandler.java @@ -48,7 +48,7 @@ public class AFPTextHandler extends FOPTextHandlerAdapter { private static Log log = LogFactory.getLog(AFPTextHandler.class); /** Overriding FontState */ - protected Font overrideFont = null; + protected Font overrideFont; /** Font information */ private final FontInfo fontInfo; diff --git a/src/java/org/apache/fop/afp/util/StructuredFieldReader.java b/src/java/org/apache/fop/afp/util/StructuredFieldReader.java index 1fc6d8369..b20e1579f 100644 --- a/src/java/org/apache/fop/afp/util/StructuredFieldReader.java +++ b/src/java/org/apache/fop/afp/util/StructuredFieldReader.java @@ -43,7 +43,7 @@ public class StructuredFieldReader { /** * The input stream to read */ - private InputStream inputStream = null; + private InputStream inputStream; /** * The constructor for the StructuredFieldReader -- cgit v1.2.3