git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/FOP-2393_gradient-rendering@1611658 13f79535-47bb-0310-9956-ffa450edef68tags/fop-2_0
@@ -100,7 +100,7 @@ | |||
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... --> | |||
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... --> | |||
<!-- <module name="ExplicitInitialization"/> produces 795 new errors --> | |||
<module name="ExplicitInitialization"/> | |||
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... --> | |||
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... --> |
@@ -6009,4 +6009,11 @@ | |||
<Method name="hasValueOfElementName"/> | |||
<Bug pattern="RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE"/> | |||
</Match> | |||
<Match> | |||
<Class name="org.apache.fop.pdf.PDFCFFStream"/> | |||
<Or> | |||
<Bug pattern="EI_EXPOSE_REP"/> | |||
<Bug pattern="EI_EXPOSE_REP2"/> | |||
</Or> | |||
</Match> | |||
</FindBugsFilter> |
@@ -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(); |
@@ -43,7 +43,7 @@ public class AFPLineDataInfo { | |||
private Color color; | |||
/** the rotation */ | |||
private int rotation = 0; | |||
private int rotation; | |||
/** | |||
* Default constructor |
@@ -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 |
@@ -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. |
@@ -66,7 +66,7 @@ public class AFPResourceLevel { | |||
} | |||
} | |||
private URI extUri = null; | |||
private URI extUri; | |||
private final ResourceType resourceType; | |||
/** |
@@ -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<AFPResourceInfo, AbstractCachedObject> includeObjectCache |
@@ -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 |
@@ -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 |
@@ -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; | |||
@@ -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; |
@@ -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 |
@@ -43,7 +43,7 @@ public class RasterFont extends AFPFont { | |||
private final SortedMap<Integer, CharacterSet> charSets = new TreeMap<Integer, CharacterSet>(); | |||
private Map<Integer, CharacterSet> substitutionCharSets; | |||
private CharacterSet charSet = null; | |||
private CharacterSet charSet; | |||
/** | |||
* Constructor for the raster font requires the name, weight and style |
@@ -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 |
@@ -41,10 +41,10 @@ implements StructuredData, Completable, Startable { | |||
= new java.util.ArrayList/*<StructuredDataObject>*/(); | |||
/** object is complete */ | |||
private boolean complete = false; | |||
private boolean complete; | |||
/** object has started */ | |||
private boolean started = false; | |||
private boolean started; | |||
/** | |||
* Default constructor |
@@ -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 |
@@ -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; | |||
@@ -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; |
@@ -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}; |
@@ -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; |
@@ -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; |
@@ -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; | |||
@@ -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 |
@@ -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; |
@@ -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 |
@@ -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 |
@@ -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 |
@@ -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/*<AbstractStructuredObject>*/ 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; |
@@ -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 |
@@ -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 |
@@ -46,19 +46,19 @@ public final class ActiveEnvironmentGroup extends AbstractEnvironmentGroup { | |||
= new java.util.ArrayList/*<MapCodedFonts>*/(); | |||
/** 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; |
@@ -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<GraphicsData> objects | |||
@@ -73,7 +73,7 @@ public class GraphicsObject extends AbstractDataObject { | |||
/** color converter */ | |||
private ColorConverter colorConverter = null; | |||
private ColorConverter colorConverter; | |||
/** | |||
* Default constructor |
@@ -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, |
@@ -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, |
@@ -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; |
@@ -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 |
@@ -292,7 +292,7 @@ public class MapCodedFont extends AbstractStructuredObject { | |||
/** | |||
* The scale (only specified for outline fonts) | |||
*/ | |||
private int scale = 0; | |||
private int scale; | |||
} | |||
} |
@@ -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 |
@@ -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 |
@@ -31,7 +31,7 @@ import java.util.List; | |||
*/ | |||
public class PageSegment extends AbstractNamedAFPObject { | |||
private List/*<AbstractAFPObject>*/ objects = null; | |||
private List/*<AbstractAFPObject>*/ objects; | |||
/** | |||
* Main constructor |
@@ -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; | |||
@@ -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/*<PresentationTextData>*/ presentationTextDataList = null; | |||
private List/*<PresentationTextData>*/ presentationTextDataList; | |||
private PtocaBuilder builder = new DefaultBuilder(); | |||
@@ -48,7 +48,7 @@ public final class Registry { | |||
= Collections.synchronizedMap(new HashMap<String, ObjectType>()); | |||
/** singleton instance */ | |||
private static Registry instance = null; | |||
private static Registry instance; | |||
/** | |||
* Returns a single instance of a MO:DCA Registry |
@@ -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/*<PreprocessPresentationObject>*/ preProcessPresentationObjects = null; | |||
private List/*<PreprocessPresentationObject>*/ preProcessPresentationObjects; | |||
/** the resource environment group state */ | |||
private boolean complete = false; | |||
private boolean complete; | |||
/** | |||
* Default constructor |
@@ -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 |
@@ -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; | |||
/** |
@@ -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; |
@@ -43,7 +43,7 @@ public class StructuredFieldReader { | |||
/** | |||
* The input stream to read | |||
*/ | |||
private InputStream inputStream = null; | |||
private InputStream inputStream; | |||
/** | |||
* The constructor for the StructuredFieldReader |
@@ -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; | |||
@@ -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 |
@@ -103,7 +103,7 @@ public final class FopFactory implements ImageContext { | |||
/** | |||
* 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 |
@@ -28,8 +28,8 @@ import org.apache.fop.fo.pagination.AbstractPageSequence; | |||
*/ | |||
public class FormattingResults { | |||
private int pageCount = 0; | |||
private List pageSequences = null; | |||
private int pageCount; | |||
private List pageSequences; | |||
/** | |||
* Constructor for the FormattingResults object |
@@ -65,7 +65,7 @@ public class AreaTreeHandler extends FOEventHandler { | |||
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 FOEventHandler { | |||
private TopLevelLayoutManager prevPageSeqLM; | |||
private int idGen = 0; | |||
private int idGen; | |||
/** | |||
* Constructor. |
@@ -37,8 +37,8 @@ import org.apache.commons.logging.LogFactory; | |||
* 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; |
@@ -35,10 +35,10 @@ import org.apache.fop.fo.extensions.ExtensionAttachment; | |||
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 { |
@@ -30,7 +30,7 @@ public class BeforeFloat extends BlockParent { | |||
// 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. |
@@ -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 |
@@ -31,7 +31,7 @@ public class BlockViewport extends Block implements Viewport { | |||
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; | |||
@@ -35,7 +35,7 @@ public class BookmarkData extends AbstractOffDocumentItem implements Resolvable | |||
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 AbstractOffDocumentItem implements Resolvable | |||
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 |
@@ -34,7 +34,7 @@ public class DestinationData extends AbstractOffDocumentItem implements Resolvab | |||
private String[] idRefs; | |||
// PageViewport that the idRef item refers to | |||
private PageViewport pageRef = null; | |||
private PageViewport pageRef; | |||
/** | |||
* Create a new pdf destination data object. |
@@ -30,7 +30,7 @@ public class Footnote extends BlockParent { | |||
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 |
@@ -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 |
@@ -30,10 +30,10 @@ public class LinkResolver implements Resolvable, Serializable { | |||
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. |
@@ -59,17 +59,17 @@ public class Page extends AreaTreeObject implements Serializable { | |||
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 |
@@ -62,7 +62,7 @@ public class PageViewport extends AreaTreeObject implements Resolvable { | |||
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 AreaTreeObject implements Resolvable { | |||
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; | |||
@@ -39,7 +39,7 @@ public class RegionViewport extends Area implements Viewport { | |||
// 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 |
@@ -491,13 +491,13 @@ public final class Trait implements Serializable { | |||
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; |
@@ -39,7 +39,7 @@ public abstract class AbstractTextArea extends InlineParent { | |||
* 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 extends InlineParent { | |||
} | |||
} | |||
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 |
@@ -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. |
@@ -35,7 +35,7 @@ public class InlineBlockParent extends InlineArea { | |||
/** | |||
* 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. |
@@ -40,7 +40,7 @@ public class InlineViewport extends InlineArea implements Viewport { | |||
// 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; | |||
@@ -36,7 +36,7 @@ public class UnresolvedPageNumber extends TextArea implements Resolvable { | |||
private static final long serialVersionUID = -1758090835371647980L; | |||
private boolean resolved = false; | |||
private boolean resolved; | |||
private String pageIDRef; | |||
private String text; | |||
private boolean pageType; |
@@ -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(); | |||
@@ -64,8 +64,8 @@ public class InputHandler implements ErrorListener, Renderable { | |||
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); |
@@ -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. |
@@ -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; |
@@ -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 |
@@ -47,7 +47,7 @@ public final class ValidationPercentBaseContext implements PercentBaseContext { | |||
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() { |
@@ -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 |
@@ -86,23 +86,23 @@ public final class FOPropertyMapping implements Constants { | |||
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 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 Property[] enums; | |||
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 |
@@ -71,19 +71,19 @@ public class FOText extends FONode implements CharSequence, TextFragment { | |||
* 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 implements CharSequence, TextFragment { | |||
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() { | |||
} |
@@ -60,7 +60,7 @@ public class FOTreeBuilder extends DefaultHandler { | |||
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 DefaultHandler { | |||
/** 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 DefaultHandler { | |||
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, |
@@ -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. |
@@ -58,15 +58,15 @@ public abstract class FObj extends FONode implements Constants { | |||
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; |
@@ -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 FObj { | |||
/** 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 |
@@ -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); | |||
@@ -32,12 +32,12 @@ public class RecursiveCharIterator extends CharIterator { | |||
/** 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 |
@@ -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; |
@@ -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) { |
@@ -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; | |||
/** |
@@ -67,7 +67,7 @@ public class RelativeNumericProperty extends Property implements Length { | |||
/** | |||
* The second operand. | |||
*/ | |||
private Numeric op2 = null; | |||
private Numeric op2; | |||
/** | |||
* The dimension of the result. | |||
*/ |
@@ -45,7 +45,7 @@ public abstract class AbstractListItemPart extends FObj implements CommonAccessi | |||
// End of property values | |||
/** used for FO validation */ | |||
private boolean blockItemFound = false; | |||
private boolean blockItemFound; | |||
/** | |||
* Base constructor |
@@ -58,7 +58,7 @@ public class BasicLink extends InlineLevel implements StructureTreeElementHolder | |||
// 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} |
@@ -51,8 +51,8 @@ public class Block extends FObjMixed implements BreakPropertySet, | |||
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; |
@@ -67,7 +67,7 @@ public class BlockContainer extends FObj implements BreakPropertySet, WritingMod | |||
// 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 |
@@ -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 |
@@ -37,7 +37,7 @@ public class Footnote extends FObj implements CommonAccessibilityHolder { | |||
private CommonAccessibility commonAccessibility; | |||
private Inline footnoteCitation = null; | |||
private Inline footnoteCitation; | |||
private FootnoteBody footnoteBody; | |||
/** |
@@ -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; | |||
/** |