[FOray-commit] SF.net SVN: foray: [8432] trunk/foray/foray-fotree/src/java/org/foray/ fotree
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
[FOray-commit] SF.net SVN: foray: [8432] trunk/foray/foray-fotree/src/java/org/foray/ fotree
|
From: <vic...@us...> - 2006-10-27 01:11:23
|
Revision: 8432
http://svn.sourceforge.net/foray/?rev=8432&view=rev
Author: victormote
Date: 2006-10-26 18:10:40 -0700 (Thu, 26 Oct 2006)
Log Message:
-----------
Move the numeric-related methods from Expr to ExprNumeric.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontSize.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Indent.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LastLineEndIndent.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Margin.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RelativeSpace.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextIndent.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtAngle.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtCharacter.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtColor.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtCountry.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtFrequency.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtInteger.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtKeep.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtLanguage.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtLengthBPIPDirection.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtLengthConditional.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtLengthRange.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtName.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtNumber.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtPercentage.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtRectangle.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtScript.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtShadowEffect.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtSpace.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtString.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtTextDeco.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtTime.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtURI.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtWritingMode.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/Expr.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprAdditiveOper.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprInner.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprMultiplicativeOper.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprNumeric.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprUnaryOper.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnAbs.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnBodyStart.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnCeiling.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnFloor.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnFromParent.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnFromTableColumn.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnInheritedProp.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnLabelEnd.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnMax.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnMin.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnNearestSpecProp.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnProportionalColWidth.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnRGB.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnRound.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/PropertyKeyword.java
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontSize.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontSize.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontSize.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -35,7 +35,7 @@
import org.foray.fotree.PropertyList;
import org.foray.fotree.value.DtLength;
import org.foray.fotree.value.DtPercentage;
-import org.foray.fotree.value.Expr;
+import org.foray.fotree.value.ExprNumeric;
import org.foray.fotree.value.PropertyKeyword;
import org.foray.fotree.value.PropertyValue;
@@ -104,8 +104,8 @@
|| pv instanceof PropertyKeyword) {
return pv;
}
- if (pv instanceof Expr) {
- if (((Expr) pv).canEvalUnitPower1()) {
+ if (pv instanceof ExprNumeric) {
+ if (((ExprNumeric) pv).canEvalUnitPower1()) {
return pv;
}
}
@@ -160,9 +160,9 @@
return Math.round(percentage * getBaseFontSize(context,
fobj) / WKConstants.PERCENT_CONVERSION);
}
- if (value() instanceof Expr) {
- return ((Expr) value()).evalUnitPower1(getBaseFontSize(context,
- fobj), 0);
+ if (value() instanceof ExprNumeric) {
+ return ((ExprNumeric) value()).evalUnitPower1(getBaseFontSize(
+ context, fobj), 0);
}
return getBaseFontSize(context, fobj);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Indent.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Indent.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Indent.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -35,7 +35,7 @@
import org.foray.fotree.PropertyList;
import org.foray.fotree.value.DtLength;
import org.foray.fotree.value.DtPercentage;
-import org.foray.fotree.value.Expr;
+import org.foray.fotree.value.ExprNumeric;
import org.foray.fotree.value.FnBodyStart;
import org.foray.fotree.value.FnLabelEnd;
import org.foray.fotree.value.PropertyKeyword;
@@ -80,8 +80,8 @@
if (pv instanceof FnBodyStart) {
return pv;
}
- if (pv instanceof Expr) {
- final Expr expression = (Expr) pv;
+ if (pv instanceof ExprNumeric) {
+ final ExprNumeric expression = (ExprNumeric) pv;
if (expression.canEvalUnitPower1()) {
return pv;
}
@@ -120,8 +120,8 @@
final DtLength lengthDT = function.eval(fobj, ipdContainingRA);
return lengthDT.getValue(fobj.traitFontSize(context), 0);
}
- if (value() instanceof Expr) {
- final Expr expression = (Expr) value();
+ if (value() instanceof ExprNumeric) {
+ final ExprNumeric expression = (ExprNumeric) value();
return expression.evalUnitPower1(fobj.traitFontSize(context),
ipdContainingRA);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LastLineEndIndent.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LastLineEndIndent.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LastLineEndIndent.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -35,7 +35,7 @@
import org.foray.fotree.PropertyList;
import org.foray.fotree.value.DtLength;
import org.foray.fotree.value.DtPercentage;
-import org.foray.fotree.value.Expr;
+import org.foray.fotree.value.ExprNumeric;
import org.foray.fotree.value.PropertyValue;
import org.axsl.common.Constants;
@@ -71,8 +71,8 @@
if (pv instanceof DtPercentage) {
return pv;
}
- if (pv instanceof Expr) {
- if (((Expr) pv).canEvalUnitPower1()) {
+ if (pv instanceof ExprNumeric) {
+ if (((ExprNumeric) pv).canEvalUnitPower1()) {
return pv;
}
throw unexpectedValue(value, propertyList);
@@ -92,9 +92,9 @@
return Math.round(percentage * ipdAncestorBANotLA /
WKConstants.PERCENT_CONVERSION);
}
- if (value() instanceof Expr) {
+ if (value() instanceof ExprNumeric) {
final int fontSize = fobj.traitFontSize(context);
- return ((Expr) value()).evalUnitPower1(fontSize, 0);
+ return ((ExprNumeric) value()).evalUnitPower1(fontSize, 0);
}
return getValueNoInstance(context, fobj, ipdAncestorBANotLA);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Margin.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Margin.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Margin.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -36,7 +36,7 @@
import org.foray.fotree.fo.obj.SimplePageMaster;
import org.foray.fotree.value.DtLength;
import org.foray.fotree.value.DtPercentage;
-import org.foray.fotree.value.Expr;
+import org.foray.fotree.value.ExprNumeric;
import org.foray.fotree.value.PropertyCollection;
import org.foray.fotree.value.PropertyKeyword;
import org.foray.fotree.value.PropertyValue;
@@ -81,8 +81,8 @@
return pv;
}
pv = standardParse(propertyList, value, false, false);
- if (pv instanceof Expr) {
- final Expr expression = (Expr) pv;
+ if (pv instanceof ExprNumeric) {
+ final ExprNumeric expression = (ExprNumeric) pv;
if (expression.canEvalUnitPower1()) {
return pv;
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RelativeSpace.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RelativeSpace.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RelativeSpace.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -36,7 +36,7 @@
import org.foray.fotree.value.DtLength;
import org.foray.fotree.value.DtPercentage;
import org.foray.fotree.value.DtSpace;
-import org.foray.fotree.value.Expr;
+import org.foray.fotree.value.ExprNumeric;
import org.foray.fotree.value.PropertyKeyword;
import org.foray.fotree.value.PropertyValue;
@@ -75,9 +75,9 @@
return pv;
}
pv = standardParse(propertyList, value, false, false);
- if (pv instanceof Expr) {
- final Expr expr = (Expr) pv;
- if (expr.unitPower() == 1) {
+ if (pv instanceof ExprNumeric) {
+ final ExprNumeric expr = (ExprNumeric) pv;
+ if (expr.canEvalUnitPower1()) {
return new DtSpace(expr, expr, expr, Constants.FOVAL_DISCARD,
0);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextIndent.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextIndent.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextIndent.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -35,7 +35,7 @@
import org.foray.fotree.PropertyList;
import org.foray.fotree.value.DtLength;
import org.foray.fotree.value.DtPercentage;
-import org.foray.fotree.value.Expr;
+import org.foray.fotree.value.ExprNumeric;
import org.foray.fotree.value.PropertyKeyword;
import org.foray.fotree.value.PropertyValue;
@@ -71,8 +71,8 @@
if (pv instanceof DtPercentage) {
return pv;
}
- if (pv instanceof Expr) {
- final Expr expression = (Expr) pv;
+ if (pv instanceof ExprNumeric) {
+ final ExprNumeric expression = (ExprNumeric) pv;
if (expression.canEvalUnitPower1()) {
return pv;
}
@@ -100,8 +100,8 @@
return Math.round(percentage * widthContainingBlock
/ WKConstants.PERCENT_CONVERSION);
}
- if (value() instanceof Expr) {
- final Expr expression = (Expr) value();
+ if (value() instanceof ExprNumeric) {
+ final ExprNumeric expression = (ExprNumeric) value();
return expression.evalUnitPower1(fobj.traitFontSize(context),
widthContainingBlock);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtAngle.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtAngle.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtAngle.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -156,11 +156,4 @@
return true;
}
- /**
- * {@inheritDoc}
- */
- public byte unitPower() {
- return -1;
- }
-
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtCharacter.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtCharacter.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtCharacter.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -51,11 +51,4 @@
return value;
}
- /**
- * {@inheritDoc}
- */
- public byte unitPower() {
- return -1;
- }
-
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtColor.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtColor.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtColor.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -570,11 +570,4 @@
return integralColor / divisor;
}
- /**
- * {@inheritDoc}
- */
- public byte unitPower() {
- return -1;
- }
-
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtCountry.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtCountry.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtCountry.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -77,11 +77,4 @@
return new DtCountry(countryCode);
}
- /**
- * {@inheritDoc}
- */
- public byte unitPower() {
- return -1;
- }
-
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtFrequency.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtFrequency.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtFrequency.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -110,11 +110,4 @@
}
}
- /**
- * {@inheritDoc}
- */
- public byte unitPower() {
- return -1;
- }
-
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtInteger.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtInteger.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtInteger.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -111,4 +111,18 @@
return this.value;
}
+ /**
+ * {@inheritDoc}
+ */
+ public boolean canEvalUnitPower1() {
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int evalUnitPower1(final int pointSize, final int percentBase) {
+ return Integer.MIN_VALUE;
+ }
+
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtKeep.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtKeep.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtKeep.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -83,11 +83,4 @@
return new DtKeep(Keep.AUTO, Keep.AUTO, Keep.AUTO);
}
- /**
- * {@inheritDoc}
- */
- public byte unitPower() {
- return -1;
- }
-
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtLanguage.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtLanguage.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtLanguage.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -69,11 +69,4 @@
return new DtLanguage(languageCode);
}
- /**
- * {@inheritDoc}
- */
- public byte unitPower() {
- return -1;
- }
-
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtLengthBPIPDirection.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtLengthBPIPDirection.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtLengthBPIPDirection.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -62,11 +62,4 @@
return this.ipdLength;
}
- /**
- * {@inheritDoc}
- */
- public byte unitPower() {
- return -1;
- }
-
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtLengthConditional.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtLengthConditional.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtLengthConditional.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -62,11 +62,4 @@
return this.conditionality;
}
- /**
- * {@inheritDoc}
- */
- public byte unitPower() {
- return -1;
- }
-
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtLengthRange.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtLengthRange.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtLengthRange.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -94,11 +94,4 @@
return false;
}
- /**
- * {@inheritDoc}
- */
- public byte unitPower() {
- return -1;
- }
-
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtName.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtName.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtName.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -67,11 +67,4 @@
return new DtName(input);
}
- /**
- * {@inheritDoc}
- */
- public byte unitPower() {
- return -1;
- }
-
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtNumber.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtNumber.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtNumber.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -84,4 +84,18 @@
return this.value;
}
+ /**
+ * {@inheritDoc}
+ */
+ public boolean canEvalUnitPower1() {
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int evalUnitPower1(final int pointSize, final int percentBase) {
+ return Integer.MIN_VALUE;
+ }
+
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtPercentage.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtPercentage.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtPercentage.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -88,8 +88,15 @@
/**
* {@inheritDoc}
*/
- public byte unitPower() {
- return -1;
+ public boolean canEvalUnitPower1() {
+ return false;
}
+ /**
+ * {@inheritDoc}
+ */
+ public int evalUnitPower1(final int pointSize, final int percentBase) {
+ return Integer.MIN_VALUE;
+ }
+
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtRectangle.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtRectangle.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtRectangle.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -162,11 +162,4 @@
}
}
- /**
- * {@inheritDoc}
- */
- public byte unitPower() {
- return -1;
- }
-
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtScript.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtScript.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtScript.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -187,11 +187,4 @@
return false;
}
- /**
- * {@inheritDoc}
- */
- public byte unitPower() {
- return -1;
- }
-
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtShadowEffect.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtShadowEffect.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtShadowEffect.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -141,11 +141,4 @@
blurRadius, color);
}
- /**
- * {@inheritDoc}
- */
- public byte unitPower() {
- return -1;
- }
-
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtSpace.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtSpace.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtSpace.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -50,21 +50,22 @@
Constants.FOVAL_FORCE,
};
- private Expr lengthMinimum;
- private Expr lengthOptimum;
- private Expr lengthMaximum;
+ private ExprNumeric lengthMinimum;
+ private ExprNumeric lengthOptimum;
+ private ExprNumeric lengthMaximum;
private short conditionality;
private int precedence;
/**
* Constructor.
*/
- public DtSpace(final Expr lengthMinimum, final Expr lengthOptimum,
- final Expr lengthMaximum, final short conditionality,
- final int precedence) throws PropertyException {
- if (lengthMinimum.unitPower() != 1
- || lengthOptimum.unitPower() != 1
- || lengthMaximum.unitPower() != 1) {
+ public DtSpace(final ExprNumeric lengthMinimum,
+ final ExprNumeric lengthOptimum, final ExprNumeric lengthMaximum,
+ final short conditionality, final int precedence)
+ throws PropertyException {
+ if (lengthMinimum.getLengthPower() != 1
+ || lengthOptimum.getLengthPower() != 1
+ || lengthMaximum.getLengthPower() != 1) {
throw new PropertyException("Invalid length");
}
this.lengthMinimum = lengthMinimum;
@@ -169,11 +170,4 @@
return false;
}
- /**
- * {@inheritDoc}
- */
- public byte unitPower() {
- return UNIT_POWER_LENGTH;
- }
-
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtString.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtString.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtString.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -51,11 +51,4 @@
return value;
}
- /**
- * {@inheritDoc}
- */
- public byte unitPower() {
- return -1;
- }
-
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtTextDeco.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtTextDeco.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtTextDeco.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -107,11 +107,4 @@
this.isUnderlined = isUnderlined;
}
- /**
- * {@inheritDoc}
- */
- public byte unitPower() {
- return -1;
- }
-
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtTime.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtTime.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtTime.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -111,11 +111,4 @@
}
}
- /**
- * {@inheritDoc}
- */
- public byte unitPower() {
- return -1;
- }
-
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtURI.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtURI.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtURI.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -88,11 +88,4 @@
return tokenizedList;
}
- /**
- * {@inheritDoc}
- */
- public byte unitPower() {
- return -1;
- }
-
}
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 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtWritingMode.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -684,11 +684,4 @@
return -1;
}
- /**
- * {@inheritDoc}
- */
- public byte unitPower() {
- return -1;
- }
-
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/Expr.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/Expr.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/Expr.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -40,40 +40,4 @@
public static final byte OPERATION_MOD = '%';
public static final byte OPERATION_NEGATION = '-';
- public static final byte UNIT_POWER_NON_NUMERIC = -1;
- public static final byte UNIT_POWER_NUMERIC = 0;
- public static final byte UNIT_POWER_LENGTH = 1;
- public static final byte UNIT_POWER_AREA = 2;
-
- /**
- * Returns the unit power for this expression.
- * Unit power is the number of dimensions to which a numeric item applies.
- * Lengths have a unit power of 1, areas have a unit power of 2.
- * Valid values are {@link #UNIT_POWER_NON_NUMERIC},
- * {@link #UNIT_POWER_NUMERIC}, {@link #UNIT_POWER_LENGTH},
- * {@link #UNIT_POWER_AREA}.
- * @return The unit power to which this expression evaluates.
- */
- public abstract byte unitPower();
-
- /**
- * Indicates whether this expression can be evaluated to a unit power = 1
- * (length) or not.
- * @return True if the expression can be evaluated to a unit power of 1
- * (length).
- */
- public boolean canEvalUnitPower1() {
- return false;
- }
-
- /**
- * Evaluates the expression to a unit power of 1 (length).
- * This superclass method always returns 0, so subclasses that can return a
- * length must override this method.
- * @return The unit power 1 value (length) of this expression.
- */
- public int evalUnitPower1(final int pointSize, final int percentBase) {
- return 0;
- }
-
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprAdditiveOper.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprAdditiveOper.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprAdditiveOper.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -33,7 +33,7 @@
/**
* Class for handling AdditiveExpr.
*/
-public class ExprAdditiveOper extends ExprAdditive {
+public class ExprAdditiveOper extends ExprAdditive implements ExprNumeric {
private ExprAdditive operand1;
private ExprMultiplicative operand2;
@@ -42,12 +42,12 @@
public ExprAdditiveOper(final ExprAdditive operand1,
final ExprMultiplicative operand2,
final byte operation) throws PropertyException {
- if (operand1.unitPower() < 0) {
+ if (! (operand1 instanceof ExprNumeric)) {
throw new PropertyException("AdditiveExpr: Non-numeric operand: "
+ operand1.toString());
}
this.operand1 = operand1;
- if (operand2.unitPower() < 0) {
+ if (! (operand2 instanceof ExprNumeric)) {
throw new PropertyException("AdditiveExpr: Non-numeric operand: "
+ operand2.toString());
}
@@ -56,7 +56,8 @@
* For Additive Expressions, the unitPower of the two operands must
* be equal. See XSL-FO Specification 1.0, Section 5.9.6.
*/
- if (operand1.unitPower() != operand2.unitPower()) {
+ if (((ExprNumeric) operand1).getLengthPower()
+ != ((ExprNumeric) operand2).getLengthPower()) {
throw new PropertyException("AdditiveExpr: Unit powers differ: "
+ operand1.toString() + ", " + operand2.toString());
}
@@ -69,10 +70,9 @@
}
public boolean canEvalUnitPower1() {
- if (operand1.canEvalUnitPower1() && operand2.canEvalUnitPower1()) {
- return true;
- }
- return false;
+ /* In the constructor, we have already tested the equality of the
+ * operands unit power. Therefore, we can just evaluate one here. */
+ return ((ExprNumeric) operand1).canEvalUnitPower1();
}
public int evalUnitPower1(final int pointSize, final int percentBase) {
@@ -81,12 +81,12 @@
}
switch (operation) {
case Expr.OPERATION_ADD: {
- return operand1.evalUnitPower1(pointSize, percentBase)
- + operand2.evalUnitPower1(pointSize, percentBase);
+ return getOperand1Length(pointSize, percentBase)
+ + getOperand2Length(pointSize, percentBase);
}
case Expr.OPERATION_SUBTRACT: {
- return operand1.evalUnitPower1(pointSize, percentBase)
- - operand2.evalUnitPower1(pointSize, percentBase);
+ return getOperand1Length(pointSize, percentBase)
+ - getOperand2Length(pointSize, percentBase);
}
}
return 0;
@@ -95,10 +95,41 @@
/**
* {@inheritDoc}
*/
- public byte unitPower() {
+ public byte getLengthPower() {
/* We already tested that the unit powers were equal at construction,
* so all we need to do here is return one of them. */
- return operand1.unitPower();
+ return ((ExprNumeric) operand1).getLengthPower();
}
+ public double getOperand1Value() {
+ return ((ExprNumeric) operand1).getNumericValue();
+ }
+
+ public double getOperand2Value() {
+ return ((ExprNumeric) operand2).getNumericValue();
+ }
+
+ public int getOperand1Length(final int pointSize, final int percentBase) {
+ return ((ExprNumeric) operand1).evalUnitPower1(pointSize, percentBase);
+ }
+
+ public int getOperand2Length(final int pointSize, final int percentBase) {
+ return ((ExprNumeric) operand2).evalUnitPower1(pointSize, percentBase);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public double getNumericValue() {
+ switch (operation) {
+ case Expr.OPERATION_ADD: {
+ return getOperand1Value() + getOperand2Value();
+ }
+ case Expr.OPERATION_SUBTRACT: {
+ return getOperand1Value() - getOperand2Value();
+ }
+ }
+ return 0;
+ }
+
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprInner.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprInner.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprInner.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -41,15 +41,8 @@
this.enclosedExpression = expression;
}
- public boolean canEvalUnitPower1() {
- if (enclosedExpression.canEvalUnitPower1()) {
- return true;
- }
- return false;
+ public ExprAdditive getEnclosedExpression() {
+ return this.enclosedExpression;
}
- public byte unitPower() {
- return this.enclosedExpression.unitPower();
- }
-
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprMultiplicativeOper.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprMultiplicativeOper.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprMultiplicativeOper.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -33,7 +33,8 @@
/**
*
*/
-public class ExprMultiplicativeOper extends ExprMultiplicative {
+public class ExprMultiplicativeOper extends ExprMultiplicative
+ implements ExprNumeric {
private ExprMultiplicative operand1;
private ExprUnary operand2;
@@ -57,7 +58,8 @@
* be equal. See XSL-FO Specification 1.0, Section 5.9.6.
*/
if (operation == Expr.OPERATION_MOD
- && operand1.unitPower() != operand2.unitPower()) {
+ && ((ExprNumeric) operand1).getLengthPower()
+ != ((ExprNumeric) operand2).getLengthPower()) {
throw new PropertyException("Modulo Operator: Unit powers differ: "
+ operand1.toString() + ", " + operand2.toString());
}
@@ -71,7 +73,8 @@
}
public boolean canEvalUnitPower1() {
- if (operand1.canEvalUnitPower1() || operand2.canEvalUnitPower1()) {
+ if (((ExprNumeric) operand1).canEvalUnitPower1()
+ || ((ExprNumeric) operand2).canEvalUnitPower1()) {
return true;
}
return false;
@@ -84,8 +87,8 @@
// Compute raw value for operand1
double rawOperand1 = 0;
- if (operand1.unitPower() == 1) {
- rawOperand1 = operand1.evalUnitPower1(pointSize, percentBase);
+ if (getOperand1UnitPower() == 1) {
+ rawOperand1 = getOperand1Length(pointSize, percentBase);
} else {
/* Cast verified during construction. */
rawOperand1 = ((ExprNumeric) operand1).getNumericValue();
@@ -93,8 +96,8 @@
// Compute raw value for operand2
double rawOperand2 = 0;
- if (operand2.unitPower() == 1) {
- rawOperand2 = operand2.evalUnitPower1(pointSize, percentBase);
+ if (getOperand2UnitPower() == 1) {
+ rawOperand2 = getOperand2Length(pointSize, percentBase);
} else {
rawOperand2 = ((ExprNumeric) operand2).getNumericValue();
}
@@ -117,10 +120,34 @@
return (int) Math.round(rawValue);
}
+ public double getOperand1Value() {
+ return ((ExprNumeric) operand1).getNumericValue();
+ }
+
+ public double getOperand2Value() {
+ return ((ExprNumeric) operand2).getNumericValue();
+ }
+
+ public byte getOperand1UnitPower() {
+ return ((ExprNumeric) operand1).getLengthPower();
+ }
+
+ public byte getOperand2UnitPower() {
+ return ((ExprNumeric) operand2).getLengthPower();
+ }
+
+ public int getOperand1Length(final int pointSize, final int percentBase) {
+ return ((ExprNumeric) operand1).evalUnitPower1(pointSize, percentBase);
+ }
+
+ public int getOperand2Length(final int pointSize, final int percentBase) {
+ return ((ExprNumeric) operand2).evalUnitPower1(pointSize, percentBase);
+ }
+
/**
* {@inheritDoc}
*/
- public byte unitPower() {
+ public byte getLengthPower() {
/* For multiplication, the unit power of the product is the sum
* of the unit powers of the operands.
* For example, 3 meters * 5 = 15 meters.
@@ -128,7 +155,26 @@
* of 0.
* 1 + 0 = 1, which is intuitively correct, because our product is in
* meters, which has a unit power of 1.*/
- return (byte) (operand1.unitPower() + operand2.unitPower());
+ return (byte) (((ExprNumeric) operand1).getLengthPower()
+ + ((ExprNumeric) operand2).getLengthPower());
}
+ /**
+ * {@inheritDoc}
+ */
+ public double getNumericValue() {
+ switch (operation) {
+ case Expr.OPERATION_MULTIPLY: {
+ return getOperand1Value() * getOperand2Value();
+ }
+ case Expr.OPERATION_DIVIDE: {
+ return getOperand1Value() / getOperand2Value();
+ }
+ case Expr.OPERATION_MOD: {
+ return getOperand1Value() % getOperand2Value();
+ }
+ }
+ return 0;
+ }
+
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprNumeric.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprNumeric.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprNumeric.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -35,6 +35,11 @@
*/
public interface ExprNumeric {
+ byte UNIT_POWER_NON_NUMERIC = -1;
+ byte UNIT_POWER_NUMERIC = 0;
+ byte UNIT_POWER_LENGTH = 1;
+ byte UNIT_POWER_AREA = 2;
+
/**
* Return the numeric value of "this".
* @return A double representation of the value of "this". Type "double" is
@@ -52,8 +57,24 @@
* inches) would, we suppose, have a length power of 2, and one referring to
* volume (e.g. cubic feet) would, we suppose have a length power of 3.
* @return The number of spatial dimensions in which this numeric item
- * operates. For XSL-FO items, this should be either 0 or 1.
+ * operates. For XSL-FO items, this should be either
+ * {@link #UNIT_POWER_NUMERIC} or {@link #UNIT_POWER_LENGTH}.
*/
byte getLengthPower();
+ /**
+ * Indicates whether this expression can be evaluated to a unit power = 1
+ * (length) or not.
+ * @return True if the expression can be evaluated to a unit power of 1
+ * (length).
+ */
+ boolean canEvalUnitPower1();
+
+ /**
+ * Evaluates the expression to a unit power of 1 (length).
+ * @return The unit power 1 value (length) of this expression if the
+ * expression can be so evaluated, or {@link Integer#MIN_VALUE} otherwise.
+ */
+ int evalUnitPower1(final int pointSize, final int percentBase);
+
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprUnaryOper.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprUnaryOper.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprUnaryOper.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -33,14 +33,14 @@
/**
*
*/
-public class ExprUnaryOper extends ExprUnary {
+public class ExprUnaryOper extends ExprUnary implements ExprNumeric {
private ExprUnary operand1;
private byte operation;
public ExprUnaryOper(final ExprUnary operand1, final byte operation)
throws PropertyException {
- if (operand1.unitPower() < 0) {
+ if (! (operand1 instanceof ExprNumeric)) {
throw new PropertyException("UnaryExpr: Non-numeric operand: "
+ operand1.toString());
}
@@ -53,7 +53,7 @@
}
public boolean canEvalUnitPower1() {
- if (operand1.canEvalUnitPower1()) {
+ if (((ExprNumeric) operand1).canEvalUnitPower1()) {
return true;
}
return false;
@@ -65,8 +65,8 @@
}
switch (operation) {
case ExprAdditive.OPERATION_NEGATION: {
- return operand1.evalUnitPower1(pointSize, percentBase)
- * -1;
+ return ((ExprNumeric) operand1).evalUnitPower1(pointSize,
+ percentBase) * -1;
}
}
return 0;
@@ -75,8 +75,15 @@
/**
* {@inheritDoc}
*/
- public byte unitPower() {
- return this.operand1.unitPower();
+ public byte getLengthPower() {
+ return ((ExprNumeric) this.operand1).getLengthPower();
}
+ public double getNumericValue() {
+ if (operation == Expr.OPERATION_NEGATION) {
+ return ((ExprNumeric) this.operand1).getNumericValue() * -1;
+ }
+ return 0;
+ }
+
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnAbs.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnAbs.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnAbs.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -64,11 +64,4 @@
return new DtNumber(value);
}
- /**
- * {@inheritDoc}
- */
- public byte unitPower() {
- return -1;
- }
-
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnBodyStart.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnBodyStart.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnBodyStart.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -106,11 +106,4 @@
return lengthDT;
}
- /**
- * {@inheritDoc}
- */
- public byte unitPower() {
- return -1;
- }
-
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnCeiling.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnCeiling.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnCeiling.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -62,11 +62,4 @@
return new DtNumber(value);
}
- /**
- * {@inheritDoc}
- */
- public byte unitPower() {
- return -1;
- }
-
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnFloor.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnFloor.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnFloor.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -61,11 +61,4 @@
return new DtNumber(value);
}
- /**
- * {@inheritDoc}
- */
- public byte unitPower() {
- return -1;
- }
-
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnFromParent.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnFromParent.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnFromParent.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -105,11 +105,4 @@
return ps.value();
}
- /**
- * {@inheritDoc}
- */
- public byte unitPower() {
- return -1;
- }
-
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnFromTableColumn.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnFromTableColumn.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnFromTableColumn.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -78,11 +78,4 @@
+ "'from-table-column'");
}
- /**
- * {@inheritDoc}
- */
- public byte unitPower() {
- return -1;
- }
-
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnInheritedProp.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnInheritedProp.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnInheritedProp.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -96,11 +96,4 @@
return ps.value();
}
- /**
- * {@inheritDoc}
- */
- public byte unitPower() {
- return -1;
- }
-
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnLabelEnd.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnLabelEnd.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnLabelEnd.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -113,11 +113,4 @@
return lengthDT;
}
- /**
- * {@inheritDoc}
- */
- public byte unitPower() {
- return -1;
- }
-
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnMax.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnMax.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnMax.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -66,11 +66,4 @@
return new DtNumber(value);
}
- /**
- * {@inheritDoc}
- */
- public byte unitPower() {
- return -1;
- }
-
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnMin.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnMin.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnMin.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -68,11 +68,4 @@
return new DtNumber(value);
}
- /**
- * {@inheritDoc}
- */
- public byte unitPower() {
- return -1;
- }
-
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnNearestSpecProp.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnNearestSpecProp.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnNearestSpecProp.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -96,11 +96,4 @@
return ps.value();
}
- /**
- * {@inheritDoc}
- */
- public byte unitPower() {
- return -1;
- }
-
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnProportionalColWidth.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnProportionalColWidth.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnProportionalColWidth.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -88,11 +88,4 @@
return (ExprNumeric) getArgs()[0];
}
- /**
- * {@inheritDoc}
- */
- public byte unitPower() {
- return -1;
- }
-
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnRGB.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnRGB.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnRGB.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -103,11 +103,4 @@
return eval();
}
- /**
- * {@inheritDoc}
- */
- public byte unitPower() {
- return -1;
- }
-
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnRound.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnRound.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnRound.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -65,11 +65,4 @@
return new DtInteger((int) value);
}
- /**
- * {@inheritDoc}
- */
- public byte unitPower() {
- return -1;
- }
-
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/PropertyKeyword.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/PropertyKeyword.java 2006-10-27 00:10:48 UTC (rev 8431)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/PropertyKeyword.java 2006-10-27 01:10:40 UTC (rev 8432)
@@ -44,11 +44,4 @@
return value;
}
- /**
- * {@inheritDoc}
- */
- public byte unitPower() {
- return -1;
- }
-
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|