xmlgraphics-fop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vhenneb...@apache.org
Subject svn commit: r989216 [18/19] - in /xmlgraphics/fop/branches/Temp_TrueTypeInPostScript: ./ examples/plan/src/org/apache/fop/plan/ lib/ src/codegen/java/org/apache/fop/tools/ src/codegen/unicode/data/ src/codegen/unicode/java/org/apache/fop/hyphenation/ s...
Date Wed, 25 Aug 2010 16:49:40 GMT
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/tools/anttasks/FileCompare.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/tools/anttasks/FileCompare.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/tools/anttasks/FileCompare.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/tools/anttasks/FileCompare.java Wed Aug 25 16:49:26 2010
@@ -84,6 +84,7 @@ public class FileCompare {
      * @param f1 first file to compare
      * @param f2 second file to compare
      * @return true if files are same, false otherwise
+     * @throws IOException if not caught
      */
     public static boolean compareFiles(File f1, File f2) throws IOException {
         return (compareFileSize(f1, f2) && compareBytes(f1, f2));
@@ -91,13 +92,15 @@ public class FileCompare {
 
     /**
      * Compare the contents of two files.
-     * @param true if files are same byte-by-byte, false otherwise
+     * @param file1 the first file to compare
+     * @param file2 the second file to compare
+     * @return true if files are same byte-by-byte, false otherwise
      */
     private static boolean compareBytes(File file1, File file2) throws IOException {
-        BufferedInputStream file1Input =
-            new BufferedInputStream(new java.io.FileInputStream(file1));
-        BufferedInputStream file2Input =
-            new BufferedInputStream(new java.io.FileInputStream(file2));
+        BufferedInputStream file1Input
+            = new BufferedInputStream(new java.io.FileInputStream(file1));
+        BufferedInputStream file2Input
+            = new BufferedInputStream(new java.io.FileInputStream(file2));
 
         int charact1 = 0;
         int charact2 = 0;
@@ -116,14 +119,12 @@ public class FileCompare {
 
     /**
      * Does a file size compare of two files
-     * @param true if files are same length, false otherwise
+     * @param oldFile the first file to compare
+     * @param newFile the second file to compare
+     * @return true if files are same length, false otherwise
      */
     private static boolean compareFileSize(File oldFile, File newFile) {
-        if (oldFile.length() != newFile.length()) {
-            return false;
-        } else {
-            return true;
-        }
+        return oldFile.length() == newFile.length();
     }    // end: compareBytes
 
     private boolean filesExist(File oldFile, File newFile) {
@@ -163,8 +164,8 @@ public class FileCompare {
         File oldFile;
         File newFile;
         try {
-            PrintWriter results =
-                new PrintWriter(new java.io.FileWriter("results.html"), true);
+            PrintWriter results
+                = new PrintWriter(new java.io.FileWriter("results.html"), true);
             this.writeHeader(results);
             for (int i = 0; i < filenameList.length; i++) {
                 oldFile = new File(referenceDirectory + filenameList[i]);

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/tools/anttasks/Fop.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/tools/anttasks/Fop.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/tools/anttasks/Fop.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/tools/anttasks/Fop.java Wed Aug 25 16:49:26 2010
@@ -267,8 +267,7 @@ public class Fop extends Task {
     /**
      * Set whether exceptions are thrown.
      * default is false.
-     *
-     * @param force true if always generate.
+     * @param throwExceptions true if should be thrown
      */
     public void setThrowexceptions(boolean throwExceptions) {
         this.throwExceptions = throwExceptions;
@@ -308,6 +307,7 @@ public class Fop extends Task {
     /**
      * Returns the message type corresponding to Project.MSG_*
      * representing the current message level.
+     * @return message type
      * @see org.apache.tools.ant.Project
      */
     public int getMessageType() {
@@ -489,9 +489,6 @@ class FOPTaskStarter {
         return new File(file.getParentFile(), name);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public void run() throws FOPException {
         //Set base directory
         if (task.getBasedir() != null) {
@@ -556,13 +553,13 @@ class FOPTaskStarter {
                 // OR output file doesn't exist OR
                 // output file is older than input file
                 if (task.getForce() || !outf.exists()
-                    || (task.getXmlFile().lastModified() > outf.lastModified() ||
-                            task.getXsltFile().lastModified() > outf.lastModified())) {
+                    || (task.getXmlFile().lastModified() > outf.lastModified()
+                        || task.getXsltFile().lastModified() > outf.lastModified())) {
                     render(task.getXmlFile(), task.getXsltFile(), outf, outputFormat);
                     actioncount++;
                 } else if (outf.exists()
-                        && (task.getXmlFile().lastModified() <= outf.lastModified() ||
-                                task.getXsltFile().lastModified() <= outf.lastModified())) {
+                        && (task.getXmlFile().lastModified() <= outf.lastModified()
+                            || task.getXsltFile().lastModified() <= outf.lastModified())) {
                     skippedcount++;
                 }
             }
@@ -642,7 +639,8 @@ class FOPTaskStarter {
         }
     }
 
-    private void renderInputHandler(InputHandler inputHandler, File outFile, String outputFormat) throws Exception {
+    private void renderInputHandler
+        (InputHandler inputHandler, File outFile, String outputFormat) throws Exception {
         OutputStream out = null;
         try {
             out = new java.io.FileOutputStream(outFile);
@@ -693,10 +691,12 @@ class FOPTaskStarter {
         try {
             renderInputHandler(inputHandler, outFile, outputFormat);
         } catch (Exception ex) {
-            logger.error("Error rendering xml/xslt files: " + xmlFile + ", " + xsltFile, ex);
+            logger.error("Error rendering xml/xslt files: "
+                         + xmlFile + ", " + xsltFile, ex);
         }
         if (task.getLogFiles()) {
-            task.log("xml: " + xmlFile + ", xslt: " + xsltFile + " -> " + outFile, Project.MSG_INFO);
+            task.log("xml: " + xmlFile + ", xslt: "
+                     + xsltFile + " -> " + outFile, Project.MSG_INFO);
         }
     }
 }

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/traits/BorderProps.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/traits/BorderProps.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/traits/BorderProps.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/traits/BorderProps.java Wed Aug 25 16:49:26 2010
@@ -42,13 +42,13 @@ public class BorderProps implements Seri
     public static final int COLLAPSE_OUTER = 2;
 
     /** Border style (one of EN_*) */
-    public int style; // Enum for border style
+    public int style; // Enum for border style                  // CSOK: VisibilityModifier
     /** Border color */
-    public Color color;
+    public Color color;                                         // CSOK: VisibilityModifier
     /** Border width */
-    public int width;
+    public int width;                                           // CSOK: VisibilityModifier
     /** Border mode (one of SEPARATE, COLLAPSE_INNER and COLLAPSE_OUTER) */
-    public int mode;
+    public int mode;                                            // CSOK: VisibilityModifier
 
     /**
      * Constructs a new BorderProps instance.

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/traits/MinOptMax.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/traits/MinOptMax.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/traits/MinOptMax.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/traits/MinOptMax.java Wed Aug 25 16:49:26 2010
@@ -56,7 +56,8 @@ public final class MinOptMax implements 
      * @return the corresponding instance
      * @throws IllegalArgumentException if <code>min > opt || max < opt</code>.
      */
-    public static MinOptMax getInstance(int min, int opt, int max) {
+    public static MinOptMax getInstance(int min, int opt, int max)
+        throws IllegalArgumentException {
         if (min > opt) {
             throw new IllegalArgumentException("min (" + min + ") > opt (" + opt + ")");
         }
@@ -167,7 +168,8 @@ public final class MinOptMax implements 
      * @throws ArithmeticException if this instance has strictly less shrink or stretch
      * than the operand
      */
-    public MinOptMax minus(MinOptMax operand) {
+    public MinOptMax minus(MinOptMax operand)
+        throws ArithmeticException {
         checkCompatibility(getShrink(), operand.getShrink(), "shrink");
         checkCompatibility(getStretch(), operand.getStretch(), "stretch");
         return new MinOptMax(min - operand.min, opt - operand.opt, max - operand.max);
@@ -197,9 +199,11 @@ public final class MinOptMax implements 
      * @param minOperand the minimal value to be added.
      * @return an instance with the given value added to the minimal value.
      * @throws IllegalArgumentException if <code>min + minOperand > opt || max < opt</code>.
-     * @deprecated Do not use! It's only for backwards compatibility.
      */
-    public MinOptMax plusMin(int minOperand) {
+    // [GA] remove deprecation - no alternative specified
+    // @deprecated Do not use! It's only for backwards compatibility.
+    public MinOptMax plusMin(int minOperand)
+        throws IllegalArgumentException {
         return getInstance(min + minOperand, opt, max);
     }
 
@@ -209,9 +213,11 @@ public final class MinOptMax implements 
      * @param minOperand the minimal value to be subtracted.
      * @return an instance with the given value subtracted to the minimal value.
      * @throws IllegalArgumentException if <code>min - minOperand > opt || max < opt</code>.
-     * @deprecated Do not use! It's only for backwards compatibility.
      */
-    public MinOptMax minusMin(int minOperand) {
+    // [GA] remove deprecation - no alternative specified
+    // @deprecated Do not use! It's only for backwards compatibility.
+    public MinOptMax minusMin(int minOperand)
+        throws IllegalArgumentException {
         return getInstance(min - minOperand, opt, max);
     }
 
@@ -221,9 +227,11 @@ public final class MinOptMax implements 
      * @param maxOperand the maximal value to be added.
      * @return an instance with the given value added to the maximal value.
      * @throws IllegalArgumentException if <code>min > opt || max < opt + maxOperand</code>.
-     * @deprecated Do not use! It's only for backwards compatibility.
      */
-    public MinOptMax plusMax(int maxOperand) {
+    // [GA] remove deprecation - no alternative specified
+    // @deprecated Do not use! It's only for backwards compatibility.
+    public MinOptMax plusMax(int maxOperand)
+        throws IllegalArgumentException {
         return getInstance(min, opt, max + maxOperand);
     }
 
@@ -233,9 +241,11 @@ public final class MinOptMax implements 
      * @param maxOperand the maximal value to be subtracted.
      * @return an instance with the given value subtracted to the maximal value.
      * @throws IllegalArgumentException if <code>min > opt || max < opt - maxOperand</code>.
-     * @deprecated Do not use! It's only for backwards compatibility.
      */
-    public MinOptMax minusMax(int maxOperand) {
+    // [GA] remove deprecation - no alternative specified
+    // @deprecated Do not use! It's only for backwards compatibility.
+    public MinOptMax minusMax(int maxOperand)
+        throws IllegalArgumentException {
         return getInstance(min, opt, max - maxOperand);
     }
 
@@ -246,7 +256,8 @@ public final class MinOptMax implements 
      * @return the product of this <code>MinOptMax</code> and the given factor
      * @throws IllegalArgumentException if the factor is negative
      */
-    public MinOptMax mult(int factor) {
+    public MinOptMax mult(int factor)
+        throws IllegalArgumentException {
         if (factor < 0) {
             throw new IllegalArgumentException("factor < 0; was: " + factor);
         } else if (factor == 1) {

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/traits/SpaceVal.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/traits/SpaceVal.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/traits/SpaceVal.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/traits/SpaceVal.java Wed Aug 25 16:49:26 2010
@@ -65,9 +65,9 @@ public class SpaceVal {
     /**
      * Constructor for SpaceVal objects based on the full set of properties.
      * @param space space to use
-     * @param bConditional Conditionality value
-     * @param bForcing Forcing value
-     * @param iPrecedence Precedence value
+     * @param conditional Conditionality value
+     * @param forcing Forcing value
+     * @param precedence Precedence value
      */
     public SpaceVal(MinOptMax space, boolean conditional, boolean forcing, int precedence) {
         this.space = space;
@@ -76,6 +76,12 @@ public class SpaceVal {
         this.precedence = precedence;
     }
 
+    /**
+     * @param wordSpacing property
+     * @param letterSpacing space value
+     * @param fs font
+     * @return space value
+     */
     public static SpaceVal makeWordSpacing(Property wordSpacing, SpaceVal letterSpacing, Font fs) {
         if (wordSpacing.getEnum() == Constants.EN_NORMAL) {
             // give word spaces the possibility to shrink by a third,
@@ -89,6 +95,10 @@ public class SpaceVal {
         }
     }
 
+    /**
+     * @param letterSpacing property
+     * @return space value
+     */
     public static SpaceVal makeLetterSpacing(Property letterSpacing) {
         if (letterSpacing.getEnum() == Constants.EN_NORMAL) {
             // letter spaces are set to zero (or use different values?)

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/traits/TraitEnum.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/traits/TraitEnum.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/traits/TraitEnum.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/traits/TraitEnum.java Wed Aug 25 16:49:26 2010
@@ -21,6 +21,8 @@ package org.apache.fop.traits;
 
 import java.io.Serializable;
 
+import org.apache.fop.fo.Constants;
+
 /** Base class for enumeration classes representing traits. */
 public abstract class TraitEnum implements Serializable {
 

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/AbstractPaintingState.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/AbstractPaintingState.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/AbstractPaintingState.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/AbstractPaintingState.java Wed Aug 25 16:49:26 2010
@@ -340,7 +340,7 @@ public abstract class AbstractPaintingSt
     /**
      * Sets the current state data
      *
-     * @param currentData state data
+     * @param data the state data
      */
     protected void setData(AbstractData data) {
         this.data = data;
@@ -468,6 +468,7 @@ public abstract class AbstractPaintingSt
 
         /**
          * Sets the current AffineTransform.
+         * @param baseTransform the transform
          */
         public void setTransform(AffineTransform baseTransform) {
             this.transform = baseTransform;

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/ColorProfileUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/ColorProfileUtil.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/ColorProfileUtil.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/ColorProfileUtil.java Wed Aug 25 16:49:26 2010
@@ -27,7 +27,10 @@ import java.io.UnsupportedEncodingExcept
 /**
  * Helper methods for handling color profiles.
  */
-public class ColorProfileUtil {
+public final class ColorProfileUtil {
+
+    private ColorProfileUtil() {
+    }
 
     /**
      * Returns the profile description of an ICC profile

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/ColorUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/ColorUtil.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/ColorUtil.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/ColorUtil.java Wed Aug 25 16:49:26 2010
@@ -27,8 +27,7 @@ import java.util.Map;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.apache.xmlgraphics.java2d.color.CMYKColorSpace;
-import org.apache.xmlgraphics.java2d.color.ColorExt;
+import org.apache.xmlgraphics.java2d.color.DeviceCMYKColorSpace;
 
 import org.apache.fop.apps.FOUserAgent;
 import org.apache.fop.fo.expr.PropertyException;
@@ -329,7 +328,7 @@ public final class ColorUtil {
                 String iccProfileSrc = null;
                 if (isPseudoProfile(iccProfileName)) {
                     if (CMYK_PSEUDO_PROFILE.equalsIgnoreCase(iccProfileName)) {
-                        colorSpace = CMYKColorSpace.getInstance();
+                        colorSpace = DeviceCMYKColorSpace.getInstance();
                     } else {
                         assert false : "Incomplete implementation";
                     }
@@ -454,7 +453,7 @@ public final class ColorUtil {
                             + "Arguments to cmyk() must be in the range [0%-100%] or [0.0-1.0]");
                 }
                 float[] cmyk = new float[] {cyan, magenta, yellow, black};
-                CMYKColorSpace cmykCs = CMYKColorSpace.getInstance();
+                DeviceCMYKColorSpace cmykCs = DeviceCMYKColorSpace.getInstance();
                 float[] rgb = cmykCs.toRGB(cmyk);
                 parsedColor = ColorExt.createFromFoRgbIcc(rgb[0], rgb[1], rgb[2],
                         CMYK_PSEUDO_PROFILE, null, cmykCs, cmyk);
@@ -521,7 +520,7 @@ public final class ColorUtil {
     /**
      * Initializes the colorMap with some predefined values.
      */
-    private static void initializeColorMap() {
+    private static void initializeColorMap() {                  // CSOK: MethodLength
         colorMap = Collections.synchronizedMap(new java.util.HashMap());
 
         colorMap.put("aliceblue", new Color(240, 248, 255));
@@ -705,12 +704,16 @@ public final class ColorUtil {
     }
 
     /**
-     * Creates an uncalibrary CMYK color with the given gray value.
+     * Creates an uncalibrated CMYK color with the given gray value.
      * @param black the gray component (0 - 1)
      * @return the CMYK color
      */
     public static Color toCMYKGrayColor(float black) {
-
-        return org.apache.xmlgraphics.java2d.color.ColorUtil.toCMYKGrayColor(black);
+        float[] cmyk = new float[] {0f, 0f, 0f, 1.0f - black};
+        DeviceCMYKColorSpace cmykCs = DeviceCMYKColorSpace.getInstance();
+        float[] rgb = cmykCs.toRGB(cmyk);
+        return ColorExt.createFromFoRgbIcc(rgb[0], rgb[1], rgb[2],
+                CMYK_PSEUDO_PROFILE, null, cmykCs, cmyk);
     }
+
 }

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/CommandLineLogger.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/CommandLineLogger.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/CommandLineLogger.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/CommandLineLogger.java Wed Aug 25 16:49:26 2010
@@ -1,9 +1,10 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
-/* contributor license agreements.  See the NOTICE file distributed with
-/* this work for additional information regarding copyright ownership.
-/* The ASF licenses this file to You under the Apache License, Version 2.0
-/* (the "License"); you may not use this file except in compliance with
-/* the License.  You may obtain a copy of the License at
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/ConversionUtils.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/ConversionUtils.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/ConversionUtils.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/ConversionUtils.java Wed Aug 25 16:49:26 2010
@@ -25,6 +25,9 @@ package org.apache.fop.util;
  */
 public final class ConversionUtils {
 
+    private ConversionUtils() {
+    }
+
     /**
      * Converts the given base <code>String</code> into
      * an array of <code>int</code>, splitting the base along the

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/DataURIResolver.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/DataURIResolver.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/DataURIResolver.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/DataURIResolver.java Wed Aug 25 16:49:26 2010
@@ -32,6 +32,10 @@ public class DataURIResolver implements 
     private final URIResolver newResolver = new org.apache.xmlgraphics.util.uri.DataURIResolver();
 
     /**
+     * @param href an href
+     * @param base a base
+     * @return a source
+     * @throws TransformerException if not caught
      * @deprecated
      * @see org.apache.xmlgraphics.util.uri.DataURIResolver#resolve(String,
      *      String)

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/DataURLUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/DataURLUtil.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/DataURLUtil.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/DataURLUtil.java Wed Aug 25 16:49:26 2010
@@ -24,23 +24,34 @@ import java.io.InputStream;
 import java.io.Writer;
 
 /**
- * @deprecated
+ * @deprecated use org.apache.xmlgraphics.util.uri.DataURLUtil directly
  * @see org.apache.xmlgraphics.util.uri.DataURLUtil
  */
-public class DataURLUtil {
+public final class DataURLUtil {
+
+    private DataURLUtil() {
+    }
 
     /**
+     * @param in an input stream
+     * @param mediatype a MIME media type
+     * @return a data url as a string
+     * @throws IOException if not caught
      * @deprecated
      * @see org.apache.xmlgraphics.util.uri.DataURLUtil#createDataURL(InputStream,
      *      String)
      */
     public static String createDataURL(InputStream in, String mediatype)
-            throws IOException {
+        throws IOException {
         return org.apache.xmlgraphics.util.uri.DataURLUtil.createDataURL(in,
                 mediatype);
     }
 
     /**
+     * @param in an input stream
+     * @param mediatype a MIME media type
+     * @param writer a writer
+     * @throws IOException if not caught
      * @deprecated
      * @see org.apache.xmlgraphics.util.uri.DataURLUtil#writeDataURL(InputStream,
      *      String, Writer)

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/DecimalFormatCache.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/DecimalFormatCache.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/DecimalFormatCache.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/DecimalFormatCache.java Wed Aug 25 16:49:26 2010
@@ -28,7 +28,10 @@ import java.util.Locale;
  * is not thread-safe but since FOP needs to format a lot of numbers the same way, it shall
  * be cached in a {@link ThreadLocal}.
  */
-public class DecimalFormatCache {
+public final class DecimalFormatCache {
+
+    private DecimalFormatCache() {
+    }
 
     private static final String BASE_FORMAT = "0.################";
 

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/LogUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/LogUtil.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/LogUtil.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/LogUtil.java Wed Aug 25 16:49:26 2010
@@ -25,7 +25,10 @@ import org.apache.fop.apps.FOPException;
 /**
  * Convenience Logging utility methods used in FOP
  */
-public class LogUtil {
+public final class LogUtil {
+
+    private LogUtil() {
+    }
 
     /**
      * Convenience method that handles any error appropriately

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/UnitConv.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/UnitConv.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/UnitConv.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/UnitConv.java Wed Aug 25 16:49:26 2010
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-/* $Id: $ */
+/* $Id$ */
 
 package org.apache.fop.util;
 
@@ -27,6 +27,9 @@ import java.awt.geom.AffineTransform;
  */
 public final class UnitConv {
 
+    private UnitConv() {
+    }
+
     /**
      * conversion factory from millimeters to inches.
      * @deprecated use org.apache.xmlgraphics.util.UnitConv.IN2MM instead.

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/WriterOutputStream.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/WriterOutputStream.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/WriterOutputStream.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/WriterOutputStream.java Wed Aug 25 16:49:26 2010
@@ -24,7 +24,7 @@ import java.io.OutputStream;
 import java.io.Writer;
 
 /**
- * @deprecated
+ * @deprecated use org.apache.xmlgraphics.util.WriterOutputStream instead
  * @see org.apache.xmlgraphics.util.WriterOutputStream
  */
 public class WriterOutputStream extends OutputStream {
@@ -32,9 +32,7 @@ public class WriterOutputStream extends 
     private final org.apache.xmlgraphics.util.WriterOutputStream writerOutputStream;
 
     /**
-     * @deprecated
-     * @see org.apache.xmlgraphics.util.WriterOutputStream#WriterOutputStream(Writer)
-     *      String)
+     * @param writer a writer
      */
     public WriterOutputStream(Writer writer) {
         writerOutputStream = new org.apache.xmlgraphics.util.WriterOutputStream(
@@ -42,52 +40,35 @@ public class WriterOutputStream extends 
     }
 
     /**
-     * @deprecated
-     * @see org.apache.xmlgraphics.util.WriterOutputStream#WriterOutputStream(Writer,
-     *      String) String)
+     * @param writer a writer
+     * @param encoding stream encoding
      */
     public WriterOutputStream(Writer writer, String encoding) {
         writerOutputStream = new org.apache.xmlgraphics.util.WriterOutputStream(
                 writer, encoding);
     }
 
-    /**
-     * @deprecated
-     * @see org.apache.xmlgraphics.util.WriterOutputStream#close()
-     */
+    /** {@inheritDoc} */
     public void close() throws IOException {
         writerOutputStream.close();
     }
 
-    /**
-     * @deprecated
-     * @see org.apache.xmlgraphics.util.WriterOutputStream#flush()
-     */
+    /** {@inheritDoc} */
     public void flush() throws IOException {
         writerOutputStream.flush();
     }
 
-    /**
-     * @deprecated
-     * @see org.apache.xmlgraphics.util.WriterOutputStream#write(byte[], int,
-     *      int)
-     */
+    /** {@inheritDoc} */
     public void write(byte[] buf, int offset, int length) throws IOException {
         writerOutputStream.write(buf, offset, length);
     }
 
-    /**
-     * @deprecated
-     * @see org.apache.xmlgraphics.util.WriterOutputStream#write(byte[])
-     */
+    /** {@inheritDoc} */
     public void write(byte[] buf) throws IOException {
         writerOutputStream.write(buf);
     }
 
-    /**
-     * @deprecated
-     * @see org.apache.xmlgraphics.util.WriterOutputStream#write(int)
-     */
+    /** {@inheritDoc} */
     public void write(int b) throws IOException {
         writerOutputStream.write(b);
     }

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/XMLUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/XMLUtil.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/XMLUtil.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/XMLUtil.java Wed Aug 25 16:49:26 2010
@@ -30,7 +30,10 @@ import org.xml.sax.helpers.AttributesImp
 /**
  * A collection of utility method for XML handling.
  */
-public class XMLUtil implements XMLConstants {
+public final class XMLUtil implements XMLConstants {
+
+    private XMLUtil() {
+    }
 
     /**
      * Returns an attribute value as a boolean value.

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/bitmap/BitmapImageUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/bitmap/BitmapImageUtil.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/bitmap/BitmapImageUtil.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/bitmap/BitmapImageUtil.java Wed Aug 25 16:49:26 2010
@@ -32,14 +32,17 @@ import java.awt.image.WritableRaster;
 /**
  * Utility method for dealing with bitmap images.
  */
-public class BitmapImageUtil {
+public final class BitmapImageUtil {
+
+    private BitmapImageUtil() {
+    }
 
     /**
      * Indicates whether an image is a monochrome (1 bit black and white) image.
      * @param img the image
      * @return true if it's a monochrome image
      */
-    public static final boolean isMonochromeImage(RenderedImage img) {
+    public static boolean isMonochromeImage(RenderedImage img) {
         return (getColorIndexSize(img) == 2);
     }
 
@@ -48,7 +51,7 @@ public class BitmapImageUtil {
      * @param img the image (must be 1 bit monochrome)
      * @return true if a zero bit indicates a black/dark pixel, false for a white/bright pixel
      */
-    public static final boolean isZeroBlack(RenderedImage img) {
+    public static boolean isZeroBlack(RenderedImage img) {
         if (!isMonochromeImage(img)) {
             throw new IllegalArgumentException("Image is not a monochrome image!");
         }
@@ -65,7 +68,7 @@ public class BitmapImageUtil {
      * @param b the blue component
      * @return the gray value
      */
-    public static final int convertToGray(int r, int g, int b) {
+    public static int convertToGray(int r, int g, int b) {
         return (r * 30 + g * 59 + b * 11) / 100;
     }
 
@@ -74,7 +77,7 @@ public class BitmapImageUtil {
      * @param rgb the RGB value
      * @return the gray value
      */
-    public static final int convertToGray(int rgb) {
+    public static int convertToGray(int rgb) {
         int r = (rgb & 0xFF0000) >> 16;
         int g = (rgb & 0xFF00) >> 8;
         int b = rgb & 0xFF;
@@ -86,7 +89,7 @@ public class BitmapImageUtil {
      * @param img the image
      * @return the size of the color index or 0 if there's no color index
      */
-    public static final int getColorIndexSize(RenderedImage img) {
+    public static int getColorIndexSize(RenderedImage img) {
         ColorModel cm = img.getColorModel();
         if (cm instanceof IndexColorModel) {
             IndexColorModel icm = (IndexColorModel)cm;
@@ -101,7 +104,7 @@ public class BitmapImageUtil {
      * @param img the image
      * @return true if it's a grayscale image
      */
-    public static final boolean isGrayscaleImage(RenderedImage img) {
+    public static boolean isGrayscaleImage(RenderedImage img) {
         return (img.getColorModel().getColorSpace().getNumComponents() == 1);
     }
 
@@ -111,7 +114,7 @@ public class BitmapImageUtil {
      * @param targetDimension the new target dimensions or null if no scaling is necessary
      * @return the sRGB image
      */
-    public static final BufferedImage convertTosRGB(RenderedImage img,
+    public static BufferedImage convertTosRGB(RenderedImage img,
             Dimension targetDimension) {
         return convertAndScaleImage(img, targetDimension, BufferedImage.TYPE_INT_RGB);
     }
@@ -122,7 +125,7 @@ public class BitmapImageUtil {
      * @param targetDimension the new target dimensions or null if no scaling is necessary
      * @return the grayscale image
      */
-    public static final BufferedImage convertToGrayscale(RenderedImage img,
+    public static BufferedImage convertToGrayscale(RenderedImage img,
             Dimension targetDimension) {
         return convertAndScaleImage(img, targetDimension, BufferedImage.TYPE_BYTE_GRAY);
     }
@@ -133,7 +136,7 @@ public class BitmapImageUtil {
      * @param targetDimension the new target dimensions or null if no scaling is necessary
      * @return the monochrome image
      */
-    public static final BufferedImage convertToMonochrome(RenderedImage img,
+    public static BufferedImage convertToMonochrome(RenderedImage img,
             Dimension targetDimension) {
         return toBufferedImage(convertToMonochrome(img, targetDimension, 0.0f));
     }
@@ -146,7 +149,7 @@ public class BitmapImageUtil {
      *                  Valid values: a value between 0.0f (fastest) and 1.0f (best)
      * @return the monochrome image
      */
-    public static final RenderedImage convertToMonochrome(RenderedImage img,
+    public static RenderedImage convertToMonochrome(RenderedImage img,
             Dimension targetDimension, float quality) {
         if (!isMonochromeImage(img)) {
             if (quality >= 0.5f) {
@@ -234,6 +237,7 @@ public class BitmapImageUtil {
         }
     }
 
+    /** @return the bitmap converter */
     public static MonochromeBitmapConverter createDefaultMonochromeBitmapConverter() {
         MonochromeBitmapConverter converter = null;
         try {

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/bitmap/DitherUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/bitmap/DitherUtil.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/bitmap/DitherUtil.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/bitmap/DitherUtil.java Wed Aug 25 16:49:26 2010
@@ -24,7 +24,10 @@ import java.awt.Color;
 /**
  * Utility methods for dithering.
  */
-public class DitherUtil {
+public final class DitherUtil {
+
+    private DitherUtil() {
+    }
 
     /** Selects a 2x2 Bayer dither matrix (5 grayscales) */
     public static final int DITHER_MATRIX_2X2 = 2;

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/text/AdvancedMessageFormat.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/text/AdvancedMessageFormat.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/text/AdvancedMessageFormat.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/text/AdvancedMessageFormat.java Wed Aug 25 16:49:26 2010
@@ -29,7 +29,7 @@ import org.apache.xmlgraphics.util.Servi
 
 /**
  * Formats messages based on a template and with a set of named parameters. This is similar to
- * {@link java.util.MessageFormat} but uses named parameters and supports conditional sub-groups.
+ * {@link java.text.MessageFormat} but uses named parameters and supports conditional sub-groups.
  * <p>
  * Example:
  * </p>

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/mif/MIFElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/mif/MIFElement.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/mif/MIFElement.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/mif/MIFElement.java Wed Aug 25 16:49:26 2010
@@ -31,24 +31,32 @@ import java.util.List;
  * to an output stream including sub-elements or a single value.
  */
 public class MIFElement {
+    /** name */
     protected String name;
+    /** value string */
     protected String valueStr = null;
+    /** value elements */
     protected List valueElements = null;
-
+    /** true if started */
     protected boolean started = false;
+    /** true if finishing */
     protected boolean finish = false;
+    /** true if finished */
     protected boolean finished = false;
 
     /**
+     * @param name a name
      */
-    public MIFElement(String n) {
-        name = n;
+    public MIFElement(String name) {
+        this.name = name;
     }
 
+    /** @param str a string value */
     public void setValue(String str) {
         valueStr = str;
     }
 
+    /** @param el an MIF element */
     public void addElement(MIFElement el) {
         if (valueElements == null) {
             valueElements = new java.util.ArrayList();
@@ -62,6 +70,10 @@ public class MIFElement {
      * This method can be called again to continue from the previous point.
      * An element that contains child elements will only be finished when
      * the finish method is called.
+     * @param os output stream
+     * @param indent indentation
+     * @return true if finished
+     * @throws IOException if not caught
      */
     public boolean output(OutputStream os, int indent) throws IOException {
         if (finished) {
@@ -105,6 +117,7 @@ public class MIFElement {
         return true;
     }
 
+    /** @param deep if true, also perform finish over value elements */
     public void finish(boolean deep) {
         finish = true;
         if (deep && valueElements != null) {

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/mif/MIFFOEventHandlerMaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/mif/MIFFOEventHandlerMaker.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/mif/MIFFOEventHandlerMaker.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/mif/MIFFOEventHandlerMaker.java Wed Aug 25 16:49:26 2010
@@ -34,17 +34,17 @@ public class MIFFOEventHandlerMaker exte
     private static final String[] MIMES = new String[] {MimeConstants.MIME_MIF};
 
 
-    /** @see org.apache.fop.render.AbstractFOEventHandlerMaker */
+    /** {@inheritDoc} */
     public FOEventHandler makeFOEventHandler(FOUserAgent ua, OutputStream out) {
         return new MIFHandler(ua, out);
     }
 
-    /** @see org.apache.fop.render.AbstractFOEventHandlerMaker#needsOutputStream() */
+    /** {@inheritDoc} */
     public boolean needsOutputStream() {
         return true;
     }
 
-    /** @see org.apache.fop.render.AbstractFOEventHandlerMaker#getSupportedMimeTypes() */
+    /** {@inheritDoc} */
     public String[] getSupportedMimeTypes() {
         return MIMES;
     }

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/mif/MIFFile.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/mif/MIFFile.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/mif/MIFFile.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/mif/MIFFile.java Wed Aug 25 16:49:26 2010
@@ -33,23 +33,39 @@ import java.util.List;
  */
 public class MIFFile extends MIFElement {
 
+    /** colorCatalog */
     protected MIFElement colorCatalog = null;
+    /** pgfCatalog */
     protected PGFElement pgfCatalog = null;
+    /** fontCatalog */
     protected MIFElement fontCatalog = null;
+    /** rulingCatalog */
     protected RulingElement rulingCatalog = null;
+    /** tblCatalog */
     protected MIFElement tblCatalog = null;
+    /** views */
     protected MIFElement views = null;
+    /** variableFormats */
     protected MIFElement variableFormats = null;
+    /** xRefFormats */
     protected MIFElement xRefFormats = null;
+    /** document */
     protected MIFElement document = null;
+    /** bookComponent */
     protected MIFElement bookComponent = null;
+    /** initialAutoNums */
     protected MIFElement initialAutoNums = null;
+    /** aFrames */
     protected MIFElement aFrames = null;
+    /** tbls */
     protected MIFElement tbls = null;
+    /** pages */
     protected List pages = new java.util.ArrayList();
+    /** textFlows */
     protected List textFlows = null;
 
 
+    /** default constructor */
     public MIFFile() {
         super("");
         valueElements = new java.util.ArrayList();
@@ -104,6 +120,10 @@ public class MIFFile extends MIFElement 
 
     }
 
+    /**
+     * @param os output stream
+     * @throws IOException if not caught
+     */
     public void output(OutputStream os) throws IOException {
         if (finished) {
             return;
@@ -130,6 +150,7 @@ public class MIFFile extends MIFElement 
         }
     }
 
+    /** @param p a page element to add */
     public void addPage(MIFElement p) {
         pages.add(p);
         addElement(p);

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/mif/MIFHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/mif/MIFHandler.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/mif/MIFHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/mif/MIFHandler.java Wed Aug 25 16:49:26 2010
@@ -42,6 +42,8 @@ import org.apache.fop.fo.flow.table.Tabl
 import org.apache.fop.fo.flow.table.TableBody;
 import org.apache.fop.fo.flow.table.TableCell;
 import org.apache.fop.fo.flow.table.TableColumn;
+import org.apache.fop.fo.flow.table.TableFooter;
+import org.apache.fop.fo.flow.table.TableHeader;
 import org.apache.fop.fo.flow.table.TableRow;
 import org.apache.fop.fo.pagination.Flow;
 import org.apache.fop.fo.pagination.PageSequence;
@@ -85,9 +87,7 @@ public class MIFHandler extends FOEventH
         FontSetup.setup(fontInfo, null, new DefaultFontResolver(ua));
     }
 
-    /**
-     * @see org.apache.fop.fo.FOEventHandler#startDocument()
-     */
+    /** {@inheritDoc} */
     public void startDocument() throws SAXException {
         log.fatal("The MIF Handler is non-functional at this time. Please help resurrect it!");
         mifFile = new MIFFile();
@@ -98,9 +98,7 @@ public class MIFHandler extends FOEventH
         }
     }
 
-    /**
-     * @see org.apache.fop.fo.FOEventHandler#endDocument()
-     */
+    /** {@inheritDoc} */
     public void endDocument() throws SAXException {
         // finish all open elements
         mifFile.finish(true);
@@ -112,19 +110,15 @@ public class MIFHandler extends FOEventH
         }
     }
 
-    /**
-     * Start the page sequence.
-     * This creates the pages in the MIF document that will be used
-     * by the following flows and static areas.
-     * @see org.apache.fop.fo.FOEventHandler
-     */
+    /** {@inheritDoc} */
     public void startPageSequence(PageSequence pageSeq) {
         // get the layout master set
         // setup the pages for this sequence
         String name = pageSeq.getMasterReference();
         SimplePageMaster spm = pageSeq.getRoot().getLayoutMasterSet().getSimplePageMaster(name);
         if (spm == null) {
-            PageSequenceMaster psm = pageSeq.getRoot().getLayoutMasterSet().getPageSequenceMaster(name);
+            PageSequenceMaster psm
+                = pageSeq.getRoot().getLayoutMasterSet().getPageSequenceMaster(name);
         } else {
             // create simple master with regions
             MIFElement prop = new MIFElement("PageType");
@@ -160,284 +154,190 @@ public class MIFHandler extends FOEventH
         }
     }
 
-    /**
-     * @see org.apache.fop.fo.FOEventHandler#endPageSequence(PageSequence)
-     */
+    /** {@inheritDoc} */
     public void endPageSequence(PageSequence pageSeq) {
     }
 
-    /**
-     * @see org.apache.fop.fo.FOEventHandler#startFlow(Flow)
-     */
+    /** {@inheritDoc} */
     public void startFlow(Flow fl) {
         // start text flow in body region
         textFlow = new MIFElement("TextFlow");
     }
 
-    /**
-     * @see org.apache.fop.fo.FOEventHandler#endFlow(Flow)
-     */
+    /** {@inheritDoc} */
     public void endFlow(Flow fl) {
         textFlow.finish(true);
         mifFile.addElement(textFlow);
         textFlow = null;
     }
 
-    /**
-     * @see org.apache.fop.fo.FOEventHandler#startBlock(Block)
-     */
+    /** {@inheritDoc} */
     public void startBlock(Block bl) {
         para = new MIFElement("Para");
         // get font
         textFlow.addElement(para);
     }
 
-    /**
-     * @see org.apache.fop.fo.FOEventHandler#endBlock(Block)
-     */
+    /** {@inheritDoc} */
     public void endBlock(Block bl) {
         para.finish(true);
         para = null;
     }
 
-    /**
-     *
-     * @param inl Inline that is starting.
-     */
-    public void startInline(Inline inl){
+    /** {@inheritDoc} */
+    public void startInline(Inline inl) {
     }
 
-    /**
-     *
-     * @param inl Inline that is ending.
-     */
-    public void endInline(Inline inl){
+    /** {@inheritDoc} */
+    public void endInline(Inline inl) {
     }
 
-    /**
-     * @see org.apache.fop.fo.FOEventHandler#startTable(Table)
-     */
+    /** {@inheritDoc} */
     public void startTable(Table tbl) {
     }
 
-    /**
-     * @see org.apache.fop.fo.FOEventHandler#endTable(Table)
-     */
+    /** {@inheritDoc} */
     public void endTable(Table tbl) {
     }
 
-    /**
-     *
-     * @param tc TableColumn that is starting;
-     */
+    /** {@inheritDoc} */
     public void startColumn(TableColumn tc) {
     }
 
-    /**
-     *
-     * @param tc TableColumn that is ending;
-     */
+    /** {@inheritDoc} */
     public void endColumn(TableColumn tc) {
     }
 
-    /**
-     * @see org.apache.fop.fo.FOEventHandler#startHeader(TableBody)
-     */
-    public void startHeader(TableBody th) {
+    /** {@inheritDoc} */
+    public void startHeader(TableHeader th) {
     }
 
-    /**
-     * @see org.apache.fop.fo.FOEventHandler#endHeader(TableBody)
-     */
-    public void endHeader(TableBody th) {
+    /** {@inheritDoc} */
+    public void endHeader(TableHeader th) {
     }
 
-    /**
-     * @see org.apache.fop.fo.FOEventHandler#startFooter(TableBody)
-     */
-    public void startFooter(TableBody tf) {
+    /** {@inheritDoc} */
+    public void startFooter(TableFooter tf) {
     }
 
-    /**
-     * @see org.apache.fop.fo.FOEventHandler#endFooter(TableBody)
-     */
-    public void endFooter(TableBody tf) {
+    /** {@inheritDoc} */
+    public void endFooter(TableFooter tf) {
     }
 
-    /**
-     * @see org.apache.fop.fo.FOEventHandler#startBody(TableBody)
-     */
+    /** {@inheritDoc} */
     public void startBody(TableBody tb) {
     }
 
-    /**
-     * @see org.apache.fop.fo.FOEventHandler#endBody(TableBody)
-     */
+    /** {@inheritDoc} */
     public void endBody(TableBody tb) {
     }
 
-    /**
-     * @see org.apache.fop.fo.FOEventHandler#startRow(TableRow)
-     */
+    /** {@inheritDoc} */
     public void startRow(TableRow tr) {
     }
 
-    /**
-     * @see org.apache.fop.fo.FOEventHandler#endRow(TableRow)
-     */
+    /** {@inheritDoc} */
     public void endRow(TableRow tr) {
     }
 
-    /**
-     * @see org.apache.fop.fo.FOEventHandler#startCell(TableCell)
-     */
+    /** {@inheritDoc} */
     public void startCell(TableCell tc) {
     }
 
-    /**
-     * @see org.apache.fop.fo.FOEventHandler#endCell(TableCell)
-     */
+    /** {@inheritDoc} */
     public void endCell(TableCell tc) {
     }
 
-    // Lists
-    /**
-     * @see org.apache.fop.fo.FOEventHandler#startList(ListBlock)
-     */
+    /** {@inheritDoc} */
     public void startList(ListBlock lb) {
     }
 
-    /**
-     * @see org.apache.fop.fo.FOEventHandler#endList(ListBlock)
-     */
+    /** {@inheritDoc} */
     public void endList(ListBlock lb) {
     }
 
-    /**
-     * @see org.apache.fop.fo.FOEventHandler#startListItem(ListItem)
-     */
+    /** {@inheritDoc} */
     public void startListItem(ListItem li) {
     }
 
-    /**
-     * @see org.apache.fop.fo.FOEventHandler#endListItem(ListItem)
-     */
+    /** {@inheritDoc} */
     public void endListItem(ListItem li) {
     }
 
-    /**
-     * @see org.apache.fop.fo.FOEventHandler#startListLabel()
-     */
+    /** {@inheritDoc} */
     public void startListLabel() {
     }
 
-    /**
-     * @see org.apache.fop.fo.FOEventHandler#endListLabel()
-     */
+    /** {@inheritDoc} */
     public void endListLabel() {
     }
 
-    /**
-     * @see org.apache.fop.fo.FOEventHandler#startListBody()
-     */
+    /** {@inheritDoc} */
     public void startListBody() {
     }
 
-    /**
-     * @see org.apache.fop.fo.FOEventHandler#endListBody()
-     */
+    /** {@inheritDoc} */
     public void endListBody() {
     }
 
-    // Static Regions
-    /**
-     * @see org.apache.fop.fo.FOEventHandler#startStatic()
-     */
+    /** {@inheritDoc} */
     public void startStatic() {
     }
 
-    /**
-     * @see org.apache.fop.fo.FOEventHandler#endStatic()
-     */
+    /** {@inheritDoc} */
     public void endStatic() {
     }
 
-    /**
-     * @see org.apache.fop.fo.FOEventHandler#startMarkup()
-     */
+    /** {@inheritDoc} */
     public void startMarkup() {
     }
 
-    /**
-     * @see org.apache.fop.fo.FOEventHandler#endMarkup()
-     */
+    /** {@inheritDoc} */
     public void endMarkup() {
     }
 
-    /**
-     * @see org.apache.fop.fo.FOEventHandler#startLink(BasicLink basicLink)
-     */
+    /** {@inheritDoc} */
     public void startLink(BasicLink basicLink) {
     }
 
-    /**
-     * @see org.apache.fop.fo.FOEventHandler#endLink()
-     */
+    /** {@inheritDoc} */
     public void endLink() {
     }
 
-    /**
-     * @see org.apache.fop.fo.FOEventHandler#image(ExternalGraphic)
-     */
+    /** {@inheritDoc} */
     public void image(ExternalGraphic eg) {
     }
 
-    /**
-     * @see org.apache.fop.fo.FOEventHandler#pageRef()
-     */
+    /** {@inheritDoc} */
     public void pageRef() {
     }
 
-    /**
-     * @see org.apache.fop.fo.FOEventHandler#foreignObject(InstreamForeignObject)
-     */
+    /** {@inheritDoc} */
     public void foreignObject(InstreamForeignObject ifo) {
     }
 
-    /**
-     * @see org.apache.fop.fo.FOEventHandler#startFootnote(Footnote)
-     */
+    /** {@inheritDoc} */
     public void startFootnote(Footnote footnote) {
     }
 
-    /**
-     * @see org.apache.fop.fo.FOEventHandler#endFootnote(Footnote)
-     */
+    /** {@inheritDoc} */
     public void endFootnote(Footnote footnote) {
     }
 
-    /**
-     * @see org.apache.fop.fo.FOEventHandler#startFootnoteBody(FootnoteBody)
-     */
+    /** {@inheritDoc} */
     public void startFootnoteBody(FootnoteBody body) {
     }
 
-    /**
-     * @see org.apache.fop.fo.FOEventHandler#endFootnoteBody(FootnoteBody)
-     */
+    /** {@inheritDoc} */
     public void endFootnoteBody(FootnoteBody body) {
     }
 
-    /**
-     * @see org.apache.fop.fo.FOEventHandler#leader(Leader)
-     */
+    /** {@inheritDoc} */
     public void leader(Leader l) {
     }
 
-    /**
-     * @see org.apache.fop.fo.FOEventHandler#characters(char[], int, int)
-     */
-    public void characters(char data[], int start, int length) {
+    /** {@inheritDoc} */
+    public void characters(char[] data, int start, int length) {
         if (para != null) {
             String str = new String(data, start, length);
             str = str.trim();
@@ -458,17 +358,11 @@ public class MIFHandler extends FOEventH
         }
     }
 
-    /**
-     *
-     * @param pagenum PageNumber that is starting.
-     */
+    /** {@inheritDoc} */
     public void startPageNumber(PageNumber pagenum) {
     }
 
-    /**
-     *
-     * @param pagenum PageNumber that is ending.
-     */
+    /** {@inheritDoc} */
     public void endPageNumber(PageNumber pagenum) {
     }
 }

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/mif/PGFElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/mif/PGFElement.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/mif/PGFElement.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/mif/PGFElement.java Wed Aug 25 16:49:26 2010
@@ -33,6 +33,10 @@ public class PGFElement extends RefEleme
         super("PgfCatalog");
     }
 
+    /**
+     * @param key an object
+     * @return an MIF element
+     */
     public MIFElement lookupElement(Object key) {
         if (key == null) {
             MIFElement pgf = new MIFElement("Pgf");

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/mif/RefElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/mif/RefElement.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/mif/RefElement.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/mif/RefElement.java Wed Aug 25 16:49:26 2010
@@ -31,12 +31,17 @@ package org.apache.fop.render.mif;
 public class RefElement extends MIFElement {
 
     /**
+     * @param name a name
      * @see org.apache.fop.render.mif.MIFElement#MIFElement(String)
      */
-    public RefElement(String n) {
-        super(n);
+    public RefElement(String name) {
+        super(name);
     }
 
+    /** 
+     * @param key a key
+     * @return an mif element
+     */
     public MIFElement lookupElement(Object key) {
         return null;
     }

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/mif/RulingElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/mif/RulingElement.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/mif/RulingElement.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/mif/RulingElement.java Wed Aug 25 16:49:26 2010
@@ -19,12 +19,15 @@
 
 package org.apache.fop.render.mif;
 
+/** a ruling element */
 public class RulingElement extends RefElement {
 
+    /** default constructor */
     public RulingElement() {
         super("RulingCatalog");
     }
 
+    /** {@inheritDoc} */
     public MIFElement lookupElement(Object key) {
         if (key == null) {
             MIFElement rul = new MIFElement("Ruling");

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/svg/SVGDataUrlImageHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/svg/SVGDataUrlImageHandler.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/svg/SVGDataUrlImageHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/svg/SVGDataUrlImageHandler.java Wed Aug 25 16:49:26 2010
@@ -33,11 +33,11 @@ import org.apache.xmlgraphics.image.load
 import org.apache.xmlgraphics.image.loader.ImageFlavor;
 import org.apache.xmlgraphics.image.loader.impl.ImageRawStream;
 import org.apache.xmlgraphics.util.QName;
+import org.apache.xmlgraphics.util.uri.DataURLUtil;
 
 import org.apache.fop.render.ImageHandler;
 import org.apache.fop.render.RenderingContext;
 import org.apache.fop.render.intermediate.IFConstants;
-import org.apache.fop.util.DataURLUtil;
 
 /**
  * Image handler implementation that embeds JPEG bitmaps as RFC 2397 data URLs in the target SVG

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/svg/SVGPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/svg/SVGPainter.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/svg/SVGPainter.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/svg/SVGPainter.java Wed Aug 25 16:49:26 2010
@@ -34,17 +34,14 @@ import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.AttributesImpl;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 import org.apache.xmlgraphics.image.loader.ImageException;
 import org.apache.xmlgraphics.image.loader.ImageInfo;
 import org.apache.xmlgraphics.image.loader.ImageManager;
 import org.apache.xmlgraphics.image.loader.ImageSessionContext;
 import org.apache.xmlgraphics.xmp.Metadata;
 
-import org.apache.fop.apps.MimeConstants;
 import org.apache.fop.ResourceEventProducer;
+import org.apache.fop.apps.MimeConstants;
 import org.apache.fop.render.ImageHandlerUtil;
 import org.apache.fop.render.RenderingContext;
 import org.apache.fop.render.intermediate.AbstractIFPainter;
@@ -64,9 +61,6 @@ import org.apache.fop.util.XMLUtil;
  */
 public class SVGPainter extends AbstractIFPainter implements SVGConstants {
 
-    /** logging instance */
-    private static Log log = LogFactory.getLog(SVGPainter.class);
-
     private AbstractSVGDocumentHandler parent;
 
     /** The SAX content handler that receives the generated XML events. */
@@ -391,7 +385,10 @@ public class SVGPainter extends Abstract
         state.resetFontChanged();
     }
 
-    /** {@inheritDoc} */
+    /**
+     * @param extension an extension object
+     * @throws IFException if not caught
+     */
     public void handleExtensionObject(Object extension) throws IFException {
         if (extension instanceof Metadata) {
             Metadata meta = (Metadata)extension;

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/svg/SVGRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/svg/SVGRenderer.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/svg/SVGRenderer.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/svg/SVGRenderer.java Wed Aug 25 16:49:26 2010
@@ -67,16 +67,16 @@ public class SVGRenderer extends Java2DR
     /** Helper class for generating multiple files */
     private MultiFileRenderingUtil multiFileUtil;
 
-    /** @see org.apache.fop.render.AbstractRenderer */
-    public String getMimeType() {
-        return MIME_TYPE;
+    /** Default constructor. */
+    public SVGRenderer() {
     }
 
-    /** Creates TIFF renderer. */
-    public SVGRenderer() {
+    /** {@inheritDoc} */
+    public String getMimeType() {
+        return MIME_TYPE;
     }
 
-    /** @see org.apache.fop.render.Renderer#startRenderer(java.io.OutputStream) */
+    /** {@inheritDoc} */
     public void startRenderer(OutputStream outputStream) throws IOException {
         this.firstOutputStream = outputStream;
         this.multiFileUtil = new MultiFileRenderingUtil(SVG_FILE_EXTENSION,
@@ -84,9 +84,7 @@ public class SVGRenderer extends Java2DR
         super.startRenderer(this.firstOutputStream);
     }
 
-    /**
-     * @see org.apache.fop.render.java2d.Java2DRenderer#renderPage(org.apache.fop.area.PageViewport)
-     */
+    /** {@inheritDoc} */
     public void renderPage(PageViewport pageViewport) throws IOException {
         log.debug("Rendering page: " + pageViewport.getPageNumberString());
         // Get a DOMImplementation
@@ -122,7 +120,7 @@ public class SVGRenderer extends Java2DR
 
     }
 
-    /** @see org.apache.fop.render.Renderer#stopRenderer() */
+    /** {@inheritDoc} */
     public void stopRenderer() throws IOException {
         super.stopRenderer();
 

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/svg/SVGRendererMaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/svg/SVGRendererMaker.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/svg/SVGRendererMaker.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/svg/SVGRendererMaker.java Wed Aug 25 16:49:26 2010
@@ -32,17 +32,17 @@ public class SVGRendererMaker extends Ab
     private static final String[] MIMES = new String[] {MimeConstants.MIME_SVG};
 
 
-    /**@see org.apache.fop.render.AbstractRendererMaker */
+    /** {@inheritDoc} */
     public Renderer makeRenderer(FOUserAgent ua) {
         return new SVGRenderer();
     }
 
-    /** @see org.apache.fop.render.AbstractRendererMaker#needsOutputStream() */
+    /** {@inheritDoc} */
     public boolean needsOutputStream() {
         return true;
     }
 
-    /** @see org.apache.fop.render.AbstractRendererMaker#getSupportedMimeTypes() */
+    /** {@inheritDoc} */
     public String[] getSupportedMimeTypes() {
         return MIMES;
     }

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/svg/SVGSVGHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/svg/SVGSVGHandler.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/svg/SVGSVGHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/svg/SVGSVGHandler.java Wed Aug 25 16:49:26 2010
@@ -32,9 +32,10 @@ import org.w3c.dom.svg.SVGDocument;
 import org.w3c.dom.svg.SVGElement;
 import org.w3c.dom.svg.SVGSVGElement;
 
+/** The svg:svg element handler. */
 public class SVGSVGHandler implements XMLHandler, SVGRendererContextConstants {
 
-    /** @see org.apache.fop.render.XMLHandler */
+    /** {@inheritDoc} */
     public void handleXML(RendererContext context,
                 org.w3c.dom.Document doc, String ns) throws Exception {
         if (getNamespace().equals(ns)) {
@@ -67,12 +68,12 @@ public class SVGSVGHandler implements XM
     }
 
 
-    /** @see org.apache.fop.render.XMLHandler#supportsRenderer(org.apache.fop.render.Renderer) */
+    /** {@inheritDoc} */
     public boolean supportsRenderer(Renderer renderer) {
         return (renderer instanceof SVGRenderer);
     }
 
-    /** @see org.apache.fop.render.XMLHandler#getNamespace() */
+    /** {@inheritDoc} */
     public String getNamespace() {
         return SVGRenderer.MIME_TYPE;
     }

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/svg/SVGUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/svg/SVGUtil.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/svg/SVGUtil.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/sandbox/org/apache/fop/render/svg/SVGUtil.java Wed Aug 25 16:49:26 2010
@@ -26,7 +26,10 @@ import org.apache.fop.render.intermediat
 /**
  * This class provides utility methods for generating SVG.
  */
-public class SVGUtil {
+public final class SVGUtil {
+
+    private SVGUtil() {
+    }
 
     /**
      * Formats a length in millipoints as a point value.

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/status.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/status.xml?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/status.xml (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/status.xml Wed Aug 25 16:49:26 2010
@@ -58,6 +58,21 @@
       documents. Example: the fix of marks layering will be such a case when it's done.
     -->
     <release version="FOP Trunk" date="TBD">
+      <action context="Renderers" dev="VH" type="remove">
+        Removed old Renderer implementations for those output formats that have a version based on 
+        the new DocumentHandler architecture available (AFP, PCL, PDF, PS).
+      </action>
+      <action context="Fonts" dev="AC" type="fix">
+        Reinstated support for being able to specify a font cache filepath in the fop user configuration.
+      </action>
+      <action context="Fonts" dev="AC" type="add">
+        Added convenience support for the flushing of the Fop font cache file from the command line.
+      </action>
+      <action context="Renderers" dev="JM" type="add" fixes-bug="44460" due-to="Andrejus Chaliapinas">
+        Added support for PDF File Attachments (Embedded Files).
+      </action>
+    </release>
+    <release version="1.0" date="21 July 2010">
       <action context="Renderers" dev="JM" type="fix">
         AFP Output: Fixed positioning of Java2D-based images (when GOCA is enabled).
       </action>
@@ -88,6 +103,8 @@
       <action context="Renderers" dev="JM" type="add" fixes-bug="48567" due-to="Peter Hancock">
         Initial support for CID-keyed double-byte fonts (Type 0) in AFP output.
       </action>
+	  <action context="API" dev="SP" type="add">Added a command-line option '-catalog' to use a catalog resolver for the XML and XSLT files</action>
+      <action context="Layout" dev="SP" type="add">Implement internal character classes if the hyphenation pattern file does not contain them</action>
       <action context="Layout" dev="VH" type="fix" fixes-bug="46486">
         Bugfix: having a special page-master for the last page caused loss of content when normal 
         blocks were mixed with blocks spanning all columns.
@@ -135,7 +152,7 @@
       <action context="Renderers" dev="JM,VH" type="add" fixes-bug="46705" due-to="Jost Klopfstein">
         Added basic accessibility and Tagged PDF support. 
       </action>
-      <action context="Code" dev="JM" type="add">
+      <action context="Renderers" dev="JM" type="add">
         Added support for encoding CMYK bitmap images (IOCA FS45) and TIFF images as embedded objects.
       </action>
       <action context="Code" dev="AC" type="add">
@@ -544,6 +561,10 @@
         Added support for addressing all glyphs available in a Type 1 font, not just the ones
         in the font's primary encoding.
       </action>
+      <action context="Code" dev="JM" type="add" importance="high">
+        Added an event handling framework which allows to get better feedback from within FOP
+        with the ability to customize problem management.
+      </action>
     </release>
     <release version="0.95" date="05 August 2008">
       <notes>

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/GenericFOPTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/GenericFOPTestCase.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/GenericFOPTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/GenericFOPTestCase.java Wed Aug 25 16:49:26 2010
@@ -31,12 +31,13 @@ import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import org.apache.fop.apps.Fop;
+import org.xml.sax.InputSource;
+
 import org.apache.fop.apps.FOUserAgent;
+import org.apache.fop.apps.Fop;
 import org.apache.fop.apps.FopFactory;
 import org.apache.fop.apps.MimeConstants;
 import org.apache.fop.util.DigestFilter;
-import org.xml.sax.InputSource;
 
 /**
  * Framework for simple regression testing.
@@ -76,8 +77,8 @@ public final class GenericFOPTestCase ex
     public void testSimple() throws Exception {
         final String digestIn = "17bf13298796065f7775db8707133aeb";
         final String digestOut = "e2761f51152f6663911e567901596707";
-        final String fo =
-            "<fo:root xmlns:fo='http://www.w3.org/1999/XSL/Format'>"
+        final String fo
+            = "<fo:root xmlns:fo='http://www.w3.org/1999/XSL/Format'>"
                 + "  <fo:layout-master-set>"
                 + "    <fo:simple-page-master master-name='simple'"
                 + "       page-height='25cm' page-width='20cm'>"
@@ -118,8 +119,8 @@ public final class GenericFOPTestCase ex
         FOUserAgent foUserAgent = fopFactory.newFOUserAgent();
         foUserAgent.setCreationDate(new Date(10000));
         MessageDigest outDigest = MessageDigest.getInstance("MD5");
-        DigestOutputStream out =
-            new DigestOutputStream(new ByteArrayOutputStream(), outDigest);
+        DigestOutputStream out
+            = new DigestOutputStream(new ByteArrayOutputStream(), outDigest);
         Fop fop = fopFactory.newFop(MimeConstants.MIME_PDF, foUserAgent, out);
         InputSource source = new InputSource(new StringReader(fo));
         DigestFilter filter = new DigestFilter("MD5");

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/StandardTestSuite.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/StandardTestSuite.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/StandardTestSuite.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/StandardTestSuite.java Wed Aug 25 16:49:26 2010
@@ -23,7 +23,6 @@ import junit.framework.Test;
 import junit.framework.TestSuite;
 
 import org.apache.fop.fonts.DejaVuLGCSerifTest;
-import org.apache.fop.fonts.TrueTypeAnsiTestCase;
 import org.apache.fop.image.loader.batik.ImageLoaderTestCase;
 import org.apache.fop.image.loader.batik.ImagePreloaderTestCase;
 import org.apache.fop.intermediate.IFMimickingTestCase;
@@ -54,7 +53,6 @@ public class StandardTestSuite {
         suite.addTest(new TestSuite(PDFEncodingTestCase.class));
         suite.addTest(new TestSuite(PDFCMapTestCase.class));
         suite.addTest(new TestSuite(PDFsRGBSettingsTestCase.class));
-        suite.addTest(new TestSuite(TrueTypeAnsiTestCase.class));
         suite.addTest(new TestSuite(DejaVuLGCSerifTest.class));
         suite.addTest(RichTextFormatTestSuite.suite());
         suite.addTest(new TestSuite(ImageLoaderTestCase.class));

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/URIResolutionTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/URIResolutionTestCase.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/URIResolutionTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/URIResolutionTestCase.java Wed Aug 25 16:49:26 2010
@@ -92,7 +92,7 @@ public class URIResolutionTestCase exten
 
         MyURIResolver resolver = new MyURIResolver(withStream);
         ua.setURIResolver(resolver);
-        ua.setBaseURL(foFile.getParentFile().toURL().toString());
+        ua.setBaseURL(foFile.getParentFile().toURI().toURL().toString());
 
         Document doc = createAreaTree(foFile, ua);
 
@@ -119,7 +119,7 @@ public class URIResolutionTestCase exten
         FOUserAgent ua = fopFactory.newFOUserAgent();
         MyURIResolver resolver = new MyURIResolver(false);
         ua.setURIResolver(resolver);
-        ua.setBaseURL(foFile.getParentFile().toURL().toString());
+        ua.setBaseURL(foFile.getParentFile().toURI().toURL().toString());
 
         ByteArrayOutputStream baout = new ByteArrayOutputStream();
 

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/config/BaseUserConfigTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/config/BaseUserConfigTestCase.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/config/BaseUserConfigTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/config/BaseUserConfigTestCase.java Wed Aug 25 16:49:26 2010
@@ -100,7 +100,7 @@ public abstract class BaseUserConfigTest
     /**
      * @return user config File
      */
-    abstract protected String getUserConfigFilename();
+    protected abstract String getUserConfigFilename();
 
     /*
      * @see junit.framework.TestCase#getName()

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/events/EventChecker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/events/EventChecker.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/events/EventChecker.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/events/EventChecker.java Wed Aug 25 16:49:26 2010
@@ -40,7 +40,7 @@ class EventChecker extends Assert implem
         if (event.getEventID().equals(expectedEventID)) {
             eventReceived = true;
         } else {
-            fail("Unexpected event: id = " + event.getEventID() + ": "+ msg);
+            fail("Unexpected event: id = " + event.getEventID() + ": " + msg);
         }
     }
 

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/fotreetest/FOTreeUnitTester.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/fotreetest/FOTreeUnitTester.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/fotreetest/FOTreeUnitTester.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/fotreetest/FOTreeUnitTester.java Wed Aug 25 16:49:26 2010
@@ -94,6 +94,6 @@ public abstract class FOTreeUnitTester e
         foReader.setErrorHandler(fop.getDefaultHandler());
         foReader.setEntityResolver(fop.getDefaultHandler());
 
-        foReader.parse(new File("test/fotree/unittests/" + filename).toURL().toExternalForm());
+        foReader.parse(new File("test/fotree/unittests/" + filename).toURI().toURL().toExternalForm());
     }
 }

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/layoutengine/LayoutEngineTester.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/layoutengine/LayoutEngineTester.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/layoutengine/LayoutEngineTester.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/layoutengine/LayoutEngineTester.java Wed Aug 25 16:49:26 2010
@@ -116,7 +116,7 @@ public class LayoutEngineTester {
 
             //Setup FOP for area tree rendering
             FOUserAgent ua = effFactory.newFOUserAgent();
-            ua.setBaseURL(testFile.getParentFile().toURL().toString());
+            ua.setBaseURL(testFile.getParentFile().toURI().toURL().toString());
             ua.getEventBroadcaster().addEventListener(
                     new ConsoleEventListenerForTests(testFile.getName(), EventSeverity.WARN));
 

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/memory/MemoryEater.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/memory/MemoryEater.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/memory/MemoryEater.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/memory/MemoryEater.java Wed Aug 25 16:49:26 2010
@@ -79,7 +79,7 @@ public class MemoryEater {
         OutputStream out = new NullOutputStream(); //write to /dev/nul
         try {
             FOUserAgent userAgent = fopFactory.newFOUserAgent();
-            userAgent.setBaseURL(foFile.getParentFile().toURL().toExternalForm());
+            userAgent.setBaseURL(foFile.getParentFile().toURI().toURL().toExternalForm());
             Fop fop = fopFactory.newFop(MimeConstants.MIME_PDF, userAgent, out);
             Result res = new SAXResult(fop.getDefaultHandler());
 

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/memory/Stats.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/memory/Stats.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/memory/Stats.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/memory/Stats.java Wed Aug 25 16:49:26 2010
@@ -71,7 +71,7 @@ class Stats {
     public void dumpFinalStats() {
         long duration = System.currentTimeMillis() - startTime;
         System.out.println("Final statistics");
-        System.out.println("Pages produced: " +totalPagesProduced);
+        System.out.println("Pages produced: " + totalPagesProduced);
         long ppm = 60000 * totalPagesProduced / duration;
         System.out.println("Average speed: " + ppm + "ppm");
     }

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/render/RendererFactoryTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/render/RendererFactoryTest.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/render/RendererFactoryTest.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/render/RendererFactoryTest.java Wed Aug 25 16:49:26 2010
@@ -33,7 +33,6 @@ import org.apache.fop.render.intermediat
 import org.apache.fop.render.intermediate.IFDocumentHandler;
 import org.apache.fop.render.intermediate.IFRenderer;
 import org.apache.fop.render.pdf.PDFDocumentHandler;
-import org.apache.fop.render.pdf.PDFRenderer;
 import org.apache.fop.render.rtf.RTFHandler;
 
 /**
@@ -73,29 +72,15 @@ public class RendererFactoryTest extends
         RendererFactory factory = fopFactory.getRendererFactory();
         FOUserAgent ua;
         Renderer renderer;
-        Renderer overrideRenderer;
 
         ua = fopFactory.newFOUserAgent();
         renderer = factory.createRenderer(ua, MimeConstants.MIME_PDF);
         assertTrue(renderer instanceof IFRenderer);
 
-        factory.setRendererPreferred(true); //Test legacy setting
-        ua = fopFactory.newFOUserAgent();
-        renderer = factory.createRenderer(ua, MimeConstants.MIME_PDF);
-        assertTrue(renderer instanceof PDFRenderer);
-
         ua = fopFactory.newFOUserAgent();
         renderer = factory.createRenderer(ua, MimeConstants.MIME_FOP_IF);
         assertTrue(renderer instanceof IFRenderer);
 
-        factory.setRendererPreferred(false);
-        ua = fopFactory.newFOUserAgent();
-        overrideRenderer = new PDFRenderer();
-        overrideRenderer.setUserAgent(ua);
-        ua.setRendererOverride(overrideRenderer);
-        renderer = factory.createRenderer(ua, null);
-        assertTrue(renderer == overrideRenderer);
-
         ua = fopFactory.newFOUserAgent();
         IFDocumentHandler overrideHandler;
         overrideHandler = new PDFDocumentHandler();



---------------------------------------------------------------------
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