PR:

Obtained from:
Submitted by:
Reviewed by:
Some code cleanup in Title and PageNumberGenerator, removal of apparently unused logger instance from latter.

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

diff --git a/src/java/org/apache/fop/fo/pagination/PageNumberGenerator.java b/src/java/org/apache/fop/fo/pagination/PageNumberGenerator.java
index 85ef7b63ffd62486be86ba0a17e2f4923523117b..6a283c3b83f09974d0b31b9b65da8e4b3bd75658 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/PageNumberGenerator.java
+++ b/src/java/org/apache/fop/fo/pagination/PageNumberGenerator.java
@@ -18,9 +18,6 @@
  
 package org.apache.fop.fo.pagination;
 
-import org.apache.commons.logging.Log;
-
-
 /**
  * This class uses the 'format', 'groupingSeparator', 'groupingSize',
  * and 'letterValue' properties on fo:page-sequence to return a String
@@ -33,11 +30,6 @@ public class PageNumberGenerator {
     private int groupingSize;
     private int letterValue;
 
-    /**
-     * logging instance
-     */
-    protected Log logger = null;
-
     // constants
     private static final int DECIMAL = 1;       // '0*1'
     private static final int LOWERALPHA = 2;    // 'a'
@@ -106,22 +98,6 @@ public class PageNumberGenerator {
         }
     }
 
-    /**
-     * Sets the Commons-Logging instance for this class
-     * @param logger The Commons-Logging instance
-     */
-    public void setLogger(Log logger) {
-        this.logger = logger;
-    }
-
-    /**
-     * Returns the Commons-Logging instance for this class
-     * @return  The Commons-Logging instance
-     */
-    protected Log getLogger(Log logger) {
-        return logger;
-    }
-
     /**
      * Formats a page number.
      * @param number page number to format
@@ -192,10 +168,5 @@ public class PageNumberGenerator {
         }
         return alphaNumber.reverse().toString();
     }
-
-    public String getName() {
-        return "fo:page-number-generator";
-    }
-
 }
 

diff --git a/src/java/org/apache/fop/fo/pagination/PageSequence.java b/src/java/org/apache/fop/fo/pagination/PageSequence.java
index 9fbd12eba0e5f745792116afdf44e8db1196dd32..73fe34176ede31b34176feea218c593cd0ed8bb8 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/PageSequence.java
+++ b/src/java/org/apache/fop/fo/pagination/PageSequence.java
@@ -280,7 +280,6 @@ public class PageSequence extends FObj {
                                     this.propertyList.get(PR_GROUPING_SEPARATOR).getCharacter(),
                                     this.propertyList.get(PR_GROUPING_SIZE).getNumber().intValue(),
                                     this.propertyList.get(PR_LETTER_VALUE).getEnum());
-        this.pageNumberGenerator.setLogger(getLogger());
 
         this.forcePageCount =
             this.propertyList.get(PR_FORCE_PAGE_COUNT).getEnum();

diff --git a/src/java/org/apache/fop/fo/pagination/Title.java b/src/java/org/apache/fop/fo/pagination/Title.java
index 8f1d1158adcd79c7ab320a5ff227aa6dae61b890..d42bf7237524ec7a0a4e95d04592c39cc404aaf1 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/Title.java
+++ b/src/java/org/apache/fop/fo/pagination/Title.java
@@ -24,19 +24,8 @@ import org.xml.sax.Locator;
 import org.xml.sax.SAXParseException;
 
 // FOP
-import org.apache.fop.datatypes.ColorType;
-import org.apache.fop.datatypes.Length;
 import org.apache.fop.fo.FObjMixed;
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.properties.CommonAccessibility;
-import org.apache.fop.fo.properties.CommonAural;
-import org.apache.fop.fo.properties.CommonBackground;
-import org.apache.fop.fo.properties.CommonBorderAndPadding;
-import org.apache.fop.fo.properties.EnumProperty;
-import org.apache.fop.fo.properties.LengthProperty;
-import org.apache.fop.fo.properties.Property;
-import org.apache.fop.fonts.Font;
-import org.apache.fop.fo.properties.CommonMarginInline;
 
 /**
  * Class modelling the fo:title object.
@@ -61,40 +50,9 @@ public class Title extends FObjMixed {
         }
     }
 
-    private void setup() {
-
-        // Common Accessibility Properties
-        CommonAccessibility mAccProps = propMgr.getAccessibilityProps();
-
-        // Common Aural Properties
-        CommonAural mAurProps = propMgr.getAuralProps();
-
-        // Common Border, Padding, and Background Properties
-        CommonBorderAndPadding bap = propMgr.getBorderAndPadding();
-        CommonBackground bProps = propMgr.getBackgroundProps();
-
-        // Common Font Properties
-        Font fontState = propMgr.getFontState(getFOInputHandler().getFontInfo());
-
-        // Common Margin Properties-Inline
-        CommonMarginInline mProps = propMgr.getMarginInlineProps();
-
-        Property prop;
-        prop = this.propertyList.get(PR_BASELINE_SHIFT);
-        if (prop instanceof LengthProperty) {
-            Length bShift = prop.getLength();
-        } else if (prop instanceof EnumProperty) {
-            int bShift = prop.getEnum();
-        }
-        ColorType col = this.propertyList.get(PR_COLOR).getColorType();
-        Length lHeight = this.propertyList.get(PR_LINE_HEIGHT).getLength();
-        int lShiftAdj = this.propertyList.get(
-                          PR_LINE_HEIGHT_SHIFT_ADJUSTMENT).getEnum();
-        int vis = this.propertyList.get(PR_VISIBILITY).getEnum();
-        Length zIndex = this.propertyList.get(PR_Z_INDEX).getLength();
-
-    }
-
+    /**
+     * @see org.apache.fop.fo.FObj#getName()
+     */
     public String getName() {
         return "fo:title";
     }