[FOray-commit] SF.net SVN: foray: [8559] trunk/foray
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
[FOray-commit] SF.net SVN: foray: [8559] trunk/foray
|
From: <vic...@us...> - 2007-01-31 18:05:24
|
Revision: 8559
http://svn.sourceforge.net/foray/?rev=8559&view=rev
Author: victormote
Date: 2007-01-31 10:04:58 -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/AbstractInlineArea.java
trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.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-areatree/src/java/org/foray/area/TableRowContainer.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/AbsoluteDimension.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderSeparation.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/RelativeDimension.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtWritingMode.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java 2007-01-31 17:33:28 UTC (rev 8558)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java 2007-01-31 18:04:58 UTC (rev 8559)
@@ -30,7 +30,7 @@
import org.axsl.areaR.GeneralInlineArea;
import org.axsl.areaW.AreaWException;
-import org.axsl.common.Constants;
+import org.axsl.common.RelativeAxis;
import org.axsl.foR.FONode;
import org.axsl.foR.fo.RetrieveMarker;
@@ -76,8 +76,8 @@
* Overrides superclass method because InlineArea contents stack in the IPD.
* @see Area#contentStackingAxis()
*/
- public byte contentStackingAxisRelative() {
- return Constants.AXIS_IP;
+ public RelativeAxis contentStackingAxisRelative() {
+ return RelativeAxis.INLINE_PROGRESSION;
}
public Area getOverflowArea(final Area childRequesting)
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 17:33:28 UTC (rev 8558)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2007-01-31 18:04:58 UTC (rev 8559)
@@ -39,6 +39,7 @@
import org.axsl.common.Constants;
import org.axsl.common.FoValue;
import org.axsl.common.LinkType;
+import org.axsl.common.RelativeAxis;
import org.axsl.foR.FONode;
import org.axsl.foR.WritingMode;
import org.axsl.foR.fo.BasicLink;
@@ -902,8 +903,8 @@
* The default value is that contents stack in the BPD. Classes that
* stack in the IPD should override this method.
*/
- public byte contentStackingAxisRelative() {
- return Constants.AXIS_BP;
+ public RelativeAxis contentStackingAxisRelative() {
+ return RelativeAxis.BLOCK_PROGRESSION;
}
/**
@@ -921,7 +922,7 @@
* the writing-mode.
*/
public byte contentStackingDirectionAbsolute() {
- final byte relative = contentStackingAxisRelative();
+ final RelativeAxis relative = contentStackingAxisRelative();
return getWritingMode().getAbsoluteDirFromRelativeAxis(relative);
}
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java 2007-01-31 17:33:28 UTC (rev 8558)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java 2007-01-31 18:04:58 UTC (rev 8559)
@@ -28,7 +28,7 @@
package org.foray.area;
-import org.axsl.common.Constants;
+import org.axsl.common.RelativeAxis;
import org.axsl.foR.FONode;
import org.axsl.foR.fo.RetrieveMarker;
@@ -329,7 +329,7 @@
public int crOriginIPDOffset() {
int offset = 0;
if (getParentArea().contentStackingAxisRelative()
- == Constants.AXIS_IP) {
+ == RelativeAxis.INLINE_PROGRESSION) {
offset += this.pdUsedBySiblings();
offset += this.getAnteriorSpace();
offset += this.traitBorderStartWidth();
@@ -344,7 +344,7 @@
public int crOriginBPDOffset() {
int offset = 0;
if (getParentArea().contentStackingAxisRelative()
- == Constants.AXIS_BP) {
+ == RelativeAxis.BLOCK_PROGRESSION) {
offset += this.pdUsedBySiblings();
offset += this.getAnteriorSpace();
offset += this.traitBorderBeforeWidth();
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 17:33:28 UTC (rev 8558)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2007-01-31 18:04:58 UTC (rev 8559)
@@ -33,6 +33,7 @@
import org.axsl.common.AbsoluteAxis;
import org.axsl.common.Constants;
import org.axsl.common.FoValue;
+import org.axsl.common.RelativeAxis;
import org.axsl.foR.FOContext;
import org.axsl.foR.FOText;
import org.axsl.foR.FOTextContent;
@@ -536,8 +537,8 @@
* Overrides superclass method because LineArea contents stack in the IPD.
* @see Area#contentStackingAxis()
*/
- public byte contentStackingAxisRelative() {
- return Constants.AXIS_IP;
+ public RelativeAxis contentStackingAxisRelative() {
+ return RelativeAxis.INLINE_PROGRESSION;
}
/*
@@ -588,7 +589,7 @@
*/
public int alignmentPointOffset() {
final AbsoluteAxis axis = this.getWritingMode().getAbsoluteAxis(
- Constants.AXIS_IP);
+ RelativeAxis.INLINE_PROGRESSION);
final int baseline = this.traitDominantBaseline();
final Font font = this.getPrimaryFont().getFont();
return font.baselineOffset(axis, baseline, this.traitFontSize());
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 17:33:28 UTC (rev 8558)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2007-01-31 18:04:58 UTC (rev 8559)
@@ -36,6 +36,7 @@
import org.axsl.common.AbsoluteAxis;
import org.axsl.common.Constants;
import org.axsl.common.FoValue;
+import org.axsl.common.RelativeAxis;
import org.axsl.foR.FObj;
import org.axsl.foR.fo.Marker;
import org.axsl.foR.fo.PageSequence;
@@ -385,7 +386,7 @@
public int crOriginX() {
switch (getWritingMode().getAbsoluteDirFromRelativeAxis(
- Constants.AXIS_BP)) {
+ RelativeAxis.BLOCK_PROGRESSION)) {
case Constants.DIRECTION_TOP_TO_BOTTOM:
case Constants.DIRECTION_BOTTOM_TO_TOP: {
if (getWritingMode().getIPDirectionOdd()
@@ -406,7 +407,7 @@
public int crOriginY() {
switch (getWritingMode().getAbsoluteDirFromRelativeAxis(
- Constants.AXIS_BP)) {
+ RelativeAxis.BLOCK_PROGRESSION)) {
case Constants.DIRECTION_TOP_TO_BOTTOM: {
return traitPageHeight() - getMarginTop();
}
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 17:33:28 UTC (rev 8558)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java 2007-01-31 18:04:58 UTC (rev 8559)
@@ -34,6 +34,7 @@
import org.axsl.areaW.AreaWException;
import org.axsl.common.AbsoluteAxis;
import org.axsl.common.Constants;
+import org.axsl.common.RelativeAxis;
import org.axsl.foR.fo.RegionBody;
import org.axsl.foR.fo.SimplePageMaster;
import org.axsl.graphicR.Graphic;
@@ -153,7 +154,7 @@
int y = getParentArea().crOriginY();
final SimplePageMaster spm = getPageMaster();
switch (getWritingMode().getAbsoluteDirFromRelativeAxis(
- Constants.AXIS_BP)) {
+ RelativeAxis.BLOCK_PROGRESSION)) {
case Constants.DIRECTION_TOP_TO_BOTTOM: {
y -= spm.getBeforeExtent();
break;
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java 2007-01-31 17:33:28 UTC (rev 8558)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java 2007-01-31 18:04:58 UTC (rev 8559)
@@ -30,7 +30,7 @@
import org.axsl.areaR.RenderVisitor;
import org.axsl.areaW.TableCellArea;
-import org.axsl.common.Constants;
+import org.axsl.common.RelativeAxis;
import org.axsl.foR.fo.RetrieveMarker;
import org.axsl.foR.fo.TableCell;
import org.axsl.foR.fo.TableRow;
@@ -53,8 +53,8 @@
* the IPD.
* @see Area#contentStackingAxis()
*/
- public byte contentStackingAxisRelative() {
- return Constants.AXIS_IP;
+ public RelativeAxis contentStackingAxisRelative() {
+ return RelativeAxis.INLINE_PROGRESSION;
}
public int crOriginY() {
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 17:33:28 UTC (rev 8558)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2007-01-31 18:04:58 UTC (rev 8559)
@@ -33,6 +33,7 @@
import org.axsl.common.AbsoluteAxis;
import org.axsl.common.Constants;
import org.axsl.common.FoValue;
+import org.axsl.common.RelativeAxis;
import org.axsl.foR.FOContext;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ShadowEffect;
@@ -1714,7 +1715,8 @@
final String script = this.traitScript(context);
final WritingMode writingMode = this.getWritingMode(context);
if (script.equals("auto")) {
- if (writingMode.getAbsoluteAxis(Constants.AXIS_IP)
+ if (writingMode.getAbsoluteAxis(
+ RelativeAxis.INLINE_PROGRESSION)
== AbsoluteAxis.HORIZONTAL) {
/* The writing mode is horizontal. */
return FoValue.ALPHABETIC;
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 17:33:28 UTC (rev 8558)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java 2007-01-31 18:04:58 UTC (rev 8559)
@@ -148,6 +148,7 @@
import org.axsl.common.Constants;
import org.axsl.common.FoProperty;
import org.axsl.common.FoValue;
+import org.axsl.common.RelativeAxis;
import org.axsl.foR.FOContext;
import org.axsl.foR.ShadowEffect;
import org.axsl.foR.Shape;
@@ -641,10 +642,11 @@
property = (BorderSpacing) getProperty(FoProperty.BORDER_SPACING);
}
if (property != null) {
- return property.getValue(context, Constants.AXIS_IP, fobj);
+ return property.getValue(context, RelativeAxis.INLINE_PROGRESSION,
+ fobj);
}
return BorderSeparation.getValueNoInstance(context,
- Constants.AXIS_IP, fobj);
+ RelativeAxis.INLINE_PROGRESSION, fobj);
}
public int getBorderSeparationBPD(final FOContext context) {
@@ -654,10 +656,11 @@
property = (BorderSpacing) getProperty(FoProperty.BORDER_SPACING);
}
if (property != null) {
- return property.getValue(context, Constants.AXIS_BP, fobj);
+ return property.getValue(context, RelativeAxis.BLOCK_PROGRESSION,
+ fobj);
}
return BorderSeparation.getValueNoInstance(context,
- Constants.AXIS_BP, fobj);
+ RelativeAxis.BLOCK_PROGRESSION, fobj);
}
public int getNumberColumnsRepeated() {
@@ -1587,10 +1590,10 @@
* "auto".
*/
private int getRelativeDimension(final FOContext context,
- final byte relativeAxis, final int subProperty,
+ final RelativeAxis relativeAxis, final int subProperty,
final int parentAreaCRDimension) {
RelativeDimension property = null;
- if (relativeAxis == Constants.AXIS_BP) {
+ if (relativeAxis == RelativeAxis.BLOCK_PROGRESSION) {
property = (RelativeDimension)
getProperty(FoProperty.BLOCK_PROGRESSION_DIMENSION);
} else {
@@ -1652,42 +1655,42 @@
public int traitBPDimensionMin(final FOContext context,
final int parentAreaContentBPD) {
- return getRelativeDimension(context, Constants.AXIS_BP,
+ return getRelativeDimension(context, RelativeAxis.BLOCK_PROGRESSION,
Property.MINIMUM,
parentAreaContentBPD);
}
public int traitBPDimensionOpt(final FOContext context,
final int parentAreaContentBPD) {
- return getRelativeDimension(context, Constants.AXIS_BP,
+ return getRelativeDimension(context, RelativeAxis.BLOCK_PROGRESSION,
Property.OPTIMUM,
parentAreaContentBPD);
}
public int traitBPDimensionMax(final FOContext context,
final int parentAreaContentBPD) {
- return getRelativeDimension(context, Constants.AXIS_BP,
+ return getRelativeDimension(context, RelativeAxis.BLOCK_PROGRESSION,
Property.MAXIMUM,
parentAreaContentBPD);
}
public int traitIPDimensionMin(final FOContext context,
final int parentAreaContentIPD) {
- return getRelativeDimension(context, Constants.AXIS_IP,
+ return getRelativeDimension(context, RelativeAxis.INLINE_PROGRESSION,
Property.MINIMUM,
parentAreaContentIPD);
}
public int traitIPDimensionOpt(final FOContext context,
final int parentAreaContentIPD) {
- return getRelativeDimension(context, Constants.AXIS_IP,
+ return getRelativeDimension(context, RelativeAxis.INLINE_PROGRESSION,
Property.OPTIMUM,
parentAreaContentIPD);
}
public int traitIPDimensionMax(final FOContext context,
final int parentAreaContentIPD) {
- return getRelativeDimension(context, Constants.AXIS_IP,
+ return getRelativeDimension(context, RelativeAxis.INLINE_PROGRESSION,
Property.MAXIMUM,
parentAreaContentIPD);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AbsoluteDimension.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AbsoluteDimension.java 2007-01-31 17:33:28 UTC (rev 8558)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AbsoluteDimension.java 2007-01-31 18:04:58 UTC (rev 8559)
@@ -40,6 +40,7 @@
import org.axsl.common.Constants;
import org.axsl.common.FoProperty;
import org.axsl.common.FoValue;
+import org.axsl.common.RelativeAxis;
import org.axsl.foR.FOContext;
@@ -89,7 +90,8 @@
throw unexpectedValue(value, propertyList);
}
- public int getValue(final FOContext context, final byte relativeAxis,
+ public int getValue(final FOContext context,
+ final RelativeAxis relativeAxis,
final FObj fobj, final int dimAncestorGenByBlockLevelFO) {
if (value() instanceof DtPercentage) {
final int base = dimAncestorGenByBlockLevelFO;
@@ -134,12 +136,12 @@
}
private int getInheritValue(final FOContext context,
- final byte relativeAxis, final FObj fobj,
+ final RelativeAxis relativeAxis, final FObj fobj,
final int dimAncestorGenByBlockLevelFO) {
switch (getPropertyType()) {
case FoProperty.HEIGHT:
case FoProperty.WIDTH: {
- if (relativeAxis == Constants.AXIS_BP) {
+ if (relativeAxis == RelativeAxis.BLOCK_PROGRESSION) {
return fobj.effectiveParent(context).traitBPDimensionOpt(
context, dimAncestorGenByBlockLevelFO);
}
@@ -148,7 +150,7 @@
}
case FoProperty.MAX_HEIGHT:
case FoProperty.MAX_WIDTH: {
- if (relativeAxis == Constants.AXIS_BP) {
+ if (relativeAxis == RelativeAxis.BLOCK_PROGRESSION) {
return fobj.effectiveParent(context).traitBPDimensionMax(
context, dimAncestorGenByBlockLevelFO);
}
@@ -157,7 +159,7 @@
}
case FoProperty.MIN_HEIGHT:
case FoProperty.MIN_WIDTH: {
- if (relativeAxis == Constants.AXIS_BP) {
+ if (relativeAxis == RelativeAxis.BLOCK_PROGRESSION) {
return fobj.effectiveParent(context).traitBPDimensionMin(
context, dimAncestorGenByBlockLevelFO);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderSeparation.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderSeparation.java 2007-01-31 17:33:28 UTC (rev 8558)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderSeparation.java 2007-01-31 18:04:58 UTC (rev 8559)
@@ -38,8 +38,8 @@
import org.foray.fotree.value.PropertyKeyword;
import org.foray.fotree.value.PropertyValue;
-import org.axsl.common.Constants;
import org.axsl.common.FoValue;
+import org.axsl.common.RelativeAxis;
import org.axsl.foR.FOContext;
@@ -87,7 +87,7 @@
throw unexpectedValue(value, propertyList);
}
- public int getValue(final FOContext context, final byte axis,
+ public int getValue(final FOContext context, final RelativeAxis axis,
final FObj fobj) {
if (value() instanceof PropertyKeyword) {
final short keyword = ((PropertyKeyword) value()).getValue();
@@ -100,35 +100,31 @@
value();
ExprNumeric numeric = null;
final int fontSize = fobj.traitFontSize(context);
- switch (axis) {
- case Constants.AXIS_BP: {
+ if (axis == RelativeAxis.BLOCK_PROGRESSION) {
numeric = lengthDir.getBPDLength();
return numeric.getLength(fontSize, 0);
}
- case Constants.AXIS_IP: {
+ if (axis == RelativeAxis.INLINE_PROGRESSION) {
numeric = lengthDir.getIPDLength();
return numeric.getLength(fontSize, 0);
}
- }
}
// This is an error that should already be caught.
return getValueNoInstance(context, axis, fobj);
}
public static int getValueNoInstance(final FOContext context,
- final byte axis, final FObj fobj) {
+ final RelativeAxis axis, final FObj fobj) {
final FObj parent = fobj.effectiveParent(context);
if (parent == null) {
return 0;
}
- switch (axis) {
- case Constants.AXIS_BP: {
+ if (axis == RelativeAxis.BLOCK_PROGRESSION) {
return parent.traitBorderSeparationBPD(context);
}
- case Constants.AXIS_IP: {
+ if (axis == RelativeAxis.INLINE_PROGRESSION) {
return parent.traitBorderSeparationIPD(context);
}
- }
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 17:33:28 UTC (rev 8558)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Extent.java 2007-01-31 18:04:58 UTC (rev 8559)
@@ -43,8 +43,8 @@
import org.foray.fotree.value.PropertyValue;
import org.axsl.common.AbsoluteAxis;
-import org.axsl.common.Constants;
import org.axsl.common.FoValue;
+import org.axsl.common.RelativeAxis;
import org.axsl.foR.FOContext;
/**
@@ -113,9 +113,11 @@
context);
AbsoluteAxis absoluteAxis = AbsoluteAxis.INVALID;
if (fobj instanceof RegionBefore || fobj instanceof RegionAfter) {
- absoluteAxis = writingMode.getAbsoluteAxis(Constants.AXIS_BP);
+ absoluteAxis = writingMode.getAbsoluteAxis(
+ RelativeAxis.BLOCK_PROGRESSION);
} else if (fobj instanceof RegionStart || fobj instanceof RegionEnd) {
- absoluteAxis = writingMode.getAbsoluteAxis(Constants.AXIS_IP);
+ absoluteAxis = writingMode.getAbsoluteAxis(
+ RelativeAxis.INLINE_PROGRESSION);
}
if (absoluteAxis == AbsoluteAxis.VERTICAL) {
return fobj.traitPageHeight();
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RelativeDimension.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RelativeDimension.java 2007-01-31 17:33:28 UTC (rev 8558)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RelativeDimension.java 2007-01-31 18:04:58 UTC (rev 8559)
@@ -40,6 +40,7 @@
import org.axsl.common.Constants;
import org.axsl.common.FoValue;
+import org.axsl.common.RelativeAxis;
import org.axsl.foR.FOContext;
/**
@@ -80,7 +81,7 @@
throw unexpectedValue(value, propertyList);
}
- public int getValue(final FOContext context, final byte axis,
+ public int getValue(final FOContext context, final RelativeAxis axis,
final int subProperty,
final FObj fobj, final int parentAreaCRDimension) {
if (value() instanceof DtLengthRange) {
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 17:33:28 UTC (rev 8558)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtWritingMode.java 2007-01-31 18:04:58 UTC (rev 8559)
@@ -30,6 +30,7 @@
import org.axsl.common.AbsoluteAxis;
import org.axsl.common.Constants;
+import org.axsl.common.RelativeAxis;
import java.util.HashMap;
@@ -264,18 +265,18 @@
* horizontal axis.
* @return Either AXIS_BP or AXIS_IP, or -1 if writing-mode is invalid.
*/
- public byte getHorizontalAxis() {
+ public RelativeAxis getHorizontalAxis() {
switch (bpd) {
case Constants.DIRECTION_LEFT_TO_RIGHT:
case Constants.DIRECTION_RIGHT_TO_LEFT: {
- return Constants.AXIS_BP;
+ return RelativeAxis.BLOCK_PROGRESSION;
}
case Constants.DIRECTION_TOP_TO_BOTTOM:
case Constants.DIRECTION_BOTTOM_TO_TOP: {
- return Constants.AXIS_IP;
+ return RelativeAxis.INLINE_PROGRESSION;
}
}
- return -1;
+ return RelativeAxis.INVALID;
}
/**
@@ -283,18 +284,18 @@
* vertical axis.
* @return Either AXIS_BP or AXIS_IP, or -1 if writing-mode is invalid.
*/
- public byte getVerticalAxis() {
+ public RelativeAxis getVerticalAxis() {
switch (bpd) {
case Constants.DIRECTION_LEFT_TO_RIGHT:
case Constants.DIRECTION_RIGHT_TO_LEFT: {
- return Constants.AXIS_IP;
+ return RelativeAxis.INLINE_PROGRESSION;
}
case Constants.DIRECTION_TOP_TO_BOTTOM:
case Constants.DIRECTION_BOTTOM_TO_TOP: {
- return Constants.AXIS_BP;
+ return RelativeAxis.BLOCK_PROGRESSION;
}
}
- return -1;
+ return RelativeAxis.INVALID;
}
/**
@@ -338,15 +339,13 @@
* @return Either AXIS_HORIZONTAL or AXIS_VERTICAL, or -1 if writing-mode
* or input is invalid.
*/
- public AbsoluteAxis getAbsoluteAxis(final byte relativeAxis) {
- switch (relativeAxis) {
- case Constants.AXIS_BP: {
+ public AbsoluteAxis getAbsoluteAxis(final RelativeAxis relativeAxis) {
+ if (relativeAxis == RelativeAxis.BLOCK_PROGRESSION) {
return getBPAxis();
}
- case Constants.AXIS_IP: {
+ if (relativeAxis == RelativeAxis.INLINE_PROGRESSION) {
return getIPAxis();
}
- }
return AbsoluteAxis.INVALID;
}
@@ -357,14 +356,14 @@
* @return Either AXIS_IP or AXIS_BP, or -1 if writing-mode or input
* is invalid.
*/
- public byte getRelativeAxis(final AbsoluteAxis absoluteAxis) {
+ public RelativeAxis getRelativeAxis(final AbsoluteAxis absoluteAxis) {
if (absoluteAxis == AbsoluteAxis.HORIZONTAL) {
return getHorizontalAxis();
}
if (absoluteAxis == AbsoluteAxis.VERTICAL) {
return getVerticalAxis();
}
- return -1;
+ return RelativeAxis.INVALID;
}
/**
@@ -593,15 +592,14 @@
* DIRECTION_LEFT_TO_RIGHT, or DIRECTION_RIGHT_TO_LEFT, or -1 for invalid
* input or writing mode.
*/
- public byte getAbsoluteDirFromRelativeAxis(final byte relativeAxis) {
- switch (relativeAxis) {
- case Constants.AXIS_BP: {
+ public byte getAbsoluteDirFromRelativeAxis(
+ final RelativeAxis relativeAxis) {
+ if (relativeAxis == RelativeAxis.BLOCK_PROGRESSION) {
return this.bpd;
}
- case Constants.AXIS_IP: {
+ if (relativeAxis == RelativeAxis.INLINE_PROGRESSION) {
return this.ipdOdd;
}
- }
return -1;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|