You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by gm...@apache.org on 2004/01/17 20:29:47 UTC
cvs commit: xml-fop/src/java/org/apache/fop/tools AreaTreeBuilder.java
gmazza 2004/01/17 11:29:46
Modified: . build.xml
src/codegen constants.xsl properties.xsl
src/java/org/apache/fop/area CTM.java PageViewport.java
src/java/org/apache/fop/area/inline Leader.java
src/java/org/apache/fop/fo Constants.java FOText.java
PropertyList.java PropertyManager.java
TextInfo.java
src/java/org/apache/fop/fo/flow ExternalGraphic.java
Inline.java InstreamForeignObject.java Leader.java
Table.java TableCell.java
src/java/org/apache/fop/fo/pagination
ConditionalPageMasterReference.java
RegionAfter.java RegionBA.java RegionBefore.java
RegionBody.java RegionEnd.java RegionSE.java
RegionStart.java
src/java/org/apache/fop/layoutmgr AbstractLayoutManager.java
AddLMVisitor.java BlockContainerLayoutManager.java
LeafNodeLayoutManager.java LineLayoutManager.java
PageLayoutManager.java
src/java/org/apache/fop/render AbstractRenderer.java
src/java/org/apache/fop/render/awt AWTRenderer.java
src/java/org/apache/fop/render/pdf PDFRenderer.java
src/java/org/apache/fop/render/ps PSRenderer.java
src/java/org/apache/fop/render/svg SVGRenderer.java
src/java/org/apache/fop/render/xml XMLRenderer.java
src/java/org/apache/fop/tools AreaTreeBuilder.java
Removed: src/codegen prop-val-enum-interfaces.xsl
Log:
Moved the interfaces into the Constants class on a trial basis (we may still
choose to remove them in favor of strictly using Constants.) Two interfaces
(span and position) were removed because of conflicts with other class names.
The interface generation was moved into Constants.xsl, which is run manually
via the XsltToJava ant task and its output is then checked in. As a result,
no more autogeneration of these interfaces at build time will be done.
Revision Changes Path
1.97 +5 -2 xml-fop/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-fop/build.xml,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- build.xml 22 Dec 2003 23:23:05 -0000 1.96
+++ build.xml 17 Jan 2004 19:29:45 -0000 1.97
@@ -350,12 +350,15 @@
<targetfilelist dir="${basedir}" files="${build.gensrc}/${replacestring}/fo/properties/fo_${ignore_this},${build.gensrc}/${replacestring}/fo/properties/FOPropertyMapping.java,${build.gensrc}/${replacestring}/fo/properties/foenums_${ignore_this}"/>
</dependset>
+
+ <!-- ${ignore_this} used for out attribute because XSL stylesheet has commands to
+ write out to (many) files other than the one specified -->
<style in="${foproperties.xml}" style="${properties.xsl}"
out="${build.gensrc}/${replacestring}/fo/properties/fo_${ignore_this}"/>
<style in="${foproperties.xml}" style="${build.codegen}/fo-property-mapping.xsl"
out="${build.gensrc}/${replacestring}/fo/properties/FOPropertyMapping.java"/>
- <style in="${foproperties.xml}" style="${build.codegen}/prop-val-enum-interfaces.xsl"
- out="${build.gensrc}/${replacestring}/fo/properties/foenums_${ignore_this}"/>
+ <!--style in="${foproperties.xml}" style="${build.codegen}/prop-val-enum-interfaces.xsl"
+ out="${build.gensrc}/${replacestring}/fo/properties/propertyListing.java"/-->
<style in="${encodings.xml}" style="${charlist.xsl}"
out="${build.gensrc}/${replacestring}/fonts//CodePointMapping.java"/>
<!--
1.2 +61 -5 xml-fop/src/codegen/constants.xsl
Index: constants.xsl
===================================================================
RCS file: /home/cvs/xml-fop/src/codegen/constants.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- constants.xsl 15 Dec 2003 01:07:50 -0000 1.1
+++ constants.xsl 17 Jan 2004 19:29:45 -0000 1.2
@@ -46,7 +46,7 @@
on behalf of the Apache Software Foundation and was originally created by
James Tauber <jt...@jtauber.com>. For more information on the Apache
Software Foundation, please see <http://www.apache.org/>.
--->
+-->
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
@@ -86,7 +86,6 @@
</xsl:for-each>
</xsl:variable>
-
<xsl:variable name="elementlist">
<xsl:for-each select="document(elementfile)//element">
<xsl:sort select="name"/>
@@ -100,7 +99,15 @@
<xsl:text>
-package org.apache.fop.fo.properties;
+package org.apache.fop.fo;
+
+import org.apache.fop.fo.properties.GenericBoolean;
+import org.apache.fop.fo.properties.GenericBorderStyle;
+import org.apache.fop.fo.properties.GenericBreak;
+import org.apache.fop.fo.properties.GenericCondBorderWidth;
+import org.apache.fop.fo.properties.GenericCondPadding;
+import org.apache.fop.fo.properties.GenericKeep;
+import org.apache.fop.fo.properties.GenericSpace;
public interface Constants {</xsl:text>
@@ -114,7 +121,8 @@
int COMPOUND_SHIFT = 9;
int PROPERTY_MASK = (1 << COMPOUND_SHIFT)-1;
int COMPOUND_MASK = ~PROPERTY_MASK;
-
+ int COMPOUND_COUNT = 11;
+
// property constants
<xsl:call-template name="sortconsts">
<xsl:with-param name="consts" select="$propertylist"/>
@@ -132,9 +140,57 @@
<xsl:with-param name="consts" select="$constlist"/>
</xsl:call-template>
+ // Enumeration Interfaces
+<xsl:apply-templates select="document(propfile)//property[not(@type='generic')]"/>
+
<xsl:text>
}
</xsl:text>
+</xsl:template>
+
+<xsl:template match="property">
+ <xsl:variable name="classname">
+ <xsl:choose>
+ <xsl:when test="class-name">
+ <xsl:value-of select="class-name"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="makeClassName">
+ <xsl:with-param name="propstr" select="name"/>
+ </xsl:call-template>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:variable name="bEnum">
+ <xsl:call-template name="hasEnum"/>
+ </xsl:variable>
+ <xsl:variable name="bSubpropEnum">
+ <xsl:call-template name="hasSubpropEnum"/>
+ </xsl:variable>
+
+ <xsl:if test="$bEnum='true' or contains($bSubpropEnum, 'true')">
+ <!--redirect:write select="concat($classname, '.java')"-->
+ <!-- Handle enumeration values -->
+ <xsl:text>
+ public interface </xsl:text>
+ <xsl:value-of select="$classname"/>
+ <xsl:if test="use-generic">
+ <xsl:text> extends </xsl:text>
+ <xsl:value-of select="use-generic"/>
+ <xsl:text>.Enums</xsl:text>
+ </xsl:if>
+ <xsl:text> {</xsl:text>
+ <xsl:for-each select="enumeration/value">
+ <xsl:text>
+ int </xsl:text>
+ <xsl:value-of select="@const"/>
+ <xsl:text> = Constants.</xsl:text>
+ <xsl:value-of select="@const"/>
+ <xsl:text>;</xsl:text>
+ </xsl:for-each>
+ <xsl:text> }
+</xsl:text>
+ </xsl:if>
</xsl:template>
<xsl:template name="sortconsts">
1.32 +3 -3 xml-fop/src/codegen/properties.xsl
Index: properties.xsl
===================================================================
RCS file: /home/cvs/xml-fop/src/codegen/properties.xsl,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- properties.xsl 10 Jan 2004 20:40:07 -0000 1.31
+++ properties.xsl 17 Jan 2004 19:29:45 -0000 1.32
@@ -306,7 +306,7 @@
<!-- Is this property an Enum or derived from a generic Enum -->
<xsl:variable name="enumconst">
<xsl:if test="enumeration/value and not(@type='generic')">
- <xsl:text> implements </xsl:text><xsl:value-of select="$eclassname"/></xsl:if>
+ <xsl:text> implements Constants</xsl:text></xsl:if>
</xsl:variable>
<redirect:write select="concat($classname, '.java')">
@@ -758,7 +758,7 @@
int correspondingValue = correspondingProperty.getEnum();</xsl:text>
<xsl:for-each select="derive/if">
<xsl:text>
- if (correspondingValue == </xsl:text>
+ if (correspondingValue == Constants.</xsl:text>
<xsl:value-of select="@match"/>
<xsl:text>)
computedProperty = new EnumProperty(</xsl:text>
1.7 +5 -5 xml-fop/src/java/org/apache/fop/area/CTM.java
Index: CTM.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/CTM.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CTM.java 19 Sep 2003 14:33:15 -0000 1.6
+++ CTM.java 17 Jan 2004 19:29:45 -0000 1.7
@@ -55,7 +55,7 @@
import java.io.Serializable;
import org.apache.fop.datatypes.FODimension;
-import org.apache.fop.fo.properties.WritingMode;
+import org.apache.fop.fo.Constants;
/**
* Describe a PDF or PostScript style coordinate transformation matrix (CTM).
@@ -145,15 +145,15 @@
public static CTM getWMctm(int wm, int ipd, int bpd) {
CTM wmctm;
switch (wm) {
- case WritingMode.LR_TB:
+ case Constants.WritingMode.LR_TB:
return new CTM(CTM_LRTB);
- case WritingMode.RL_TB: {
+ case Constants.WritingMode.RL_TB: {
wmctm = new CTM(CTM_RLTB);
wmctm.e = ipd;
return wmctm;
}
//return CTM_RLTB.translate(ipd, 0);
- case WritingMode.TB_RL: { // CJK
+ case Constants.WritingMode.TB_RL: { // CJK
wmctm = new CTM(CTM_TBRL);
wmctm.e = bpd;
return wmctm;
@@ -331,7 +331,7 @@
* can set ipd and bpd appropriately based on the writing mode.
*/
- if (writingMode == WritingMode.LR_TB || writingMode == WritingMode.RL_TB) {
+ if (writingMode == Constants.WritingMode.LR_TB || writingMode == Constants.WritingMode.RL_TB) {
reldims.ipd = width;
reldims.bpd = height;
} else {
1.2 +5 -5 xml-fop/src/java/org/apache/fop/area/PageViewport.java
Index: PageViewport.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/PageViewport.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PageViewport.java 11 Mar 2003 13:05:27 -0000 1.1
+++ PageViewport.java 17 Jan 2004 19:29:45 -0000 1.2
@@ -59,7 +59,7 @@
import java.util.HashMap;
import java.util.Iterator;
-import org.apache.fop.fo.properties.RetrievePosition;
+import org.apache.fop.fo.Constants;
/**
* Page viewport that specifies the viewport area and holds the page contents.
@@ -307,7 +307,7 @@
public Object getMarker(String name, int pos) {
Object mark = null;
switch (pos) {
- case RetrievePosition.FSWP:
+ case Constants.RetrievePosition.FSWP:
if (markerFirstStart != null) {
mark = markerFirstStart.get(name);
}
@@ -315,12 +315,12 @@
mark = markerFirstAny.get(name);
}
break;
- case RetrievePosition.FIC:
+ case Constants.RetrievePosition.FIC:
if (markerFirstAny != null) {
mark = markerFirstAny.get(name);
}
break;
- case RetrievePosition.LSWP:
+ case Constants.RetrievePosition.LSWP:
if (markerLastStart != null) {
mark = markerLastStart.get(name);
}
@@ -328,7 +328,7 @@
mark = markerLastAny.get(name);
}
break;
- case RetrievePosition.LEWP:
+ case Constants.RetrievePosition.LEWP:
if (markerLastEnd != null) {
mark = markerLastEnd.get(name);
}
1.3 +2 -2 xml-fop/src/java/org/apache/fop/area/inline/Leader.java
Index: Leader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/inline/Leader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Leader.java 10 Sep 2003 18:42:22 -0000 1.2
+++ Leader.java 17 Jan 2004 19:29:45 -0000 1.3
@@ -50,7 +50,7 @@
*/
package org.apache.fop.area.inline;
-import org.apache.fop.fo.properties.RuleStyle;
+import org.apache.fop.fo.Constants;
/**
* This is a leader inline area.
@@ -63,7 +63,7 @@
// if space replaced with a space
// otherwise this is a holder for a line
- private int ruleStyle = RuleStyle.SOLID;
+ private int ruleStyle = Constants.RuleStyle.SOLID;
private int ruleThickness = 1000;
/**
1.4 +285 -3 xml-fop/src/java/org/apache/fop/fo/Constants.java
Index: Constants.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/Constants.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Constants.java 22 Dec 2003 21:37:43 -0000 1.3
+++ Constants.java 17 Jan 2004 19:29:46 -0000 1.4
@@ -1,4 +1,5 @@
-/* $Id$
+/*
+ * $Id$
* ============================================================================
* The Apache Software License, Version 1.1
* ============================================================================
@@ -46,12 +47,22 @@
* on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jt...@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>.
-*/
+ */
+
package org.apache.fop.fo;
+import org.apache.fop.fo.properties.GenericBoolean;
+import org.apache.fop.fo.properties.GenericBorderStyle;
+import org.apache.fop.fo.properties.GenericBreak;
+import org.apache.fop.fo.properties.GenericCondBorderWidth;
+import org.apache.fop.fo.properties.GenericCondPadding;
+import org.apache.fop.fo.properties.GenericKeep;
+import org.apache.fop.fo.properties.GenericSpace;
+
public interface Constants {
// element constants
+
int FO_BASIC_LINK = 1;
int FO_BIDI_OVERRIDE = 2;
int FO_BLOCK = 3;
@@ -110,12 +121,15 @@
int FO_WRAPPER = 56;
int ELEMENT_COUNT = 56;
+
// Masks
int COMPOUND_SHIFT = 9;
int PROPERTY_MASK = (1 << COMPOUND_SHIFT)-1;
int COMPOUND_MASK = ~PROPERTY_MASK;
-
+ int COMPOUND_COUNT = 11;
+
// property constants
+
int PR_ABSOLUTE_POSITION = 1;
int PR_ACTIVE_STATE = 2;
int PR_ALIGNMENT_ADJUST = 3;
@@ -365,7 +379,9 @@
int PR_Z_INDEX = 247;
int PROPERTY_COUNT = 247;
+
// compound property constants
+
int CP_BLOCK_PROGRESSION_DIRECTION = 1 << COMPOUND_SHIFT;
int CP_CONDITIONALITY = 2 << COMPOUND_SHIFT;
int CP_INLINE_PROGRESSION_DIRECTION = 3 << COMPOUND_SHIFT;
@@ -379,6 +395,7 @@
int CP_WITHIN_PAGE = 11 << COMPOUND_SHIFT;
// Enumeration constants
+
int ABSOLUTE = 1;
int ABSOLUTE_COLORMETRIC = 2;
int AFTER = 3;
@@ -485,5 +502,270 @@
int USECONTENT = 104;
int VISIBLE = 105;
int WRAP = 106;
+
+ // Enumeration Interfaces
+
+ public interface AbsolutePosition {
+ int AUTO = Constants.AUTO;
+ int FIXED = Constants.FIXED;
+ int ABSOLUTE = Constants.ABSOLUTE; }
+
+ public interface BackgroundRepeat {
+ int REPEAT = Constants.REPEAT;
+ int REPEATX = Constants.REPEATX;
+ int REPEATY = Constants.REPEATY;
+ int NOREPEAT = Constants.NOREPEAT; }
+
+ public interface BorderBeforeStyle extends GenericBorderStyle.Enums { }
+
+ public interface BorderBeforeWidth extends GenericCondBorderWidth.Enums { }
+
+ public interface BorderAfterStyle extends GenericBorderStyle.Enums { }
+
+ public interface BorderAfterWidth extends GenericCondBorderWidth.Enums { }
+
+ public interface BorderStartStyle extends GenericBorderStyle.Enums { }
+
+ public interface BorderStartWidth extends GenericCondBorderWidth.Enums { }
+
+ public interface BorderEndStyle extends GenericBorderStyle.Enums { }
+
+ public interface BorderEndWidth extends GenericCondBorderWidth.Enums { }
+
+ public interface BorderTopStyle extends GenericBorderStyle.Enums { }
+
+ public interface BorderBottomStyle extends GenericBorderStyle.Enums { }
+
+ public interface BorderLeftStyle extends GenericBorderStyle.Enums { }
+
+ public interface BorderRightStyle extends GenericBorderStyle.Enums { }
+
+ public interface PaddingBefore extends GenericCondPadding.Enums { }
+
+ public interface PaddingAfter extends GenericCondPadding.Enums { }
+
+ public interface PaddingStart extends GenericCondPadding.Enums { }
+
+ public interface PaddingEnd extends GenericCondPadding.Enums { }
+
+ public interface FontVariant {
+ int NORMAL = Constants.NORMAL;
+ int SMALL_CAPS = Constants.SMALL_CAPS; }
+
+ public interface Hyphenate {
+ int TRUE = Constants.TRUE;
+ int FALSE = Constants.FALSE; }
+
+ public interface SpaceBefore extends GenericSpace.Enums { }
+
+ public interface SpaceAfter extends GenericSpace.Enums { }
+
+ public interface SpaceEnd extends GenericSpace.Enums { }
+
+ public interface SpaceStart extends GenericSpace.Enums { }
+
+ public interface BaselineShift {
+ int BASELINE = Constants.BASELINE;
+ int SUB = Constants.SUB;
+ int SUPER = Constants.SUPER; }
+
+ public interface DisplayAlign {
+ int BEFORE = Constants.BEFORE;
+ int AFTER = Constants.AFTER;
+ int CENTER = Constants.CENTER;
+ int AUTO = Constants.AUTO; }
+
+ public interface RelativeAlign {
+ int BEFORE = Constants.BEFORE;
+ int BASELINE = Constants.BASELINE; }
+
+ public interface Scaling {
+ int UNIFORM = Constants.UNIFORM;
+ int NON_UNIFORM = Constants.NON_UNIFORM; }
+
+ public interface LinefeedTreatment {
+ int IGNORE = Constants.IGNORE;
+ int PRESERVE = Constants.PRESERVE;
+ int TREAT_AS_SPACE = Constants.TREAT_AS_SPACE;
+ int TREAT_AS_ZERO_WIDTH_SPACE = Constants.TREAT_AS_ZERO_WIDTH_SPACE; }
+
+ public interface TextAlign {
+ int CENTER = Constants.CENTER;
+ int END = Constants.END;
+ int START = Constants.START;
+ int JUSTIFY = Constants.JUSTIFY; }
+
+ public interface TextAlignLast {
+ int CENTER = Constants.CENTER;
+ int END = Constants.END;
+ int START = Constants.START;
+ int JUSTIFY = Constants.JUSTIFY; }
+
+ public interface WhiteSpaceCollapse extends GenericBoolean.Enums { }
+
+ public interface WrapOption {
+ int WRAP = Constants.WRAP;
+ int NO_WRAP = Constants.NO_WRAP; }
+
+ public interface TextDecoration {
+ int NONE = Constants.NONE;
+ int UNDERLINE = Constants.UNDERLINE;
+ int OVERLINE = Constants.OVERLINE;
+ int LINE_THROUGH = Constants.LINE_THROUGH;
+ int BLINK = Constants.BLINK;
+ int NO_UNDERLINE = Constants.NO_UNDERLINE;
+ int NO_OVERLINE = Constants.NO_OVERLINE;
+ int NO_LINE_THROUGH = Constants.NO_LINE_THROUGH;
+ int NO_BLINK = Constants.NO_BLINK; }
+
+ public interface TextTransform {
+ int NONE = Constants.NONE;
+ int CAPITALIZE = Constants.CAPITALIZE;
+ int UPPERCASE = Constants.UPPERCASE;
+ int LOWERCASE = Constants.LOWERCASE; }
+
+ public interface WordSpacing extends GenericSpace.Enums { }
+
+ public interface RenderingIntent {
+ int AUTO = Constants.AUTO;
+ int PERCEPTUAL = Constants.PERCEPTUAL;
+ int RELATIVE_COLOMETRIC = Constants.RELATIVE_COLOMETRIC;
+ int SATURATION = Constants.SATURATION;
+ int ABSOLUTE_COLORMETRIC = Constants.ABSOLUTE_COLORMETRIC; }
+
+ public interface BreakAfter extends GenericBreak.Enums { }
+
+ public interface BreakBefore extends GenericBreak.Enums { }
+
+ public interface KeepTogether extends GenericKeep.Enums { }
+
+ public interface KeepWithNext extends GenericKeep.Enums { }
+
+ public interface KeepWithPrevious extends GenericKeep.Enums { }
+
+ public interface Overflow {
+ int VISIBLE = Constants.VISIBLE;
+ int HIDDEN = Constants.HIDDEN;
+ int SCROLL = Constants.SCROLL;
+ int ERROR_IF_OVERFLOW = Constants.ERROR_IF_OVERFLOW;
+ int AUTO = Constants.AUTO; }
+
+/* public interface Span { conflicts with Area.Span
+ int NONE = Constants.NONE;
+ int ALL = Constants.ALL; } */
+
+ public interface LeaderAlignment {
+ int NONE = Constants.NONE;
+ int REFERENCE_AREA = Constants.REFERENCE_AREA;
+ int PAGE = Constants.PAGE; }
+
+ public interface LeaderPattern {
+ int SPACE = Constants.SPACE;
+ int RULE = Constants.RULE;
+ int DOTS = Constants.DOTS;
+ int USECONTENT = Constants.USECONTENT; }
+
+ public interface RuleStyle {
+ int NONE = Constants.NONE;
+ int DOTTED = Constants.DOTTED;
+ int DASHED = Constants.DASHED;
+ int SOLID = Constants.SOLID;
+ int DOUBLE = Constants.DOUBLE;
+ int GROOVE = Constants.GROOVE;
+ int RIDGE = Constants.RIDGE; }
+
+ public interface RetrievePosition {
+ int FSWP = Constants.FSWP;
+ int FIC = Constants.FIC;
+ int LSWP = Constants.LSWP;
+ int LEWP = Constants.LEWP; }
+
+ public interface RetrieveBoundary {
+ int PAGE = Constants.PAGE;
+ int PAGE_SEQUENCE = Constants.PAGE_SEQUENCE;
+ int DOCUMENT = Constants.DOCUMENT; }
+
+ public interface LetterValue {
+ int ALPHABETIC = Constants.ALPHABETIC;
+ int TRADITIONAL = Constants.TRADITIONAL;
+ int AUTO = Constants.AUTO; }
+
+ public interface BlankOrNotBlank {
+ int BLANK = Constants.BLANK;
+ int NOT_BLANK = Constants.NOT_BLANK;
+ int ANY = Constants.ANY; }
+
+ public interface ForcePageCount {
+ int EVEN = Constants.EVEN;
+ int ODD = Constants.ODD;
+ int END_ON_EVEN = Constants.END_ON_EVEN;
+ int END_ON_ODD = Constants.END_ON_ODD;
+ int NO_FORCE = Constants.NO_FORCE;
+ int AUTO = Constants.AUTO; }
+
+ public interface OddOrEven {
+ int ODD = Constants.ODD;
+ int EVEN = Constants.EVEN;
+ int ANY = Constants.ANY; }
+
+ public interface PagePosition {
+ int FIRST = Constants.FIRST;
+ int LAST = Constants.LAST;
+ int REST = Constants.REST;
+ int ANY = Constants.ANY; }
+
+ public interface Precedence {
+ int TRUE = Constants.TRUE;
+ int FALSE = Constants.FALSE; }
+
+ public interface BorderCollapse {
+ int SEPARATE = Constants.SEPARATE;
+ int COLLAPSE = Constants.COLLAPSE; }
+
+ public interface CaptionSide {
+ int BEFORE = Constants.BEFORE;
+ int AFTER = Constants.AFTER;
+ int START = Constants.START;
+ int END = Constants.END;
+ int TOP = Constants.TOP;
+ int BOTTOM = Constants.BOTTOM;
+ int LEFT = Constants.LEFT;
+ int RIGHT = Constants.RIGHT; }
+
+ public interface TableLayout {
+ int AUTO = Constants.AUTO;
+ int FIXED = Constants.FIXED; }
+
+ public interface TableOmitFooterAtBreak extends GenericBoolean.Enums { }
+
+ public interface TableOmitHeaderAtBreak extends GenericBoolean.Enums { }
+
+ public interface WritingMode {
+ int LR_TB = Constants.LR_TB;
+ int RL_TB = Constants.RL_TB;
+ int TB_RL = Constants.TB_RL; }
+
+/* public interface Position { conflicts with layoutmgr.Position
+ int STATIC = Constants.STATIC;
+ int RELATIVE = Constants.RELATIVE;
+ int ABSOLUTE = Constants.ABSOLUTE;
+ int FIXED = Constants.FIXED; } */
+
+ public interface VerticalAlign {
+ int BASELINE = Constants.BASELINE;
+ int MIDDLE = Constants.MIDDLE;
+ int SUB = Constants.SUB;
+ int SUPER = Constants.SUPER;
+ int TEXT_TOP = Constants.TEXT_TOP;
+ int TEXT_BOTTOM = Constants.TEXT_BOTTOM;
+ int TOP = Constants.TOP;
+ int BOTTOM = Constants.BOTTOM; }
+
+ public interface WhiteSpaceTreatment {
+ int IGNORE = Constants.IGNORE;
+ int PRESERVE = Constants.PRESERVE;
+ int IGNORE_IF_BEFORE_LINEFEED = Constants.IGNORE_IF_BEFORE_LINEFEED;
+ int IGNORE_IF_AFTER_LINEFEED = Constants.IGNORE_IF_AFTER_LINEFEED;
+ int IGNORE_IF_SURROUNDING_LINEFEED = Constants.IGNORE_IF_SURROUNDING_LINEFEED; }
}
1.12 +0 -2 xml-fop/src/java/org/apache/fop/fo/FOText.java
Index: FOText.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOText.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FOText.java 16 Sep 2003 05:21:04 -0000 1.11
+++ FOText.java 17 Jan 2004 19:29:46 -0000 1.12
@@ -54,10 +54,8 @@
import java.util.NoSuchElementException;
// FOP
-import org.apache.fop.fo.properties.WhiteSpaceCollapse;
import org.apache.fop.fo.flow.Block;
import org.apache.fop.fo.pagination.Root;
-import org.apache.fop.fo.properties.TextTransform;
/**
* A text node in the formatting object tree.
1.26 +6 -7 xml-fop/src/java/org/apache/fop/fo/PropertyList.java
Index: PropertyList.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/PropertyList.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- PropertyList.java 13 Jan 2004 23:28:31 -0000 1.25
+++ PropertyList.java 17 Jan 2004 19:29:46 -0000 1.26
@@ -58,7 +58,6 @@
import org.apache.fop.apps.FOPException;
import org.apache.fop.fo.Property.Maker;
import org.apache.fop.fo.properties.FOPropertyMapping;
-import org.apache.fop.fo.properties.WritingMode;
/**
@@ -110,15 +109,15 @@
private static final HashMap WRITING_MODE_TABLES = new HashMap(4);
{
- WRITING_MODE_TABLES.put(new Integer(WritingMode.LR_TB), /* lr-tb */
+ WRITING_MODE_TABLES.put(new Integer(Constants.WritingMode.LR_TB), /* lr-tb */
new byte[] {
START, END, BEFORE, AFTER, BLOCKPROGDIM, INLINEPROGDIM
});
- WRITING_MODE_TABLES.put(new Integer(WritingMode.RL_TB), /* rl-tb */
+ WRITING_MODE_TABLES.put(new Integer(Constants.WritingMode.RL_TB), /* rl-tb */
new byte[] {
END, START, BEFORE, AFTER, BLOCKPROGDIM, INLINEPROGDIM
});
- WRITING_MODE_TABLES.put(new Integer(WritingMode.TB_RL), /* tb-rl */
+ WRITING_MODE_TABLES.put(new Integer(Constants.WritingMode.TB_RL), /* tb-rl */
new byte[] {
AFTER, BEFORE, START, END, INLINEPROGDIM, BLOCKPROGDIM
});
@@ -385,9 +384,9 @@
*/
public int wmMap(int lrtb, int rltb, int tbrl) {
switch (writingMode) {
- case WritingMode.LR_TB: return lrtb;
- case WritingMode.RL_TB: return rltb;
- case WritingMode.TB_RL: return tbrl;
+ case Constants.WritingMode.LR_TB: return lrtb;
+ case Constants.WritingMode.RL_TB: return rltb;
+ case Constants.WritingMode.TB_RL: return tbrl;
}
return -1;
}
1.20 +1 -2 xml-fop/src/java/org/apache/fop/fo/PropertyManager.java
Index: PropertyManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/PropertyManager.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- PropertyManager.java 4 Jan 2004 21:14:34 -0000 1.19
+++ PropertyManager.java 17 Jan 2004 19:29:46 -0000 1.20
@@ -64,7 +64,6 @@
import org.apache.fop.traits.InlineProps;
import org.apache.fop.traits.SpaceVal;
import org.apache.fop.traits.LayoutProps; // keep, break, span, space?
-import org.apache.fop.fo.properties.Span;
import org.apache.fop.fonts.FontMetrics;
import org.apache.fop.fo.properties.CommonHyphenation;
@@ -454,7 +453,7 @@
LayoutProps props = new LayoutProps();
props.breakBefore = this.propertyList.get(PR_BREAK_BEFORE).getEnum();
props.breakAfter = this.propertyList.get(PR_BREAK_AFTER).getEnum();
- props.bIsSpan = (this.propertyList.get(PR_SPAN).getEnum() == Span.ALL);
+ props.bIsSpan = (this.propertyList.get(PR_SPAN).getEnum() == Constants.ALL);
props.spaceBefore = new SpaceVal(
this.propertyList.get(PR_SPACE_BEFORE).getSpace());
props.spaceAfter = new SpaceVal(
1.5 +1 -2 xml-fop/src/java/org/apache/fop/fo/TextInfo.java
Index: TextInfo.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/TextInfo.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TextInfo.java 14 Aug 2003 15:31:09 -0000 1.4
+++ TextInfo.java 17 Jan 2004 19:29:46 -0000 1.5
@@ -54,7 +54,6 @@
import org.apache.fop.fonts.Font;
import org.apache.fop.datatypes.ColorType;
import org.apache.fop.traits.SpaceVal;
-import org.apache.fop.fo.properties.TextTransform;
/**
* Collection of properties used in
@@ -75,7 +74,7 @@
/** fo:line-height property */
public int lineHeight;
/** fo:text-transform property */
- public int textTransform = TextTransform.NONE;
+ public int textTransform = Constants.TextTransform.NONE;
// Props used for calculating inline-progression-dimension
/** fo:word-spacing property */
1.17 +0 -4 xml-fop/src/java/org/apache/fop/fo/flow/ExternalGraphic.java
Index: ExternalGraphic.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/ExternalGraphic.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ExternalGraphic.java 3 Jan 2004 03:13:37 -0000 1.16
+++ ExternalGraphic.java 17 Jan 2004 19:29:46 -0000 1.17
@@ -58,10 +58,6 @@
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.FOTreeVisitor;
-import org.apache.fop.fo.properties.TextAlign;
-import org.apache.fop.fo.properties.Overflow;
-import org.apache.fop.fo.properties.DisplayAlign;
-import org.apache.fop.fo.properties.Scaling;
import org.apache.fop.image.ImageFactory;
import org.apache.fop.image.FopImage;
import org.apache.fop.datatypes.Length;
1.9 +0 -1 xml-fop/src/java/org/apache/fop/fo/flow/Inline.java
Index: Inline.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Inline.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Inline.java 27 Dec 2003 22:00:38 -0000 1.8
+++ Inline.java 17 Jan 2004 19:29:46 -0000 1.9
@@ -59,7 +59,6 @@
import org.apache.fop.fo.FObjMixed;
import org.apache.fop.fo.InlineCharIterator;
import org.apache.fop.fo.FOTreeVisitor;
-import org.apache.fop.fo.properties.TextDecoration;
import org.apache.fop.fo.properties.CommonAccessibility;
import org.apache.fop.fo.properties.CommonAural;
import org.apache.fop.fo.properties.CommonBackground;
1.12 +0 -2 xml-fop/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java
Index: InstreamForeignObject.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- InstreamForeignObject.java 28 Dec 2003 17:10:16 -0000 1.11
+++ InstreamForeignObject.java 17 Jan 2004 19:29:46 -0000 1.12
@@ -53,8 +53,6 @@
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FOTreeVisitor;
import org.apache.fop.fo.FObj;
-import org.apache.fop.fo.properties.DisplayAlign;
-import org.apache.fop.fo.properties.TextAlign;
/**
* The instream-foreign-object flow formatting object.
1.20 +0 -1 xml-fop/src/java/org/apache/fop/fo/flow/Leader.java
Index: Leader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Leader.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Leader.java 2 Jan 2004 23:53:09 -0000 1.19
+++ Leader.java 17 Jan 2004 19:29:46 -0000 1.20
@@ -63,7 +63,6 @@
import org.apache.fop.fo.properties.CommonMarginInline;
import org.apache.fop.fo.properties.CommonRelativePosition;
import org.apache.fop.fo.properties.FOPropertyMapping;
-import org.apache.fop.fo.properties.LeaderPattern;
import org.apache.fop.fonts.Font;
/**
1.11 +0 -3 xml-fop/src/java/org/apache/fop/fo/flow/Table.java
Index: Table.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Table.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Table.java 28 Dec 2003 17:10:17 -0000 1.10
+++ Table.java 17 Jan 2004 19:29:46 -0000 1.11
@@ -63,9 +63,6 @@
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.FOTreeVisitor;
-import org.apache.fop.fo.properties.TableLayout;
-import org.apache.fop.fo.properties.TableOmitFooterAtBreak;
-import org.apache.fop.fo.properties.TableOmitHeaderAtBreak;
import org.apache.fop.fo.properties.CommonAccessibility;
import org.apache.fop.fo.properties.CommonAural;
import org.apache.fop.fo.properties.CommonBackground;
1.11 +0 -2 xml-fop/src/java/org/apache/fop/fo/flow/TableCell.java
Index: TableCell.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableCell.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TableCell.java 28 Dec 2003 17:10:17 -0000 1.10
+++ TableCell.java 17 Jan 2004 19:29:46 -0000 1.11
@@ -59,8 +59,6 @@
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.FOTreeVisitor;
-import org.apache.fop.fo.properties.BorderCollapse;
-import org.apache.fop.fo.properties.DisplayAlign;
import org.apache.fop.fo.properties.CommonAccessibility;
import org.apache.fop.fo.properties.CommonAural;
1.7 +0 -3 xml-fop/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java
Index: ConditionalPageMasterReference.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ConditionalPageMasterReference.java 14 Jan 2004 00:00:37 -0000 1.6
+++ ConditionalPageMasterReference.java 17 Jan 2004 19:29:46 -0000 1.7
@@ -57,9 +57,6 @@
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.FOTreeVisitor;
-import org.apache.fop.fo.properties.BlankOrNotBlank;
-import org.apache.fop.fo.properties.OddOrEven;
-import org.apache.fop.fo.properties.PagePosition;
import org.apache.fop.apps.FOPException;
/**
1.7 +0 -1 xml-fop/src/java/org/apache/fop/fo/pagination/RegionAfter.java
Index: RegionAfter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionAfter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RegionAfter.java 16 Sep 2003 05:21:06 -0000 1.6
+++ RegionAfter.java 17 Jan 2004 19:29:46 -0000 1.7
@@ -56,7 +56,6 @@
// FOP
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FOTreeVisitor;
-import org.apache.fop.fo.properties.WritingMode;
import org.apache.fop.datatypes.FODimension;
/**
1.6 +0 -2 xml-fop/src/java/org/apache/fop/fo/pagination/RegionBA.java
Index: RegionBA.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionBA.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RegionBA.java 28 Dec 2003 17:10:17 -0000 1.5
+++ RegionBA.java 17 Jan 2004 19:29:46 -0000 1.6
@@ -55,8 +55,6 @@
// FOP
import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.properties.Precedence;
-import org.apache.fop.fo.properties.WritingMode;
import org.apache.fop.fo.FOTreeVisitor;
/**
1.7 +0 -1 xml-fop/src/java/org/apache/fop/fo/pagination/RegionBefore.java
Index: RegionBefore.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionBefore.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RegionBefore.java 16 Sep 2003 05:21:06 -0000 1.6
+++ RegionBefore.java 17 Jan 2004 19:29:46 -0000 1.7
@@ -52,7 +52,6 @@
// FOP
import org.apache.fop.datatypes.FODimension;
-import org.apache.fop.fo.properties.WritingMode;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FOTreeVisitor;
1.13 +0 -1 xml-fop/src/java/org/apache/fop/fo/pagination/RegionBody.java
Index: RegionBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionBody.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- RegionBody.java 14 Jan 2004 00:00:37 -0000 1.12
+++ RegionBody.java 17 Jan 2004 19:29:46 -0000 1.13
@@ -61,7 +61,6 @@
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.properties.CommonMarginBlock;
import org.apache.fop.fo.properties.FOPropertyMapping;
-import org.apache.fop.fo.properties.WritingMode;
/**
* The fo:region-body element.
1.7 +0 -1 xml-fop/src/java/org/apache/fop/fo/pagination/RegionEnd.java
Index: RegionEnd.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionEnd.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RegionEnd.java 16 Sep 2003 05:21:06 -0000 1.6
+++ RegionEnd.java 17 Jan 2004 19:29:46 -0000 1.7
@@ -56,7 +56,6 @@
// FOP
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FOTreeVisitor;
-import org.apache.fop.fo.properties.WritingMode;
import org.apache.fop.datatypes.FODimension;
/**
1.4 +0 -1 xml-fop/src/java/org/apache/fop/fo/pagination/RegionSE.java
Index: RegionSE.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionSE.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RegionSE.java 16 Sep 2003 05:21:06 -0000 1.3
+++ RegionSE.java 17 Jan 2004 19:29:46 -0000 1.4
@@ -56,7 +56,6 @@
// FOP
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FOTreeVisitor;
-import org.apache.fop.fo.properties.WritingMode;
/**
* Abstract base class for fo:region-start and fo:region-end.
1.7 +0 -1 xml-fop/src/java/org/apache/fop/fo/pagination/RegionStart.java
Index: RegionStart.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionStart.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RegionStart.java 16 Sep 2003 05:21:06 -0000 1.6
+++ RegionStart.java 17 Jan 2004 19:29:46 -0000 1.7
@@ -56,7 +56,6 @@
// FOP
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FOTreeVisitor;
-import org.apache.fop.fo.properties.WritingMode;
import org.apache.fop.datatypes.FODimension;
/**
1.5 +1 -1 xml-fop/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
Index: AbstractLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractLayoutManager.java 29 Dec 2003 23:28:47 -0000 1.4
+++ AbstractLayoutManager.java 17 Jan 2004 19:29:46 -0000 1.5
@@ -213,7 +213,7 @@
* representing a potential break decision.
* If pos is null, then back up to the first child LM.
*/
- protected void reset(Position pos) {
+ protected void reset(org.apache.fop.layoutmgr.Position pos) {
//if (lm == null) return;
LayoutManager lm = (pos != null) ? pos.getLM() : null;
if (curChildLM != lm) {
1.28 +8 -11 xml-fop/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java
Index: AddLMVisitor.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- AddLMVisitor.java 9 Jan 2004 03:26:00 -0000 1.27
+++ AddLMVisitor.java 17 Jan 2004 19:29:46 -0000 1.28
@@ -154,9 +154,6 @@
import org.apache.fop.fo.pagination.Title;
import org.apache.fop.fo.properties.CommonBackground;
import org.apache.fop.fo.properties.CommonBorderAndPadding;
-import org.apache.fop.fo.properties.LeaderPattern;
-import org.apache.fop.fo.properties.Overflow;
-import org.apache.fop.fo.properties.Scaling;
import org.apache.fop.layoutmgr.list.Item;
import org.apache.fop.layoutmgr.list.ListBlockLayoutManager;
import org.apache.fop.layoutmgr.list.ListItemLayoutManager;
@@ -370,14 +367,14 @@
node.setup();
InlineArea leaderArea = null;
- if (node.getLeaderPattern() == LeaderPattern.RULE) {
+ if (node.getLeaderPattern() == Constants.LeaderPattern.RULE) {
org.apache.fop.area.inline.Leader leader = new org.apache.fop.area.inline.Leader();
leader.setRuleStyle(node.getRuleStyle());
leader.setRuleThickness(node.getRuleThickness());
leaderArea = leader;
- } else if (node.getLeaderPattern() == LeaderPattern.SPACE) {
+ } else if (node.getLeaderPattern() == Constants.LeaderPattern.SPACE) {
leaderArea = new Space();
- } else if (node.getLeaderPattern() == LeaderPattern.DOTS) {
+ } else if (node.getLeaderPattern() == Constants.LeaderPattern.DOTS) {
TextArea t = new TextArea();
char dot = '.'; // userAgent.getLeaderDotCharacter();
@@ -403,7 +400,7 @@
fa.setHeight(node.getFontState().getAscender());
leaderArea = fa;
- } else if (node.getLeaderPattern() == LeaderPattern.USECONTENT) {
+ } else if (node.getLeaderPattern() == Constants.LeaderPattern.USECONTENT) {
if (node.getChildren() == null) {
node.getLogger().error("Leader use-content with no content");
return null;
@@ -644,7 +641,7 @@
cheight = (int)size.getY() * 1000;
}
int scaling = node.propertyList.get(Constants.PR_SCALING).getEnum();
- if (scaling == Scaling.UNIFORM) {
+ if (scaling == Constants.Scaling.UNIFORM) {
// adjust the larger
double rat1 = cwidth / (size.getX() * 1000f);
double rat2 = cheight / (size.getY() * 1000f);
@@ -666,9 +663,9 @@
boolean clip = false;
if (cwidth > ipd || cheight > bpd) {
int overflow = node.propertyList.get(Constants.PR_OVERFLOW).getEnum();
- if (overflow == Overflow.HIDDEN) {
+ if (overflow == Constants.Overflow.HIDDEN) {
clip = true;
- } else if (overflow == Overflow.ERROR_IF_OVERFLOW) {
+ } else if (overflow == Constants.Overflow.ERROR_IF_OVERFLOW) {
node.getLogger().error("Instream foreign object overflows the viewport: clipping");
clip = true;
}
1.11 +0 -2 xml-fop/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
Index: BlockContainerLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- BlockContainerLayoutManager.java 29 Dec 2003 23:28:47 -0000 1.10
+++ BlockContainerLayoutManager.java 17 Jan 2004 19:29:46 -0000 1.11
@@ -58,8 +58,6 @@
import org.apache.fop.area.Block;
import org.apache.fop.fo.PropertyManager;
import org.apache.fop.fo.properties.CommonAbsolutePosition;
-import org.apache.fop.fo.properties.AbsolutePosition;
-import org.apache.fop.fo.properties.Overflow;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.area.CTM;
import org.apache.fop.datatypes.FODimension;
1.4 +0 -1 xml-fop/src/java/org/apache/fop/layoutmgr/LeafNodeLayoutManager.java
Index: LeafNodeLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/LeafNodeLayoutManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LeafNodeLayoutManager.java 8 Sep 2003 17:00:54 -0000 1.3
+++ LeafNodeLayoutManager.java 17 Jan 2004 19:29:46 -0000 1.4
@@ -52,7 +52,6 @@
import org.apache.fop.area.Area;
import org.apache.fop.area.inline.InlineArea;
-import org.apache.fop.fo.properties.VerticalAlign;
import org.apache.fop.traits.MinOptMax;
/**
1.11 +0 -1 xml-fop/src/java/org/apache/fop/layoutmgr/LineLayoutManager.java
Index: LineLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/LineLayoutManager.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- LineLayoutManager.java 2 Jan 2004 22:51:31 -0000 1.10
+++ LineLayoutManager.java 17 Jan 2004 19:29:46 -0000 1.11
@@ -58,7 +58,6 @@
import org.apache.fop.traits.BlockProps;
import org.apache.fop.area.LineArea;
import org.apache.fop.area.Resolveable;
-import org.apache.fop.fo.properties.TextAlign;
import java.util.ListIterator;
import java.util.Iterator;
1.28 +0 -2 xml-fop/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java
Index: PageLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- PageLayoutManager.java 2 Jan 2004 12:18:44 -0000 1.27
+++ PageLayoutManager.java 17 Jan 2004 19:29:46 -0000 1.28
@@ -75,13 +75,11 @@
import org.apache.fop.fo.pagination.PageNumberGenerator;
import org.apache.fop.fo.pagination.PageSequence;
import org.apache.fop.fo.pagination.Region;
-import org.apache.fop.fo.properties.RetrieveBoundary;
import org.apache.fop.fo.pagination.SimplePageMaster;
import org.apache.fop.fo.pagination.StaticContent;
import org.apache.fop.fo.properties.CommonBackground;
import org.apache.fop.fo.properties.CommonBorderAndPadding;
import org.apache.fop.fo.properties.CommonMarginBlock;
-import org.apache.fop.fo.properties.Overflow;
import java.util.ArrayList;
import java.util.List;
1.19 +2 -1 xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java
Index: AbstractRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- AbstractRenderer.java 24 Nov 2003 19:07:35 -0000 1.18
+++ AbstractRenderer.java 17 Jan 2004 19:29:46 -0000 1.19
@@ -93,6 +93,7 @@
import org.apache.fop.area.inline.TextArea;
import org.apache.fop.area.inline.Character;
import org.apache.fop.apps.FOUserAgent;
+import org.apache.fop.fo.Constants;
import org.apache.fop.fo.FOTreeControl;
import org.apache.fop.fo.pagination.Region;
@@ -108,7 +109,7 @@
* handle viewports. This keeps track of the current block and inline position.
*/
public abstract class AbstractRenderer extends AbstractLogEnabled
- implements Renderer, Configurable, InlineAreaVisitor {
+ implements Renderer, Configurable, InlineAreaVisitor, Constants {
/**
* user agent
1.18 +0 -1 xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java
Index: AWTRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- AWTRenderer.java 20 Dec 2003 06:53:23 -0000 1.17
+++ AWTRenderer.java 17 Jan 2004 19:29:46 -0000 1.18
@@ -88,7 +88,6 @@
import org.apache.fop.area.inline.TextArea;
import org.apache.fop.datatypes.ColorType;
import org.apache.fop.fo.FOTreeControl;
-import org.apache.fop.fo.properties.BackgroundRepeat;
import org.apache.fop.image.FopImage;
import org.apache.fop.image.ImageFactory;
import org.apache.fop.render.AbstractRenderer;
1.27 +0 -2 xml-fop/src/java/org/apache/fop/render/pdf/PDFRenderer.java
Index: PDFRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/pdf/PDFRenderer.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- PDFRenderer.java 2 Jan 2004 12:18:45 -0000 1.26
+++ PDFRenderer.java 17 Jan 2004 19:29:46 -0000 1.27
@@ -90,8 +90,6 @@
import org.apache.fop.area.inline.Leader;
import org.apache.fop.area.inline.InlineParent;
import org.apache.fop.datatypes.ColorType;
-import org.apache.fop.fo.properties.BackgroundRepeat;
-import org.apache.fop.fo.properties.RuleStyle;
import org.apache.fop.fonts.Typeface;
import org.apache.fop.fonts.Font;
import org.apache.fop.fonts.FontSetup;
1.20 +0 -1 xml-fop/src/java/org/apache/fop/render/ps/PSRenderer.java
Index: PSRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/ps/PSRenderer.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- PSRenderer.java 12 Dec 2003 22:37:39 -0000 1.19
+++ PSRenderer.java 17 Jan 2004 19:29:46 -0000 1.20
@@ -59,7 +59,6 @@
// FOP
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.fop.fo.properties.BackgroundRepeat;
import org.apache.fop.area.Area;
import org.apache.fop.area.RegionViewport;
import org.apache.fop.apps.FOPException;
1.11 +0 -1 xml-fop/src/java/org/apache/fop/render/svg/SVGRenderer.java
Index: SVGRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/svg/SVGRenderer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SVGRenderer.java 28 Oct 2003 04:22:14 -0000 1.10
+++ SVGRenderer.java 17 Jan 2004 19:29:46 -0000 1.11
@@ -59,7 +59,6 @@
import org.apache.fop.svg.SVGUtilities;
import org.apache.fop.apps.Document;
import org.apache.fop.apps.FOUserAgent;
-import org.apache.fop.fo.properties.RuleStyle;
import org.apache.fop.fo.FOTreeControl;
import org.w3c.dom.Node;
1.13 +0 -1 xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java
Index: XMLRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XMLRenderer.java 12 Dec 2003 22:37:39 -0000 1.12
+++ XMLRenderer.java 17 Jan 2004 19:29:46 -0000 1.13
@@ -93,7 +93,6 @@
import org.apache.fop.area.inline.Viewport;
import org.apache.fop.area.inline.TextArea;
import org.apache.fop.fonts.FontSetup;
-import org.apache.fop.fo.properties.RuleStyle;
import org.apache.fop.fo.FOTreeControl;
import org.apache.fop.fo.pagination.Region;
1.12 +7 -7 xml-fop/src/java/org/apache/fop/tools/AreaTreeBuilder.java
Index: AreaTreeBuilder.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/tools/AreaTreeBuilder.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AreaTreeBuilder.java 1 Nov 2003 04:28:01 -0000 1.11
+++ AreaTreeBuilder.java 17 Jan 2004 19:29:46 -0000 1.12
@@ -107,8 +107,8 @@
import org.apache.fop.render.svg.SVGRenderer;
import org.apache.fop.render.xml.XMLRenderer;
import org.apache.fop.apps.FOUserAgent;
+import org.apache.fop.fo.Constants;
import org.apache.fop.fo.pagination.Region;
-import org.apache.fop.fo.properties.RuleStyle;
import org.apache.fop.fonts.FontMetrics;
// Avalon
@@ -698,17 +698,17 @@
Leader leader = new Leader();
String rs = root.getAttribute("ruleStyle");
if ("solid".equals(rs)) {
- leader.setRuleStyle(RuleStyle.SOLID);
+ leader.setRuleStyle(Constants.RuleStyle.SOLID);
} else if ("dotted".equals(rs)) {
- leader.setRuleStyle(RuleStyle.DOTTED);
+ leader.setRuleStyle(Constants.RuleStyle.DOTTED);
} else if ("dashed".equals(rs)) {
- leader.setRuleStyle(RuleStyle.DASHED);
+ leader.setRuleStyle(Constants.RuleStyle.DASHED);
} else if ("double".equals(rs)) {
- leader.setRuleStyle(RuleStyle.DOUBLE);
+ leader.setRuleStyle(Constants.RuleStyle.DOUBLE);
} else if ("groove".equals(rs)) {
- leader.setRuleStyle(RuleStyle.GROOVE);
+ leader.setRuleStyle(Constants.RuleStyle.GROOVE);
} else if ("ridge".equals(rs)) {
- leader.setRuleStyle(RuleStyle.RIDGE);
+ leader.setRuleStyle(Constants.RuleStyle.RIDGE);
}
String rt = root.getAttribute("ruleThickness");
int thick = Integer.parseInt(rt);
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org