[FOray-commit] SF.net SVN: foray: [8558] trunk/foray
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
[FOray-commit] SF.net SVN: foray: [8558] trunk/foray
|
From: <vic...@us...> - 2007-01-31 17:50:46
|
Revision: 8558
http://svn.sourceforge.net/foray/?rev=8558&view=rev
Author: victormote
Date: 2007-01-31 09:33:28 -0800 (Wed, 31 Jan 2007)
Log Message:
-----------
Conform to axsl changes for converting an enumeration to a typesafe enum.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java
trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java
trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java
trunk/foray/foray-font/src/java/org/foray/font/FreeStandingFont.java
trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BackgroundPosition.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ContentDimension.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Extent.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/GlyphOrientation.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/PageDimension.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Size.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtWritingMode.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2007-01-31 15:08:14 UTC (rev 8557)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2007-01-31 17:33:28 UTC (rev 8558)
@@ -35,6 +35,7 @@
import org.axsl.areaW.ListBlockArea;
import org.axsl.areaW.NormalBlockArea;
import org.axsl.areaW.TableArea;
+import org.axsl.common.AbsoluteAxis;
import org.axsl.common.Constants;
import org.axsl.common.FoValue;
import org.axsl.common.LinkType;
@@ -347,7 +348,7 @@
public int brOriginX() {
// Start at the padding-rectangle origin.
int x = prOriginX();
- if (this.getBPAxis() == Constants.AXIS_VERTICAL) {
+ if (this.getBPAxis() == AbsoluteAxis.VERTICAL) {
// Our BP Axis is vertical
final boolean goingRight = this.traitIPDirectionOdd()
== Constants.DIRECTION_LEFT_TO_RIGHT;
@@ -377,7 +378,7 @@
public int brOriginY() {
// Start at the padding-rectangle origin.
int y = prOriginY();
- if (this.getBPAxis() == Constants.AXIS_VERTICAL) {
+ if (this.getBPAxis() == AbsoluteAxis.VERTICAL) {
// Our BP Axis is vertical
final boolean goingDown = this.traitBPDirection()
== Constants.DIRECTION_TOP_TO_BOTTOM;
@@ -447,7 +448,7 @@
public int prOriginX() {
// Start at the content-rectangle origin.
int x = crOriginX();
- if (this.getBPAxis() == Constants.AXIS_VERTICAL) {
+ if (this.getBPAxis() == AbsoluteAxis.VERTICAL) {
// Our BP Axis is vertical
final boolean goingRight = this.traitIPDirectionOdd()
== Constants.DIRECTION_LEFT_TO_RIGHT;
@@ -477,7 +478,7 @@
public int prOriginY() {
// Start at the content-rectangle origin.
int y = crOriginY();
- if (this.getBPAxis() == Constants.AXIS_VERTICAL) {
+ if (this.getBPAxis() == AbsoluteAxis.VERTICAL) {
final boolean goingDown = this.traitBPDirection()
== Constants.DIRECTION_TOP_TO_BOTTOM;
if (goingDown) {
@@ -880,11 +881,11 @@
* @return Either AXIS_HORIZONTAL or AXIS_VERTICAL, or -1 if writing-mode
* is invalid.
*/
- public byte getBPAxis() {
+ public AbsoluteAxis getBPAxis() {
return traitGeneratedBy().getBPAxis(this);
}
- public byte getIPAxis() {
+ public AbsoluteAxis getIPAxis() {
return traitGeneratedBy().getIPAxis(this);
}
@@ -910,7 +911,7 @@
* relative content stacking axis and the writing-mode.
* @see #contentStackingAxisRelative()
*/
- public byte contentStackingAxisAbsolute() {
+ public AbsoluteAxis contentStackingAxisAbsolute() {
return getWritingMode().getAbsoluteAxis(contentStackingAxisRelative());
}
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2007-01-31 15:08:14 UTC (rev 8557)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2007-01-31 17:33:28 UTC (rev 8558)
@@ -30,6 +30,7 @@
import org.axsl.areaR.RenderVisitor;
import org.axsl.areaW.AreaWException;
+import org.axsl.common.AbsoluteAxis;
import org.axsl.common.Constants;
import org.axsl.common.FoValue;
import org.axsl.foR.FOContext;
@@ -586,7 +587,7 @@
* alignment-point.
*/
public int alignmentPointOffset() {
- final int axis = this.getWritingMode().getAbsoluteAxis(
+ final AbsoluteAxis axis = this.getWritingMode().getAbsoluteAxis(
Constants.AXIS_IP);
final int baseline = this.traitDominantBaseline();
final Font font = this.getPrimaryFont().getFont();
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2007-01-31 15:08:14 UTC (rev 8557)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2007-01-31 17:33:28 UTC (rev 8558)
@@ -33,6 +33,7 @@
import org.axsl.areaR.RegionBodyArea;
import org.axsl.areaR.RenderVisitor;
import org.axsl.areaW.AreaWException;
+import org.axsl.common.AbsoluteAxis;
import org.axsl.common.Constants;
import org.axsl.common.FoValue;
import org.axsl.foR.FObj;
@@ -353,14 +354,14 @@
}
public int crIPD() {
- if (getWritingMode().getIPAxis() == Constants.AXIS_HORIZONTAL) {
+ if (getWritingMode().getIPAxis() == AbsoluteAxis.HORIZONTAL) {
return traitPageWidth() - getMarginLeft() - getMarginRight();
}
return traitPageHeight() - getMarginTop() - getMarginBottom();
}
public int crBPD() {
- if (getWritingMode().getBPAxis() == Constants.AXIS_VERTICAL) {
+ if (getWritingMode().getBPAxis() == AbsoluteAxis.VERTICAL) {
return traitPageHeight() - getMarginTop() - getMarginBottom();
}
return traitPageWidth() - getMarginLeft() - getMarginRight();
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java 2007-01-31 15:08:14 UTC (rev 8557)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java 2007-01-31 17:33:28 UTC (rev 8558)
@@ -32,6 +32,7 @@
import org.axsl.areaR.RegionBodyArea;
import org.axsl.areaR.RenderVisitor;
import org.axsl.areaW.AreaWException;
+import org.axsl.common.AbsoluteAxis;
import org.axsl.common.Constants;
import org.axsl.foR.fo.RegionBody;
import org.axsl.foR.fo.SimplePageMaster;
@@ -83,7 +84,7 @@
public int crBPD() {
int dimension = getParentArea().brBPD();
- if (this.getBPAxis() == Constants.AXIS_VERTICAL) {
+ if (this.getBPAxis() == AbsoluteAxis.VERTICAL) {
dimension -= getMarginTop();
dimension -= getMarginBottom();
} else {
@@ -95,7 +96,7 @@
public int crIPD() {
int dimension = getParentArea().brIPD();
- if (this.getBPAxis() == Constants.AXIS_VERTICAL) {
+ if (this.getBPAxis() == AbsoluteAxis.VERTICAL) {
dimension -= getMarginLeft();
dimension -= getMarginRight();
} else {
Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java 2007-01-31 15:08:14 UTC (rev 8557)
+++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java 2007-01-31 17:33:28 UTC (rev 8558)
@@ -31,6 +31,7 @@
import org.foray.font.format.Kerning;
import org.foray.font.format.Panose;
+import org.axsl.common.AbsoluteAxis;
import org.axsl.common.Baseline;
import org.axsl.fontR.Font;
@@ -389,8 +390,8 @@
/**
* {@inheritDoc}
*/
- public int baselineOffset(final int writingMode, final int baselineType,
- final int fontSize) {
+ public int baselineOffset(final AbsoluteAxis writingMode,
+ final int baselineType, final int fontSize) {
final int baseline = extractBaseline(writingMode, baselineType,
fontSize);
if (baseline == Integer.MIN_VALUE) {
@@ -401,26 +402,32 @@
/**
* Returns the font's explicit definition of the baseline, if possible.
- * @param writingMode Same as for {@link #baselineOffset(int, int, int)}.
- * @param baselineType Same as for {@link #baselineOffset(int, int, int)}.
- * @param fontSize Same as for {@link #baselineOffset(int, int, int)}.
+ * @param writingMode Same as for
+ * {@link #baselineOffset(AbsoluteAxis, int, int)}.
+ * @param baselineType Same as for
+ * {@link #baselineOffset(AbsoluteAxis, int, int)}.
+ * @param fontSize Same as for
+ * {@link #baselineOffset(AbsoluteAxis, int, int)}.
* @return The extracted Baseline, as described for
- * {@link #baselineOffset(int, int, int)}, if it exists. Otherwise, returns
- * {@link Integer#MIN_VALUE}.
+ * {@link #baselineOffset(AbsoluteAxis, int, int)}, if it exists.
+ * Otherwise, returns {@link Integer#MIN_VALUE}.
*/
- public abstract int extractBaseline(int writingMode, int baselineType,
- int fontSize);
+ public abstract int extractBaseline(AbsoluteAxis writingMode,
+ int baselineType, int fontSize);
/**
* Provides reasonable estimates of the various baseline values for the
* font, based on other font metrics.
- * @param writingMode Same as for {@link #baselineOffset(int, int, int)}.
- * @param baselineType Same as for {@link #baselineOffset(int, int, int)}.
- * @param fontSize Same as for {@link #baselineOffset(int, int, int)}.
+ * @param writingMode Same as for
+ * {@link #baselineOffset(AbsoluteAxis, int, int)}.
+ * @param baselineType Same as for
+ * {@link #baselineOffset(AbsoluteAxis, int, int)}.
+ * @param fontSize Same as for
+ * {@link #baselineOffset(AbsoluteAxis, int, int)}.
* @return The estimated value of the baseline.
*/
- public int estimateBaseline(final int writingMode, final int baselineType,
- final int fontSize) {
+ public int estimateBaseline(final AbsoluteAxis writingMode,
+ final int baselineType, final int fontSize) {
switch (baselineType) {
case Baseline.ALPHABETIC: {
return fontSize + this.getDescender(fontSize);
Modified: trunk/foray/foray-font/src/java/org/foray/font/FreeStandingFont.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/FreeStandingFont.java 2007-01-31 15:08:14 UTC (rev 8557)
+++ trunk/foray/foray-font/src/java/org/foray/font/FreeStandingFont.java 2007-01-31 17:33:28 UTC (rev 8558)
@@ -34,6 +34,7 @@
import org.foray.font.format.Kerning;
import org.foray.ps.encode.Encoding;
+import org.axsl.common.AbsoluteAxis;
import org.axsl.fontR.Font;
import java.io.IOException;
@@ -420,8 +421,8 @@
/**
* {@inheritDoc}
*/
- public int extractBaseline(final int writingMode, final int baselineType,
- final int fontSize) {
+ public int extractBaseline(final AbsoluteAxis writingMode,
+ final int baselineType, final int fontSize) {
return Integer.MIN_VALUE;
}
Modified: trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java 2007-01-31 15:08:14 UTC (rev 8557)
+++ trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java 2007-01-31 17:33:28 UTC (rev 8558)
@@ -34,6 +34,7 @@
import org.foray.font.format.FontFileReader;
import org.foray.font.format.Kerning;
+import org.axsl.common.AbsoluteAxis;
import org.axsl.fontR.FontException;
import java.awt.Font;
@@ -553,8 +554,8 @@
/**
* {@inheritDoc}
*/
- public int extractBaseline(final int writingMode, final int baselineType,
- final int fontSize) {
+ public int extractBaseline(final AbsoluteAxis writingMode,
+ final int baselineType, final int fontSize) {
return Integer.MIN_VALUE;
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2007-01-31 15:08:14 UTC (rev 8557)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2007-01-31 17:33:28 UTC (rev 8558)
@@ -30,6 +30,7 @@
import org.foray.common.XMLCharacter;
+import org.axsl.common.AbsoluteAxis;
import org.axsl.common.Constants;
import org.axsl.common.FoValue;
import org.axsl.foR.FOContext;
@@ -1714,7 +1715,7 @@
final WritingMode writingMode = this.getWritingMode(context);
if (script.equals("auto")) {
if (writingMode.getAbsoluteAxis(Constants.AXIS_IP)
- == Constants.AXIS_HORIZONTAL) {
+ == AbsoluteAxis.HORIZONTAL) {
/* The writing mode is horizontal. */
return FoValue.ALPHABETIC;
} else {
@@ -2454,14 +2455,14 @@
/**
* {@inheritDoc}
*/
- public byte getBPAxis(final FOContext context) {
+ public AbsoluteAxis getBPAxis(final FOContext context) {
return propertyList.getBPAxis(context);
}
/**
* {@inheritDoc}
*/
- public byte getIPAxis(final FOContext context) {
+ public AbsoluteAxis getIPAxis(final FOContext context) {
return propertyList.getIPAxis(context);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java 2007-01-31 15:08:14 UTC (rev 8557)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java 2007-01-31 17:33:28 UTC (rev 8558)
@@ -144,6 +144,7 @@
import org.foray.fotree.xml.PropertyMakerXML;
import org.foray.fotree.xml.prop.Lang;
+import org.axsl.common.AbsoluteAxis;
import org.axsl.common.Constants;
import org.axsl.common.FoProperty;
import org.axsl.common.FoValue;
@@ -1037,7 +1038,7 @@
return MaximumRepeats.getValueNoInstance();
}
- private int getPageDimension(final byte axis) {
+ private int getPageDimension(final AbsoluteAxis axis) {
final short propertyType = PageDimension.rawPropertyType(axis);
final PageDimension property = (PageDimension)
getProperty(propertyType);
@@ -1055,11 +1056,11 @@
}
public int getPageWidth() {
- return getPageDimension(Constants.AXIS_HORIZONTAL);
+ return getPageDimension(AbsoluteAxis.HORIZONTAL);
}
public int getPageHeight() {
- return getPageDimension(Constants.AXIS_VERTICAL);
+ return getPageDimension(AbsoluteAxis.VERTICAL);
}
public short getTextAlign(final FOContext context) {
@@ -1406,14 +1407,15 @@
}
public ContentDimension getContentDimensionProperty(
- final byte absoluteAxis) {
+ final AbsoluteAxis absoluteAxis) {
final short propertyType = ContentDimension.rawPropertyName(
absoluteAxis);
return (ContentDimension) getProperty(propertyType);
}
private float getContentDimension(final FOContext context,
- final byte absoluteAxis, final float intrinsicContentDimension,
+ final AbsoluteAxis absoluteAxis,
+ final float intrinsicContentDimension,
final float viewportDimension) {
final ContentDimension property = getContentDimensionProperty(
absoluteAxis);
@@ -1430,7 +1432,7 @@
*/
public float getContentWidth(final FOContext context,
final float intrinsicContentWidth, final float viewportWidth) {
- return getContentDimension(context, Constants.AXIS_HORIZONTAL,
+ return getContentDimension(context, AbsoluteAxis.HORIZONTAL,
intrinsicContentWidth, viewportWidth);
}
@@ -1441,7 +1443,7 @@
public float getContentHeight(final FOContext context,
final float intrinsicContentHeight,
final float viewportHeight) {
- return getContentDimension(context, Constants.AXIS_VERTICAL,
+ return getContentDimension(context, AbsoluteAxis.VERTICAL,
intrinsicContentHeight, viewportHeight);
}
@@ -1601,9 +1603,10 @@
}
// Try the corresponding absolute dimension
AbsoluteDimension absDimProperty = null;
- final byte absoluteAxis = getWritingMode(context).getAbsoluteAxis(
+ final DtWritingMode writingMode = this.getWritingMode(context);
+ final AbsoluteAxis absoluteAxis = writingMode.getAbsoluteAxis(
relativeAxis);
- if (absoluteAxis == Constants.AXIS_HORIZONTAL) {
+ if (absoluteAxis == AbsoluteAxis.HORIZONTAL) {
switch (subProperty) {
case Property.MINIMUM: {
absDimProperty = (AbsoluteDimension) getProperty(
@@ -1621,7 +1624,7 @@
break;
}
}
- } else if (absoluteAxis == Constants.AXIS_VERTICAL) {
+ } else if (absoluteAxis == AbsoluteAxis.VERTICAL) {
switch (subProperty) {
case Property.MINIMUM: {
absDimProperty = (AbsoluteDimension) getProperty(
@@ -1642,7 +1645,7 @@
}
if (absDimProperty != null) {
return absDimProperty.getValue(context,
- absoluteAxis, fobj, parentAreaCRDimension);
+ relativeAxis, fobj, parentAreaCRDimension);
}
return RelativeDimension.getValueNoInstance();
}
@@ -3123,20 +3126,20 @@
final GlyphOrientation property = (GlyphOrientation)
getProperty(FoProperty.GLYPH_ORIENTATION_HORIZONTAL);
if (property != null) {
- return property.getValue(context, fobj, Constants.AXIS_HORIZONTAL);
+ return property.getValue(context, fobj, AbsoluteAxis.HORIZONTAL);
}
return GlyphOrientation.getValueNoInstance(context, fobj,
- Constants.AXIS_HORIZONTAL);
+ AbsoluteAxis.HORIZONTAL);
}
public short traitGlyphOrientationVertical(final FOContext context) {
final GlyphOrientation property = (GlyphOrientation)
getProperty(FoProperty.GLYPH_ORIENTATION_VERTICAL);
if (property != null) {
- return property.getValue(context, fobj, Constants.AXIS_VERTICAL);
+ return property.getValue(context, fobj, AbsoluteAxis.VERTICAL);
}
return GlyphOrientation.getValueNoInstance(context, fobj,
- Constants.AXIS_VERTICAL);
+ AbsoluteAxis.VERTICAL);
}
public int traitBackgroundPositionHorizontal(final FOContext context,
@@ -3146,7 +3149,7 @@
getProperty(FoProperty.BACKGROUND_POSITION_HORIZONTAL);
if (property != null) {
return property.getValue(context, fobj,
- Constants.AXIS_HORIZONTAL, paddingRectangleWidth,
+ AbsoluteAxis.HORIZONTAL, paddingRectangleWidth,
backgroundImageWidth);
}
// Try the first shorthand
@@ -3154,7 +3157,7 @@
FoProperty.BACKGROUND_POSITION);
if (property != null) {
return property.getShorthandValue(context,
- fobj, Constants.AXIS_HORIZONTAL,
+ fobj, AbsoluteAxis.HORIZONTAL,
paddingRectangleWidth, backgroundImageWidth);
}
// Try the second shorthand
@@ -3164,7 +3167,7 @@
property = background.getPosition();
if (property != null) {
return property.getShorthandValue(context,
- fobj, Constants.AXIS_HORIZONTAL,
+ fobj, AbsoluteAxis.HORIZONTAL,
paddingRectangleWidth, backgroundImageWidth);
}
}
@@ -3178,7 +3181,7 @@
getProperty(FoProperty.BACKGROUND_POSITION_VERTICAL);
if (property != null) {
return property.getValue(context, fobj,
- Constants.AXIS_VERTICAL, paddingRectangleHeight,
+ AbsoluteAxis.VERTICAL, paddingRectangleHeight,
backgroundImageHeight);
}
// Try the first shorthand
@@ -3186,7 +3189,7 @@
FoProperty.BACKGROUND_POSITION);
if (property != null) {
return property.getShorthandValue(context,
- fobj, Constants.AXIS_VERTICAL,
+ fobj, AbsoluteAxis.VERTICAL,
paddingRectangleHeight, backgroundImageHeight);
}
// Try the second shorthand
@@ -3196,7 +3199,7 @@
property = background.getPosition();
if (property != null) {
return property.getShorthandValue(context,
- fobj, Constants.AXIS_VERTICAL,
+ fobj, AbsoluteAxis.VERTICAL,
paddingRectangleHeight, backgroundImageHeight);
}
}
@@ -3248,7 +3251,7 @@
* @return Either AXIS_HORIZONTAL or AXIS_VERTICAL, or -1 if writing-mode
* is invalid.
*/
- public byte getBPAxis(final FOContext context) {
+ public AbsoluteAxis getBPAxis(final FOContext context) {
return getWritingMode(context).getBPAxis();
}
@@ -3257,7 +3260,7 @@
* @return Either AXIS_HORIZONTAL or AXIS_VERTICAL, or -1 if writing-mode
* is invalid.
*/
- public byte getIPAxis(final FOContext context) {
+ public AbsoluteAxis getIPAxis(final FOContext context) {
return getWritingMode(context).getIPAxis();
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BackgroundPosition.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BackgroundPosition.java 2007-01-31 15:08:14 UTC (rev 8557)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BackgroundPosition.java 2007-01-31 17:33:28 UTC (rev 8558)
@@ -39,7 +39,7 @@
import org.foray.fotree.value.PropertyKeyword;
import org.foray.fotree.value.PropertyValue;
-import org.axsl.common.Constants;
+import org.axsl.common.AbsoluteAxis;
import org.axsl.common.FoProperty;
import org.axsl.common.FoValue;
import org.axsl.foR.FOContext;
@@ -186,7 +186,7 @@
}
public int getValue(final FOContext context, final FObj fobj,
- final byte axis, final int paddingRectangleDimension,
+ final AbsoluteAxis axis, final int paddingRectangleDimension,
final int backgroundImageDimension) {
if (value() instanceof DtPercentage) {
final float percent = ((DtPercentage) value()).getValue();
@@ -215,18 +215,16 @@
case FoValue.INHERIT: {
final FObj parent = fobj.effectiveParent(context);
if (parent != null) {
- switch (axis) {
- case Constants.AXIS_HORIZONTAL: {
+ if (axis == AbsoluteAxis.HORIZONTAL) {
return parent.traitBackgroundPositionHorizontal(
context, paddingRectangleDimension,
backgroundImageDimension);
}
- case Constants.AXIS_VERTICAL: {
+ if (axis == AbsoluteAxis.VERTICAL) {
return parent.traitBackgroundPositionVertical(
context, paddingRectangleDimension,
backgroundImageDimension);
}
- }
}
}
}
@@ -235,7 +233,7 @@
}
public int getShorthandValue(final FOContext context, final FObj fobj,
- final byte axis, final int paddingRectangleDimension,
+ final AbsoluteAxis axis, final int paddingRectangleDimension,
final int backgroundImageDimension) {
final PropertyCollection collection = (PropertyCollection) value();
final BackgroundPosition bpProperty = (BackgroundPosition) collection
@@ -243,19 +241,19 @@
final PropertyValue pv = bpProperty.value();
if (collection.getCount() == 1) {
if (pv instanceof DtPercentage || pv instanceof DtLength) {
- if (axis == Constants.AXIS_VERTICAL) {
+ if (axis == AbsoluteAxis.VERTICAL) {
return Math.round((paddingRectangleDimension
- backgroundImageDimension) / 2);
}
}
if (pv instanceof PropertyKeyword) {
final short keyword = ((PropertyKeyword) pv).getValue();
- if (axis == Constants.AXIS_HORIZONTAL
+ if (axis == AbsoluteAxis.HORIZONTAL
&& keywordInSet(keyword, VALID_KEYWORDS_VERTICAL)) {
return Math.round((paddingRectangleDimension
- backgroundImageDimension) / 2);
}
- if (axis == Constants.AXIS_VERTICAL
+ if (axis == AbsoluteAxis.VERTICAL
&& keywordInSet(keyword, VALID_KEYWORDS_HORIZONTAL)) {
return Math.round((paddingRectangleDimension
- backgroundImageDimension) / 2);
@@ -276,10 +274,10 @@
final PropertyValue pv2 = bpProperty2.value();
BackgroundPosition bpPropertyToUse = null;
if (pv instanceof DtPercentage || pv instanceof DtLength) {
- if (axis == Constants.AXIS_HORIZONTAL) {
+ if (axis == AbsoluteAxis.HORIZONTAL) {
bpPropertyToUse = bpProperty;
}
- if (axis == Constants.AXIS_VERTICAL) {
+ if (axis == AbsoluteAxis.VERTICAL) {
bpPropertyToUse = bpProperty2;
}
}
@@ -299,14 +297,14 @@
if (keywordInSet(keyword2, VALID_KEYWORDS_HORIZONTAL)) {
horizontalFirst = false;
}
- if (axis == Constants.AXIS_HORIZONTAL) {
+ if (axis == AbsoluteAxis.HORIZONTAL) {
if (horizontalFirst) {
bpPropertyToUse = bpProperty;
} else {
bpPropertyToUse = bpProperty2;
}
}
- if (axis == Constants.AXIS_VERTICAL) {
+ if (axis == AbsoluteAxis.VERTICAL) {
if (horizontalFirst) {
bpPropertyToUse = bpProperty2;
} else {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ContentDimension.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ContentDimension.java 2007-01-31 15:08:14 UTC (rev 8557)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ContentDimension.java 2007-01-31 17:33:28 UTC (rev 8558)
@@ -37,7 +37,7 @@
import org.foray.fotree.value.PropertyKeyword;
import org.foray.fotree.value.PropertyValue;
-import org.axsl.common.Constants;
+import org.axsl.common.AbsoluteAxis;
import org.axsl.common.FoProperty;
import org.axsl.common.FoValue;
import org.axsl.foR.FOContext;
@@ -82,8 +82,8 @@
* @param context An object that knows how to resolve FO Tree context
* issues.
* @param fobj The FObj instance to which this property is attached.
- * @param absoluteAxis One of {@link Constants#AXIS_HORIZONTAL} or
- * {@link Constants#AXIS_VERTICAL}.
+ * @param absoluteAxis One of {@link AbsoluteAxis#HORIZONTAL} or
+ * {@link AbsoluteAxis#VERTICAL}.
* @param intrinsicContentDimension The intrinsic dimension, either height
* or width (depending on the nature of this instance), of the content.
* @param viewportDimension The viewport dimension, either height or width
@@ -92,7 +92,8 @@
* @return The scaling factor implied or stated by this property.
*/
public float getValue(final FOContext context, final FObj fobj,
- final byte absoluteAxis, final float intrinsicContentDimension,
+ final AbsoluteAxis absoluteAxis,
+ final float intrinsicContentDimension,
final float viewportDimension) {
if (value() instanceof PropertyKeyword) {
final short keyword = ((PropertyKeyword) value()).getValue();
@@ -102,19 +103,15 @@
if (parent == null) {
return getValueNoInstance();
}
- switch (absoluteAxis) {
- case Constants.AXIS_VERTICAL: {
+ if (absoluteAxis == AbsoluteAxis.VERTICAL) {
return parent.getContentHeight(context,
intrinsicContentDimension, viewportDimension);
}
- case Constants.AXIS_HORIZONTAL: {
+ if (absoluteAxis == AbsoluteAxis.HORIZONTAL) {
return parent.getContentWidth(context,
intrinsicContentDimension, viewportDimension);
}
- default: {
- return getValueNoInstance();
- }
- }
+ return getValueNoInstance();
}
case FoValue.AUTO: {
return 1;
@@ -153,15 +150,13 @@
* @return Either {@link FoProperty#CONTENT_WIDTH} or
* {@link FoProperty#CONTENT_HEIGHT}.
*/
- public static short rawPropertyName(final int absoluteAxis) {
- switch (absoluteAxis) {
- case Constants.AXIS_HORIZONTAL: {
+ public static short rawPropertyName(final AbsoluteAxis absoluteAxis) {
+ if (absoluteAxis == AbsoluteAxis.HORIZONTAL) {
return FoProperty.CONTENT_WIDTH;
}
- case Constants.AXIS_VERTICAL: {
+ if (absoluteAxis == AbsoluteAxis.VERTICAL) {
return FoProperty.CONTENT_HEIGHT;
}
- }
return 0;
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Extent.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Extent.java 2007-01-31 15:08:14 UTC (rev 8557)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Extent.java 2007-01-31 17:33:28 UTC (rev 8558)
@@ -42,6 +42,7 @@
import org.foray.fotree.value.PropertyKeyword;
import org.foray.fotree.value.PropertyValue;
+import org.axsl.common.AbsoluteAxis;
import org.axsl.common.Constants;
import org.axsl.common.FoValue;
import org.axsl.foR.FOContext;
@@ -110,20 +111,18 @@
private int computeBase(final FOContext context, final FObj fobj) {
final DtWritingMode writingMode = fobj.getPropertyList().getWritingMode(
context);
- byte absoluteAxis = -1;
+ AbsoluteAxis absoluteAxis = AbsoluteAxis.INVALID;
if (fobj instanceof RegionBefore || fobj instanceof RegionAfter) {
absoluteAxis = writingMode.getAbsoluteAxis(Constants.AXIS_BP);
} else if (fobj instanceof RegionStart || fobj instanceof RegionEnd) {
absoluteAxis = writingMode.getAbsoluteAxis(Constants.AXIS_IP);
}
- switch (absoluteAxis) {
- case Constants.AXIS_VERTICAL: {
+ if (absoluteAxis == AbsoluteAxis.VERTICAL) {
return fobj.traitPageHeight();
}
- case Constants.AXIS_HORIZONTAL: {
+ if (absoluteAxis == AbsoluteAxis.HORIZONTAL) {
return fobj.traitPageWidth();
}
- }
return getValueNoInstance();
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/GlyphOrientation.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/GlyphOrientation.java 2007-01-31 15:08:14 UTC (rev 8557)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/GlyphOrientation.java 2007-01-31 17:33:28 UTC (rev 8558)
@@ -36,7 +36,7 @@
import org.foray.fotree.value.PropertyKeyword;
import org.foray.fotree.value.PropertyValue;
-import org.axsl.common.Constants;
+import org.axsl.common.AbsoluteAxis;
import org.axsl.common.FoProperty;
import org.axsl.common.FoValue;
import org.axsl.foR.FOContext;
@@ -90,7 +90,7 @@
}
public short getValue(final FOContext context, final FObj fobj,
- final byte axis) {
+ final AbsoluteAxis axis) {
if (value() instanceof DtAngle) {
final double angleValue = ((DtAngle) value()).getValue();
if (angleValue < ANGLE_ROUNDING_0_CUTOFF) {
@@ -120,27 +120,23 @@
}
public static short getValueNoInstance(final FOContext context,
- final FObj fobj, final byte axis) {
+ final FObj fobj, final AbsoluteAxis axis) {
final FObj parent = fobj.effectiveParent(context);
if (parent != null) {
- switch (axis) {
- case Constants.AXIS_HORIZONTAL: {
+ if (axis == AbsoluteAxis.HORIZONTAL) {
return parent.traitGlyphOrientationHorizontal(context);
}
- case Constants.AXIS_VERTICAL: {
+ if (axis == AbsoluteAxis.VERTICAL) {
return parent.traitGlyphOrientationVertical(context);
}
- }
}
/* The initial values are different between the two. */
- switch (axis) {
- case Constants.AXIS_HORIZONTAL: {
+ if (axis == AbsoluteAxis.HORIZONTAL) {
return 0;
}
- case Constants.AXIS_VERTICAL: {
+ if (axis == AbsoluteAxis.VERTICAL) {
return -1;
}
- }
return 0;
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/PageDimension.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/PageDimension.java 2007-01-31 15:08:14 UTC (rev 8557)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/PageDimension.java 2007-01-31 17:33:28 UTC (rev 8558)
@@ -36,7 +36,7 @@
import org.foray.fotree.value.PropertyKeyword;
import org.foray.fotree.value.PropertyValue;
-import org.axsl.common.Constants;
+import org.axsl.common.AbsoluteAxis;
import org.axsl.common.FoProperty;
import org.axsl.common.FoValue;
import org.axsl.foR.FOContext;
@@ -73,7 +73,7 @@
throw unexpectedValue(value, propertyList);
}
- public int getValue(final byte axis, final FObj fobj) {
+ public int getValue(final AbsoluteAxis axis, final FObj fobj) {
/* Null context is OK, because the object can't be inside a marker. */
final FOContext context = null;
if (value() instanceof PropertyKeyword) {
@@ -84,30 +84,30 @@
if (parent == null) {
return getValueNoInstance(axis);
}
- if (axis == Constants.AXIS_HORIZONTAL) {
+ if (axis == AbsoluteAxis.HORIZONTAL) {
return parent.traitPageWidth();
}
- if (axis == Constants.AXIS_VERTICAL) {
+ if (axis == AbsoluteAxis.VERTICAL) {
return parent.traitPageHeight();
}
break;
}
case FoValue.AUTO: {
// This isn't right, but is reasonable for now
- if (axis == Constants.AXIS_HORIZONTAL) {
+ if (axis == AbsoluteAxis.HORIZONTAL) {
return SimplePageMaster.FALLBACK_PAGE_WIDTH;
}
- if (axis == Constants.AXIS_VERTICAL) {
+ if (axis == AbsoluteAxis.VERTICAL) {
return SimplePageMaster.FALLBACK_PAGE_HEIGHT;
}
break;
}
case FoValue.INDEFINITE: {
// This isn't right, but is reasonable for now
- if (axis == Constants.AXIS_HORIZONTAL) {
+ if (axis == AbsoluteAxis.HORIZONTAL) {
return SimplePageMaster.FALLBACK_PAGE_WIDTH;
}
- if (axis == Constants.AXIS_VERTICAL) {
+ if (axis == AbsoluteAxis.VERTICAL) {
return SimplePageMaster.FALLBACK_PAGE_HEIGHT;
}
break;
@@ -120,11 +120,11 @@
return 0;
}
- public static int getValueNoInstance(final byte axis) {
- if (axis == Constants.AXIS_HORIZONTAL) {
+ public static int getValueNoInstance(final AbsoluteAxis axis) {
+ if (axis == AbsoluteAxis.HORIZONTAL) {
return SimplePageMaster.FALLBACK_PAGE_WIDTH;
}
- if (axis == Constants.AXIS_VERTICAL) {
+ if (axis == AbsoluteAxis.VERTICAL) {
return SimplePageMaster.FALLBACK_PAGE_HEIGHT;
}
return 0;
@@ -138,15 +138,13 @@
* @param axis One of the absolute axes.
* @return String representation of the raw property name.
*/
- public static short rawPropertyType(final byte axis) {
- switch (axis) {
- case Constants.AXIS_HORIZONTAL: {
+ public static short rawPropertyType(final AbsoluteAxis axis) {
+ if (axis == AbsoluteAxis.HORIZONTAL) {
return FoProperty.PAGE_WIDTH;
}
- case Constants.AXIS_VERTICAL: {
+ if (axis == AbsoluteAxis.VERTICAL) {
return FoProperty.PAGE_HEIGHT;
}
- }
return 0;
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Size.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Size.java 2007-01-31 15:08:14 UTC (rev 8557)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Size.java 2007-01-31 17:33:28 UTC (rev 8558)
@@ -33,12 +33,11 @@
import org.foray.fotree.PropertyException;
import org.foray.fotree.PropertyList;
import org.foray.fotree.value.DtLength;
-import org.foray.fotree.value.DtWritingMode;
import org.foray.fotree.value.PropertyCollection;
import org.foray.fotree.value.PropertyKeyword;
import org.foray.fotree.value.PropertyValue;
-import org.axsl.common.Constants;
+import org.axsl.common.AbsoluteAxis;
import org.axsl.common.FoValue;
import org.axsl.foR.FOContext;
@@ -93,7 +92,7 @@
}
public int getValue(final FOContext context, final FObj fobj,
- final byte axis) {
+ final AbsoluteAxis axis) {
if (value() instanceof PropertyCollection) {
final PropertyCollection collection =
(PropertyCollection) value();
@@ -101,20 +100,15 @@
return getValueNoInstance(axis);
}
int index = -1;
- switch (axis) {
- case Constants.AXIS_VERTICAL: {
+ if (axis == AbsoluteAxis.VERTICAL) {
index = 0;
- break;
- }
- case Constants.AXIS_HORIZONTAL: {
+ } else if (axis == AbsoluteAxis.HORIZONTAL) {
if (collection.getCount() > 1) {
index = 1;
} else {
index = 0;
}
- break;
}
- }
final Property property = collection.getItem(index);
final PropertyValue pv = property.value();
final DtLength length = (DtLength) pv;
@@ -135,7 +129,7 @@
* Since our default page is portrait, we'll just reverse the
* axes for landscape.
*/
- final byte otherAxis = DtWritingMode.getOtherAxis(axis);
+ final AbsoluteAxis otherAxis = axis.getOpposite();
return PageDimension.getValueNoInstance(otherAxis);
}
case FoValue.PORTRAIT: {
@@ -147,14 +141,12 @@
case FoValue.INHERIT: {
final FObj parent = fobj.effectiveParent(context);
if (parent != null) {
- switch (axis) {
- case Constants.AXIS_HORIZONTAL: {
+ if (axis == AbsoluteAxis.HORIZONTAL) {
return fobj.traitPageWidth();
}
- case Constants.AXIS_VERTICAL: {
+ if (axis == AbsoluteAxis.VERTICAL) {
return fobj.traitPageHeight();
}
- }
}
}
}
@@ -162,7 +154,7 @@
return getValueNoInstance(axis);
}
- public static int getValueNoInstance(final byte axis) {
+ public static int getValueNoInstance(final AbsoluteAxis axis) {
return PageDimension.getValueNoInstance(axis);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtWritingMode.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtWritingMode.java 2007-01-31 15:08:14 UTC (rev 8557)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtWritingMode.java 2007-01-31 17:33:28 UTC (rev 8558)
@@ -28,6 +28,7 @@
package org.foray.fotree.value;
+import org.axsl.common.AbsoluteAxis;
import org.axsl.common.Constants;
import java.util.HashMap;
@@ -297,41 +298,37 @@
}
/**
- * Tells which axis (horizontal or vertical) is the block-progression axis.
- * @return Either AXIS_HORIZONTAL or AXIS_VERTICAL, or -1 if writing-mode
- * is invalid.
+ * {@inheritDoc}
*/
- public byte getBPAxis() {
+ public AbsoluteAxis getBPAxis() {
switch (bpd) {
case Constants.DIRECTION_LEFT_TO_RIGHT:
case Constants.DIRECTION_RIGHT_TO_LEFT: {
- return Constants.AXIS_HORIZONTAL;
+ return AbsoluteAxis.HORIZONTAL;
}
case Constants.DIRECTION_TOP_TO_BOTTOM:
case Constants.DIRECTION_BOTTOM_TO_TOP: {
- return Constants.AXIS_VERTICAL;
+ return AbsoluteAxis.VERTICAL;
}
}
- return -1;
+ return AbsoluteAxis.INVALID;
}
/**
- * Tells which axis (horizontal or vertical) is the inline-progression axis.
- * @return Either AXIS_HORIZONTAL or AXIS_VERTICAL, or -1 if writing-mode
- * is invalid.
+ * {@inheritDoc}
*/
- public byte getIPAxis() {
+ public AbsoluteAxis getIPAxis() {
switch (bpd) {
case Constants.DIRECTION_LEFT_TO_RIGHT:
case Constants.DIRECTION_RIGHT_TO_LEFT: {
- return Constants.AXIS_VERTICAL;
+ return AbsoluteAxis.VERTICAL;
}
case Constants.DIRECTION_TOP_TO_BOTTOM:
case Constants.DIRECTION_BOTTOM_TO_TOP: {
- return Constants.AXIS_HORIZONTAL;
+ return AbsoluteAxis.HORIZONTAL;
}
}
- return -1;
+ return AbsoluteAxis.INVALID;
}
/**
@@ -341,7 +338,7 @@
* @return Either AXIS_HORIZONTAL or AXIS_VERTICAL, or -1 if writing-mode
* or input is invalid.
*/
- public byte getAbsoluteAxis(final byte relativeAxis) {
+ public AbsoluteAxis getAbsoluteAxis(final byte relativeAxis) {
switch (relativeAxis) {
case Constants.AXIS_BP: {
return getBPAxis();
@@ -350,7 +347,7 @@
return getIPAxis();
}
}
- return -1;
+ return AbsoluteAxis.INVALID;
}
/**
@@ -360,15 +357,13 @@
* @return Either AXIS_IP or AXIS_BP, or -1 if writing-mode or input
* is invalid.
*/
- public byte getRelativeAxis(final byte absoluteAxis) {
- switch (absoluteAxis) {
- case Constants.AXIS_HORIZONTAL: {
+ public byte getRelativeAxis(final AbsoluteAxis absoluteAxis) {
+ if (absoluteAxis == AbsoluteAxis.HORIZONTAL) {
return getHorizontalAxis();
}
- case Constants.AXIS_VERTICAL: {
+ if (absoluteAxis == AbsoluteAxis.VERTICAL) {
return getVerticalAxis();
}
- }
return -1;
}
@@ -674,14 +669,4 @@
return -1;
}
- public static byte getOtherAxis(final byte axis) {
- if (axis == Constants.AXIS_HORIZONTAL) {
- return Constants.AXIS_VERTICAL;
- }
- if (axis == Constants.AXIS_VERTICAL) {
- return Constants.AXIS_HORIZONTAL;
- }
- return -1;
- }
-
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|