jeremias    2005/02/01 13:21:28

  Modified:    src/java/org/apache/fop/fo FObjMixed.java FONode.java
  Log:
  Name of parameter was wrong.
  Some style updates while at it.
  
  Revision  Changes    Path
  1.47      +9 -7      xml-fop/src/java/org/apache/fop/fo/FObjMixed.java
  
  Index: FObjMixed.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FObjMixed.java,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- FObjMixed.java    6 Jan 2005 00:56:26 -0000       1.46
  +++ FObjMixed.java    1 Feb 2005 21:21:28 -0000       1.47
  @@ -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 @@
       }
   
       /**
  +     * 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();
  
  
  
  1.53      +9 -8      xml-fop/src/java/org/apache/fop/fo/FONode.java
  
  Index: FONode.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FONode.java,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- FONode.java       9 Jan 2005 12:47:40 -0000       1.52
  +++ FONode.java       1 Feb 2005 21:21:28 -0000       1.53
  @@ -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 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 @@
   
       /**
        * 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
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to