gmazza 2004/08/26 23:02:03
Modified: src/java/org/apache/fop/fo/pagination
PageNumberGenerator.java PageSequence.java
Title.java
Log:
Some code cleanup in Title and PageNumberGenerator, removal of apparently unused
logger instance from latter.
Revision Changes Path
1.5 +0 -29
xml-fop/src/java/org/apache/fop/fo/pagination/PageNumberGenerator.java
Index: PageNumberGenerator.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/PageNumberGenerator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PageNumberGenerator.java 12 Jun 2004 23:18:52 -0000 1.4
+++ PageNumberGenerator.java 27 Aug 2004 06:02:03 -0000 1.5
@@ -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 @@
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'
@@ -107,22 +99,6 @@
}
/**
- * 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
* @return the formatted page number as a String
@@ -192,10 +168,5 @@
}
return alphaNumber.reverse().toString();
}
-
- public String getName() {
- return "fo:page-number-generator";
- }
-
}
1.39 +0 -1 xml-fop/src/java/org/apache/fop/fo/pagination/PageSequence.java
Index: PageSequence.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/PageSequence.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- PageSequence.java 21 Aug 2004 19:48:00 -0000 1.38
+++ PageSequence.java 27 Aug 2004 06:02:03 -0000 1.39
@@ -280,7 +280,6 @@
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();
1.26 +4 -46 xml-fop/src/java/org/apache/fop/fo/pagination/Title.java
Index: Title.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Title.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Title.java 25 Aug 2004 05:03:07 -0000 1.25
+++ Title.java 27 Aug 2004 06:02:03 -0000 1.26
@@ -24,19 +24,8 @@
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 @@
}
}
- 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";
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
