You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by sp...@apache.org on 2010/11/17 20:45:31 UTC
svn commit: r1036179 [1/2] - in /xmlgraphics/fop/trunk: ./
examples/embedding/java/embedding/ src/java/org/apache/fop/afp/
src/java/org/apache/fop/afp/modca/ src/java/org/apache/fop/apps/
src/java/org/apache/fop/area/ src/java/org/apache/fop/area/inlin...
Author: spepping
Date: Wed Nov 17 19:45:27 2010
New Revision: 1036179
URL: http://svn.apache.org/viewvc?rev=1036179&view=rev
Log:
findbugs-reported bug squashing; 959 bugs left (findbugs 1.3.9)
Modified:
xmlgraphics/fop/trunk/checkstyle-5.1.xml
xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleFO2PDF.java
xmlgraphics/fop/trunk/examples/embedding/java/embedding/MultipleFO2PDF.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AbstractAFPPainter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractAFPObject.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/PageSequenceResults.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Area.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeModel.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeParser.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BeforeFloat.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Block.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BlockParent.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BlockViewport.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BodyRegion.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/CTM.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Footnote.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/LineArea.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/LinkResolver.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/MainReference.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/NormalFlow.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Page.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/PageViewport.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/RegionReference.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/RegionViewport.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Span.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Trait.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/AbstractTextArea.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Anchor.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Container.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/FilledArea.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Image.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineBlockParent.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineParent.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Leader.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Space.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/SpaceArea.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/TextArea.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Viewport.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/WordArea.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/CommandLineOptions.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/LengthBase.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FONode.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOText.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/xmp/XMPMetadata.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/Property.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontInfo.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontInfoConfigurator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontLoader.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/apps/PFMReader.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/substitute/FontSubstitutions.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/substitute/FontWeightRange.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/PFMFile.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/Type1FontLoader.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/ByteVector.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/CharVector.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/Hyphen.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/Hyphenator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/TernaryTree.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockKnuthSequence.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/InlineKnuthSequence.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/UnresolvedListElementWithLength.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ImageLayout.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFObject.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractConfigurator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractGenericSVGHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/PrintRendererConfigurator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/XMLHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/XMLHandlerConfigurator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/XMLHandlerRegistry.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererImageInfo.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AFPExtensionHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/PageChangeEvent.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFParser.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFSerializer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/extensions/AbstractAction.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/extensions/ActionSet.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/extensions/DocumentNavigationHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/extensions/GoToXYAction.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/extensions/URIAction.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFDocumentNavigationHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/extensions/PDFExtensionHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSFontUtils.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSImageFormResource.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/ResourceHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/extensions/PSExtensionHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/ParagraphKeeptogetherContext.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfJforCmd.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/XMLXMLHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/servlet/FopPrintServlet.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/servlet/FopServlet.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/TestConverter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/Fop.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/traits/BorderProps.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorUtil.java
Modified: xmlgraphics/fop/trunk/checkstyle-5.1.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/checkstyle-5.1.xml?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/checkstyle-5.1.xml (original)
+++ xmlgraphics/fop/trunk/checkstyle-5.1.xml Wed Nov 17 19:45:27 2010
@@ -96,7 +96,7 @@
<property name="severity" value="warning"/>
</module>
<module name="ConstantNameCheck">
- <property name="format" value="^[A-Z](_?[A-Z0-9]+)*$"/>
+ <property name="format" value="^([A-Z](_?[A-Z0-9]+)*)|(log)$"/>
<property name="severity" value="warning"/>
</module>
<module name="LocalFinalVariableNameCheck">
Modified: xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleFO2PDF.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleFO2PDF.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleFO2PDF.java (original)
+++ xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleFO2PDF.java Wed Nov 17 19:45:27 2010
@@ -94,8 +94,8 @@ public class ExampleFO2PDF {
for (java.util.Iterator it = pageSequences.iterator(); it.hasNext();) {
PageSequenceResults pageSequenceResults = (PageSequenceResults)it.next();
System.out.println("PageSequence "
- + (String.valueOf(pageSequenceResults.getID()).length() > 0
- ? pageSequenceResults.getID() : "<no id>")
+ + (String.valueOf(pageSequenceResults.getId()).length() > 0
+ ? pageSequenceResults.getId() : "<no id>")
+ " generated " + pageSequenceResults.getPageCount() + " pages.");
}
System.out.println("Generated " + foResults.getPageCount() + " pages in total.");
Modified: xmlgraphics/fop/trunk/examples/embedding/java/embedding/MultipleFO2PDF.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/embedding/java/embedding/MultipleFO2PDF.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/embedding/java/embedding/MultipleFO2PDF.java (original)
+++ xmlgraphics/fop/trunk/examples/embedding/java/embedding/MultipleFO2PDF.java Wed Nov 17 19:45:27 2010
@@ -147,8 +147,8 @@ public class MultipleFO2PDF {
for (java.util.Iterator it = pageSequences.iterator(); it.hasNext();) {
PageSequenceResults pageSequenceResults = (PageSequenceResults)it.next();
System.out.println("PageSequence "
- + (String.valueOf(pageSequenceResults.getID()).length() > 0
- ? pageSequenceResults.getID() : "<no id>")
+ + (String.valueOf(pageSequenceResults.getId()).length() > 0
+ ? pageSequenceResults.getId() : "<no id>")
+ " generated " + pageSequenceResults.getPageCount() + " pages.");
}
System.out.println("Generated " + foResults.getPageCount() + " pages in total.");
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AbstractAFPPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AbstractAFPPainter.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AbstractAFPPainter.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AbstractAFPPainter.java Wed Nov 17 19:45:27 2010
@@ -30,7 +30,7 @@ import org.apache.commons.logging.LogFac
public abstract class AbstractAFPPainter {
/** Static logging instance */
- protected static Log log = LogFactory.getLog("org.apache.xmlgraphics.afp");
+ protected static final Log log = LogFactory.getLog("org.apache.xmlgraphics.afp");
/** data stream */
protected final DataStream dataStream;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractAFPObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractAFPObject.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractAFPObject.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractAFPObject.java Wed Nov 17 19:45:27 2010
@@ -45,7 +45,7 @@ public abstract class AbstractAFPObject
protected static final byte SF_CLASS = (byte)0xD3;
/** the structure field header */
- protected static final byte[] SF_HEADER = new byte[] {
+ static final byte[] SF_HEADER = new byte[] {
0x5A, // Structured field identifier
0x00, // Length byte 1
0x10, // Length byte 2
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/PageSequenceResults.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/PageSequenceResults.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/PageSequenceResults.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/PageSequenceResults.java Wed Nov 17 19:45:27 2010
@@ -44,7 +44,7 @@ public class PageSequenceResults {
*
* @return The ID
*/
- public String getID() {
+ public String getId() {
return this.id;
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Area.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Area.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Area.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Area.java Wed Nov 17 19:45:27 2010
@@ -38,6 +38,9 @@ import org.apache.fop.traits.BorderProps
* Base object for all areas.
*/
public class Area extends AreaTreeObject implements Serializable {
+
+ private static final long serialVersionUID = 6342888466142626492L;
+
// stacking directions
/**
* Stacking left to right
@@ -134,7 +137,7 @@ public class Area extends AreaTreeObject
/**
* logging instance
*/
- protected static Log log = LogFactory.getLog(Area.class);
+ protected static final Log log = LogFactory.getLog(Area.class);
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeModel.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeModel.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeModel.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeModel.java Wed Nov 17 19:45:27 2010
@@ -42,7 +42,7 @@ public class AreaTreeModel {
protected PageSequence currentPageSequence;
// private List offDocumentItems = new java.util.ArrayList();
/** logger instance */
- protected static Log log = LogFactory.getLog(AreaTreeModel.class);
+ protected static final Log log = LogFactory.getLog(AreaTreeModel.class);
/**
* Create a new store pages model
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeParser.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeParser.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeParser.java Wed Nov 17 19:45:27 2010
@@ -98,7 +98,7 @@ import org.apache.fop.util.XMLUtil;
public class AreaTreeParser {
/** Logger instance */
- protected static Log log = LogFactory.getLog(AreaTreeParser.class);
+ protected static final Log log = LogFactory.getLog(AreaTreeParser.class);
private static SAXTransformerFactory tFactory
= (SAXTransformerFactory)SAXTransformerFactory.newInstance();
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BeforeFloat.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BeforeFloat.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BeforeFloat.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BeforeFloat.java Wed Nov 17 19:45:27 2010
@@ -25,6 +25,9 @@ package org.apache.fop.area;
* See fo:region-body definition in the XSL Rec for more information.
*/
public class BeforeFloat extends BlockParent {
+
+ private static final long serialVersionUID = 4101415711488333380L;
+
// this is an optional block area that will be rendered
// as the separator only if there are float areas
private Block separator = null;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Block.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Block.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Block.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Block.java Wed Nov 17 19:45:27 2010
@@ -32,6 +32,9 @@ package org.apache.fop.area;
* It holds child block areas such as other blocks or lines.
*/
public class Block extends BlockParent {
+
+ private static final long serialVersionUID = 6843727817993665788L;
+
/**
* Normally stacked with other blocks.
*/
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BlockParent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BlockParent.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BlockParent.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BlockParent.java Wed Nov 17 19:45:27 2010
@@ -27,6 +27,11 @@ import java.util.List;
*/
public class BlockParent extends Area {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 7076916890348533805L;
+
// this position is used for absolute position
// or as an indent
// this has the size in the block progression dimension
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BlockViewport.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BlockViewport.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BlockViewport.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BlockViewport.java Wed Nov 17 19:45:27 2010
@@ -25,6 +25,9 @@ package org.apache.fop.area;
* The block-container creates this area.
*/
public class BlockViewport extends Block {
+
+ private static final long serialVersionUID = -7840580922580735157L;
+
// clipping for this viewport
private boolean clip = false;
// transform if rotated or absolute
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BodyRegion.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BodyRegion.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BodyRegion.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BodyRegion.java Wed Nov 17 19:45:27 2010
@@ -30,6 +30,9 @@ import org.apache.fop.fo.pagination.Regi
* See fo:region-body definition in the XSL Rec for more information.
*/
public class BodyRegion extends RegionReference {
+
+ private static final long serialVersionUID = -1848872997724078080L;
+
private BeforeFloat beforeFloat; // optional
private MainReference mainReference; // mandatory
private Footnote footnote; // optional
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/CTM.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/CTM.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/CTM.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/CTM.java Wed Nov 17 19:45:27 2010
@@ -34,6 +34,8 @@ import org.apache.fop.fo.Constants;
*/
public class CTM implements Serializable {
+ private static final long serialVersionUID = -8743287485623778341L;
+
private double a, b, c, d, e, f;
private static final CTM CTM_LRTB = new CTM(1, 0, 0, 1, 0, 0);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Footnote.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Footnote.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Footnote.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Footnote.java Wed Nov 17 19:45:27 2010
@@ -27,6 +27,9 @@ package org.apache.fop.area;
* See fo:region-body definition in the XSL Rec for more information.
*/
public class Footnote extends BlockParent {
+
+ private static final long serialVersionUID = -7907428219886367161L;
+
private Block separator = null;
// footnote has an optional separator
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/LineArea.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/LineArea.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/LineArea.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/LineArea.java Wed Nov 17 19:45:27 2010
@@ -32,12 +32,17 @@ import java.util.List;
*/
public class LineArea extends Area {
+ private static final long serialVersionUID = 7670235908329290684L;
+
/**
* this class stores information about line width and potential adjustments
* that can be used in order to re-compute adjustement and / or indents when a
* page-number or a page-number-citation is resolved
*/
private final class LineAdjustingInfo implements Serializable {
+
+ private static final long serialVersionUID = -6103629976229458273L;
+
private int lineAlignment;
private int difference;
private int availableStretch;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/LinkResolver.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/LinkResolver.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/LinkResolver.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/LinkResolver.java Wed Nov 17 19:45:27 2010
@@ -33,6 +33,9 @@ import org.apache.fop.area.Area;
* Link resolving for resolving internal links.
*/
public class LinkResolver implements Resolvable, Serializable {
+
+ private static final long serialVersionUID = -7102134165192960718L;
+
private boolean resolved = false;
private String idRef;
private Area area;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/MainReference.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/MainReference.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/MainReference.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/MainReference.java Wed Nov 17 19:45:27 2010
@@ -31,6 +31,8 @@ import java.util.List;
*/
public class MainReference extends Area {
+ private static final long serialVersionUID = 7635126485620012448L;
+
private BodyRegion parent;
private List spanAreas = new java.util.ArrayList();
private boolean isEmpty = true;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/NormalFlow.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/NormalFlow.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/NormalFlow.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/NormalFlow.java Wed Nov 17 19:45:27 2010
@@ -25,6 +25,9 @@ package org.apache.fop.area;
* See fo:region-body definition in the XSL Rec for more information.
*/
public class NormalFlow extends BlockParent {
+
+ private static final long serialVersionUID = -3753538631016929004L;
+
/**
* Constructor.
* @param ipd of Normal flow object
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Page.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Page.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Page.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Page.java Wed Nov 17 19:45:27 2010
@@ -47,6 +47,9 @@ import org.apache.fop.layoutmgr.TraitSet
* the top level page and regions.
*/
public class Page extends AreaTreeObject implements Serializable, Cloneable {
+
+ private static final long serialVersionUID = 6272157047421543866L;
+
// contains before, start, body, end and after regions
private RegionViewport regionBefore = null;
private RegionViewport regionStart = null;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/PageViewport.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/PageViewport.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/PageViewport.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/PageViewport.java Wed Nov 17 19:45:27 2010
@@ -87,7 +87,7 @@ public class PageViewport extends AreaTr
/**
* logging instance
*/
- protected static Log log = LogFactory.getLog(PageViewport.class);
+ protected static final Log log = LogFactory.getLog(PageViewport.class);
/**
* Create a page viewport.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/RegionReference.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/RegionReference.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/RegionReference.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/RegionReference.java Wed Nov 17 19:45:27 2010
@@ -31,13 +31,14 @@ import org.apache.fop.fo.pagination.Regi
*/
public class RegionReference extends Area implements Cloneable {
+ private static final long serialVersionUID = -298980963268244238L;
+
/** Reference to the region FO. */
//protected Region regionFO;
private int regionClass;
private String regionName;
private CTM ctm;
-
// the list of block areas from the static flow
private ArrayList blocks = new ArrayList();
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/RegionViewport.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/RegionViewport.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/RegionViewport.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/RegionViewport.java Wed Nov 17 19:45:27 2010
@@ -30,6 +30,9 @@ import java.util.HashMap;
* in the fo:region-body description in the XSL Recommendation.
*/
public class RegionViewport extends Area implements Cloneable {
+
+ private static final long serialVersionUID = 505781815165102572L;
+
// this rectangle is relative to the page
private RegionReference regionReference;
private Rectangle2D viewArea;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Span.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Span.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Span.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Span.java Wed Nov 17 19:45:27 2010
@@ -30,6 +30,9 @@ import java.util.List;
* See fo:region-body definition in the XSL Rec for more information.
*/
public class Span extends Area {
+
+ private static final long serialVersionUID = -5551430053660081549L;
+
// the list of flow reference areas in this span area
private List flowAreas;
private int colCount;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Trait.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Trait.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Trait.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Trait.java Wed Nov 17 19:45:27 2010
@@ -36,6 +36,8 @@ import org.apache.fop.util.ColorUtil;
*/
public final class Trait implements Serializable {
+ private static final long serialVersionUID = 3234280285391611437L;
+
private Trait() {
}
@@ -313,6 +315,8 @@ public final class Trait implements Seri
*/
public static class InternalLink implements Serializable {
+ private static final long serialVersionUID = -8993505060996723039L;
+
/** The unique key of the PageViewport. */
private String pvKey;
@@ -447,6 +451,8 @@ public final class Trait implements Seri
*/
public static class ExternalLink implements Serializable {
+ private static final long serialVersionUID = -3720707599232620946L;
+
private String destination;
private boolean newWindow;
@@ -520,6 +526,8 @@ public final class Trait implements Seri
*/
public static class Background implements Serializable {
+ private static final long serialVersionUID = 8452078676273242870L;
+
/** The background color if any. */
private Color color = null;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/AbstractTextArea.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/AbstractTextArea.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/AbstractTextArea.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/AbstractTextArea.java Wed Nov 17 19:45:27 2010
@@ -24,6 +24,8 @@ package org.apache.fop.area.inline;
*/
public abstract class AbstractTextArea extends InlineParent {
+ private static final long serialVersionUID = -1246306443569094371L;
+
/**
* this class stores information about spaces and potential adjustments
* that can be used in order to re-compute adjustments when a
@@ -31,6 +33,8 @@ public abstract class AbstractTextArea e
*/
protected class TextAdjustingInfo extends InlineAdjustingInfo {
+ private static final long serialVersionUID = -2412095162983479947L;
+
/** difference between the optimal width of a space
* and the default width of a space according to the font
* (this is equivalent to the property word-spacing.optimum)
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Anchor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Anchor.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Anchor.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Anchor.java Wed Nov 17 19:45:27 2010
@@ -25,6 +25,8 @@ package org.apache.fop.area.inline;
*/
public class Anchor extends InlineArea {
+ private static final long serialVersionUID = 5227798744787823499L;
+
// has a keep with adjacent area
// has reference to associated footnote or float out-of-line area
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Container.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Container.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Container.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Container.java Wed Nov 17 19:45:27 2010
@@ -32,6 +32,9 @@ import java.util.ArrayList;
* This allows an inline area to have blocks as children.
*/
public class Container extends Area {
+
+ private static final long serialVersionUID = 5256423939348189260L;
+
/**
* The list of block areas stacked inside this container
*/
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/FilledArea.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/FilledArea.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/FilledArea.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/FilledArea.java Wed Nov 17 19:45:27 2010
@@ -34,6 +34,9 @@ import java.util.Iterator;
* this as a normal inline parent.
*/
public class FilledArea extends InlineParent {
+
+ private static final long serialVersionUID = 8586584705587017474L;
+
private int unitWidth;
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Image.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Image.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Image.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Image.java Wed Nov 17 19:45:27 2010
@@ -27,6 +27,9 @@ import org.apache.fop.area.Area;
* The url of the image is used as a key to reference the image cache.
*/
public class Image extends Area {
+
+ private static final long serialVersionUID = 4800834714349695386L;
+
private String url;
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java Wed Nov 17 19:45:27 2010
@@ -32,12 +32,17 @@ import org.apache.fop.area.Trait;
*/
public class InlineArea extends Area {
+ private static final long serialVersionUID = -8940066479810170980L;
+
/**
* this class stores information about potential adjustments
* that can be used in order to re-compute adjustments when a
* page-number or a page-number-citation is resolved
*/
protected class InlineAdjustingInfo implements Serializable {
+
+ private static final long serialVersionUID = -5601387735459712149L;
+
/** stretch of the inline area */
protected int availableStretch;
/** shrink of the inline area */
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineBlockParent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineBlockParent.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineBlockParent.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineBlockParent.java Wed Nov 17 19:45:27 2010
@@ -29,6 +29,9 @@ import org.apache.fop.area.Block;
*/
public class InlineBlockParent extends InlineArea {
+
+ private static final long serialVersionUID = -3661746143321407377L;
+
/**
* The list of inline areas added to this inline parent.
*/
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineParent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineParent.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineParent.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineParent.java Wed Nov 17 19:45:27 2010
@@ -29,6 +29,9 @@ import java.util.ArrayList;
* This is an inline area that can have other inlines as children.
*/
public class InlineParent extends InlineArea {
+
+ private static final long serialVersionUID = -3047168298770354813L;
+
/**
* The list of inline areas added to this inline parent.
*/
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Leader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Leader.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Leader.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Leader.java Wed Nov 17 19:45:27 2010
@@ -32,6 +32,9 @@ public class Leader extends InlineArea {
// if space replaced with a space
// otherwise this is a holder for a line
+
+ private static final long serialVersionUID = -8011373048313956301L;
+
private int ruleStyle = Constants.EN_SOLID;
private int ruleThickness = 1000;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Space.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Space.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Space.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Space.java Wed Nov 17 19:45:27 2010
@@ -25,4 +25,6 @@ package org.apache.fop.area.inline;
*/
public class Space extends InlineArea {
+ private static final long serialVersionUID = -8748265505356839796L;
+
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/SpaceArea.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/SpaceArea.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/SpaceArea.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/SpaceArea.java Wed Nov 17 19:45:27 2010
@@ -24,6 +24,8 @@ package org.apache.fop.area.inline;
*/
public class SpaceArea extends InlineArea {
+ private static final long serialVersionUID = 2218803009825411416L;
+
/**
* The space for this space area
*/
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/TextArea.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/TextArea.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/TextArea.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/TextArea.java Wed Nov 17 19:45:27 2010
@@ -24,6 +24,8 @@ package org.apache.fop.area.inline;
*/
public class TextArea extends AbstractTextArea {
+ private static final long serialVersionUID = 7315900267242540809L;
+
/**
* Create a text inline area
*/
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java Wed Nov 17 19:45:27 2010
@@ -32,6 +32,9 @@ import java.util.List;
*/
public class UnresolvedPageNumber extends TextArea implements Resolvable {
+
+ private static final long serialVersionUID = -1758090835371647980L;
+
private boolean resolved = false;
private String pageIDRef;
private String text;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Viewport.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Viewport.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Viewport.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Viewport.java Wed Nov 17 19:45:27 2010
@@ -32,6 +32,9 @@ import java.util.HashMap;
* holds the area and positions it.
*/
public class Viewport extends InlineArea {
+
+ private static final long serialVersionUID = 813338534627918689L;
+
// contents could be container, foreign object or image
private Area content;
// clipping for the viewport
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/WordArea.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/WordArea.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/WordArea.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/WordArea.java Wed Nov 17 19:45:27 2010
@@ -24,6 +24,8 @@ package org.apache.fop.area.inline;
*/
public class WordArea extends InlineArea {
+ private static final long serialVersionUID = 6444644662158970942L;
+
/** The text for this word area */
protected String word;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/CommandLineOptions.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/CommandLineOptions.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/CommandLineOptions.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/CommandLineOptions.java Wed Nov 17 19:45:27 2010
@@ -89,23 +89,23 @@ public class CommandLineOptions {
/* user configuration file */
private File userConfigFile = null;
/* input fo file */
- private File fofile = null;
+ private File foFile = null;
/* xsltfile (xslt transformation as input) */
- private File xsltfile = null;
+ private File xsltFile = null;
/* xml file (xslt transformation as input) */
- private File xmlfile = null;
+ private File xmlFile = null;
/* area tree input file */
- private File areatreefile = null;
+ private File areatreeFile = null;
/* intermediate format input file */
- private File iffile = null;
+ private File ifFile = null;
/* area tree input file */
- private File imagefile = null;
+ private File imageFile = null;
/* output file */
- private File outfile = null;
+ private File outFile = null;
/* input mode */
- private int inputmode = NOT_SET;
+ private int inputMode = NOT_SET;
/* output mode */
- private String outputmode = null;
+ private String outputMode = null;
/* true if System.in (stdin) should be used for the input file */
private boolean useStdIn = false;
/* true if System.out (stdout) should be used for the output file */
@@ -194,7 +194,7 @@ public class CommandLineOptions {
inputHandler = createInputHandler();
- if (MimeConstants.MIME_FOP_AWT_PREVIEW.equals(outputmode)) {
+ if (MimeConstants.MIME_FOP_AWT_PREVIEW.equals(outputMode)) {
//set the system look&feel for the preview dialog
try {
UIManager.setLookAndFeel(
@@ -207,7 +207,7 @@ public class CommandLineOptions {
renderer.setRenderable(inputHandler); //set before user agent!
renderer.setUserAgent(foUserAgent);
foUserAgent.setRendererOverride(renderer);
- } else if (MimeConstants.MIME_FOP_AREA_TREE.equals(outputmode)
+ } else if (MimeConstants.MIME_FOP_AREA_TREE.equals(outputMode)
&& mimicRenderer != null) {
// render from FO to Intermediate Format
Renderer targetRenderer = foUserAgent.getRendererFactory().createRenderer(
@@ -220,7 +220,7 @@ public class CommandLineOptions {
//Make sure the prepared XMLRenderer is used
foUserAgent.setRendererOverride(xmlRenderer);
- } else if (MimeConstants.MIME_FOP_IF.equals(outputmode)
+ } else if (MimeConstants.MIME_FOP_IF.equals(outputMode)
&& mimicRenderer != null) {
// render from FO to Intermediate Format
IFSerializer serializer = new IFSerializer();
@@ -447,7 +447,7 @@ public class CommandLineOptions {
if (isSystemInOutFile(filename)) {
this.useStdIn = true;
} else {
- fofile = new File(filename);
+ foFile = new File(filename);
}
return 1;
}
@@ -460,7 +460,7 @@ public class CommandLineOptions {
throw new FOPException("you must specify the stylesheet "
+ "file for the '-xsl' option");
} else {
- xsltfile = new File(args[i + 1]);
+ xsltFile = new File(args[i + 1]);
return 1;
}
}
@@ -476,7 +476,7 @@ public class CommandLineOptions {
if (isSystemInOutFile(filename)) {
this.useStdIn = true;
} else {
- xmlfile = new File(filename);
+ xmlFile = new File(filename);
}
return 1;
}
@@ -508,7 +508,7 @@ public class CommandLineOptions {
if (isSystemInOutFile(filename)) {
this.useStdOut = true;
} else {
- outfile = new File(filename);
+ outFile = new File(filename);
}
}
@@ -701,16 +701,16 @@ public class CommandLineOptions {
}
private int parseUnknownOption(String[] args, int i) throws FOPException {
- if (inputmode == NOT_SET) {
- inputmode = FO_INPUT;
+ if (inputMode == NOT_SET) {
+ inputMode = FO_INPUT;
String filename = args[i];
if (isSystemInOutFile(filename)) {
this.useStdIn = true;
} else {
- fofile = new File(filename);
+ foFile = new File(filename);
}
- } else if (outputmode == null) {
- outputmode = MimeConstants.MIME_PDF;
+ } else if (outputMode == null) {
+ outputMode = MimeConstants.MIME_PDF;
setOutputFile(args[i]);
} else {
throw new FOPException("Don't know what to do with "
@@ -765,7 +765,7 @@ public class CommandLineOptions {
if (isSystemInOutFile(filename)) {
this.useStdIn = true;
} else {
- areatreefile = new File(filename);
+ areatreeFile = new File(filename);
}
return 1;
}
@@ -781,7 +781,7 @@ public class CommandLineOptions {
if (isSystemInOutFile(filename)) {
this.useStdIn = true;
} else {
- iffile = new File(filename);
+ ifFile = new File(filename);
}
return 1;
}
@@ -797,7 +797,7 @@ public class CommandLineOptions {
if (isSystemInOutFile(filename)) {
this.useStdIn = true;
} else {
- imagefile = new File(filename);
+ imageFile = new File(filename);
}
return 1;
}
@@ -867,8 +867,8 @@ public class CommandLineOptions {
}
private void setOutputMode(String mime) throws FOPException {
- if (outputmode == null) {
- outputmode = mime;
+ if (outputMode == null) {
+ outputMode = mime;
} else {
throw new FOPException("you can only set one output method");
}
@@ -896,8 +896,8 @@ public class CommandLineOptions {
}
private void setInputFormat(int format) throws FOPException {
- if (inputmode == NOT_SET || inputmode == format) {
- inputmode = format;
+ if (inputMode == NOT_SET || inputMode == format) {
+ inputMode = format;
} else {
throw new FOPException("Only one input mode can be specified!");
}
@@ -907,100 +907,100 @@ public class CommandLineOptions {
* checks whether all necessary information has been given in a consistent way
*/
private void checkSettings() throws FOPException, FileNotFoundException {
- if (inputmode == NOT_SET) {
+ if (inputMode == NOT_SET) {
throw new FOPException("No input file specified");
}
- if (outputmode == null) {
+ if (outputMode == null) {
throw new FOPException("No output file specified");
}
- if ((outputmode.equals(MimeConstants.MIME_FOP_AWT_PREVIEW)
- || outputmode.equals(MimeConstants.MIME_FOP_PRINT))
- && outfile != null) {
+ if ((outputMode.equals(MimeConstants.MIME_FOP_AWT_PREVIEW)
+ || outputMode.equals(MimeConstants.MIME_FOP_PRINT))
+ && outFile != null) {
throw new FOPException("Output file may not be specified "
+ "for AWT or PRINT output");
}
- if (inputmode == XSLT_INPUT) {
+ if (inputMode == XSLT_INPUT) {
// check whether xml *and* xslt file have been set
- if (xmlfile == null && !this.useStdIn) {
+ if (xmlFile == null && !this.useStdIn) {
throw new FOPException("XML file must be specified for the transform mode");
}
- if (xsltfile == null) {
+ if (xsltFile == null) {
throw new FOPException("XSLT file must be specified for the transform mode");
}
// warning if fofile has been set in xslt mode
- if (fofile != null) {
+ if (foFile != null) {
log.warn("Can't use fo file with transform mode! Ignoring.\n"
+ "Your input is " + "\n xmlfile: "
- + xmlfile.getAbsolutePath()
+ + xmlFile.getAbsolutePath()
+ "\nxsltfile: "
- + xsltfile.getAbsolutePath()
+ + xsltFile.getAbsolutePath()
+ "\n fofile: "
- + fofile.getAbsolutePath());
+ + foFile.getAbsolutePath());
}
- if (xmlfile != null && !xmlfile.exists()) {
+ if (xmlFile != null && !xmlFile.exists()) {
throw new FileNotFoundException("Error: xml file "
- + xmlfile.getAbsolutePath()
+ + xmlFile.getAbsolutePath()
+ " not found ");
}
- if (!xsltfile.exists()) {
+ if (!xsltFile.exists()) {
throw new FileNotFoundException("Error: xsl file "
- + xsltfile.getAbsolutePath()
+ + xsltFile.getAbsolutePath()
+ " not found ");
}
- } else if (inputmode == FO_INPUT) {
- if (outputmode.equals(MimeConstants.MIME_XSL_FO)) {
+ } else if (inputMode == FO_INPUT) {
+ if (outputMode.equals(MimeConstants.MIME_XSL_FO)) {
throw new FOPException(
"FO output mode is only available if you use -xml and -xsl");
}
- if (fofile != null && !fofile.exists()) {
+ if (foFile != null && !foFile.exists()) {
throw new FileNotFoundException("Error: fo file "
- + fofile.getAbsolutePath()
+ + foFile.getAbsolutePath()
+ " not found ");
}
- } else if (inputmode == AREATREE_INPUT) {
- if (outputmode.equals(MimeConstants.MIME_XSL_FO)) {
+ } else if (inputMode == AREATREE_INPUT) {
+ if (outputMode.equals(MimeConstants.MIME_XSL_FO)) {
throw new FOPException(
"FO output mode is only available if you use -xml and -xsl");
- } else if (outputmode.equals(MimeConstants.MIME_FOP_AREA_TREE)) {
+ } else if (outputMode.equals(MimeConstants.MIME_FOP_AREA_TREE)) {
throw new FOPException(
"Area Tree Output is not available if Area Tree is used as input!");
}
- if (areatreefile != null && !areatreefile.exists()) {
+ if (areatreeFile != null && !areatreeFile.exists()) {
throw new FileNotFoundException("Error: area tree file "
- + areatreefile.getAbsolutePath()
+ + areatreeFile.getAbsolutePath()
+ " not found ");
}
- } else if (inputmode == IF_INPUT) {
- if (outputmode.equals(MimeConstants.MIME_XSL_FO)) {
+ } else if (inputMode == IF_INPUT) {
+ if (outputMode.equals(MimeConstants.MIME_XSL_FO)) {
throw new FOPException(
"FO output mode is only available if you use -xml and -xsl");
- } else if (outputmode.equals(MimeConstants.MIME_FOP_AREA_TREE)) {
+ } else if (outputMode.equals(MimeConstants.MIME_FOP_AREA_TREE)) {
throw new FOPException(
"Area Tree Output is not available if Intermediate Format"
+ " is used as input!");
- } else if (outputmode.equals(MimeConstants.MIME_FOP_IF)) {
+ } else if (outputMode.equals(MimeConstants.MIME_FOP_IF)) {
throw new FOPException(
"Intermediate Output is not available if Intermediate Format"
+ " is used as input!");
}
- if (iffile != null && !iffile.exists()) {
+ if (ifFile != null && !ifFile.exists()) {
throw new FileNotFoundException("Error: intermediate format file "
- + iffile.getAbsolutePath()
+ + ifFile.getAbsolutePath()
+ " not found ");
}
- } else if (inputmode == IMAGE_INPUT) {
- if (outputmode.equals(MimeConstants.MIME_XSL_FO)) {
+ } else if (inputMode == IMAGE_INPUT) {
+ if (outputMode.equals(MimeConstants.MIME_XSL_FO)) {
throw new FOPException(
"FO output mode is only available if you use -xml and -xsl");
}
- if (imagefile != null && !imagefile.exists()) {
+ if (imageFile != null && !imageFile.exists()) {
throw new FileNotFoundException("Error: image file "
- + imagefile.getAbsolutePath()
+ + imageFile.getAbsolutePath()
+ " not found ");
}
}
@@ -1027,13 +1027,13 @@ public class CommandLineOptions {
* @throws FOPException for invalid output formats
*/
protected String getOutputFormat() throws FOPException {
- if (outputmode == null) {
+ if (outputMode == null) {
throw new FOPException("Renderer has not been set!");
}
- if (outputmode.equals(MimeConstants.MIME_FOP_AREA_TREE)) {
+ if (outputMode.equals(MimeConstants.MIME_FOP_AREA_TREE)) {
renderingOptions.put("fineDetail", isCoarseAreaXml());
}
- return outputmode;
+ return outputMode;
}
/**
@@ -1042,21 +1042,21 @@ public class CommandLineOptions {
* @throws IllegalArgumentException if invalid/missing parameters
*/
private InputHandler createInputHandler() {
- switch (inputmode) {
+ switch (inputMode) {
case FO_INPUT:
- return new InputHandler(fofile);
+ return new InputHandler(foFile);
case AREATREE_INPUT:
- return new AreaTreeInputHandler(areatreefile);
+ return new AreaTreeInputHandler(areatreeFile);
case IF_INPUT:
- return new IFInputHandler(iffile);
+ return new IFInputHandler(ifFile);
case XSLT_INPUT:
- InputHandler handler = new InputHandler(xmlfile, xsltfile, xsltParams);
+ InputHandler handler = new InputHandler(xmlFile, xsltFile, xsltParams);
if (useCatalogResolver) {
handler.createCatalogResolver(foUserAgent);
}
return handler;
case IMAGE_INPUT:
- return new ImageInputHandler(imagefile, xsltfile, xsltParams);
+ return new ImageInputHandler(imageFile, xsltFile, xsltParams);
default:
throw new IllegalArgumentException("Error creating InputHandler object.");
}
@@ -1074,24 +1074,24 @@ public class CommandLineOptions {
* Returns the XSL-FO file if set.
* @return the XSL-FO file, null if not set
*/
- public File getFOFile() {
- return fofile;
+ public File getFoFile() {
+ return foFile;
}
/**
* Returns the input XML file if set.
* @return the input XML file, null if not set
*/
- public File getXMLFile() {
- return xmlfile;
+ public File getXmlFile() {
+ return xmlFile;
}
/**
* Returns the stylesheet to be used for transformation to XSL-FO.
* @return stylesheet
*/
- public File getXSLFile() {
- return xsltfile;
+ public File getXslFile() {
+ return xsltFile;
}
/**
@@ -1099,7 +1099,7 @@ public class CommandLineOptions {
* @return the output file
*/
public File getOutputFile() {
- return outfile;
+ return outFile;
}
/**
@@ -1139,13 +1139,13 @@ public class CommandLineOptions {
* @return either the fofile or the xmlfile
*/
public File getInputFile() {
- switch (inputmode) {
+ switch (inputMode) {
case FO_INPUT:
- return fofile;
+ return foFile;
case XSLT_INPUT:
- return xmlfile;
+ return xmlFile;
default:
- return fofile;
+ return foFile;
}
}
@@ -1270,7 +1270,7 @@ public class CommandLineOptions {
*/
private void dumpConfiguration() {
log.info("Input mode: ");
- switch (inputmode) {
+ switch (inputMode) {
case NOT_SET:
log.info("not set");
break;
@@ -1279,7 +1279,7 @@ public class CommandLineOptions {
if (isInputFromStdIn()) {
log.info("fo input file: from stdin");
} else {
- log.info("fo input file: " + fofile.toString());
+ log.info("fo input file: " + foFile.toString());
}
break;
case XSLT_INPUT:
@@ -1287,16 +1287,16 @@ public class CommandLineOptions {
if (isInputFromStdIn()) {
log.info("xml input file: from stdin");
} else {
- log.info("xml input file: " + xmlfile.toString());
+ log.info("xml input file: " + xmlFile.toString());
}
- log.info("xslt stylesheet: " + xsltfile.toString());
+ log.info("xslt stylesheet: " + xsltFile.toString());
break;
case AREATREE_INPUT:
log.info("AT ");
if (isInputFromStdIn()) {
log.info("area tree input file: from stdin");
} else {
- log.info("area tree input file: " + areatreefile.toString());
+ log.info("area tree input file: " + areatreeFile.toString());
}
break;
case IF_INPUT:
@@ -1304,7 +1304,7 @@ public class CommandLineOptions {
if (isInputFromStdIn()) {
log.info("intermediate input file: from stdin");
} else {
- log.info("intermediate input file: " + iffile.toString());
+ log.info("intermediate input file: " + ifFile.toString());
}
break;
case IMAGE_INPUT:
@@ -1312,28 +1312,28 @@ public class CommandLineOptions {
if (isInputFromStdIn()) {
log.info("image input file: from stdin");
} else {
- log.info("image input file: " + imagefile.toString());
+ log.info("image input file: " + imageFile.toString());
}
break;
default:
log.info("unknown input type");
}
log.info("Output mode: ");
- if (outputmode == null) {
+ if (outputMode == null) {
log.info("not set");
- } else if (MimeConstants.MIME_FOP_AWT_PREVIEW.equals(outputmode)) {
+ } else if (MimeConstants.MIME_FOP_AWT_PREVIEW.equals(outputMode)) {
log.info("awt on screen");
- if (outfile != null) {
+ if (outFile != null) {
log.error("awt mode, but outfile is set:");
- log.error("out file: " + outfile.toString());
+ log.error("out file: " + outFile.toString());
}
- } else if (MimeConstants.MIME_FOP_PRINT.equals(outputmode)) {
+ } else if (MimeConstants.MIME_FOP_PRINT.equals(outputMode)) {
log.info("print directly");
- if (outfile != null) {
+ if (outFile != null) {
log.error("print mode, but outfile is set:");
- log.error("out file: " + outfile.toString());
+ log.error("out file: " + outFile.toString());
}
- } else if (MimeConstants.MIME_FOP_AREA_TREE.equals(outputmode)) {
+ } else if (MimeConstants.MIME_FOP_AREA_TREE.equals(outputMode)) {
log.info("area tree");
if (mimicRenderer != null) {
log.info("mimic renderer: " + mimicRenderer);
@@ -1341,17 +1341,17 @@ public class CommandLineOptions {
if (isOutputToStdOut()) {
log.info("output file: to stdout");
} else {
- log.info("output file: " + outfile.toString());
+ log.info("output file: " + outFile.toString());
}
- } else if (MimeConstants.MIME_FOP_IF.equals(outputmode)) {
+ } else if (MimeConstants.MIME_FOP_IF.equals(outputMode)) {
log.info("intermediate format");
- log.info("output file: " + outfile.toString());
+ log.info("output file: " + outFile.toString());
} else {
- log.info(outputmode);
+ log.info(outputMode);
if (isOutputToStdOut()) {
log.info("output file: to stdout");
} else {
- log.info("output file: " + outfile.toString());
+ log.info("output file: " + outFile.toString());
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/LengthBase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/LengthBase.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/LengthBase.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/LengthBase.java Wed Nov 17 19:45:27 2010
@@ -62,7 +62,7 @@ public class LengthBase implements Perce
/**
* logging instance
*/
- protected static Log log = LogFactory.getLog(LengthBase.class);
+ protected static final Log log = LogFactory.getLog(LengthBase.class);
/**
* The FO for which this property is to be calculated.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FONode.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FONode.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FONode.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FONode.java Wed Nov 17 19:45:27 2010
@@ -69,7 +69,7 @@ public abstract class FONode implements
protected Locator locator;
/** Logger for fo-tree related messages **/
- protected static Log log = LogFactory.getLog(FONode.class);
+ protected static final Log log = LogFactory.getLog(FONode.class);
/**
* Base constructor
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOText.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOText.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOText.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOText.java Wed Nov 17 19:45:27 2010
@@ -619,7 +619,7 @@ public class FOText extends FONode imple
}
/** @return the baseline-shift property */
- public Length getBaseLineShift() {
+ public Length getBaselineShift() {
return baselineShift;
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/xmp/XMPMetadata.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/xmp/XMPMetadata.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/xmp/XMPMetadata.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/xmp/XMPMetadata.java Wed Nov 17 19:45:27 2010
@@ -33,6 +33,8 @@ import org.xml.sax.SAXException;
*/
public class XMPMetadata implements ExtensionAttachment, Serializable, XMLizable {
+ private static final long serialVersionUID = 591347206217931578L;
+
/** The category URI for this extension attachment. */
public static final String CATEGORY = XMPConstants.XMP_NAMESPACE;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/Property.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/Property.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/Property.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/Property.java Wed Nov 17 19:45:27 2010
@@ -36,7 +36,7 @@ import org.apache.fop.fo.Constants;
public class Property {
/** Logger for all property classes */
- protected static Log log = LogFactory.getLog(PropertyMaker.class);
+ protected static final Log log = LogFactory.getLog(PropertyMaker.class);
/**
* The original specified value for properties which inherit
@@ -197,6 +197,6 @@ public class Property {
if (obj != this) {
return obj.toString();
}
- return null;
+ return "";
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontInfo.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontInfo.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontInfo.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontInfo.java Wed Nov 17 19:45:27 2010
@@ -41,7 +41,7 @@ import org.apache.commons.logging.LogFac
public class FontInfo {
/** logging instance */
- protected static Log log = LogFactory.getLog(FontInfo.class);
+ protected static final Log log = LogFactory.getLog(FontInfo.class);
/** Map containing fonts that have been used */
private Map/*<String,FontMetrics>*/ usedFonts = null; //(String = font key)
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontInfoConfigurator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontInfoConfigurator.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontInfoConfigurator.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontInfoConfigurator.java Wed Nov 17 19:45:27 2010
@@ -44,7 +44,7 @@ import org.apache.fop.util.LogUtil;
*/
public class FontInfoConfigurator {
/** logger instance */
- protected static Log log = LogFactory.getLog(FontInfoConfigurator.class);
+ protected static final Log log = LogFactory.getLog(FontInfoConfigurator.class);
private Configuration cfg;
private FontManager fontManager;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontLoader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontLoader.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontLoader.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontLoader.java Wed Nov 17 19:45:27 2010
@@ -40,7 +40,7 @@ import org.apache.fop.fonts.type1.Type1F
public abstract class FontLoader {
/** logging instance */
- protected static Log log = LogFactory.getLog(FontLoader.class);
+ protected static final Log log = LogFactory.getLog(FontLoader.class);
/** URI representing the font file */
protected String fontFileURI = null;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/apps/PFMReader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/apps/PFMReader.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/apps/PFMReader.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/apps/PFMReader.java Wed Nov 17 19:45:27 2010
@@ -173,7 +173,7 @@ public class PFMReader extends AbstractF
public void preview(PFMFile pfm) {
if (log != null && log.isInfoEnabled()) {
log.info("Font: " + pfm.getWindowsName());
- log.info("Name: " + pfm.getPostscriptName());
+ log.info("Name: " + pfm.getPostScriptName());
log.info("CharSet: " + pfm.getCharSetName());
log.info("CapHeight: " + pfm.getCapHeight());
log.info("XHeight: " + pfm.getXHeight());
@@ -217,7 +217,7 @@ public class PFMReader extends AbstractF
Element el = doc.createElement("font-name");
root.appendChild(el);
- el.appendChild(doc.createTextNode(pfm.getPostscriptName()));
+ el.appendChild(doc.createTextNode(pfm.getPostScriptName()));
// Currently unused.
// String s = pfm.getPostscriptName();
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/substitute/FontSubstitutions.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/substitute/FontSubstitutions.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/substitute/FontSubstitutions.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/substitute/FontSubstitutions.java Wed Nov 17 19:45:27 2010
@@ -35,7 +35,7 @@ public class FontSubstitutions extends j
private static final long serialVersionUID = -9173104935431899722L;
/** logging instance */
- protected static Log log = LogFactory.getLog(FontSubstitutions.class);
+ protected static final Log log = LogFactory.getLog(FontSubstitutions.class);
/**
* Adjusts a given fontInfo using this font substitution catalog
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/substitute/FontWeightRange.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/substitute/FontWeightRange.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/substitute/FontWeightRange.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/substitute/FontWeightRange.java Wed Nov 17 19:45:27 2010
@@ -30,7 +30,7 @@ import org.apache.commons.logging.LogFac
public class FontWeightRange {
/** logging instance */
- protected static Log log = LogFactory.getLog("org.apache.fop.render.fonts");
+ protected static final Log log = LogFactory.getLog("org.apache.fop.render.fonts");
/**
* Returns an <code>FontWeightRange</code> object holding the
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/PFMFile.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/PFMFile.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/PFMFile.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/PFMFile.java Wed Nov 17 19:45:27 2010
@@ -38,7 +38,7 @@ public class PFMFile {
// Header stuff
private String windowsName;
- private String postscriptName;
+ private String postScriptName;
private short dfItalic;
private int dfWeight;
private short dfCharSet;
@@ -164,7 +164,7 @@ public class PFMFile {
inStream.reset();
inStream.skip(driverInfoOffset);
- postscriptName = inStream.readString();
+ postScriptName = inStream.readString();
if (extMetricsOffset != 0) {
inStream.reset();
@@ -279,8 +279,8 @@ public class PFMFile {
*
* @return The Postscript name.
*/
- public String getPostscriptName() {
- return postscriptName;
+ public String getPostScriptName() {
+ return postScriptName;
}
/**
@@ -304,7 +304,7 @@ public class PFMFile {
case 0:
return "WinAnsi"; // AKA ISOAdobe
case 2:
- if ("Symbol".equals(getPostscriptName())) {
+ if ("Symbol".equals(getPostScriptName())) {
return "Symbol";
}
break;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/Type1FontLoader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/Type1FontLoader.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/Type1FontLoader.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/Type1FontLoader.java Wed Nov 17 19:45:27 2010
@@ -226,8 +226,8 @@ public class Type1FontLoader extends Fon
names.add(afm.getFamilyName());
returnFont.setFamilyNames(names);
} else {
- returnFont.setFontName(pfm.getPostscriptName());
- String fullName = pfm.getPostscriptName();
+ returnFont.setFontName(pfm.getPostScriptName());
+ String fullName = pfm.getPostScriptName();
fullName = fullName.replace('-', ' '); //Hack! Try to emulate full name
returnFont.setFullName(fullName); //emulate afm.getFullName()
Set names = new java.util.HashSet();
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/ByteVector.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/ByteVector.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/ByteVector.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/ByteVector.java Wed Nov 17 19:45:27 2010
@@ -29,6 +29,8 @@ import java.io.Serializable;
*/
public class ByteVector implements Serializable {
+ private static final long serialVersionUID = 1554572867863466772L;
+
/**
* Capacity increment size
*/
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/CharVector.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/CharVector.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/CharVector.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/CharVector.java Wed Nov 17 19:45:27 2010
@@ -29,6 +29,8 @@ import java.io.Serializable;
*/
public class CharVector implements Cloneable, Serializable {
+ private static final long serialVersionUID = 4263472982169004048L;
+
/**
* Capacity increment size
*/
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/Hyphen.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/Hyphen.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/Hyphen.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/Hyphen.java Wed Nov 17 19:45:27 2010
@@ -39,6 +39,8 @@ import java.io.Serializable;
*/
public class Hyphen implements Serializable {
+ private static final long serialVersionUID = 8989909741110279085L;
+
/** pre break string */
public String preBreak; // CSOK: VisibilityModifier
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/Hyphenator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/Hyphenator.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/Hyphenator.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/Hyphenator.java Wed Nov 17 19:45:27 2010
@@ -43,7 +43,7 @@ import org.xml.sax.InputSource;
public final class Hyphenator {
/** logging instance */
- protected static Log log = LogFactory.getLog(Hyphenator.class);
+ protected static final Log log = LogFactory.getLog(Hyphenator.class);
private static HyphenationTreeCache hTreeCache = null;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/TernaryTree.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/TernaryTree.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/TernaryTree.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/TernaryTree.java Wed Nov 17 19:45:27 2010
@@ -75,6 +75,8 @@ public class TernaryTree implements Clon
* if it ain't broken, don't fix it.
*/
+ private static final long serialVersionUID = 3175412271203716160L;
+
/**
* Pointer to low branch and to rest of the key when it is
* stored directly in this node, we don't have unions in java!
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java Wed Nov 17 19:45:27 2010
@@ -40,7 +40,7 @@ import org.apache.fop.util.ListUtil;
public abstract class AbstractBreaker {
/** logging instance */
- protected static Log log = LogFactory.getLog(AbstractBreaker.class);
+ protected static final Log log = LogFactory.getLog(AbstractBreaker.class);
/**
* A page break position.
@@ -93,6 +93,8 @@ public abstract class AbstractBreaker {
*/
public class BlockSequence extends BlockKnuthSequence {
+ private static final long serialVersionUID = -5348831120146774118L;
+
/** Number of elements to ignore at the beginning of the list. */
int ignoreAtStart = 0; // CSOK: VisibilityModifier
/** Number of elements to ignore at the end of the list. */
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockKnuthSequence.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockKnuthSequence.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockKnuthSequence.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockKnuthSequence.java Wed Nov 17 19:45:27 2010
@@ -27,6 +27,8 @@ import java.util.List;
*/
public class BlockKnuthSequence extends KnuthSequence {
+ private static final long serialVersionUID = 1648962416582509095L;
+
private boolean isClosed = false;
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java Wed Nov 17 19:45:27 2010
@@ -42,7 +42,7 @@ import org.apache.fop.fo.Constants;
public abstract class BreakingAlgorithm {
/** the logger for the class */
- protected static Log log = LogFactory.getLog(BreakingAlgorithm.class);
+ protected static final Log log = LogFactory.getLog(BreakingAlgorithm.class);
/** Maximum adjustment ration */
protected static final int INFINITE_RATIO = 1000;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/InlineKnuthSequence.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/InlineKnuthSequence.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/InlineKnuthSequence.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/InlineKnuthSequence.java Wed Nov 17 19:45:27 2010
@@ -32,6 +32,8 @@ import org.apache.fop.layoutmgr.inline.K
*/
public class InlineKnuthSequence extends KnuthSequence {
+ private static final long serialVersionUID = 1354774188859946549L;
+
private boolean isClosed = false;
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/UnresolvedListElementWithLength.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/UnresolvedListElementWithLength.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/UnresolvedListElementWithLength.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/UnresolvedListElementWithLength.java Wed Nov 17 19:45:27 2010
@@ -30,7 +30,7 @@ import org.apache.fop.traits.MinOptMax;
public abstract class UnresolvedListElementWithLength extends UnresolvedListElement {
/** Logger instance */
- protected static Log log = LogFactory.getLog(UnresolvedListElementWithLength.class);
+ protected static final Log log = LogFactory.getLog(UnresolvedListElementWithLength.class);
private MinOptMax length;
private boolean conditional;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ImageLayout.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ImageLayout.java?rev=1036179&r1=1036178&r2=1036179&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ImageLayout.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ImageLayout.java Wed Nov 17 19:45:27 2010
@@ -37,7 +37,7 @@ import org.apache.fop.fo.properties.Leng
public class ImageLayout implements Constants {
/** logging instance */
- protected static Log log = LogFactory.getLog(ImageLayout.class);
+ protected static final Log log = LogFactory.getLog(ImageLayout.class);
//Input
private GraphicsProperties props;
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org
Re: svn commit: r1036179 [1/2] - in /xmlgraphics/fop/trunk
Posted by Glenn Adams <gl...@skynav.com>.
I agree with Vincent that common acronyms should not be changed to words
(initial cap only) just to satisfy findbugs; this is a case where exclusions
to findbugs should be used, or even a blanket exclusion; furthermore, the
term "Namespace" in XML is well established as a single word and should not
be divided into two words "NameSpace" to satisfy findbugs;
the problem here (and with checkstyle) is that some policy rules having to
do with style or design do not have sufficient universal consensus to simply
adopt without question; in this case, I do not believe there is a consensus
(at least Vincent and I do not agree with the renaming), so I suggest
another way be found to eliminate these findbugs "warnings".
regards,
glenn
On Thu, Nov 18, 2010 at 8:42 AM, Simon Pepping <sp...@leverkruid.eu>wrote:
> render.AbstractGenericSVGHandler.getNamespace -> getNameSpace
> render.intermediate.extensions.AbstractAction.setID -> setId
> render.intermediate.extensions.AbstractAction.getID -> getId
> render.intermediate.extensions.AbstractAction.hasID -> hasId
> render.intermediate.extensions.AbstractAction.getIDPrefix -> getIdPrefix
> render.intermediate.extensions.URIAction.getIDPrefix -> getIdPrefix
> render.XMLHandler.getNamespace -> getNameSpace
> render.ps.PSImageFormResource.getImageURI -> getImageUri
> render.xml.XMLXMLHandler.getNamespace -> getNameSpace
> render.afp.AFPRendererImageInfo.getURI -> getUri
> fonts.type1.PFMFile.getPostscriptName -> getPostScriptName
> tools.TestConverter.setBaseDir -> setBasedir
> tools.anttasks.Fop.setUserconfig -> setUserConfig
> tools.anttasks.Fop.getUserconfig -> getUserConfig()
> tools.anttasks.Fop.setFofile -> setFoFile
> tools.anttasks.Fop.getFofile -> getFoFile
> tools.anttasks.Fop.setThrowexceptions -> setThrowExceptions
> tools.anttasks.Fop.getThrowexceptions -> getThrowExceptions
> apps.PageSequenceResults.getID -> getId
> fo.FOText.getBaseLineShift -> getBaselineShift
> cli.CommandLineOptions.getFOFile -> getFoFile
> cli.CommandLineOptions.getXMLFile -> getXmlFile
> cli.CommandLineOptions.getXSLFile -> getXslFile
>
> On Wed, Nov 17, 2010 at 09:29:06PM +0100, Simon Pepping wrote:
> > On Wed, Nov 17, 2010 at 07:45:31PM -0000, spepping@apache.org wrote:
> > > Author: spepping
> > > Date: Wed Nov 17 19:45:27 2010
> > > New Revision: 1036179
> > >
> > > URL: http://svn.apache.org/viewvc?rev=1036179&view=rev
> > > Log:
> > > findbugs-reported bug squashing; 959 bugs left (findbugs 1.3.9)
> >
> > findbugs reports naming problems in public methods, such as setters
> > and getters. I resolved those problems. But in doing so, in principle
> > I am changing the public API. I do not think that every public method
> > is really in use by other applications. Let me know when I go too far
> > in those changes, harming applications that depend on fop.
> >
> > Simon
> >
>
Re: svn commit: r1036179 [1/2] - in /xmlgraphics/fop/trunk
Posted by Jeremias Maerki <de...@jeremias-maerki.ch>.
Thanks!!!
On 19.11.2010 11:33:21 Simon Pepping wrote:
> I will revert the renaming of public methods. It was not a good idea.
> Sorry for the noise.
>
> Simon
>
> On Thu, Nov 18, 2010 at 05:03:34PM +0100, Simon Pepping wrote:
> > It breaks org.krysalis.barcode4j.fop.BarcodeXMLHandler: getNamespace
> > -> getNameSpace (from render.xml.XMLXMLHandler.getNamespace ->
> > getNameSpace
> >
> > On Thu, Nov 18, 2010 at 04:42:44PM +0100, Simon Pepping wrote:
> > > render.AbstractGenericSVGHandler.getNamespace -> getNameSpace
> > > render.intermediate.extensions.AbstractAction.setID -> setId
> > > render.intermediate.extensions.AbstractAction.getID -> getId
> > > render.intermediate.extensions.AbstractAction.hasID -> hasId
> > > render.intermediate.extensions.AbstractAction.getIDPrefix -> getIdPrefix
> > > render.intermediate.extensions.URIAction.getIDPrefix -> getIdPrefix
> > > render.XMLHandler.getNamespace -> getNameSpace
> > > render.ps.PSImageFormResource.getImageURI -> getImageUri
> > > render.xml.XMLXMLHandler.getNamespace -> getNameSpace
> > > render.afp.AFPRendererImageInfo.getURI -> getUri
> > > fonts.type1.PFMFile.getPostscriptName -> getPostScriptName
> > > tools.TestConverter.setBaseDir -> setBasedir
> > > tools.anttasks.Fop.setUserconfig -> setUserConfig
> > > tools.anttasks.Fop.getUserconfig -> getUserConfig()
> > > tools.anttasks.Fop.setFofile -> setFoFile
> > > tools.anttasks.Fop.getFofile -> getFoFile
> > > tools.anttasks.Fop.setThrowexceptions -> setThrowExceptions
> > > tools.anttasks.Fop.getThrowexceptions -> getThrowExceptions
> > > apps.PageSequenceResults.getID -> getId
> > > fo.FOText.getBaseLineShift -> getBaselineShift
> > > cli.CommandLineOptions.getFOFile -> getFoFile
> > > cli.CommandLineOptions.getXMLFile -> getXmlFile
> > > cli.CommandLineOptions.getXSLFile -> getXslFile
> > >
> > > On Wed, Nov 17, 2010 at 09:29:06PM +0100, Simon Pepping wrote:
> > > > On Wed, Nov 17, 2010 at 07:45:31PM -0000, spepping@apache.org wrote:
> > > > > Author: spepping
> > > > > Date: Wed Nov 17 19:45:27 2010
> > > > > New Revision: 1036179
> > > > >
> > > > > URL: http://svn.apache.org/viewvc?rev=1036179&view=rev
> > > > > Log:
> > > > > findbugs-reported bug squashing; 959 bugs left (findbugs 1.3.9)
> > > >
> > > > findbugs reports naming problems in public methods, such as setters
> > > > and getters. I resolved those problems. But in doing so, in principle
> > > > I am changing the public API. I do not think that every public method
> > > > is really in use by other applications. Let me know when I go too far
> > > > in those changes, harming applications that depend on fop.
> > > >
> > > > Simon
> > > >
Jeremias Maerki
Re: svn commit: r1036179 [1/2] - in /xmlgraphics/fop/trunk
Posted by Simon Pepping <sp...@leverkruid.eu>.
I will revert the renaming of public methods. It was not a good idea.
Sorry for the noise.
Simon
On Thu, Nov 18, 2010 at 05:03:34PM +0100, Simon Pepping wrote:
> It breaks org.krysalis.barcode4j.fop.BarcodeXMLHandler: getNamespace
> -> getNameSpace (from render.xml.XMLXMLHandler.getNamespace ->
> getNameSpace
>
> On Thu, Nov 18, 2010 at 04:42:44PM +0100, Simon Pepping wrote:
> > render.AbstractGenericSVGHandler.getNamespace -> getNameSpace
> > render.intermediate.extensions.AbstractAction.setID -> setId
> > render.intermediate.extensions.AbstractAction.getID -> getId
> > render.intermediate.extensions.AbstractAction.hasID -> hasId
> > render.intermediate.extensions.AbstractAction.getIDPrefix -> getIdPrefix
> > render.intermediate.extensions.URIAction.getIDPrefix -> getIdPrefix
> > render.XMLHandler.getNamespace -> getNameSpace
> > render.ps.PSImageFormResource.getImageURI -> getImageUri
> > render.xml.XMLXMLHandler.getNamespace -> getNameSpace
> > render.afp.AFPRendererImageInfo.getURI -> getUri
> > fonts.type1.PFMFile.getPostscriptName -> getPostScriptName
> > tools.TestConverter.setBaseDir -> setBasedir
> > tools.anttasks.Fop.setUserconfig -> setUserConfig
> > tools.anttasks.Fop.getUserconfig -> getUserConfig()
> > tools.anttasks.Fop.setFofile -> setFoFile
> > tools.anttasks.Fop.getFofile -> getFoFile
> > tools.anttasks.Fop.setThrowexceptions -> setThrowExceptions
> > tools.anttasks.Fop.getThrowexceptions -> getThrowExceptions
> > apps.PageSequenceResults.getID -> getId
> > fo.FOText.getBaseLineShift -> getBaselineShift
> > cli.CommandLineOptions.getFOFile -> getFoFile
> > cli.CommandLineOptions.getXMLFile -> getXmlFile
> > cli.CommandLineOptions.getXSLFile -> getXslFile
> >
> > On Wed, Nov 17, 2010 at 09:29:06PM +0100, Simon Pepping wrote:
> > > On Wed, Nov 17, 2010 at 07:45:31PM -0000, spepping@apache.org wrote:
> > > > Author: spepping
> > > > Date: Wed Nov 17 19:45:27 2010
> > > > New Revision: 1036179
> > > >
> > > > URL: http://svn.apache.org/viewvc?rev=1036179&view=rev
> > > > Log:
> > > > findbugs-reported bug squashing; 959 bugs left (findbugs 1.3.9)
> > >
> > > findbugs reports naming problems in public methods, such as setters
> > > and getters. I resolved those problems. But in doing so, in principle
> > > I am changing the public API. I do not think that every public method
> > > is really in use by other applications. Let me know when I go too far
> > > in those changes, harming applications that depend on fop.
> > >
> > > Simon
> > >
Re: svn commit: r1036179 [1/2] - in /xmlgraphics/fop/trunk
Posted by Simon Pepping <sp...@leverkruid.eu>.
It breaks org.krysalis.barcode4j.fop.BarcodeXMLHandler: getNamespace
-> getNameSpace (from render.xml.XMLXMLHandler.getNamespace ->
getNameSpace
On Thu, Nov 18, 2010 at 04:42:44PM +0100, Simon Pepping wrote:
> render.AbstractGenericSVGHandler.getNamespace -> getNameSpace
> render.intermediate.extensions.AbstractAction.setID -> setId
> render.intermediate.extensions.AbstractAction.getID -> getId
> render.intermediate.extensions.AbstractAction.hasID -> hasId
> render.intermediate.extensions.AbstractAction.getIDPrefix -> getIdPrefix
> render.intermediate.extensions.URIAction.getIDPrefix -> getIdPrefix
> render.XMLHandler.getNamespace -> getNameSpace
> render.ps.PSImageFormResource.getImageURI -> getImageUri
> render.xml.XMLXMLHandler.getNamespace -> getNameSpace
> render.afp.AFPRendererImageInfo.getURI -> getUri
> fonts.type1.PFMFile.getPostscriptName -> getPostScriptName
> tools.TestConverter.setBaseDir -> setBasedir
> tools.anttasks.Fop.setUserconfig -> setUserConfig
> tools.anttasks.Fop.getUserconfig -> getUserConfig()
> tools.anttasks.Fop.setFofile -> setFoFile
> tools.anttasks.Fop.getFofile -> getFoFile
> tools.anttasks.Fop.setThrowexceptions -> setThrowExceptions
> tools.anttasks.Fop.getThrowexceptions -> getThrowExceptions
> apps.PageSequenceResults.getID -> getId
> fo.FOText.getBaseLineShift -> getBaselineShift
> cli.CommandLineOptions.getFOFile -> getFoFile
> cli.CommandLineOptions.getXMLFile -> getXmlFile
> cli.CommandLineOptions.getXSLFile -> getXslFile
>
> On Wed, Nov 17, 2010 at 09:29:06PM +0100, Simon Pepping wrote:
> > On Wed, Nov 17, 2010 at 07:45:31PM -0000, spepping@apache.org wrote:
> > > Author: spepping
> > > Date: Wed Nov 17 19:45:27 2010
> > > New Revision: 1036179
> > >
> > > URL: http://svn.apache.org/viewvc?rev=1036179&view=rev
> > > Log:
> > > findbugs-reported bug squashing; 959 bugs left (findbugs 1.3.9)
> >
> > findbugs reports naming problems in public methods, such as setters
> > and getters. I resolved those problems. But in doing so, in principle
> > I am changing the public API. I do not think that every public method
> > is really in use by other applications. Let me know when I go too far
> > in those changes, harming applications that depend on fop.
> >
> > Simon
> >
Re: svn commit: r1036179 [1/2] - in /xmlgraphics/fop/trunk
Posted by Simon Pepping <sp...@leverkruid.eu>.
render.AbstractGenericSVGHandler.getNamespace -> getNameSpace
render.intermediate.extensions.AbstractAction.setID -> setId
render.intermediate.extensions.AbstractAction.getID -> getId
render.intermediate.extensions.AbstractAction.hasID -> hasId
render.intermediate.extensions.AbstractAction.getIDPrefix -> getIdPrefix
render.intermediate.extensions.URIAction.getIDPrefix -> getIdPrefix
render.XMLHandler.getNamespace -> getNameSpace
render.ps.PSImageFormResource.getImageURI -> getImageUri
render.xml.XMLXMLHandler.getNamespace -> getNameSpace
render.afp.AFPRendererImageInfo.getURI -> getUri
fonts.type1.PFMFile.getPostscriptName -> getPostScriptName
tools.TestConverter.setBaseDir -> setBasedir
tools.anttasks.Fop.setUserconfig -> setUserConfig
tools.anttasks.Fop.getUserconfig -> getUserConfig()
tools.anttasks.Fop.setFofile -> setFoFile
tools.anttasks.Fop.getFofile -> getFoFile
tools.anttasks.Fop.setThrowexceptions -> setThrowExceptions
tools.anttasks.Fop.getThrowexceptions -> getThrowExceptions
apps.PageSequenceResults.getID -> getId
fo.FOText.getBaseLineShift -> getBaselineShift
cli.CommandLineOptions.getFOFile -> getFoFile
cli.CommandLineOptions.getXMLFile -> getXmlFile
cli.CommandLineOptions.getXSLFile -> getXslFile
On Wed, Nov 17, 2010 at 09:29:06PM +0100, Simon Pepping wrote:
> On Wed, Nov 17, 2010 at 07:45:31PM -0000, spepping@apache.org wrote:
> > Author: spepping
> > Date: Wed Nov 17 19:45:27 2010
> > New Revision: 1036179
> >
> > URL: http://svn.apache.org/viewvc?rev=1036179&view=rev
> > Log:
> > findbugs-reported bug squashing; 959 bugs left (findbugs 1.3.9)
>
> findbugs reports naming problems in public methods, such as setters
> and getters. I resolved those problems. But in doing so, in principle
> I am changing the public API. I do not think that every public method
> is really in use by other applications. Let me know when I go too far
> in those changes, harming applications that depend on fop.
>
> Simon
>
Re: svn commit: r1036179 [1/2] - in /xmlgraphics/fop/trunk
Posted by Simon Pepping <sp...@leverkruid.eu>.
On Thu, Nov 18, 2010 at 11:25:10AM +0000, Vincent Hennebert wrote:
> Hi Simon,
>
> On 17/11/10 20:29, Simon Pepping wrote:
> > On Wed, Nov 17, 2010 at 07:45:31PM -0000, spepping@apache.org wrote:
> >> Author: spepping
> >> Date: Wed Nov 17 19:45:27 2010
> >> New Revision: 1036179
> >>
> >> URL: http://svn.apache.org/viewvc?rev=1036179&view=rev
> >> Log:
> >> findbugs-reported bug squashing; 959 bugs left (findbugs 1.3.9)
> >
> > findbugs reports naming problems in public methods, such as setters
> > and getters. I resolved those problems. But in doing so, in principle
> > I am changing the public API. I do not think that every public method
> > is really in use by other applications. Let me know when I go too far
> > in those changes, harming applications that depend on fop.
>
> Good work, thanks for that. There are a few renamings that I’m not sure
> I agree with, though:
>
> • an ID is written ID, all upper case. Id is something else [1] that
> I believe is outside the scope of FOP ;-)
> So I would keep the names setID and getID, and not rename them into
> setId/getId. Affected classes are o.a.f.apps.PageSequenceResults,
> o.a.f.render.intermediate.extensions.AbstractAction and
> o.a.f.render.intermediate.extensions.URIAction
>
> [1] http://www.thefreedictionary.com/ID
>
> • likewise, URI is an acronym that’s always written upper case, and
> I think that should remain so. FWIW, the Java standard library uses
> names like toURI, toURL, etc. Affected classes are
> o.a.f.render.afp.AFPRendererImageInfo and
> o.a.f.render.ps.PSImageFormResource
>
> • namespace is not theoretically an English word but its use has been so
> pervasive (in the W3C Namespaces recommendation, to start with), that
> I would keep it like this. Affected classes are
> o.a.f.render.XMLHandler and descendants.
Findbugs reports inconsistencies in naming. That means that there is
Id and ID, Uri and URI, NameSpace and Namespace, in the Fop code. I
chose for the starting capital with lc as a pattern, but I do not have
a strong preference.
Simon
Re: svn commit: r1036179 [1/2] - in /xmlgraphics/fop/trunk: ./ examples/embedding/java/embedding/
src/java/org/apache/fop/afp/ src/java/org/apache/fop/afp/modca/ src/java/org/apache/fop/apps/
src/java/org/apache/fop/area/ src/java/org/apache/fop/area/inlin...
Posted by Vincent Hennebert <vh...@gmail.com>.
Hi Simon,
On 17/11/10 20:29, Simon Pepping wrote:
> On Wed, Nov 17, 2010 at 07:45:31PM -0000, spepping@apache.org wrote:
>> Author: spepping
>> Date: Wed Nov 17 19:45:27 2010
>> New Revision: 1036179
>>
>> URL: http://svn.apache.org/viewvc?rev=1036179&view=rev
>> Log:
>> findbugs-reported bug squashing; 959 bugs left (findbugs 1.3.9)
>
> findbugs reports naming problems in public methods, such as setters
> and getters. I resolved those problems. But in doing so, in principle
> I am changing the public API. I do not think that every public method
> is really in use by other applications. Let me know when I go too far
> in those changes, harming applications that depend on fop.
Good work, thanks for that. There are a few renamings that I’m not sure
I agree with, though:
• an ID is written ID, all upper case. Id is something else [1] that
I believe is outside the scope of FOP ;-)
So I would keep the names setID and getID, and not rename them into
setId/getId. Affected classes are o.a.f.apps.PageSequenceResults,
o.a.f.render.intermediate.extensions.AbstractAction and
o.a.f.render.intermediate.extensions.URIAction
[1] http://www.thefreedictionary.com/ID
• likewise, URI is an acronym that’s always written upper case, and
I think that should remain so. FWIW, the Java standard library uses
names like toURI, toURL, etc. Affected classes are
o.a.f.render.afp.AFPRendererImageInfo and
o.a.f.render.ps.PSImageFormResource
• namespace is not theoretically an English word but its use has been so
pervasive (in the W3C Namespaces recommendation, to start with), that
I would keep it like this. Affected classes are
o.a.f.render.XMLHandler and descendants.
WDYT?
Thanks,
Vincent
Re: svn commit: r1036179 [1/2] - in /xmlgraphics/fop/trunk: ./
examples/embedding/java/embedding/ src/java/org/apache/fop/afp/
src/java/org/apache/fop/afp/modca/ src/java/org/apache/fop/apps/
src/java/org/apache/fop/area/ src/java/org/apache/fop/area/inlin...
Posted by Simon Pepping <sp...@leverkruid.eu>.
On Wed, Nov 17, 2010 at 07:45:31PM -0000, spepping@apache.org wrote:
> Author: spepping
> Date: Wed Nov 17 19:45:27 2010
> New Revision: 1036179
>
> URL: http://svn.apache.org/viewvc?rev=1036179&view=rev
> Log:
> findbugs-reported bug squashing; 959 bugs left (findbugs 1.3.9)
findbugs reports naming problems in public methods, such as setters
and getters. I resolved those problems. But in doing so, in principle
I am changing the public API. I do not think that every public method
is really in use by other applications. Let me know when I go too far
in those changes, harming applications that depend on fop.
Simon