You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by vh...@apache.org on 2010/08/17 20:57:15 UTC

svn commit: r986451 [11/13] - in /xmlgraphics/fop/branches/Temp_ComplexScripts: ./ examples/plan/src/org/apache/fop/plan/ src/codegen/java/org/apache/fop/tools/ src/codegen/unicode/data/ src/codegen/unicode/java/org/apache/fop/hyphenation/ src/codegen/...

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/ps/PSImageHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/ps/PSImageHandler.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/ps/PSImageHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/ps/PSImageHandler.java Tue Aug 17 18:57:04 2010
@@ -30,7 +30,8 @@ import org.apache.fop.render.RenderingCo
  * Specialized image handler interface for PostScript output. Implementations can optionally
  * support creating PostScript forms. The implementation shall check the rendering context
  * to see if forms functionality is enabled in the
- * {@link #isCompatible(org.apache.fop.render.RenderingContext, org.apache.xmlgraphics.image.loader.Image)}
+ * {@link #isCompatible(org.apache.fop.render.RenderingContext,
+ * org.apache.xmlgraphics.image.loader.Image)}
  * method.
  */
 public interface PSImageHandler extends ImageHandler {

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/ps/PSPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/ps/PSPainter.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/ps/PSPainter.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/ps/PSPainter.java Tue Aug 17 18:57:04 2010
@@ -403,9 +403,10 @@ public class PSPainter extends AbstractI
         }
     }
 
-    private void writeText(String text, int start, int len,
-            int letterSpacing, int wordSpacing, int[] dx,
-            Font font, Typeface tf) throws IOException {
+    private void writeText                                      // CSOK: ParameterNumber
+        (String text, int start, int len,
+         int letterSpacing, int wordSpacing, int[] dx,
+         Font font, Typeface tf) throws IOException {
         PSGenerator generator = getGenerator();
         int end = start + len;
         int initialSize = len;

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/ps/PSRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/ps/PSRenderer.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/ps/PSRenderer.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/ps/PSRenderer.java Tue Aug 17 18:57:04 2010
@@ -597,8 +597,9 @@ public class PSRenderer extends Abstract
     }
 
     /** {@inheritDoc} */
-    protected void drawBorderLine(float x1, float y1, float x2, float y2,
-            boolean horz, boolean startOrBefore, int style, Color col) {
+    protected void drawBorderLine                               // CSOK: ParameterNumber
+        (float x1, float y1, float x2, float y2,
+         boolean horz, boolean startOrBefore, int style, Color col) {
         try {
             PSBorderPainter.drawBorderLine(gen, x1, y1, x2, y2, horz, startOrBefore, style, col);
         } catch (IOException ioe) {

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/ps/PSRendererContextConstants.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/ps/PSRendererContextConstants.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/ps/PSRendererContextConstants.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/ps/PSRendererContextConstants.java Tue Aug 17 18:57:04 2010
@@ -27,10 +27,9 @@ import org.apache.fop.render.RendererCon
 public interface PSRendererContextConstants extends RendererContextConstants {
 
     /** The PostScript generator that is being used to drawn into. */
-    public static final String PS_GENERATOR = "psGenerator";
+    String PS_GENERATOR = "psGenerator";
 
     /** The font information for the PostScript renderer. */
-    public static final String PS_FONT_INFO = "psFontInfo";
-
+    String PS_FONT_INFO = "psFontInfo";
 
 }

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/ps/PSRenderingUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/ps/PSRenderingUtil.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/ps/PSRenderingUtil.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/ps/PSRenderingUtil.java Tue Aug 17 18:57:04 2010
@@ -229,6 +229,7 @@ public class PSRenderingUtil implements 
         this.dscCompliant = value;
     }
 
+    /** @return true if DSC complicance is enabled */
     public boolean isDSCComplianceEnabled() {
         return this.dscCompliant;
     }

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/ps/PSSVGHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/ps/PSSVGHandler.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/ps/PSSVGHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/ps/PSSVGHandler.java Tue Aug 17 18:57:04 2010
@@ -30,8 +30,6 @@ import org.apache.avalon.framework.confi
 import org.apache.batik.bridge.BridgeContext;
 import org.apache.batik.bridge.GVTBuilder;
 import org.apache.batik.gvt.GraphicsNode;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 import org.apache.xmlgraphics.java2d.ps.PSGraphics2D;
 import org.apache.xmlgraphics.ps.PSGenerator;
@@ -57,9 +55,6 @@ import org.apache.fop.svg.SVGUserAgent;
 public class PSSVGHandler extends AbstractGenericSVGHandler
             implements PSRendererContextConstants {
 
-    /** logging instance */
-    private static Log log = LogFactory.getLog(PSSVGHandler.class);
-
     /**
      * Create a new PostScript XML handler for use by the PostScript renderer.
      */

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/ps/PSTextPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/ps/PSTextPainter.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/ps/PSTextPainter.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/ps/PSTextPainter.java Tue Aug 17 18:57:04 2010
@@ -49,7 +49,7 @@ import org.apache.fop.svg.NativeTextPain
 import org.apache.fop.util.CharUtilities;
 
 /**
- * Renders the attributed character iterator of a {@link TextNode}.
+ * Renders the attributed character iterator of a text node.
  * This class draws the text directly using PostScript text operators so
  * the text is not drawn using shapes which makes the PS files larger.
  * <p>

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/RTFEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/RTFEventProducer.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/RTFEventProducer.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/RTFEventProducer.java Tue Aug 17 18:57:04 2010
@@ -31,7 +31,10 @@ import org.apache.fop.fo.FONode;
 public interface RTFEventProducer extends EventProducer {
 
     /** Provider class for the event producer. */
-    class Provider {
+    final class Provider {
+
+        private Provider() {
+        }
 
         /**
          * Returns an event producer.

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/RTFHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/RTFHandler.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/RTFHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/RTFHandler.java Tue Aug 17 18:57:04 2010
@@ -1468,7 +1468,7 @@ public class RTFHandler extends FOEventH
      * @param foNode FO node whose event is to be called
      * @param bStart TRUE calls the start handler, FALSE the end handler
      */
-    private void invokeDeferredEvent(FONode foNode, boolean bStart) {
+    private void invokeDeferredEvent(FONode foNode, boolean bStart) { // CSOK: MethodLength
         if (foNode instanceof PageSequence) {
             if (bStart) {
                 startPageSequence( (PageSequence) foNode);

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/TableAttributesConverter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/TableAttributesConverter.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/TableAttributesConverter.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/TableAttributesConverter.java Tue Aug 17 18:57:04 2010
@@ -65,11 +65,8 @@ public final class TableAttributesConver
     /**
      * Converts table-only attributes to rtf attributes.
      *
-     * @param attrs Given attributes
-     * @param defaultAttributes Default rtf attributes
-     *
+     * @param fobj the table for which the attributes are converted
      * @return All valid rtf attributes together
-     *
      * @throws ConverterException On convertion error
      */
     static RtfAttributes convertTableAttributes(Table fobj)
@@ -83,11 +80,8 @@ public final class TableAttributesConver
     /**
      * Converts table-only attributes to rtf attributes.
      *
-     * @param attrs Given attributes
-     * @param defaultAttributes Default rtf attributes
-     *
+     * @param part the table part for which the attributes are converted
      * @return All valid rtf attributes together
-     *
      * @throws ConverterException On convertion error
      */
     static RtfAttributes convertTablePartAttributes(TablePart part)
@@ -226,8 +220,6 @@ public final class TableAttributesConver
      * Converts table and row attributes to rtf attributes.
      *
      * @param fobj FObj to be converted
-     * @param defaultAttributes Default rtf attributes
-     *
      * @return All valid rtf attributes together
      * @throws ConverterException On converion error
      */

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java Tue Aug 17 18:57:04 2010
@@ -68,7 +68,7 @@ final class TextAttributesConverter {
 
     /**
      * Converts all known text FO properties to RtfAttributes
-     * @param props list of FO properites, which are to be converted
+     * @param fobj the FO for which the attributes are to be converted
      */
     public static RtfAttributes convertAttributes(Block fobj)
                 throws FOPException {
@@ -86,7 +86,7 @@ final class TextAttributesConverter {
 
     /**
      * Converts all known text FO properties to RtfAttributes
-     * @param props list of FO properites, which are to be converted
+     * @param fobj FObj whose properties are to be converted
      */
     public static RtfAttributes convertBlockContainerAttributes(BlockContainer fobj)
                 throws FOPException {
@@ -442,7 +442,7 @@ final class TextAttributesConverter {
     /**
      * Reads background-color from bl and writes it to rtfAttr.
      *
-     * @param bl the Block object the properties are read from
+     * @param bph the CommonBorderPaddingBackground from which the properties are read
      * @param rtfAttr the RtfAttributes object the attributes are written to
      */
     private static void attrBackgroundColor(CommonBorderPaddingBackground bpb,

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/ParagraphKeeptogetherContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/ParagraphKeeptogetherContext.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/ParagraphKeeptogetherContext.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/ParagraphKeeptogetherContext.java Tue Aug 17 18:57:04 2010
@@ -33,16 +33,15 @@ package org.apache.fop.render.rtf.rtflib
  *
  */
 
-public class ParagraphKeeptogetherContext {
+public final class ParagraphKeeptogetherContext {
 
     private static int paraKeepTogetherOpen = 0;
     private static boolean paraResetProperties = false;
     private static ParagraphKeeptogetherContext instance = null;
 
-    ParagraphKeeptogetherContext() {
+    private ParagraphKeeptogetherContext() {
     }
 
-
     /**
      * Singelton.
      *

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBookmark.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBookmark.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBookmark.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBookmark.java Tue Aug 17 18:57:04 2010
@@ -59,8 +59,8 @@ public class RtfBookmark extends RtfElem
      * @param writer a <code>Writer</code> value
      * @param bookmark Name of the bookmark
      */
-    RtfBookmark (RtfContainer parent, Writer w, String bookmark) throws IOException {
-        super (parent, w);
+    RtfBookmark (RtfContainer parent, Writer writer, String bookmark) throws IOException {
+        super (parent, writer);
 
         int now = bookmark.length ();
 

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExternalGraphic.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExternalGraphic.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExternalGraphic.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExternalGraphic.java Tue Aug 17 18:57:04 2010
@@ -87,8 +87,8 @@ public class RtfExternalGraphic extends 
         /**
          * Convert image data if necessary - for example when format is not supported by rtf.
          *
+         * @param format Format type
          * @param data Image
-         * @param type Format type
          */
         public FormatBase convert(FormatBase format, byte[] data) {
             return format;
@@ -640,7 +640,7 @@ public class RtfExternalGraphic extends 
             tmpUrl = new URL (urlString);
         } catch (MalformedURLException e) {
             try {
-                tmpUrl = new File (urlString).toURL ();
+                tmpUrl = new File (urlString).toURI().toURL ();
             } catch (MalformedURLException ee) {
                 throw new ExternalGraphicException("The attribute 'src' of "
                         + "<fo:external-graphic> has a invalid value: '"

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExtraRowSet.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExtraRowSet.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExtraRowSet.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExtraRowSet.java Tue Aug 17 18:57:04 2010
@@ -102,6 +102,13 @@ public class RtfExtraRowSet extends RtfC
             return result;
         }
 
+        public int hashCode() {
+            int hc = super.hashCode();
+            hc ^= ( hc * 11 ) + xOffset;
+            hc ^= ( hc * 19 ) + rowIndex;
+            return hc;
+        }
+
         public boolean equals(Object o) {
             return o != null && this.compareTo(o) == 0;
         }

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFile.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFile.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFile.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFile.java Tue Aug 17 18:57:04 2010
@@ -80,9 +80,10 @@ extends RtfContainer {
      * If called, must be called before startDocumentArea
      * @return the new RtfHeader
      * @throws IOException for I/O problems
+     * @throws RtfStructureException for illegal RTF structure
      */
     public RtfHeader startHeader()
-    throws IOException {
+    throws IOException, RtfStructureException {
         if (header != null) {
             throw new RtfStructureException("startHeader called more than once");
         }
@@ -128,7 +129,7 @@ extends RtfContainer {
      * @throws RtfStructureException for illegal RTF structure
      */
     public RtfPageArea startPageArea()
-    throws IOException {
+    throws IOException, RtfStructureException {
         if (pageArea != null) {
             throw new RtfStructureException("startPageArea called more than once");
         }
@@ -149,7 +150,7 @@ extends RtfContainer {
      * @throws RtfStructureException for illegal RTF structure
      */
     public RtfPageArea getPageArea()
-    throws IOException {
+    throws IOException, RtfStructureException {
         if (pageArea == null) {
             return startPageArea();
         }
@@ -164,7 +165,7 @@ extends RtfContainer {
      * @throws RtfStructureException for illegal RTF structure
      */
     public RtfDocumentArea startDocumentArea()
-    throws IOException {
+        throws IOException, RtfStructureException {
         if (docArea != null) {
             throw new RtfStructureException("startDocumentArea called more than once");
         }
@@ -187,7 +188,7 @@ extends RtfContainer {
      * @throws RtfStructureException for illegal RTF structure
      */
     public RtfDocumentArea getDocumentArea()
-    throws IOException {
+    throws IOException, RtfStructureException {
         if (docArea == null) {
             return startDocumentArea();
         }

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFootnote.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFootnote.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFootnote.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFootnote.java Tue Aug 17 18:57:04 2010
@@ -17,7 +17,6 @@
 
 /* $Id$ */
 
-
 package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 //Java
@@ -33,18 +32,28 @@ import org.apache.fop.render.rtf.rtflib.
  */
 public class RtfFootnote extends RtfContainer
         implements IRtfTextrunContainer, IRtfListContainer {
-    RtfTextrun textrunInline = null;
-    RtfContainer body = null;
-    RtfList list = null;
-    boolean bBody = false;
+    RtfTextrun textrunInline = null;                            // CSOK: VisibilityModifier
+    RtfContainer body = null;                                   // CSOK: VisibilityModifier
+    RtfList list = null;                                        // CSOK: VisibilityModifier
+    boolean bBody = false;                                      // CSOK: VisibilityModifier
 
-    /** Create an RTF list item as a child of given container with default attributes */
+    /**
+     * Create an RTF list item as a child of given container with default attributes.
+     * @param parent a container
+     * @param w a writer
+     * @return a text run
+     * @throw IOException if not caught
+     */
     RtfFootnote(RtfContainer parent, Writer w) throws IOException {
         super(parent, w);
         textrunInline = new RtfTextrun(this, writer, null);
         body = new RtfContainer(this, writer);
     }
 
+    /**
+     * @return a text run
+     * @throws IOException if not caught
+     */
     public RtfTextrun getTextrun() throws IOException {
         if (bBody) {
             RtfTextrun textrun = RtfTextrun.getTextrun(body, writer, null);
@@ -72,6 +81,11 @@ public class RtfFootnote extends RtfCont
         writeGroupMark(false);
     }
 
+    /**
+     * @param attrs some attributes
+     * @return an rtf list
+     * @throws IOException if not caught
+     */
     public RtfList newList(RtfAttributes attrs) throws IOException {
         if (list != null) {
             list.close();
@@ -82,10 +96,12 @@ public class RtfFootnote extends RtfCont
         return list;
     }
 
+    /** start body */
     public void startBody() {
         bBody = true;
     }
 
+    /** end body */
     public void endBody() {
         bBody = false;
     }

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfGenerator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfGenerator.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfGenerator.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfGenerator.java Tue Aug 17 18:57:04 2010
@@ -27,7 +27,12 @@ import java.io.Writer;
  */
 public class RtfGenerator extends RtfElement {
 
-    /** Default constructor for the generator element. */
+    /**
+     * Default constructor for the generator element.
+     * @param h a header
+     * @param w a writer
+     * @throws IOException if not caught
+     */
     public RtfGenerator(RtfHeader h, Writer w) throws IOException {
         super(h, w);
     }

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHyperLink.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHyperLink.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHyperLink.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHyperLink.java Tue Aug 17 18:57:04 2010
@@ -57,7 +57,7 @@ implements IRtfTextContainer,
 
 
     /**
-     * Default constructor.
+     * A constructor.
      *
      * @param parent a <code>RtfContainer</code> value
      * @param writer a <code>Writer</code> value
@@ -71,6 +71,14 @@ implements IRtfTextContainer,
         new RtfText (this, writer, str, attr);
     }
 
+    /**
+     * A constructor.
+     *
+     * @param parent a <code>RtfContainer</code> value
+     * @param writer a <code>Writer</code> value
+     * @param attr a <code>RtfAttributes</code> value
+     * @throws IOException for I/O problems
+     */
     public RtfHyperLink (RtfTextrun parent, Writer writer, RtfAttributes attr)
         throws IOException {
         super ((RtfContainer) parent, writer, attr);
@@ -217,8 +225,11 @@ implements IRtfTextContainer,
         return false;
     }
 
-    public RtfTextrun getTextrun()
-    throws IOException {
+    /**
+     * @return a text run
+     * @throws IOException if not caught
+     */
+    public RtfTextrun getTextrun() throws IOException {
         RtfTextrun textrun = RtfTextrun.getTextrun(this, writer, null);
         return textrun;
     }

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfList.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfList.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfList.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfList.java Tue Aug 17 18:57:04 2010
@@ -26,9 +26,8 @@ package org.apache.fop.render.rtf.rtflib
  * the FOP project.
  */
 
-import java.io.Writer;
 import java.io.IOException;
-import java.util.Date;
+import java.io.Writer;
 import java.util.Random;
 
 /**

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfString.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfString.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfString.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfString.java Tue Aug 17 18:57:04 2010
@@ -17,6 +17,7 @@
 
 /* $Id$ */
 
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 /*
  * This file is part of the RTF library of the FOP project, which was originally
@@ -25,8 +26,6 @@
  * the FOP project.
  */
 
-package org.apache.fop.render.rtf.rtflib.rtfdoc;
-
 import java.io.IOException;
 import java.io.Writer;
 
@@ -59,10 +58,12 @@ public class RtfString extends RtfElemen
         RtfStringConverter.getInstance().writeRtfString(writer, text);
     }
 
+    /** @return the text */
     public String getText() {
         return text;
     }
 
+    /** @param s some text */
     public void setText(String s) {
         text = s;
     }

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStringConverter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStringConverter.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStringConverter.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStringConverter.java Tue Aug 17 18:57:04 2010
@@ -17,6 +17,7 @@
 
 /* $Id$ */
 
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 /*
  * This file is part of the RTF library of the FOP project, which was originally
@@ -25,8 +26,6 @@
  * the FOP project.
  */
 
-package org.apache.fop.render.rtf.rtflib.rtfdoc;
-
 import java.util.Map;
 import java.util.HashMap;
 import java.io.IOException;
@@ -36,9 +35,9 @@ import java.io.Writer;
  *  @author Bertrand Delacretaz bdelacretaz@codeconsult.ch
  */
 
-public class RtfStringConverter {
-    private static final RtfStringConverter INSTANCE = new RtfStringConverter();
+public final class RtfStringConverter {
 
+    private static final RtfStringConverter INSTANCE = new RtfStringConverter();
     private static final Map SPECIAL_CHARS;
     private static final Character DBLQUOTE = new Character('\"');
     private static final Character QUOTE = new Character('\'');

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStyleSheetTable.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStyleSheetTable.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStyleSheetTable.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStyleSheetTable.java Tue Aug 17 18:57:04 2010
@@ -17,6 +17,7 @@
 
 /* $Id$ */
 
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 /*
  * This file is part of the RTF library of the FOP project, which was originally
@@ -25,8 +26,6 @@
  * the FOP project.
  */
 
-package org.apache.fop.render.rtf.rtflib.rtfdoc;
-
 import java.util.Vector;
 import java.util.Hashtable;
 import java.io.IOException;
@@ -37,7 +36,7 @@ import java.util.Iterator;
  * This class belongs to the <jfor:stylesheet> tag processing.
  * @author <a href="mailto:a.putz@skynamics.com">Andreas Putz</a>
  */
-public class RtfStyleSheetTable {
+public final class RtfStyleSheetTable {
     //////////////////////////////////////////////////
     // @@ Symbolic constants
     //////////////////////////////////////////////////

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java Tue Aug 17 18:57:04 2010
@@ -181,8 +181,8 @@ public class RtfTableCell
     }
 
     /** used by RtfTableRow to write the <celldef> cell definition control words
-     *  @param widthOffset sum of the widths of preceeding cells in same row
-     *  @return widthOffset + width of this cell
+     *  @param offset sum of the widths of preceeding cells in same row
+     *  @return offset + width of this cell
      */
     int writeCellDef(int offset) throws IOException {
         /*

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTemplate.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTemplate.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTemplate.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTemplate.java Tue Aug 17 18:57:04 2010
@@ -17,6 +17,7 @@
 
 /* $Id$ */
 
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 /*
  * This file is part of the RTF library of the FOP project, which was originally
@@ -25,8 +26,6 @@
  * the FOP project.
  */
 
-package org.apache.fop.render.rtf.rtflib.rtfdoc;
-
 import java.io.IOException;
 
 /**
@@ -34,7 +33,7 @@ import java.io.IOException;
  * This class belongs to the <jfor:style-template> tag processing.
  */
 
-public class RtfTemplate  {
+public final class RtfTemplate  {
 
     /** Singelton instance */
     private static RtfTemplate instance = null;

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfText.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfText.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfText.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfText.java Tue Aug 17 18:57:04 2010
@@ -17,6 +17,7 @@
 
 /* $Id$ */
 
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 /*
  * This file is part of the RTF library of the FOP project, which was originally
@@ -25,8 +26,6 @@
  * the FOP project.
  */
 
-package org.apache.fop.render.rtf.rtflib.rtfdoc;
-
 import java.io.IOException;
 import java.io.Writer;
 

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java Tue Aug 17 18:57:04 2010
@@ -355,8 +355,8 @@ public class RtfTextrun extends RtfConta
          * Maybe this can be done more efficient.
          */
 
-        boolean bHasTableCellParent =
-            this.getParentOfClass(RtfTableCell.class) != null;
+        boolean bHasTableCellParent
+            = this.getParentOfClass(RtfTableCell.class) != null;
         RtfAttributes attrBlockLevel = new RtfAttributes();
 
         //determine, if this RtfTextrun is the last child of its parent

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/WhitespaceCollapser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/WhitespaceCollapser.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/WhitespaceCollapser.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/WhitespaceCollapser.java Tue Aug 17 18:57:04 2010
@@ -17,6 +17,7 @@
 
 /* $Id$ */
 
+package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
 /*
  * This file is part of the RTF library of the FOP project, which was originally
@@ -25,8 +26,6 @@
  * the FOP project.
  */
 
-package org.apache.fop.render.rtf.rtflib.rtfdoc;
-
 import java.util.Iterator;
 import java.util.StringTokenizer;
 
@@ -34,11 +33,15 @@ import java.util.StringTokenizer;
  *  @author Bertrand Delacretaz bdelacretaz@codeconsult.ch
  */
 
-class WhitespaceCollapser {
+final class WhitespaceCollapser {
+
     private static final String SPACE = " ";
     private boolean lastEndSpace = true;
 
-    /** remove extra whitespace in RtfText elements that are inside c */
+    /**
+     * Remove extra whitespace in RtfText elements that are inside container.
+     * @param c the container
+     */
     WhitespaceCollapser(RtfContainer c) {
         // process all texts
         for (Iterator it = c.getChildren().iterator(); it.hasNext();) {
@@ -56,6 +59,11 @@ class WhitespaceCollapser {
         }
     }
 
+    /** @return last end space */
+    public boolean getLastEndSpace() {
+        return lastEndSpace;
+    }
+
     /** process one RtfText from our container */
     private void processText(RtfText txt) {
         final String newString = processString(txt.getText());

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/tools/BuilderContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/tools/BuilderContext.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/tools/BuilderContext.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/tools/BuilderContext.java Tue Aug 17 18:57:04 2010
@@ -49,6 +49,10 @@ public class BuilderContext {
     /** Rtf options */
     private IRtfOptions options;
 
+    /**
+     * Construct a builder context.
+     * @param rtfOptions some options
+     */
     public BuilderContext(IRtfOptions rtfOptions) {
         options = rtfOptions;
     }
@@ -82,9 +86,13 @@ public class BuilderContext {
         return result;
     }*/
 
-    /** find the "nearest" container that implements the given interface on our stack
-     *  @param required if true, ConverterException is thrown if no container found
-     *  @param forWhichBuilder used in error message if container not found
+    /**
+     * Find the "nearest" container that implements the given interface on our stack.
+     * @param containerClass class of container
+     * @param required if true, ConverterException is thrown if no container found
+     * @param forWhichBuilder used in error message if container not found
+     * @return the container
+     * @throws RtfException if not caught
      */
     public RtfContainer getContainer(Class containerClass, boolean required,
                               Object /*IBuilder*/ forWhichBuilder) throws RtfException {
@@ -103,7 +111,10 @@ public class BuilderContext {
         return result;
     }
 
-    /** push an RtfContainer on our stack */
+    /** 
+     * Push an RtfContainer on our stack.
+     * @param c the container
+     */
     public void pushContainer(RtfContainer c) {
         containers.push(c);
     }
@@ -115,6 +126,9 @@ public class BuilderContext {
      * paragraph container to handle what follows the nested block.
      * TODO: what happens to elements that are "more on top" than oldC on the
      * stack? shouldn't they be closed or something?
+     * @param oldC old container
+     * @param newC new container
+     * @throws Exception if not caught
      */
     public void replaceContainer(RtfContainer oldC, RtfContainer newC)
     throws Exception {
@@ -150,17 +164,23 @@ public class BuilderContext {
         return result;
     }
     */
-    /** return the current TableContext */
+
+    /** @return the current TableContext */
     public TableContext getTableContext() {
         return (TableContext)tableContexts.peek();
     }
 
-    /** push a TableContext to our stack */
+    /**
+     * Push a TableContext to our stack.
+     * @param tc the table context
+     */
     public void pushTableContext(TableContext tc) {
         tableContexts.push(tc);
     }
 
-    /** pop a TableContext from our stack */
+    /**
+     * Pop a TableContext from our stack.
+     */
     public void popTableContext() {
         tableContexts.pop();
     }

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/tools/ImageConstants.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/tools/ImageConstants.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/tools/ImageConstants.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/tools/ImageConstants.java Tue Aug 17 18:57:04 2010
@@ -17,6 +17,7 @@
 
 /* $Id$ */
 
+package org.apache.fop.render.rtf.rtflib.tools;
 
 /*
  * This file is part of the RTF library of the FOP project, which was originally
@@ -25,15 +26,12 @@
  * the FOP project.
  */
 
-package org.apache.fop.render.rtf.rtflib.tools;
-
-
 /** Here will be defined all supported image formats.
  *  This class belongs to the <fo:external-graphic> tag processing.
  *  @author a.putz@skynamics.com (Andreas Putz)
  */
 
-public class ImageConstants {
+public final class ImageConstants {
     //////////////////////////////////////////////////
     // @@ Symbolic constants
     //////////////////////////////////////////////////

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/tools/ImageUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/tools/ImageUtil.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/tools/ImageUtil.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/rtf/rtflib/tools/ImageUtil.java Tue Aug 17 18:57:04 2010
@@ -17,6 +17,7 @@
 
 /* $Id$ */
 
+package org.apache.fop.render.rtf.rtflib.tools;
 
 /*
  * This file is part of the RTF library of the FOP project, which was originally
@@ -25,13 +26,11 @@
  * the FOP project.
  */
 
-package org.apache.fop.render.rtf.rtflib.tools;
-
 /**  Misc.utilities for images handling
  *  This class belongs to the <fo:external-graphic> tag processing.
  *  @author <a href="mailto:a.putz@skynamics.com">Andreas Putz</a>
  */
-public class ImageUtil {
+public final class ImageUtil {
 
     //////////////////////////////////////////////////
     // @@ Construction

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/txt/TXTRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/txt/TXTRenderer.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/txt/TXTRenderer.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/txt/TXTRenderer.java Tue Aug 17 18:57:04 2010
@@ -494,8 +494,9 @@ public class TXTRenderer extends Abstrac
     /**
      * {@inheritDoc}
      */
-    protected void drawBorderLine(float x1, float y1, float x2, float y2,
-            boolean horz, boolean startOrBefore, int style, Color col) {
+    protected void drawBorderLine                               // CSOK: ParameterNumber
+        (float x1, float y1, float x2, float y2,
+         boolean horz, boolean startOrBefore, int style, Color col) {
 
         int borderHeight = bm.getHeight();
         int borderWidth = bm.getWidth();

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/txt/TXTStream.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/txt/TXTStream.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/txt/TXTStream.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/txt/TXTStream.java Tue Aug 17 18:57:04 2010
@@ -71,10 +71,11 @@ public class TXTStream {
      * @param encoding the encoding, if null, "UTF-8" is chosen as default
      */
     public void setEncoding(String encoding) {
-        if (encoding != null)
+        if (encoding != null) {
             this.encoding = encoding;
-        else
+        } else {
             this.encoding = DEFAULT_ENCODING;
+        }
     }
 }
 

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/xml/AbstractXMLRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/xml/AbstractXMLRenderer.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/xml/AbstractXMLRenderer.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/xml/AbstractXMLRenderer.java Tue Aug 17 18:57:04 2010
@@ -43,7 +43,9 @@ import org.xml.sax.SAXException;
 import org.xml.sax.ext.LexicalHandler;
 import org.xml.sax.helpers.AttributesImpl;
 
+/** Abstract xml renderer base class. */
 public abstract class AbstractXMLRenderer extends PrintRenderer {
+
     /** Main namespace in use. */
     public static final String NS = "";
 
@@ -62,6 +64,7 @@ public abstract class AbstractXMLRendere
     /** The OutputStream to write the generated XML to. */
     protected OutputStream out;
 
+    /** The renderer context. */
     protected RendererContext context;
 
     /** A list of ExtensionAttachements received through processOffDocumentItem() */
@@ -237,7 +240,7 @@ public abstract class AbstractXMLRendere
         }
     }
 
-    /** {@inheritDoc} */
+    /** Handle document extension attachments. */
     protected void handleDocumentExtensionAttachments() {
         if (extensionAttachments != null && extensionAttachments.size() > 0) {
             handleExtensionAttachments(extensionAttachments);

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/AbstractFOPBridgeContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/AbstractFOPBridgeContext.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/AbstractFOPBridgeContext.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/AbstractFOPBridgeContext.java Tue Aug 17 18:57:04 2010
@@ -37,12 +37,13 @@ import org.apache.fop.fonts.FontInfo;
  */
 public abstract class AbstractFOPBridgeContext extends BridgeContext {
 
-    /** The font list. */
+    /** the font list */
     protected final FontInfo fontInfo;
-
+    /** image manager */
     protected final ImageManager imageManager;
+    /** image session context */
     protected final ImageSessionContext imageSessionContext;
-
+    /** link transform */
     protected final AffineTransform linkTransform;
 
     /**
@@ -122,6 +123,10 @@ public abstract class AbstractFOPBridgeC
         return this.imageSessionContext;
     }
 
+    /**
+     * @param className name of bridge class to load and construct
+     * @param testFor class name to test for presence
+     */
     protected void putElementBridgeConditional(String className, String testFor) {
         try {
             Class.forName(testFor);
@@ -137,6 +142,7 @@ public abstract class AbstractFOPBridgeC
 
     // Make sure any 'sub bridge contexts' also have our bridges.
     //TODO There's no matching method in the super-class here
+    /** @return new bridge context */
     public abstract BridgeContext createBridgeContext();
 
 }

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/AbstractFOPImageElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/AbstractFOPImageElementBridge.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/AbstractFOPImageElementBridge.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/AbstractFOPImageElementBridge.java Tue Aug 17 18:57:04 2010
@@ -160,10 +160,15 @@ public abstract class AbstractFOPImageEl
      */
     public class LoaderImageNode extends AbstractGraphicsNode {
 
+        /** image */
         protected final Image image;
+        /** bridge context */
         protected final BridgeContext ctx;
+        /** image element */
         protected final Element imageElement;
+        /** parsed url */
         protected final ParsedURL purl;
+        /** original graphics mode */
         protected GraphicsNode origGraphicsNode = null;
 
         /**

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java Tue Aug 17 18:57:04 2010
@@ -129,7 +129,10 @@ public abstract class AbstractFOPTransco
         this.resolver = resolver;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * @param cfg the configuration
+     * @throws ConfigurationException if not caught
+     */
     public void configure(Configuration cfg) throws ConfigurationException {
         this.cfg = cfg;
     }

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/FOPTextHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/FOPTextHandler.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/FOPTextHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/FOPTextHandler.java Tue Aug 17 18:57:04 2010
@@ -19,9 +19,12 @@
 
 package org.apache.fop.svg;
 
+/** an fop extension to text handler */
 public interface FOPTextHandler extends org.apache.xmlgraphics.java2d.TextHandler {
 
+    /** @param font override font */
     void setOverrideFont(org.apache.fop.fonts.Font font);
 
+    /** @return font info */
     org.apache.fop.fonts.FontInfo getFontInfo();
 }

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/GraphicsConfiguration.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/GraphicsConfiguration.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/GraphicsConfiguration.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/GraphicsConfiguration.java Tue Aug 17 18:57:04 2010
@@ -29,9 +29,12 @@ import java.awt.image.VolatileImage;
  * for JDK 1.3 because there is no VolatileImage there.
  *
  */
-abstract public class GraphicsConfiguration extends java.awt.GraphicsConfiguration {
+public abstract class GraphicsConfiguration extends java.awt.GraphicsConfiguration {
 
     /**
+     * @param width of image
+     * @param height of image
+     * @return new volatile image
      * @see java.awt.GraphicsConfiguration#createCompatibleVolatileImage(int, int)
      * @since JDK 1.4
      */
@@ -40,6 +43,10 @@ abstract public class GraphicsConfigurat
     }
 
     /**
+     * @param width of image
+     * @param height of image
+     * @param transparency of image
+     * @return new volatile image
      * @see java.awt.GraphicsConfiguration#createCompatibleVolatileImage(int, int, int)
      * @since JDK 1.5
      */

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/NativeImageHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/NativeImageHandler.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/NativeImageHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/NativeImageHandler.java Tue Aug 17 18:57:04 2010
@@ -19,6 +19,7 @@
 
 package org.apache.fop.svg;
 
+/** native image handler */
 public interface NativeImageHandler {
 
     /**

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/NativeTextPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/NativeTextPainter.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/NativeTextPainter.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/NativeTextPainter.java Tue Aug 17 18:57:04 2010
@@ -190,6 +190,10 @@ public abstract class NativeTextPainter 
         return chars;
     }
 
+    /**
+     * @param runaci an attributed character iterator
+     * @param layout a text span layout
+     */
     protected final void logTextRun(AttributedCharacterIterator runaci, TextSpanLayout layout) {
         if (log.isTraceEnabled()) {
             int charCount = runaci.getEndIndex() - runaci.getBeginIndex();
@@ -202,6 +206,12 @@ public abstract class NativeTextPainter 
         }
     }
 
+    /**
+     * @param ch a character
+     * @param layout a text span layout
+     * @param index an index
+     * @param visibleChar visible character flag
+     */
     protected final void logCharacter(char ch, TextSpanLayout layout, int index,
             boolean visibleChar) {
         if (log.isTraceEnabled()) {

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/PDFBridgeContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/PDFBridgeContext.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/PDFBridgeContext.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/PDFBridgeContext.java Tue Aug 17 18:57:04 2010
@@ -125,6 +125,7 @@ public class PDFBridgeContext extends Ab
 
     // Make sure any 'sub bridge contexts' also have our bridges.
     //TODO There's no matching method in the super-class here
+    /** @return the new bridge context */
     public BridgeContext createBridgeContext() {
         return new PDFBridgeContext(getUserAgent(), getDocumentLoader(),
                                     fontInfo,

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/PDFGraphics2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/PDFGraphics2D.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/PDFGraphics2D.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/PDFGraphics2D.java Tue Aug 17 18:57:04 2010
@@ -776,7 +776,7 @@ public class PDFGraphics2D extends Abstr
      * @param fill true if the paint should be set for filling
      * @return true if the paint is handled natively, false if the paint should be rasterized
      */
-    protected boolean applyPaint(Paint paint, boolean fill) {
+    protected boolean applyPaint(Paint paint, boolean fill) {   // CSOK: MethodLength
         preparePainting();
 
         if (paint instanceof Color) {
@@ -1053,6 +1053,11 @@ public class PDFGraphics2D extends Abstr
         return true;
     }
 
+    /**
+     * @param paint some paint
+     * @param shape a shape
+     * @return true (always)
+     */
     protected boolean applyUnknownPaint(Paint paint, Shape shape) {
         preparePainting();
 
@@ -1200,6 +1205,8 @@ public class PDFGraphics2D extends Abstr
             case BasicStroke.CAP_SQUARE:
                 currentStream.write(2 + " J\n");
                 break;
+            default:
+                break;
             }
 
             int lj = bs.getLineJoin();
@@ -1213,6 +1220,8 @@ public class PDFGraphics2D extends Abstr
             case BasicStroke.JOIN_BEVEL:
                 currentStream.write(2 + " j\n");
                 break;
+            default:
+                break;
             }
             float lw = bs.getLineWidth();
             currentStream.write(PDFNumber.doubleOut(lw) + " w\n");
@@ -1228,7 +1237,11 @@ public class PDFGraphics2D extends Abstr
         drawInnerRenderedImage(key, img, xform);
     }
 
-    /** {@inheritDoc} */
+    /**
+     * @param key a key
+     * @param img an image
+     * @param xform a transform
+     */
     public void drawInnerRenderedImage(String key, RenderedImage img, AffineTransform xform) {
         preparePainting();
         PDFXObject xObject = pdfDoc.getXObject(key);

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/PDFGraphicsConfiguration.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/PDFGraphicsConfiguration.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/PDFGraphicsConfiguration.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/PDFGraphicsConfiguration.java Tue Aug 17 18:57:04 2010
@@ -33,11 +33,11 @@ import java.awt.image.ColorModel;
  */
 class PDFGraphicsConfiguration extends GraphicsConfiguration {
     // We use this to get a good colormodel..
-    private static final BufferedImage BI_WITH_ALPHA =
-        new BufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
+    private static final BufferedImage BI_WITH_ALPHA
+        = new BufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
     // We use this to get a good colormodel..
-    private static final BufferedImage BI_WITHOUT_ALPHA =
-        new BufferedImage(1, 1, BufferedImage.TYPE_INT_RGB);
+    private static final BufferedImage BI_WITHOUT_ALPHA
+        = new BufferedImage(1, 1, BufferedImage.TYPE_INT_RGB);
 
     /**
      * Construct a buffered image with an alpha channel, unless

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/PDFGraphicsDevice.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/PDFGraphicsDevice.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/PDFGraphicsDevice.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/PDFGraphicsDevice.java Tue Aug 17 18:57:04 2010
@@ -39,7 +39,7 @@ class PDFGraphicsDevice extends Graphics
     /**
      * Create a new PDF graphics device.
      *
-     * @param The gc we should reference
+     * @param gc The graphics configuration we should reference
      */
     PDFGraphicsDevice(PDFGraphicsConfiguration gc) {
         this.gc = gc;
@@ -62,7 +62,7 @@ class PDFGraphicsDevice extends Graphics
      * @return an array containing the one graphics configuration
      */
     public GraphicsConfiguration[] getConfigurations() {
-        return new GraphicsConfiguration[]{ gc };
+        return new GraphicsConfiguration[] {gc};
     }
 
     /**

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/PDFTextPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/PDFTextPainter.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/PDFTextPainter.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/PDFTextPainter.java Tue Aug 17 18:57:04 2010
@@ -40,7 +40,7 @@ import org.apache.fop.fonts.FontInfo;
 import org.apache.fop.util.CharUtilities;
 
 /**
- * Renders the attributed character iterator of a {@link TextNode}.
+ * Renders the attributed character iterator of a {@link org.apache.batik.gvt.TextNode}.
  * This class draws the text directly into the PDFGraphics2D so that
  * the text is not drawn using shapes which makes the PDF files larger.
  * If the text is simple enough to draw then it sets the font and calls

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/SVGEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/SVGEventProducer.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/SVGEventProducer.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/SVGEventProducer.java Tue Aug 17 18:57:04 2010
@@ -30,7 +30,10 @@ public interface SVGEventProducer extend
     /**
      * Provider class for the event producer.
      */
-    class Provider {
+    final class Provider {
+
+        private Provider() {
+        }
 
         /**
          * Returns an event producer.

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/SVGUtilities.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/SVGUtilities.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/SVGUtilities.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/svg/SVGUtilities.java Tue Aug 17 18:57:04 2010
@@ -34,7 +34,11 @@ import org.apache.batik.util.XMLConstant
 /**
  * Some utilities for creating svg DOM documents and elements.
  */
-public class SVGUtilities {
+public final class SVGUtilities {
+
+    private SVGUtilities() {
+    }
+
     private static final String SVG_NS = SVGDOMImplementation.SVG_NAMESPACE_URI;
 
     /**
@@ -43,7 +47,7 @@ public class SVGUtilities {
      * @param height the height of the root svg element
      * @return a new SVG Document
      */
-    public static final Document createSVGDocument(float width,
+    public static Document createSVGDocument(float width,
             float height) {
         DOMImplementation impl = SVGDOMImplementation.getDOMImplementation();
         Document doc = impl.createDocument(SVG_NS, "svg", null);
@@ -60,9 +64,9 @@ public class SVGUtilities {
      * @param font the font
      * @return the width of the string in the given font
      */
-    public static final float getStringWidth(String str, java.awt.Font font) {
-        Rectangle2D rect =
-            font.getStringBounds(str, 0, str.length(),
+    public static float getStringWidth(String str, java.awt.Font font) {
+        Rectangle2D rect
+            = font.getStringBounds(str, 0, str.length(),
                                  new FontRenderContext(new AffineTransform(),
                                  true, true));
         return (float)rect.getWidth();
@@ -74,10 +78,10 @@ public class SVGUtilities {
      * @param font the font
      * @return the height of the string in the given font
      */
-    public static final float getStringHeight(String str,
+    public static float getStringHeight(String str,
                                               java.awt.Font font) {
-        Rectangle2D rect =
-            font.getStringBounds(str, 0, str.length(),
+        Rectangle2D rect
+            = font.getStringBounds(str, 0, str.length(),
                                  new FontRenderContext(new AffineTransform(),
                                  true, true));
         return (float)rect.getHeight();
@@ -89,7 +93,7 @@ public class SVGUtilities {
      * @param font the font
      * @return the bounds of the string
      */
-    public static final Rectangle2D getStringBounds(String str,
+    public static Rectangle2D getStringBounds(String str,
             java.awt.Font font) {
         return font.getStringBounds(str, 0, str.length(),
                                     new FontRenderContext(new AffineTransform(),
@@ -105,7 +109,7 @@ public class SVGUtilities {
      * @param y2 the end y position
      * @return the new line element
      */
-    public static final Element createLine(Document doc, float x, float y,
+    public static Element createLine(Document doc, float x, float y,
                                            float x2, float y2) {
         Element ellipse = doc.createElementNS(SVG_NS, "line");
         ellipse.setAttributeNS(null, "x1", "" + x);
@@ -124,7 +128,7 @@ public class SVGUtilities {
      * @param ry the y axis radius
      * @return the new ellipse element
      */
-    public static final Element createEllipse(Document doc, float cx,
+    public static Element createEllipse(Document doc, float cx,
                                               float cy, float rx, float ry) {
         Element ellipse = doc.createElementNS(SVG_NS, "ellipse");
         ellipse.setAttributeNS(null, "cx", "" + cx);
@@ -140,7 +144,7 @@ public class SVGUtilities {
      * @param str the string for the d attribute on the path
      * @return the new path element
      */
-    public static final Element createPath(Document doc, String str) {
+    public static Element createPath(Document doc, String str) {
         Element path = doc.createElementNS(SVG_NS, "path");
         path.setAttributeNS(null, "d", str);
         return path;
@@ -154,7 +158,7 @@ public class SVGUtilities {
      * @param str the string
      * @return the new text element
      */
-    public static final Element createText(Document doc, float x, float y,
+    public static Element createText(Document doc, float x, float y,
                                            String str) {
         Element textGraph = doc.createElementNS(SVG_NS, "text");
         textGraph.setAttributeNS(null, "x", "" + x);
@@ -173,7 +177,7 @@ public class SVGUtilities {
      * @param height the height of the rectangle
      * @return the new rectangle element
      */
-    public static final Element createRect(Document doc, float x, float y,
+    public static Element createRect(Document doc, float x, float y,
                                            float width, float height) {
         Element border = doc.createElementNS(SVG_NS, "rect");
         border.setAttributeNS(null, "x", "" + x);
@@ -188,7 +192,7 @@ public class SVGUtilities {
      * @param doc the document to create the element
      * @return the new g element
      */
-    public static final Element createG(Document doc) {
+    public static Element createG(Document doc) {
         Element border = doc.createElementNS(SVG_NS, "g");
         return border;
     }
@@ -200,7 +204,7 @@ public class SVGUtilities {
      * @param id the id of the clipping path
      * @return the new clip element
      */
-    public static final Element createClip(Document doc, Element els,
+    public static Element createClip(Document doc, Element els,
                                            String id) {
         Element border = doc.createElementNS(SVG_NS, "clipPath");
         border.setAttributeNS(null, "id", id);
@@ -216,7 +220,7 @@ public class SVGUtilities {
      * @param height the height to set on the image
      * @return a new image element
      */
-    public static final Element createImage(Document doc, String ref,
+    public static Element createImage(Document doc, String ref,
                                             float width, float height) {
         Element border = doc.createElementNS(SVG_NS, "image");
         border.setAttributeNS(XMLConstants.XLINK_NAMESPACE_URI, "href",
@@ -234,7 +238,7 @@ public class SVGUtilities {
      * @param width the width to wrap
      * @return the new element containing the wrapped text
      */
-    public static final Element wrapText(Document doc, String str,
+    public static Element wrapText(Document doc, String str,
                                          java.awt.Font font, float width) {
         Element g = createG(doc);
         Element text;

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/text/linebreak/LineBreakStatus.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/text/linebreak/LineBreakStatus.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/text/linebreak/LineBreakStatus.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/text/linebreak/LineBreakStatus.java Tue Aug 17 18:57:04 2010
@@ -62,8 +62,9 @@ public class LineBreakStatus {
 
     /**
      * Check whether a line break may happen according to the rules described in
-     * the <a href="http://unicode.org/reports/tr14/#Algorithm">Unicode Line Breaking Algorithm</a>.
-     * The function returns the line breaking status of the point <em>before</em> the given character.
+     * the <a href="http://unicode.org/reports/tr14/#Algorithm">Unicode Line Breaking
+     * Algorithm</a>. The function returns the line breaking status of the point
+     * <em>before</em> the given character.
      * The algorithm is the table-driven algorithm, as described in
      * <a href="http://unicode.org/reports/tr14/#PairBasedImplementation">
      * Unicode Technical Report #14</a>.



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org