Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java?rev=1036179&r1=1036178&r2=1036179&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java Wed Nov 17 19:45:27 2010 @@ -56,7 +56,7 @@ public abstract class LeafNodeLayoutMana /** * logging instance */ - protected static Log log = LogFactory.getLog(LeafNodeLayoutManager.class); + protected static final Log log = LogFactory.getLog(LeafNodeLayoutManager.class); /** * The inline area that this leafnode will add.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java?rev=1036179&r1=1036178&r2=1036179&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java Wed Nov 17 19:45:27 2010 @@ -184,6 +184,9 @@ public class LineLayoutManager extends I // this class represents a paragraph private class Paragraph extends InlineKnuthSequence { + + private static final long serialVersionUID = 5862072380375189105L; + /** Number of elements to ignore at the beginning of the list. */ private int ignoreAtStart = 0; /** Number of elements to ignore at the end of the list. */ Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFObject.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFObject.java?rev=1036179&r1=1036178&r2=1036179&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFObject.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFObject.java Wed Nov 17 19:45:27 2010 @@ -42,7 +42,7 @@ import org.apache.commons.logging.LogFac public abstract class PDFObject implements PDFWritable { /** logger for all PDFObjects (and descendants) */ - protected static Log log = LogFactory.getLog(PDFObject.class.getName()); + protected static final Log log = LogFactory.getLog(PDFObject.class.getName()); /** * the object's number Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractConfigurator.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractConfigurator.java?rev=1036179&r1=1036178&r2=1036179&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractConfigurator.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractConfigurator.java Wed Nov 17 19:45:27 2010 @@ -30,7 +30,7 @@ import org.apache.fop.apps.FOUserAgent; */ public abstract class AbstractConfigurator { /** logger instance */ - protected static Log log = LogFactory.getLog(AbstractConfigurator.class); + protected static final Log log = LogFactory.getLog(AbstractConfigurator.class); private static final String MIME = "mime"; Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractGenericSVGHandler.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractGenericSVGHandler.java?rev=1036179&r1=1036178&r2=1036179&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractGenericSVGHandler.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractGenericSVGHandler.java Wed Nov 17 19:45:27 2010 @@ -178,7 +178,7 @@ public abstract class AbstractGenericSVG } /** {...@inheritdoc} */ - public String getNamespace() { + public String getNameSpace() { return SVGDOMImplementation.SVG_NAMESPACE_URI; } Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java?rev=1036179&r1=1036178&r2=1036179&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java Wed Nov 17 19:45:27 2010 @@ -79,7 +79,7 @@ public abstract class AbstractRenderer implements Renderer, Constants { /** logging instance */ - protected static Log log = LogFactory.getLog("org.apache.fop.render"); + protected static final Log log = LogFactory.getLog("org.apache.fop.render"); /** * user agent Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/PrintRendererConfigurator.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/PrintRendererConfigurator.java?rev=1036179&r1=1036178&r2=1036179&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/PrintRendererConfigurator.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/PrintRendererConfigurator.java Wed Nov 17 19:45:27 2010 @@ -48,7 +48,7 @@ public class PrintRendererConfigurator e implements RendererConfigurator, IFDocumentHandlerConfigurator { /** logger instance */ - protected static Log log = LogFactory.getLog(PrintRendererConfigurator.class); + protected static final Log log = LogFactory.getLog(PrintRendererConfigurator.class); /** * Default constructor Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/XMLHandler.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/XMLHandler.java?rev=1036179&r1=1036178&r2=1036179&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/XMLHandler.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/XMLHandler.java Wed Nov 17 19:45:27 2010 @@ -60,6 +60,6 @@ public interface XMLHandler { * @return the XML namespace for the XML dialect this XMLHandler supports, * null if all XML content is handled by this instance. */ - String getNamespace(); + String getNameSpace(); } Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/XMLHandlerConfigurator.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/XMLHandlerConfigurator.java?rev=1036179&r1=1036178&r2=1036179&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/XMLHandlerConfigurator.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/XMLHandlerConfigurator.java Wed Nov 17 19:45:27 2010 @@ -32,7 +32,7 @@ import org.apache.fop.apps.FOUserAgent; public class XMLHandlerConfigurator extends AbstractRendererConfigurator { /** logger instance */ - protected static Log log = LogFactory.getLog(XMLHandlerConfigurator.class); + protected static final Log log = LogFactory.getLog(XMLHandlerConfigurator.class); /** * Default constructor Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/XMLHandlerRegistry.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/XMLHandlerRegistry.java?rev=1036179&r1=1036178&r2=1036179&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/XMLHandlerRegistry.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/XMLHandlerRegistry.java Wed Nov 17 19:45:27 2010 @@ -85,7 +85,7 @@ public class XMLHandlerRegistry { * @param handler the XMLHandler instance */ public void addXMLHandler(XMLHandler handler) { - String ns = handler.getNamespace(); + String ns = handler.getNameSpace(); if (ns == null) { setDefaultXMLHandler(handler); } else { Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererImageInfo.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererImageInfo.java?rev=1036179&r1=1036178&r2=1036179&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererImageInfo.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererImageInfo.java Wed Nov 17 19:45:27 2010 @@ -124,7 +124,7 @@ public class AFPRendererImageInfo { * * @return the uri */ - public String getURI() { + public String getUri() { return this.uri; } Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AFPExtensionHandler.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AFPExtensionHandler.java?rev=1036179&r1=1036178&r2=1036179&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AFPExtensionHandler.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AFPExtensionHandler.java Wed Nov 17 19:45:27 2010 @@ -41,7 +41,7 @@ public class AFPExtensionHandler extends implements ContentHandlerFactory.ObjectSource { /** Logger instance */ - protected static Log log = LogFactory.getLog(AFPExtensionHandler.class); + protected static final Log log = LogFactory.getLog(AFPExtensionHandler.class); private StringBuffer content = new StringBuffer(); private Attributes lastAttributes; Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/PageChangeEvent.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/PageChangeEvent.java?rev=1036179&r1=1036178&r2=1036179&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/PageChangeEvent.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/PageChangeEvent.java Wed Nov 17 19:45:27 2010 @@ -27,6 +27,8 @@ import java.util.EventObject; */ public class PageChangeEvent extends EventObject { + private static final long serialVersionUID = -5969283475959932887L; + private int oldPage; private int newPage; Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRenderer.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRenderer.java?rev=1036179&r1=1036178&r2=1036179&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRenderer.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRenderer.java Wed Nov 17 19:45:27 2010 @@ -31,6 +31,7 @@ import java.awt.image.SinglePixelPackedS import java.io.IOException; import java.io.OutputStream; import java.util.Iterator; +import java.util.NoSuchElementException; import org.apache.commons.logging.Log; @@ -133,7 +134,11 @@ public class TIFFRenderer extends Java2D multiWriter.close(); } } else { - writer.writeImage((RenderedImage) pageImagesItr.next(), outputStream, writerParams); + RenderedImage renderedImage = null; + if (pageImagesItr.hasNext()) { + renderedImage = (RenderedImage) pageImagesItr.next(); + } + writer.writeImage(renderedImage, outputStream, writerParams); if (pageImagesItr.hasNext()) { BitmapRendererEventProducer eventProducer = BitmapRendererEventProducer.Provider.get( @@ -186,8 +191,7 @@ public class TIFFRenderer extends Java2D try { pageImage = getPageImage(current++); } catch (FOPException e) { - log.error(e); - return null; + throw new NoSuchElementException(e.getMessage()); } if (COMPRESSION_CCITT_T4.equalsIgnoreCase(writerParams.getCompressionMethod()) Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFParser.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFParser.java?rev=1036179&r1=1036178&r2=1036179&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFParser.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFParser.java Wed Nov 17 19:45:27 2010 @@ -71,7 +71,7 @@ import org.apache.fop.util.XMLUtil; public class IFParser implements IFConstants { /** Logger instance */ - protected static Log log = LogFactory.getLog(IFParser.class); + protected static final Log log = LogFactory.getLog(IFParser.class); private static SAXTransformerFactory tFactory = (SAXTransformerFactory)SAXTransformerFactory.newInstance(); Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFRenderer.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFRenderer.java?rev=1036179&r1=1036178&r2=1036179&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFRenderer.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFRenderer.java Wed Nov 17 19:45:27 2010 @@ -110,7 +110,7 @@ public class IFRenderer extends Abstract //if optimizations can be done to avoid int->float->int conversions. /** logging instance */ - protected static Log log = LogFactory.getLog(IFRenderer.class); + protected static final Log log = LogFactory.getLog(IFRenderer.class); /** XML MIME type */ public static final String IF_MIME_TYPE = MimeConstants.MIME_FOP_IF; Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFSerializer.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFSerializer.java?rev=1036179&r1=1036178&r2=1036179&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFSerializer.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFSerializer.java Wed Nov 17 19:45:27 2010 @@ -668,8 +668,8 @@ public class IFSerializer extends Abstra throw new NullPointerException("action must not be null"); } if (!action.isComplete()) { - assert action.hasID(); - incompleteActions.put(action.getID(), action); + assert action.hasId(); + incompleteActions.put(action.getId(), action); } } @@ -744,8 +744,8 @@ public class IFSerializer extends Abstra /** {...@inheritdoc} */ public void addResolvedAction(AbstractAction action) throws IFException { assert action.isComplete(); - assert action.hasID(); - AbstractAction noted = (AbstractAction)incompleteActions.remove(action.getID()); + assert action.hasId(); + AbstractAction noted = (AbstractAction)incompleteActions.remove(action.getId()); if (noted != null) { completeActions.add(action); } else { Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/extensions/AbstractAction.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/extensions/AbstractAction.java?rev=1036179&r1=1036178&r2=1036179&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/extensions/AbstractAction.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/extensions/AbstractAction.java Wed Nov 17 19:45:27 2010 @@ -33,7 +33,7 @@ public abstract class AbstractAction imp * Sets an ID to make the action referencable. * @param id the ID */ - public void setID(String id) { + public void setId(String id) { this.id = id; } @@ -41,7 +41,7 @@ public abstract class AbstractAction imp * Returns an optional ID for this action. * @return the ID or null */ - public String getID() { + public String getId() { return this.id; } @@ -65,7 +65,7 @@ public abstract class AbstractAction imp * Indicates whether the action has an ID and is therefore referencable. * @return true if the action has an ID */ - public boolean hasID() { + public boolean hasId() { return this.id != null; } @@ -90,7 +90,7 @@ public abstract class AbstractAction imp * Returns a string that is used to prefix a generated ID to make it unique. * @return the prefix string */ - public String getIDPrefix() { + public String getIdPrefix() { return null; } Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/extensions/ActionSet.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/extensions/ActionSet.java?rev=1036179&r1=1036178&r2=1036179&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/extensions/ActionSet.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/extensions/ActionSet.java Wed Nov 17 19:45:27 2010 @@ -39,7 +39,7 @@ public class ActionSet { */ public synchronized String generateNewID(AbstractAction action) { this.lastGeneratedID++; - String prefix = action.getIDPrefix(); + String prefix = action.getIdPrefix(); if (prefix == null) { throw new IllegalArgumentException("Action class is not compatible"); } @@ -62,12 +62,12 @@ public class ActionSet { * @return the action instance that should be used in place of the given one */ public AbstractAction put(AbstractAction action) { - if (!action.hasID()) { - action.setID(generateNewID(action)); + if (!action.hasId()) { + action.setId(generateNewID(action)); } AbstractAction effAction = normalize(action); if (effAction == action) { - this.actionRegistry.put(action.getID(), action); + this.actionRegistry.put(action.getId(), action); } return effAction; } Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/extensions/DocumentNavigationHandler.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/extensions/DocumentNavigationHandler.java?rev=1036179&r1=1036178&r2=1036179&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/extensions/DocumentNavigationHandler.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/extensions/DocumentNavigationHandler.java Wed Nov 17 19:45:27 2010 @@ -41,7 +41,7 @@ public class DocumentNavigationHandler e implements DocumentNavigationExtensionConstants { /** Logger instance */ - protected static Log log = LogFactory.getLog(DocumentNavigationHandler.class); + protected static final Log log = LogFactory.getLog(DocumentNavigationHandler.class); private StringBuffer content = new StringBuffer(); private Stack objectStack = new Stack(); @@ -132,7 +132,7 @@ public class DocumentNavigationHandler e boolean newWindow = "new".equals(showDestination); URIAction action = new URIAction(gotoURI, newWindow); if (id != null) { - action.setID(id); + action.setId(id); } if (structurePointer != null) { action.setStructurePointer(structurePointer); Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/extensions/GoToXYAction.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/extensions/GoToXYAction.java?rev=1036179&r1=1036178&r2=1036179&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/extensions/GoToXYAction.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/extensions/GoToXYAction.java Wed Nov 17 19:45:27 2010 @@ -52,7 +52,7 @@ public class GoToXYAction extends Abstra * or null, if the position isn't known, yet */ public GoToXYAction(String id, int pageIndex, Point targetLocation) { - setID(id); + setId(id); if (pageIndex < 0 && targetLocation != null) { throw new IllegalArgumentException( "Page index may not be null if target location is known!"); @@ -144,7 +144,7 @@ public class GoToXYAction extends Abstra AttributesImpl atts = new AttributesImpl(); if (this.isCompleteExceptTargetLocation()) { final Point reportedTargetLocation = this.getTargetLocation(); - atts.addAttribute(null, "id", "id", XMLUtil.CDATA, getID()); + atts.addAttribute(null, "id", "id", XMLUtil.CDATA, getId()); atts.addAttribute(null, "page-index", "page-index", XMLUtil.CDATA, Integer.toString(pageIndex)); atts.addAttribute(null, "x", "x", XMLUtil.CDATA, @@ -152,7 +152,7 @@ public class GoToXYAction extends Abstra atts.addAttribute(null, "y", "y", XMLUtil.CDATA, Integer.toString(reportedTargetLocation.y)); } else { - atts.addAttribute(null, "idref", "idref", XMLUtil.CDATA, getID()); + atts.addAttribute(null, "idref", "idref", XMLUtil.CDATA, getId()); } handler.startElement(GOTO_XY.getNamespaceURI(), GOTO_XY.getLocalName(), GOTO_XY.getQName(), atts); @@ -162,7 +162,7 @@ public class GoToXYAction extends Abstra /** {...@inheritdoc} */ public String toString() { - return "GoToXY: ID=" + getID() + return "GoToXY: ID=" + getId() + ", page=" + getPageIndex() + ", loc=" + getTargetLocation() + ", " + (isComplete() ? "complete" : "INCOMPLETE"); Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/extensions/URIAction.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/extensions/URIAction.java?rev=1036179&r1=1036178&r2=1036179&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/extensions/URIAction.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/extensions/URIAction.java Wed Nov 17 19:45:27 2010 @@ -82,15 +82,15 @@ public class URIAction extends AbstractA } /** {...@inheritdoc} */ - public String getIDPrefix() { + public String getIdPrefix() { return "fop-" + GOTO_URI.getLocalName(); } /** {...@inheritdoc} */ public void toSAX(ContentHandler handler) throws SAXException { AttributesImpl atts = new AttributesImpl(); - if (hasID()) { - atts.addAttribute(null, "id", "id", XMLUtil.CDATA, getID()); + if (hasId()) { + atts.addAttribute(null, "id", "id", XMLUtil.CDATA, getId()); } atts.addAttribute(null, "uri", "uri", XMLUtil.CDATA, getURI()); if (isNewWindow()) { Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFDocumentNavigationHandler.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFDocumentNavigationHandler.java?rev=1036179&r1=1036178&r2=1036179&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFDocumentNavigationHandler.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFDocumentNavigationHandler.java Wed Nov 17 19:45:27 2010 @@ -129,7 +129,7 @@ public class PDFDocumentNavigationHandle /** {...@inheritdoc} */ public void addResolvedAction(AbstractAction action) throws IFException { assert action.isComplete(); - PDFAction pdfAction = (PDFAction)this.incompleteActions.remove(action.getID()); + PDFAction pdfAction = (PDFAction)this.incompleteActions.remove(action.getId()); if (pdfAction == null) { getAction(action); } else if (pdfAction instanceof PDFGoTo) { @@ -145,11 +145,11 @@ public class PDFDocumentNavigationHandle if (action == null) { return null; } - PDFAction pdfAction = (PDFAction)this.completeActions.get(action.getID()); + PDFAction pdfAction = (PDFAction)this.completeActions.get(action.getId()); if (pdfAction != null) { return pdfAction; } else if (action instanceof GoToXYAction) { - pdfAction = (PDFAction) incompleteActions.get(action.getID()); + pdfAction = (PDFAction) incompleteActions.get(action.getId()); if (pdfAction != null) { return pdfAction; } else { @@ -159,7 +159,7 @@ public class PDFDocumentNavigationHandle if (action.isComplete()) { updateTargetLocation(pdfGoTo, a); } else { - this.incompleteActions.put(action.getID(), pdfGoTo); + this.incompleteActions.put(action.getId(), pdfGoTo); } return pdfGoTo; } @@ -173,7 +173,7 @@ public class PDFDocumentNavigationHandle //Some PDF actions are pooled getPDFDoc().registerObject(pdfAction); } - this.completeActions.put(action.getID(), pdfAction); + this.completeActions.put(action.getId(), pdfAction); return pdfAction; } else { throw new UnsupportedOperationException("Unsupported action type: " @@ -195,7 +195,7 @@ public class PDFDocumentNavigationHandle //Queue this object now that it's complete getPDFDoc().addObject(pdfGoTo); - this.completeActions.put(action.getID(), pdfGoTo); + this.completeActions.put(action.getId(), pdfGoTo); } } Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/extensions/PDFExtensionHandler.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/extensions/PDFExtensionHandler.java?rev=1036179&r1=1036178&r2=1036179&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/extensions/PDFExtensionHandler.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/extensions/PDFExtensionHandler.java Wed Nov 17 19:45:27 2010 @@ -37,7 +37,7 @@ public class PDFExtensionHandler extends implements ContentHandlerFactory.ObjectSource { /** Logger instance */ - protected static Log log = LogFactory.getLog(PDFExtensionHandler.class); + protected static final Log log = LogFactory.getLog(PDFExtensionHandler.class); private Attributes lastAttributes; Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSFontUtils.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSFontUtils.java?rev=1036179&r1=1036178&r2=1036179&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSFontUtils.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSFontUtils.java Wed Nov 17 19:45:27 2010 @@ -54,7 +54,7 @@ import org.apache.fop.fonts.Typeface; public class PSFontUtils extends org.apache.xmlgraphics.ps.PSFontUtils { /** logging instance */ - protected static Log log = LogFactory.getLog(PSFontUtils.class); + protected static final Log log = LogFactory.getLog(PSFontUtils.class); /** * Generates the PostScript code for the font dictionary. This method should only be Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSImageFormResource.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSImageFormResource.java?rev=1036179&r1=1036178&r2=1036179&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSImageFormResource.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSImageFormResource.java Wed Nov 17 19:45:27 2010 @@ -53,7 +53,7 @@ public class PSImageFormResource extends * Returns the image URI. * @return the image URI */ - public String getImageURI() { + public String getImageUri() { return this.uri; } Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/ResourceHandler.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/ResourceHandler.java?rev=1036179&r1=1036178&r2=1036179&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/ResourceHandler.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/ResourceHandler.java Wed Nov 17 19:45:27 2010 @@ -281,7 +281,7 @@ public class ResourceHandler implements private void generateFormForImage(PSGenerator gen, PSImageFormResource form) throws IOException { - final String uri = form.getImageURI(); + final String uri = form.getImageUri(); ImageManager manager = userAgent.getFactory().getImageManager(); ImageInfo info = null; Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/extensions/PSExtensionHandler.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/extensions/PSExtensionHandler.java?rev=1036179&r1=1036178&r2=1036179&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/extensions/PSExtensionHandler.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/extensions/PSExtensionHandler.java Wed Nov 17 19:45:27 2010 @@ -37,7 +37,7 @@ public class PSExtensionHandler extends implements ContentHandlerFactory.ObjectSource { /** Logger instance */ - protected static Log log = LogFactory.getLog(PSExtensionHandler.class); + protected static final Log log = LogFactory.getLog(PSExtensionHandler.class); private StringBuffer content = new StringBuffer(); private Attributes lastAttributes; Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java?rev=1036179&r1=1036178&r2=1036179&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java Wed Nov 17 19:45:27 2010 @@ -149,7 +149,7 @@ final class TextAttributesConverter { attrFont(fobj.getCommonFont(), attrib); attrFontColor(fobj.getColor(), attrib); attrTextDecoration(fobj.getTextDecoration(), attrib); - attrBaseLineShift(fobj.getBaseLineShift(), attrib); + attrBaseLineShift(fobj.getBaselineShift(), attrib); return attrib; } Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/ParagraphKeeptogetherContext.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/ParagraphKeeptogetherContext.java?rev=1036179&r1=1036178&r2=1036179&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/ParagraphKeeptogetherContext.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/ParagraphKeeptogetherContext.java Wed Nov 17 19:45:27 2010 @@ -37,24 +37,11 @@ public final class ParagraphKeeptogether private static int paraKeepTogetherOpen = 0; private static boolean paraResetProperties = false; - private static ParagraphKeeptogetherContext instance = null; private ParagraphKeeptogetherContext() { } /** - * Singelton. - * - * @return The instance of ParagraphKeeptogetherContext - */ - public static ParagraphKeeptogetherContext getInstance() { - if (instance == null) { - instance = new ParagraphKeeptogetherContext(); - } - return instance; - } - - /** * @return the level of current "keep whith next" paragraph */ public static int getKeepTogetherOpenValue() { Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfJforCmd.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfJforCmd.java?rev=1036179&r1=1036178&r2=1036179&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfJforCmd.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfJforCmd.java Wed Nov 17 19:45:27 2010 @@ -39,14 +39,12 @@ public class RtfJforCmd extends RtfConta private static final String PARA_KEEP_OFF = "para-keep:off"; private final RtfAttributes attrib; - private ParagraphKeeptogetherContext paragraphKeeptogetherContext; RtfJforCmd(RtfContainer parent, Writer w, RtfAttributes attrs) throws IOException { super((RtfContainer)parent, w); attrib = attrs; - paragraphKeeptogetherContext = ParagraphKeeptogetherContext.getInstance(); } Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java?rev=1036179&r1=1036178&r2=1036179&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java Wed Nov 17 19:45:27 2010 @@ -54,7 +54,7 @@ public class RtfTextrun extends RtfConta /** * logging instance */ - protected static Log log = LogFactory.getLog(RtfTextrun.class); + protected static final Log log = LogFactory.getLog(RtfTextrun.class); /** Manager for handling space-* property. */ private RtfSpaceManager rtfSpaceManager = new RtfSpaceManager(); @@ -271,7 +271,6 @@ public class RtfTextrun extends RtfConta //add RtfSpaceSplitter to inherit accumulated space rtfSpaceManager.pushRtfSpaceSplitter(attrs); rtfSpaceManager.setCandidate(attrs); - RtfString r = new RtfString(this, writer, s); rtfSpaceManager.popRtfSpaceSplitter(); } @@ -301,7 +300,7 @@ public class RtfTextrun extends RtfConta ListIterator lit = children.listIterator(children.size()); while (lit.hasPrevious() && (lit.previous() instanceof RtfCloseGroupMark)) { - tmp.push(new Integer(((RtfCloseGroupMark)lit.next()).getBreakType())); + tmp.push(Integer.valueOf(((RtfCloseGroupMark)lit.next()).getBreakType())); lit.remove(); deletedCloseGroupCount++; } Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/XMLXMLHandler.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/XMLXMLHandler.java?rev=1036179&r1=1036178&r2=1036179&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/XMLXMLHandler.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/XMLXMLHandler.java Wed Nov 17 19:45:27 2010 @@ -48,7 +48,7 @@ public class XMLXMLHandler implements XM } /** {...@inheritdoc} */ - public String getNamespace() { + public String getNameSpace() { return null; //Handle all XML content } Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/servlet/FopPrintServlet.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/servlet/FopPrintServlet.java?rev=1036179&r1=1036178&r2=1036179&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/servlet/FopPrintServlet.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/servlet/FopPrintServlet.java Wed Nov 17 19:45:27 2010 @@ -61,6 +61,8 @@ import org.apache.fop.apps.MimeConstants */ public class FopPrintServlet extends FopServlet { + private static final long serialVersionUID = 1645706757391617935L; + /** * {...@inheritdoc} */ Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/servlet/FopServlet.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/servlet/FopServlet.java?rev=1036179&r1=1036178&r2=1036179&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/servlet/FopServlet.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/servlet/FopServlet.java Wed Nov 17 19:45:27 2010 @@ -70,6 +70,8 @@ import org.apache.fop.apps.MimeConstants */ public class FopServlet extends HttpServlet { + private static final long serialVersionUID = -908918093488215264L; + /** Name of the parameter used for the XSL-FO file */ protected static final String FO_REQUEST_PARAM = "fo"; /** Name of the parameter used for the XML file */ Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/TestConverter.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/TestConverter.java?rev=1036179&r1=1036178&r2=1036179&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/TestConverter.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/TestConverter.java Wed Nov 17 19:45:27 2010 @@ -56,7 +56,7 @@ public class TestConverter { private String outputFormat = MimeConstants.MIME_FOP_AREA_TREE; private File destdir; private File compare = null; - private String baseDir = "./"; + private String basedir = "./"; private Map differ = new java.util.HashMap(); /** @@ -95,7 +95,7 @@ public class TestConverter { } else if (args[count].equals("-d")) { tc.setDebug(true); } else if (args[count].equals("-b")) { - tc.setBaseDir(args[++count]); + tc.setBasedir(args[++count]); } else if (args[count].equals("-results")) { results = args[++count]; } else { @@ -138,8 +138,8 @@ public class TestConverter { * Sets the base directory. * @param str base directory */ - public void setBaseDir(String str) { - baseDir = str; + public void setBasedir(String str) { + basedir = str; } /** @@ -167,11 +167,11 @@ public class TestConverter { logger.debug("running tests in file:" + fname); try { if (compDir != null) { - compare = new File(baseDir + "/" + compDir); + compare = new File(basedir + "/" + compDir); } - destdir = new File(baseDir + "/" + dest); + destdir = new File(basedir + "/" + dest); destdir.mkdirs(); - File f = new File(baseDir + "/" + fname); + File f = new File(basedir + "/" + fname); DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); DocumentBuilder db = factory.newDocumentBuilder(); Document doc = db.parse(f); @@ -271,7 +271,7 @@ public class TestConverter { res = resNode.getNodeValue(); } try { - File xmlFile = new File(baseDir + "/" + xml); + File xmlFile = new File(basedir + "/" + xml); String baseURL = null; try { baseURL = xmlFile.getParentFile().toURI().toURL().toExternalForm(); @@ -284,7 +284,7 @@ public class TestConverter { inputHandler = new InputHandler(xmlFile); } else { inputHandler = new InputHandler(xmlFile, - new File(baseDir + "/" + new File(basedir + "/" + xsl), null); } Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/Fop.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/Fop.java?rev=1036179&r1=1036178&r2=1036179&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/Fop.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/Fop.java Wed Nov 17 19:45:27 2010 @@ -85,7 +85,7 @@ public class Fop extends Task { * Sets the filename for the userconfig.xml. * @param userConfig Configuration to use */ - public void setUserconfig(File userConfig) { + public void setUserConfig(File userConfig) { this.userConfig = userConfig; } @@ -93,7 +93,7 @@ public class Fop extends Task { * Returns the file for the userconfig.xml. * @return the userconfig.xml file */ - public File getUserconfig() { + public File getUserConfig() { return this.userConfig; } @@ -101,7 +101,7 @@ public class Fop extends Task { * Sets the input XSL-FO file. * @param foFile input XSL-FO file */ - public void setFofile(File foFile) { + public void setFoFile(File foFile) { this.foFile = foFile; } @@ -109,7 +109,7 @@ public class Fop extends Task { * Gets the input XSL-FO file. * @return input XSL-FO file */ - public File getFofile() { + public File getFoFile() { return foFile; } @@ -267,7 +267,7 @@ public class Fop extends Task { * default is false. * @param throwExceptions true if exceptions should be thrown */ - public void setThrowexceptions(boolean throwExceptions) { + public void setThrowExceptions(boolean throwExceptions) { this.throwExceptions = throwExceptions; } @@ -275,7 +275,7 @@ public class Fop extends Task { * Gets the throw exceptions attribute * @return the throw exceptions attribute */ - public boolean getThrowexceptions() { + public boolean getThrowExceptions() { return this.throwExceptions; } @@ -408,8 +408,8 @@ class FOPTaskStarter { FOPTaskStarter(Fop task) throws SAXException, IOException { this.task = task; - if (task.getUserconfig() != null) { - fopFactory.setUserConfig(task.getUserconfig()); + if (task.getUserConfig() != null) { + fopFactory.setUserConfig(task.getUserConfig()); } } @@ -497,8 +497,8 @@ class FOPTaskStarter { } } else { try { - if (task.getFofile() != null) { - this.baseURL = task.getFofile().getParentFile().toURI().toURL(). + if (task.getFoFile() != null) { + this.baseURL = task.getFoFile().getParentFile().toURI().toURL(). toExternalForm(); } } catch (MalformedURLException mfue) { @@ -517,8 +517,8 @@ class FOPTaskStarter { int skippedcount = 0; // deal with single source file - if (task.getFofile() != null) { - if (task.getFofile().exists()) { + if (task.getFoFile() != null) { + if (task.getFoFile().exists()) { File outf = task.getOutfile(); if (outf == null) { throw new BuildException("outfile is required when fofile is used"); @@ -530,11 +530,11 @@ class FOPTaskStarter { // OR output file doesn't exist OR // output file is older than input file if (task.getForce() || !outf.exists() - || (task.getFofile().lastModified() > outf.lastModified() )) { - render(task.getFofile(), outf, outputFormat); + || (task.getFoFile().lastModified() > outf.lastModified() )) { + render(task.getFoFile(), outf, outputFormat); actioncount++; } else if (outf.exists() - && (task.getFofile().lastModified() <= outf.lastModified() )) { + && (task.getFoFile().lastModified() <= outf.lastModified() )) { skippedcount++; } } @@ -653,7 +653,7 @@ class FOPTaskStarter { inputHandler.renderTo(userAgent, outputFormat, out); success = true; } catch (Exception ex) { - if (task.getThrowexceptions()) { + if (task.getThrowExceptions()) { throw new BuildException(ex); } throw ex; Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/traits/BorderProps.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/traits/BorderProps.java?rev=1036179&r1=1036178&r2=1036179&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/traits/BorderProps.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/traits/BorderProps.java Wed Nov 17 19:45:27 2010 @@ -34,6 +34,8 @@ import org.apache.fop.util.ColorUtil; */ public class BorderProps implements Serializable { + private static final long serialVersionUID = -886871454032189183L; + /** Separate border model */ public static final int SEPARATE = 0; /** Collapsing border model, for borders inside a table */ Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorUtil.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorUtil.java?rev=1036179&r1=1036178&r2=1036179&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorUtil.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorUtil.java Wed Nov 17 19:45:27 2010 @@ -53,7 +53,7 @@ public final class ColorUtil { private static Map colorMap = null; /** Logger instance */ - protected static Log log = LogFactory.getLog(ColorUtil.class); + protected static final Log log = LogFactory.getLog(ColorUtil.class); static { initializeColorMap(); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
