Name of parameter was wrong.

Some style updates while at it.


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198359 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 18 insertions, 15 deletions

diff --git a/src/java/org/apache/fop/fo/FONode.java b/src/java/org/apache/fop/fo/FONode.java
index fecc2374a..4f9707c2d 100644
--- a/src/java/org/apache/fop/fo/FONode.java
+++ b/src/java/org/apache/fop/fo/FONode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
 package org.apache.fop.fo;
 
 // Java
-import java.util.List;
 import java.util.ListIterator;
 
 import org.xml.sax.Attributes;
@@ -136,7 +135,7 @@ public abstract class FONode implements Cloneable {
     */
     public void processNode(String elementName, Locator locator, 
             Attributes attlist, PropertyList parent) throws FOPException {
-        System.out.println("name = " + elementName);
+        log.debug("name = " + elementName);
     }
 
     /**
@@ -165,12 +164,14 @@ public abstract class FONode implements Cloneable {
 
     /**
      * Adds characters (does nothing here)
-     * @param data text
-     * @param start start position
-     * @param length length of the text
-     * @param locator location in fo source file. 
+     * @param data array of characters containing text to be added
+     * @param start starting array element to add
+     * @param end ending array element to add
+     * @param pList currently applicable PropertyList 
+     * @param locator location in fo source file.
+     * @throws FOPException if there's a problem during processing
      */
-    protected void addCharacters(char data[], int start, int length,
+    protected void addCharacters(char[] data, int start, int end,
                                  PropertyList pList,
                                  Locator locator) throws FOPException {
         // ignore
diff --git a/src/java/org/apache/fop/fo/FObjMixed.java b/src/java/org/apache/fop/fo/FObjMixed.java
index b7e0a7f29..b20cedc14 100644
--- a/src/java/org/apache/fop/fo/FObjMixed.java
+++ b/src/java/org/apache/fop/fo/FObjMixed.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,8 +18,6 @@
 
 package org.apache.fop.fo;
 
-import java.util.List;
-
 import org.xml.sax.Locator;
 
 import org.apache.fop.apps.FOPException;
@@ -38,15 +36,19 @@ public abstract class FObjMixed extends FObj {
     }
 
     /**
+     * Adds characters
      * @param data array of characters containing text to be added
      * @param start starting array element to add
-     * @param length number of characters to add
-     * @param locator location in fo source file. 
+     * @param end ending array element to add
+     * @param pList currently applicable PropertyList 
+     * @param locator location in fo source file.
+     * @throws FOPException if there's a problem during processing
+     * @see org.apache.fop.fo.FONode#addCharacters(char[], int, int, org.apache.fop.fo.PropertyList, org.xml.sax.Locator)
      */
-    protected void addCharacters(char data[], int start, int length,
+    protected void addCharacters(char[] data, int start, int end,
                                  PropertyList pList,
                                  Locator locator) throws FOPException {
-        FOText ft = new FOText(data, start, length, this);
+        FOText ft = new FOText(data, start, end, this);
         ft.setLocator(locator);
         ft.bind(pList);
         ft.startOfNode();