xmlgraphics-fop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From man...@apache.org
Subject svn commit: r397875 - in /xmlgraphics/fop/trunk/src/sandbox: META-INF/services/ org/apache/fop/render/afp/ org/apache/fop/render/afp/exceptions/ org/apache/fop/render/afp/extensions/ org/apache/fop/render/afp/fonts/ org/apache/fop/render/afp/modca/ org...
Date Fri, 28 Apr 2006 11:58:37 GMT
Author: manuel
Date: Fri Apr 28 04:58:33 2006
New Revision: 397875

URL: http://svn.apache.org/viewcvs?rev=397875&view=rev
Log:
Some cleanup of the AFP Renderer code (tab char removal and a few other things). Changed AFP
extension namespace to http://xmlgraphics.apache.org/fop/extensions/afp. Added another missing
file.

Added:
    xmlgraphics/fop/trunk/src/sandbox/META-INF/services/org.apache.fop.fo.ElementMapping
Modified:
    xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/AFPRenderer.java
    xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/exceptions/NestedRuntimeException.java
    xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/exceptions/RendererRuntimeException.java
    xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/extensions/AFPAttribute.java
    xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/extensions/AFPElementMapping.java
    xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/extensions/AFPPageSetup.java
    xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/fonts/AFPFont.java
    xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/fonts/CharacterSetOrientation.java
    xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/fonts/FopCharacterSet.java
    xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/fonts/OutlineFont.java
    xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/modca/IMImageObject.java
    xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/modca/ImageObject.java
    xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/modca/ImageRasterPattern.java
    xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/modca/ImageSegment.java
    xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/modca/PageObject.java
    xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/modca/PresentationTextData.java
    xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/tools/DTDEntityResolver.java
    xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/tools/StructuredFieldReader.java

Added: xmlgraphics/fop/trunk/src/sandbox/META-INF/services/org.apache.fop.fo.ElementMapping
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/sandbox/META-INF/services/org.apache.fop.fo.ElementMapping?rev=397875&view=auto
==============================================================================
--- xmlgraphics/fop/trunk/src/sandbox/META-INF/services/org.apache.fop.fo.ElementMapping (added)
+++ xmlgraphics/fop/trunk/src/sandbox/META-INF/services/org.apache.fop.fo.ElementMapping Fri
Apr 28 04:58:33 2006
@@ -0,0 +1 @@
+org.apache.fop.render.afp.extensions.AFPElementMapping
\ No newline at end of file

Modified: xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/AFPRenderer.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/AFPRenderer.java?rev=397875&r1=397874&r2=397875&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/AFPRenderer.java (original)
+++ xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/AFPRenderer.java Fri Apr 28
04:58:33 2006
@@ -1157,9 +1157,7 @@
                         }
                         convertToGrayScaleImage(io, fopimage.getBitmaps());
                     }
-                }
-                else
-                {
+                } else {
                     if (!fopimage.load(FopImage.BITMAP)) {
                         return;
                     }
@@ -1276,7 +1274,7 @@
 
         // Create an AFPFontAttributes object from the current font details
         AFPFontAttributes afpFontAttributes =
-            new AFPFontAttributes(name, tf,_currentFontSize);
+            new AFPFontAttributes(name, tf, _currentFontSize);
 
         if (!_currentPageFonts.containsKey(afpFontAttributes.getFontKey())) {
             // Font not found on current page, so add the new one
@@ -1547,7 +1545,8 @@
             || rotation == 270) {
             _portraitRotation = rotation;
         } else {
-            throw new IllegalArgumentException("The portrait rotation must be one of the
values 0, 90, 180, 270");
+            throw new IllegalArgumentException("The portrait rotation must be one"
+                + " of the values 0, 90, 180, 270");
 
         }
 
@@ -1568,8 +1567,8 @@
             || rotation == 270) {
             _landscapeRotation = rotation;
         } else {
-            throw new IllegalArgumentException("The landscape rotation must be one of the
values 0, 90, 180, 270");
-
+            throw new IllegalArgumentException("The landscape rotation must be one"
+                + " of the values 0, 90, 180, 270");
         }
 
     }
@@ -1692,21 +1691,21 @@
         }
 
         ViewPortPos(Rectangle2D view, CTM ctm) {
-            ViewPortPos currentVP = (ViewPortPos)viewPortPositions.get(viewPortPositions.size()-1);
+            ViewPortPos currentVP = (ViewPortPos)viewPortPositions.get(viewPortPositions.size()
- 1);
             int xOrigin;
             int yOrigin;
             int width;
             int height;
             switch (currentVP.rot) {
                 case 90:
-                    width = mpts2units(view.getHeight());;
+                    width = mpts2units(view.getHeight());
                     height = mpts2units(view.getWidth());
                     xOrigin = _pageWidth - width - mpts2units(view.getY()) - currentVP.y;
                     yOrigin = mpts2units(view.getX()) + currentVP.x;
                     break;
                 case 180:
                     width = mpts2units(view.getWidth());
-                    height = mpts2units(view.getHeight());;
+                    height = mpts2units(view.getHeight());
                     xOrigin = _pageWidth - width - mpts2units(view.getX()) - currentVP.x;
                     yOrigin = _pageHeight - height - mpts2units(view.getY()) - currentVP.y;
                     break;

Modified: xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/exceptions/NestedRuntimeException.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/exceptions/NestedRuntimeException.java?rev=397875&r1=397874&r2=397875&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/exceptions/NestedRuntimeException.java
(original)
+++ xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/exceptions/NestedRuntimeException.java
Fri Apr 28 04:58:33 2006
@@ -15,6 +15,7 @@
  */
 
 /* $Id$ */
+
 package org.apache.fop.render.afp.exceptions;
 
 import java.io.PrintStream;
@@ -28,81 +29,81 @@
  *
  */
 public abstract class NestedRuntimeException extends RuntimeException {
-
-	/** Root cause of this nested exception */
-	private Throwable _underlyingException;
-
-	/**
-	 * Construct a <code>NestedRuntimeException</code> with the specified detail
message.
-	 * @param msg The detail message.
-	 */
-	public NestedRuntimeException(String msg) {
-		super(msg);
-	}
-
-	/**
-	 * Construct a <code>NestedRuntimeException</code> with the specified
-	 * detail message and nested exception.
-	 * @param msg The detail message.
-	 * @param t The nested exception.
-	 */
-	public NestedRuntimeException(String msg, Throwable t) {
-		super(msg);
-		_underlyingException = t;
-
-	}
-
-	/**
-	 * Gets the original triggering exception
-	 * @return The original exception as a throwable.
-	 */
-	public Throwable getUnderlyingException() {
-
-		return _underlyingException;
-
-	}
-
-	/**
-	 * Return the detail message, including the message from the nested
-	 * exception if there is one.
-	 * @return The detail message.
-	 */
-	public String getMessage() {
-
-		if (_underlyingException == null) {
-			return super.getMessage();
-		} else {
-			return super.getMessage()
-				+ "; nested exception is "
-				+ _underlyingException.getClass().getName();
-		}
-
-	}
-
-	/**
-	 * Print the composite message and the embedded stack trace to the specified stream.
-	 * @param ps the print stream
-	 */
-	public void printStackTrace(PrintStream ps) {
-		if (_underlyingException == null) {
-			super.printStackTrace(ps);
-		} else {
-			ps.println(this);
-			_underlyingException.printStackTrace(ps);
-		}
-	}
-
-	/**
-	 * Print the composite message and the embedded stack trace to the specified writer.
-	 * @param pw the print writer
-	 */
-	public void printStackTrace(PrintWriter pw) {
-		if (_underlyingException == null) {
-			super.printStackTrace(pw);
-		} else {
-			pw.println(this);
-			_underlyingException.printStackTrace(pw);
-		}
-	}
-
+    
+    /** Root cause of this nested exception */
+    private Throwable _underlyingException;
+    
+    /**
+     * Construct a <code>NestedRuntimeException</code> with the specified detail
message.
+     * @param msg The detail message.
+     */
+    public NestedRuntimeException(String msg) {
+        super(msg);
+    }
+    
+    /**
+     * Construct a <code>NestedRuntimeException</code> with the specified
+     * detail message and nested exception.
+     * @param msg The detail message.
+     * @param t The nested exception.
+     */
+    public NestedRuntimeException(String msg, Throwable t) {
+        super(msg);
+        _underlyingException = t;
+        
+    }
+    
+    /**
+     * Gets the original triggering exception
+     * @return The original exception as a throwable.
+     */
+    public Throwable getUnderlyingException() {
+        
+        return _underlyingException;
+        
+    }
+    
+    /**
+     * Return the detail message, including the message from the nested
+     * exception if there is one.
+     * @return The detail message.
+     */
+    public String getMessage() {
+        
+        if (_underlyingException == null) {
+            return super.getMessage();
+        } else {
+            return super.getMessage()
+            + "; nested exception is "
+                + _underlyingException.getClass().getName();
+        }
+        
+    }
+    
+    /**
+     * Print the composite message and the embedded stack trace to the specified stream.
+     * @param ps the print stream
+     */
+    public void printStackTrace(PrintStream ps) {
+        if (_underlyingException == null) {
+            super.printStackTrace(ps);
+        } else {
+            ps.println(this);
+            _underlyingException.printStackTrace(ps);
+        }
+    }
+    
+    /**
+     * Print the composite message and the embedded stack trace to the specified writer.
+     * @param pw the print writer
+     */
+    public void printStackTrace(PrintWriter pw) {
+        if (_underlyingException == null) {
+            super.printStackTrace(pw);
+        } else {
+            pw.println(this);
+            _underlyingException.printStackTrace(pw);
+        }
+    }
+    
 }

Modified: xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/exceptions/RendererRuntimeException.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/exceptions/RendererRuntimeException.java?rev=397875&r1=397874&r2=397875&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/exceptions/RendererRuntimeException.java
(original)
+++ xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/exceptions/RendererRuntimeException.java
Fri Apr 28 04:58:33 2006
@@ -23,23 +23,23 @@
  * <p/>
  */
 public class RendererRuntimeException extends NestedRuntimeException {
-
-	/**
-	 * Constructs a RendererRuntimeException with the specified message.
-	 * @param msg the exception mesaage
-	 */
-	public RendererRuntimeException(String msg) {
-		super(msg);
-	}
-
-	/**
-	 * Constructs a RendererRuntimeException with the specified message
-	 * wrapping the underlying exception.
-	 * @param msg the exception mesaage
-	 * @param t the underlying exception
-	 */
-	public RendererRuntimeException(String msg, Throwable t) {
-		super(msg, t);
-	}
-
+    
+    /**
+     * Constructs a RendererRuntimeException with the specified message.
+     * @param msg the exception mesaage
+     */
+    public RendererRuntimeException(String msg) {
+        super(msg);
+    }
+    
+    /**
+     * Constructs a RendererRuntimeException with the specified message
+     * wrapping the underlying exception.
+     * @param msg the exception mesaage
+     * @param t the underlying exception
+     */
+    public RendererRuntimeException(String msg, Throwable t) {
+        super(msg, t);
+    }
+    
 }

Modified: xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/extensions/AFPAttribute.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/extensions/AFPAttribute.java?rev=397875&r1=397874&r2=397875&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/extensions/AFPAttribute.java
(original)
+++ xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/extensions/AFPAttribute.java
Fri Apr 28 04:58:33 2006
@@ -48,6 +48,7 @@
 
     /**
      * Overide the make method to return the property object
+     * @param propertyList the property list from which to make the property
      * @return property The property object.
      */
     public Property make(PropertyList propertyList) {

Modified: xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/extensions/AFPElementMapping.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/extensions/AFPElementMapping.java?rev=397875&r1=397874&r2=397875&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/extensions/AFPElementMapping.java
(original)
+++ xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/extensions/AFPElementMapping.java
Fri Apr 28 04:58:33 2006
@@ -47,7 +47,7 @@
     /**
      * The namespace used for AFP extensions
      */
-    public static final String NAMESPACE = "http://org.apache.fop/extensions/afp";
+    public static final String NAMESPACE = "http://xmlgraphics.apache.org/fop/extensions/afp";
 
     /**
      * The usual namespace prefix used for AFP extensions

Modified: xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/extensions/AFPPageSetup.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/extensions/AFPPageSetup.java?rev=397875&r1=397874&r2=397875&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/extensions/AFPPageSetup.java
(original)
+++ xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/extensions/AFPPageSetup.java
Fri Apr 28 04:58:33 2006
@@ -71,7 +71,7 @@
 
     /**
      * Sets the value
-     * @param value The value name to set.
+     * @param source The value name to set.
      */
     public void setValue(String source) {
         this.value = source;

Modified: xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/fonts/AFPFont.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/fonts/AFPFont.java?rev=397875&r1=397874&r2=397875&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/fonts/AFPFont.java (original)
+++ xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/fonts/AFPFont.java Fri Apr
28 04:58:33 2006
@@ -76,6 +76,7 @@
     /**
      * Returns the character set for a given size
      * @param size the font size
+     * @return the character set object
      */
     public abstract CharacterSet getCharacterSet(int size);
 

Modified: xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/fonts/CharacterSetOrientation.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/fonts/CharacterSetOrientation.java?rev=397875&r1=397874&r2=397875&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/fonts/CharacterSetOrientation.java
(original)
+++ xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/fonts/CharacterSetOrientation.java
Fri Apr 28 04:58:33 2006
@@ -178,7 +178,7 @@
     /**
      * XHeight refers to the height of the lower case letters above
      * the baseline.
-     * @return heightX	the typical height of characters
+     * @return heightX the typical height of characters
      */
     public int getXHeight() {
         return _xHeight;
@@ -224,7 +224,7 @@
      * Descender depth is the distance from the character baseline to
      * the bottom of a character box. A negative descender depth signifies
      * that all of the graphic character is above the character baseline.
-     * @param descender	the descender value in millipoints
+     * @param descender the descender value in millipoints
      */
     public void setDescender(int descender) {
         _descender = descender;
@@ -250,7 +250,7 @@
      * Set the width (in 1/1000ths of a point size) of the character
      * identified by the parameter passed.
      * @param character the character for which the width is being set
-     * @param width	the widths of the character
+     * @param width the widths of the character
      */
     public void setWidth(int character, int width) {
 

Modified: xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/fonts/FopCharacterSet.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/fonts/FopCharacterSet.java?rev=397875&r1=397874&r2=397875&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/fonts/FopCharacterSet.java
(original)
+++ xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/fonts/FopCharacterSet.java
Fri Apr 28 04:58:33 2006
@@ -15,6 +15,7 @@
  */
 
 /* $Id$ */
+
 package org.apache.fop.render.afp.fonts;
 
 import org.apache.fop.fonts.Typeface;
@@ -35,7 +36,7 @@
      * @param encoding the encoding of the font
      * @param name the character set name
      * @param size the font size
-     * @param Typeface the fop character set
+     * @param characterSet the fop character set
      */
     public FopCharacterSet(
         String codePage,

Modified: xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/fonts/OutlineFont.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/fonts/OutlineFont.java?rev=397875&r1=397874&r2=397875&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/fonts/OutlineFont.java (original)
+++ xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/fonts/OutlineFont.java Fri
Apr 28 04:58:33 2006
@@ -15,8 +15,8 @@
  */
 
 /* $Id$ */
-package org.apache.fop.render.afp.fonts;
 
+package org.apache.fop.render.afp.fonts;
 
 /**
  * A font defined as a set of lines and curves as opposed to a bitmap font. An
@@ -154,7 +154,7 @@
     public int[] getWidths(int size) {
 
         int[] widths =  _characterSet.getWidths();
-        for (int i = 0 ; i < widths.length; i++) {
+        for (int i = 0; i < widths.length; i++) {
             widths[i] = widths[i] / 1000 * size;
         }
         return widths;

Modified: xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/modca/IMImageObject.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/modca/IMImageObject.java?rev=397875&r1=397874&r2=397875&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/modca/IMImageObject.java (original)
+++ xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/modca/IMImageObject.java Fri
Apr 28 04:58:33 2006
@@ -59,7 +59,7 @@
     /**
      * Constructor for the image object with the specified name,
      * the name must be a fixed length of eight characters.
-     * @param name	The name of the image.
+     * @param name The name of the image.
      */
     public IMImageObject(String name) {
 

Modified: xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/modca/ImageObject.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/modca/ImageObject.java?rev=397875&r1=397874&r2=397875&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/modca/ImageObject.java (original)
+++ xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/modca/ImageObject.java Fri
Apr 28 04:58:33 2006
@@ -42,7 +42,7 @@
     /**
      * Constructor for the image object with the specified name,
      * the name must be a fixed length of eight characters.
-     * @param name	The name of the image.
+     * @param name The name of the image.
      */
     public ImageObject(String name) {
 

Modified: xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/modca/ImageRasterPattern.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/modca/ImageRasterPattern.java?rev=397875&r1=397874&r2=397875&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/modca/ImageRasterPattern.java
(original)
+++ xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/modca/ImageRasterPattern.java
Fri Apr 28 04:58:33 2006
@@ -749,7 +749,7 @@
                 break;
         }
 
-        for(int i = 0; i < repeat; i++) {
+        for (int i = 0; i < repeat; i++) {
 
             System.arraycopy(greypattern, 0, rasterdata, i * 32, 32);
 

Modified: xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/modca/ImageSegment.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/modca/ImageSegment.java?rev=397875&r1=397874&r2=397875&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/modca/ImageSegment.java (original)
+++ xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/modca/ImageSegment.java Fri
Apr 28 04:58:33 2006
@@ -65,7 +65,7 @@
     /**
      * Constructor for the image segment with the specified name,
      * the name must be a fixed length of eight characters.
-     * @param name	The name of the image.
+     * @param name The name of the image.
      */
     public ImageSegment(String name) {
 

Modified: xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/modca/PageObject.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/modca/PageObject.java?rev=397875&r1=397874&r2=397875&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/modca/PageObject.java (original)
+++ xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/modca/PageObject.java Fri
Apr 28 04:58:33 2006
@@ -70,7 +70,7 @@
 
     /**
      * Adds an overlay to the page resources
-     * @param the overlay to add
+     * @param overlay the overlay to add
      */
     public void addOverlay(Overlay overlay) {
         if (_resourceGroup == null) {

Modified: xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/modca/PresentationTextData.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/modca/PresentationTextData.java?rev=397875&r1=397874&r2=397875&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/modca/PresentationTextData.java
(original)
+++ xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/modca/PresentationTextData.java
Fri Apr 28 04:58:33 2006
@@ -488,18 +488,18 @@
         ByteArrayOutputStream afpdata) {
 
         afpdata.write(new byte[] {
-              15		 // Control sequence length
-            , (byte)0x81         // Control sequence function type
-            , 0x00		 // Reserved; must be zero
-            , 0x01 		 // Color space - 0x01 = RGB
-            , 0x00		 // Reserved; must be zero
-            , 0x00		 // Reserved; must be zero
-            , 0x00		 // Reserved; must be zero
-            , 0x00		 // Reserved; must be zero
-            , 8			 // Number of bits in component 1
-            , 8			 // Number of bits in component 2
-            , 8			 // Number of bits in component 3
-            , 0			 // Number of bits in component 4
+              15                // Control sequence length
+            , (byte)0x81        // Control sequence function type
+            , 0x00              // Reserved; must be zero
+            , 0x01              // Color space - 0x01 = RGB
+            , 0x00              // Reserved; must be zero
+            , 0x00              // Reserved; must be zero
+            , 0x00              // Reserved; must be zero
+            , 0x00              // Reserved; must be zero
+            , 8                 // Number of bits in component 1
+            , 8                 // Number of bits in component 2
+            , 8                 // Number of bits in component 3
+            , 0                 // Number of bits in component 4
             , (byte)(col.getRed())   // Red intensity
             , (byte)(col.getGreen()) // Green intensity
             , (byte)(col.getBlue())  // Blue intensity

Modified: xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/tools/DTDEntityResolver.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/tools/DTDEntityResolver.java?rev=397875&r1=397874&r2=397875&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/tools/DTDEntityResolver.java
(original)
+++ xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/tools/DTDEntityResolver.java
Fri Apr 28 04:58:33 2006
@@ -15,6 +15,7 @@
  */
 
 /* $Id$ */
+
 package org.apache.fop.render.afp.tools;
 
 import java.io.IOException;
@@ -67,11 +68,11 @@
     throws IOException {
 
         URL resource = null;
-        if( AFP_DTD_1_2_ID.equals(publicId) ) {
+        if ( AFP_DTD_1_2_ID.equals(publicId) ) {
             resource = getResource( AFP_DTD_1_2_RESOURCE );
-        } else if( AFP_DTD_1_1_ID.equals(publicId) ) {
+        } else if ( AFP_DTD_1_1_ID.equals(publicId) ) {
             resource = getResource( AFP_DTD_1_1_RESOURCE );
-        } else if( AFP_DTD_1_0_ID.equals(publicId) ) {
+        } else if ( AFP_DTD_1_0_ID.equals(publicId) ) {
             throw new FontRuntimeException(
                 "The AFP Installed Font Definition 1.0 DTD is not longer supported" );
         } else if( systemId != null && systemId.indexOf("afp-fonts.dtd") >= 0
) {
@@ -95,14 +96,14 @@
      * @return the URL of the required resource
      * @throws FontRuntimeException if the resource could not be found.
      */
-    private URL getResource( String resourcePath ) {
+    private URL getResource(String resourcePath) {
         ClassLoader cl = Thread.currentThread().getContextClassLoader();
         if (cl == null) {
             cl = ClassLoader.getSystemClassLoader();
         }
 
         URL resource = cl.getResource( resourcePath );
-        if( resource == null ) {
+        if (resource == null) {
             throw new FontRuntimeException( "Resource " + resourcePath +
                 " could not be found on the classpath" );
         }

Modified: xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/tools/StructuredFieldReader.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/tools/StructuredFieldReader.java?rev=397875&r1=397874&r2=397875&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/tools/StructuredFieldReader.java
(original)
+++ xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/afp/tools/StructuredFieldReader.java
Fri Apr 28 04:58:33 2006
@@ -58,6 +58,7 @@
      * Get the next structured field as identified by the identifer
      * parameter (this must be a valid MO:DCA structured field.
      * @param identifier the three byte identifier
+     * @throws IOException
      */
     public byte[] getNext(byte[] identifier) throws IOException {
 
@@ -109,7 +110,8 @@
                 length[0] = bufferData[b];
                 length[1] = bufferData[a];
 
-                int reclength = ((length[0] & 0xFF) << 8) + (length[1] & 0xFF)
 - identifier.length -2;
+                int reclength = ((length[0] & 0xFF) << 8) 
+                                + (length[1] & 0xFF) - identifier.length - 2;
 
                 byte[] retval = new byte[reclength];
 



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


Mime
View raw message