|
From: <vic...@us...> - 2022-12-25 15:36:49
|
Revision: 12952
http://sourceforge.net/p/foray/code/12952
Author: victormote
Date: 2022-12-25 15:36:46 +0000 (Sun, 25 Dec 2022)
Log Message:
-----------
Simplify API for parseElement().
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java 2022-12-25 03:30:06 UTC (rev 12951)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java 2022-12-25 15:36:46 UTC (rev 12952)
@@ -337,7 +337,7 @@
* Parse the attributes/properties first, as they are independent of the elements/objects.
* Parsing the properties is much easier and cleaner if we just parse them first, and don't worry about any
* validation tasks until we join them up with the object to which they will be attached. */
- final PropertyList list = nativeNamespace.parseAttributes(attlist, this);
+ final PropertyList propertyList = nativeNamespace.parseAttributes(attlist, this);
/* Now parse the element/object itself. Root gets handled specially because it doesn't have an FoObj
@@ -345,7 +345,7 @@
if (this.currentFObj == null) {
if (NamespaceFo.getInstance() == nativeNamespace
&& "root".equals(localName)) {
- final Root4a root = new Root4a(foTree, list);
+ final Root4a root = new Root4a(foTree, propertyList);
foTree.setRootFo(root);
fobj = root;
} else {
@@ -353,7 +353,7 @@
throw new SAXException("The first element parsed must be: " + qname.toString());
}
} else {
- fobj = nativeNamespace.parseElement(localName, this.currentFObj, list, getLocator(), this);
+ fobj = nativeNamespace.parseElement(localName, this.currentFObj, propertyList, this);
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java 2022-12-25 03:30:06 UTC (rev 12951)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java 2022-12-25 15:36:46 UTC (rev 12952)
@@ -38,7 +38,6 @@
import org.axsl.fotree.FoTreeException;
import org.xml.sax.Attributes;
-import org.xml.sax.Locator;
/**
* Abstract superclass for {@link Namespace} instances whose members are parsed as native objects in the FO tree.
@@ -68,13 +67,12 @@
* @param localName The local name of the element.
* @param currentFObj The current FoObj, that is, the parent of the one being parsed.
* @param list The property list into which properties for the new FoObj should be placed.
- * @param locator The SAX locator.
* @param errorHandler Object that wants to be notified if an element unknown to this Namespace is encountered.
* @return The newly-created FoObj instance.
* @throws FoTreeException For parsing errors.
*/
public FoObj parseElement(final String localName, final FoObj currentFObj, final PropertyList list,
- final Locator locator, final ErrorHandler errorHandler) throws FoTreeException {
+ final ErrorHandler errorHandler) throws FoTreeException {
final FoObj fobj = parseElementForNS(localName, currentFObj, list);
if (fobj == null
&& errorHandler != null) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-12-28 03:04:02
|
Revision: 12969
http://sourceforge.net/p/foray/code/12969
Author: victormote
Date: 2022-12-28 03:03:56 +0000 (Wed, 28 Dec 2022)
Log Message:
-----------
Convert PropertyParser to a true singleton.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/AbstractAxslProperty.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/AbstractFoProperty.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/parse/PropertyParser.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/AbstractXmlProperty.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/AbstractAxslProperty.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/AbstractAxslProperty.java 2022-12-28 02:42:12 UTC (rev 12968)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/AbstractAxslProperty.java 2022-12-28 03:03:56 UTC (rev 12969)
@@ -55,7 +55,7 @@
if (pv != null) {
return pv;
}
- pv = PropertyParser.parse(rawPropertyValue, this.getPropertyType());
+ pv = PropertyParser.getInstance().parse(rawPropertyValue, this.getPropertyType());
return pv;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/AbstractFoProperty.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/AbstractFoProperty.java 2022-12-28 02:42:12 UTC (rev 12968)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/AbstractFoProperty.java 2022-12-28 03:03:56 UTC (rev 12969)
@@ -78,7 +78,7 @@
if (pv != null) {
return pv;
}
- return PropertyParser.parse(rawPropertyValue, this.getPropertyType());
+ return PropertyParser.getInstance().parse(rawPropertyValue, this.getPropertyType());
}
/**
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/parse/PropertyParser.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/parse/PropertyParser.java 2022-12-28 02:42:12 UTC (rev 12968)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/parse/PropertyParser.java 2022-12-28 03:03:56 UTC (rev 12969)
@@ -54,20 +54,28 @@
import java.util.List;
/**
- * Class to parse XSL-FO property expressions.
+ * Parses an XSL-FO property expressions.
* This class is heavily based on the expression parser in James Clark's XT, an XSLT processor.
+ * This class maintains no state of its own, and gets a new {@link PropertyTokenizer} for each parse task, so we think
+ * this class should be thread-safe.
*/
public final class PropertyParser {
- /** The tokenizer. */
- private PropertyTokenizer tokenizer;
+ /** The singleton instance of this class. */
+ private static PropertyParser theInstance = new PropertyParser();
/**
- * Private constructor. Called by the static parse() method.
- * @param expression The XML attribute which will be parsed.
+ * Private constructor.
+ * Use {@link #getInstance()} to obtain the singleton instance of this class.
*/
- private PropertyParser(final String expression) {
- this.tokenizer = new PropertyTokenizer(expression);
+ private PropertyParser() { }
+
+ /**
+ * Returns the singleton instance of this class.
+ * @return The singleton instance of this class.
+ */
+ public static PropertyParser getInstance() {
+ return theInstance;
}
/**
@@ -78,9 +86,9 @@
* @return A PropertyValue instance holding the parsed result.
* @throws PropertyException If the "expr" cannot be parsed as a Property.
*/
- public static PropertyValue parse(final String expr, final PropertyId propertyType) throws PropertyException {
- final PropertyParser parser = new PropertyParser(expr);
- PropertyValue pv = parser.parseProperty(propertyType);
+ public PropertyValue parse(final String expr, final PropertyId propertyType) throws PropertyException {
+ final PropertyTokenizer tokenizer = new PropertyTokenizer(expr);
+ PropertyValue pv = parseProperty(tokenizer, propertyType);
if (pv == null) {
pv = new DtString(expr);
}
@@ -90,19 +98,21 @@
/**
* Parse the property expression described in the instance variables.
* Note: If the property expression String is empty, a StringProperty object holding an empty String is returned.
+ * @param tokenizer The PropertyTokenizer.
* @param propertyType The property type for which the value is being parsed.
* @return A Property object holding the parsed result.
* @throws PropertyException If the "expr" cannot be parsed as a Property.
*/
- private PropertyValue parseProperty(final PropertyId propertyType) throws PropertyException {
- this.tokenizer.next();
- if (this.tokenizer.getCurrentToken() == PropertyTokenizer.Token.EOF) {
+ private PropertyValue parseProperty(final PropertyTokenizer tokenizer, final PropertyId propertyType)
+ throws PropertyException {
+ tokenizer.next();
+ if (tokenizer.getCurrentToken() == PropertyTokenizer.Token.EOF) {
// if prop value is empty string, force to StringProperty
return new DtString("");
}
while (true) {
- final PropertyValue prop = parseAdditiveExpr(propertyType);
- if (this.tokenizer.getCurrentToken() == PropertyTokenizer.Token.EOF) {
+ final PropertyValue prop = parseAdditiveExpr(tokenizer, propertyType);
+ if (tokenizer.getCurrentToken() == PropertyTokenizer.Token.EOF) {
return prop;
}
/* If what is parsed so far is not numeric, it cannot be a part of
@@ -116,24 +126,25 @@
/**
* Parse an addition or subtraction expression.
+ * @param tokenizer The PropertyTokenizer.
* @param propertyType The property type for which the value is being parsed.
* @return The expression parsed.
* @throws PropertyException For errors parsing the expression.
*/
- private ExprAdditive parseAdditiveExpr(final PropertyId propertyType) throws PropertyException {
+ private ExprAdditive parseAdditiveExpr(final PropertyTokenizer tokenizer, final PropertyId propertyType)
+ throws PropertyException {
// Evaluate and put result on the operand stack
- ExprAdditive prop = parseMultiplicativeExpr(propertyType);
+ ExprAdditive prop = parseMultiplicativeExpr(tokenizer, propertyType);
loop:
for (;;) {
- switch (this.tokenizer.getCurrentToken()) {
+ switch (tokenizer.getCurrentToken()) {
case PLUS:
- this.tokenizer.next();
- prop = evalAddition(prop, parseMultiplicativeExpr(propertyType));
+ tokenizer.next();
+ prop = evalAddition(prop, parseMultiplicativeExpr(tokenizer, propertyType));
break;
case MINUS:
- this.tokenizer.next();
- prop =
- evalSubtraction(prop, parseMultiplicativeExpr(propertyType));
+ tokenizer.next();
+ prop = evalSubtraction(prop, parseMultiplicativeExpr(tokenizer, propertyType));
break;
default:
break loop;
@@ -144,27 +155,28 @@
/**
* Parse a multiply, divide or modulo expression.
+ * @param tokenizer The PropertyTokenizer.
* @param propertyType The property type for which the value is being parsed.
* @return The expression parsed.
* @throws PropertyException For errors parsing the expression.
*/
- private ExprMultiplicative parseMultiplicativeExpr(final PropertyId propertyType)
+ private ExprMultiplicative parseMultiplicativeExpr(final PropertyTokenizer tokenizer, final PropertyId propertyType)
throws PropertyException {
- ExprMultiplicative prop = parseUnaryExpr(propertyType);
+ ExprMultiplicative prop = parseUnaryExpr(tokenizer, propertyType);
loop:
for (;;) {
- switch (this.tokenizer.getCurrentToken()) {
+ switch (tokenizer.getCurrentToken()) {
case DIV:
- this.tokenizer.next();
- prop = evalDivide(prop, parseUnaryExpr(propertyType));
+ tokenizer.next();
+ prop = evalDivide(prop, parseUnaryExpr(tokenizer, propertyType));
break;
case MOD:
- this.tokenizer.next();
- prop = evalModulo(prop, parseUnaryExpr(propertyType));
+ tokenizer.next();
+ prop = evalModulo(prop, parseUnaryExpr(tokenizer, propertyType));
break;
case MULTIPLY:
- this.tokenizer.next();
- prop = evalMultiply(prop, parseUnaryExpr(propertyType));
+ tokenizer.next();
+ prop = evalMultiply(prop, parseUnaryExpr(tokenizer, propertyType));
break;
default:
break loop;
@@ -175,30 +187,31 @@
/**
* Parse a unary minus expression.
+ * @param tokenizer The PropertyTokenizer.
* @param propertyType The property type for which the value is being parsed.
* @return The expression parsed.
* @throws PropertyException For errors parsing the expression.
*/
- private ExprUnary parseUnaryExpr(final PropertyId propertyType) throws PropertyException {
- if (this.tokenizer.getCurrentToken() == PropertyTokenizer.Token.MINUS) {
- this.tokenizer.next();
- return evalNegate(parseUnaryExpr(propertyType));
+ private ExprUnary parseUnaryExpr(final PropertyTokenizer tokenizer, final PropertyId propertyType)
+ throws PropertyException {
+ if (tokenizer.getCurrentToken() == PropertyTokenizer.Token.MINUS) {
+ tokenizer.next();
+ return evalNegate(parseUnaryExpr(tokenizer, propertyType));
}
- return parsePrimaryExpr(propertyType);
+ return parsePrimaryExpr(tokenizer, propertyType);
}
/**
- * Checks that the current token is a right parenthesis and throws an
- * exception if this isn't the case.
- * @throws PropertyException If the current token is not a right
- * parenthesis.
+ * Checks that the current token is a right parenthesis and throws an exception if this isn't the case.
+ * @param tokenizer The PropertyTokenizer.
+ * @throws PropertyException If the current token is not a right parenthesis.
*/
- private void expectRpar() throws PropertyException {
- if (this.tokenizer.getCurrentToken() != PropertyTokenizer.Token.RPAR) {
+ private void expectRpar(final PropertyTokenizer tokenizer) throws PropertyException {
+ if (tokenizer.getCurrentToken() != PropertyTokenizer.Token.RPAR) {
throw new PropertyException("expected )");
}
- this.tokenizer.next();
+ tokenizer.next();
}
/**
@@ -205,43 +218,44 @@
* Parse a primary expression.
* A primary expression is either a parenthesized expression or an expression representing a primitive Property
* datatype, such as a string literal, an NCname, a number or a unit expression, or a function call expression.
+ * @param tokenizer The PropertyTokenizer.
* @param propertyType The property type for which the value is being parsed.
* @return The expression parsed.
* @throws PropertyException For errors parsing the expression.
*/
- private ExprPrimary parsePrimaryExpr(final PropertyId propertyType)
+ private ExprPrimary parsePrimaryExpr(final PropertyTokenizer tokenizer, final PropertyId propertyType)
throws PropertyException {
final ExprPrimary prop;
- final PropertyTokenizer.Token currentToken = this.tokenizer.getCurrentToken();
+ final PropertyTokenizer.Token currentToken = tokenizer.getCurrentToken();
switch (currentToken) {
case LPAR:
- this.tokenizer.next();
- prop = parseInnerExpression(propertyType);
- expectRpar();
+ tokenizer.next();
+ prop = parseInnerExpression(tokenizer, propertyType);
+ expectRpar(tokenizer);
return prop;
case LITERAL:
- prop = new DtString(this.tokenizer.getCurrentTokenValue());
+ prop = new DtString(tokenizer.getCurrentTokenValue());
break;
case NCNAME:
// Interpret this in context of the property or do it later?
- prop = new DtName(this.tokenizer.getCurrentTokenValue());
+ prop = new DtName(tokenizer.getCurrentTokenValue());
break;
case FLOAT:
- final double floatValue = Double.parseDouble(this.tokenizer.getCurrentTokenValue());
+ final double floatValue = Double.parseDouble(tokenizer.getCurrentTokenValue());
prop = new DtNumber(floatValue);
break;
case INTEGER:
- final int integerValue = Integer.parseInt(this.tokenizer.getCurrentTokenValue());
+ final int integerValue = Integer.parseInt(tokenizer.getCurrentTokenValue());
prop = new DtInteger(integerValue);
break;
case PERCENT:
- final String asString = this.tokenizer.getCurrentTokenValue().substring(
- 0, this.tokenizer.getCurrentTokenValue().length() - 1);
+ final String asString = tokenizer.getCurrentTokenValue().substring(
+ 0, tokenizer.getCurrentTokenValue().length() - 1);
final double pcval = Double.parseDouble(asString);
prop = new DtPercentage((float) pcval);
break;
@@ -248,9 +262,9 @@
case NUMERIC_WITH_UNITS:
// A number plus a valid unit name.
- final int numLen = this.tokenizer.getCurrentTokenValue().length() - this.tokenizer.getCurrentUnitLength();
- final String valuePart = this.tokenizer.getCurrentTokenValue().substring(0, numLen);
- final String unitPart = this.tokenizer.getCurrentTokenValue().substring(numLen);
+ final int numLen = tokenizer.getCurrentTokenValue().length() - tokenizer.getCurrentUnitLength();
+ final String valuePart = tokenizer.getCurrentTokenValue().substring(0, numLen);
+ final String unitPart = tokenizer.getCurrentTokenValue().substring(numLen);
final float value = Float.parseFloat(valuePart);
prop = new DtLength(value, unitPart);
break;
@@ -257,7 +271,7 @@
case COLORSPEC:
try {
- prop = DtColor.parseColorDescription(this.tokenizer.getCurrentTokenValue());
+ prop = DtColor.parseColorDescription(tokenizer.getCurrentTokenValue());
} catch (final PropertyException e) {
throw new PropertyException(e.getMessage());
}
@@ -264,12 +278,12 @@
break;
case FUNCTION_LPAR: {
- this.tokenizer.next();
- final String functionType = this.tokenizer.getCurrentTokenValue();
- final Expr[] functionArguments = parseArgs(propertyType);
+ tokenizer.next();
+ final String functionType = tokenizer.getCurrentTokenValue();
+ final Expr[] functionArguments = parseArgs(tokenizer, propertyType);
final Function function = Function.makeFunction(functionType, functionArguments, propertyType);
if (function == null) {
- throw new PropertyException("No such function: " + this.tokenizer.getCurrentTokenValue());
+ throw new PropertyException("No such function: " + tokenizer.getCurrentTokenValue());
}
return function;
}
@@ -276,18 +290,20 @@
default:
return null;
}
- this.tokenizer.next();
+ tokenizer.next();
return prop;
}
/**
* Parse an inner expression.
+ * @param tokenizer The PropertyTokenizer.
* @param propertyType The property type for which the value is being parsed.
* @return The expression parsed.
* @throws PropertyException For errors parsing the expression.
*/
- private ExprInner parseInnerExpression(final PropertyId propertyType) throws PropertyException {
- final ExprAdditive expr = parseAdditiveExpr(propertyType);
+ private ExprInner parseInnerExpression(final PropertyTokenizer tokenizer, final PropertyId propertyType)
+ throws PropertyException {
+ final ExprAdditive expr = parseAdditiveExpr(tokenizer, propertyType);
return new ExprInner(expr);
}
@@ -298,26 +314,27 @@
* This method does not care how many arguments the function is supposed to have.
* It simply parses them and passes them on.
* They can be counted and evaluated downstream.
+ * @param tokenizer The PropertyTokenizer.
* @param propertyType The property type for which the value is being parsed.
* @return An array of PropertyValue instances representing the arguments found.
* @throws PropertyException If the number of arguments found isn't equal to the number expected.
*/
- Expr[] parseArgs(final PropertyId propertyType) throws PropertyException {
+ Expr[] parseArgs(final PropertyTokenizer tokenizer, final PropertyId propertyType) throws PropertyException {
final List<PropertyValue> args = new ArrayList<PropertyValue>();
PropertyValue prop;
- if (this.tokenizer.getCurrentToken() == PropertyTokenizer.Token.RPAR) {
+ if (tokenizer.getCurrentToken() == PropertyTokenizer.Token.RPAR) {
// No args: func()
- this.tokenizer.next();
+ tokenizer.next();
} else {
while (true) {
- prop = parseAdditiveExpr(propertyType);
+ prop = parseAdditiveExpr(tokenizer, propertyType);
args.add(prop);
- if (this.tokenizer.getCurrentToken() != PropertyTokenizer.Token.COMMA) {
+ if (tokenizer.getCurrentToken() != PropertyTokenizer.Token.COMMA) {
break;
}
- this.tokenizer.next();
+ tokenizer.next();
}
- expectRpar();
+ expectRpar(tokenizer);
}
final Expr[] propertyArray = new Expr[args.size()];
args.toArray(propertyArray);
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/AbstractXmlProperty.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/AbstractXmlProperty.java 2022-12-28 02:42:12 UTC (rev 12968)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/AbstractXmlProperty.java 2022-12-28 03:03:56 UTC (rev 12969)
@@ -54,7 +54,7 @@
if (pv != null) {
return pv;
}
- pv = PropertyParser.parse(rawPropertyValue, getPropertyType());
+ pv = PropertyParser.getInstance().parse(rawPropertyValue, getPropertyType());
return pv;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-12-28 05:19:44
|
Revision: 12971
http://sourceforge.net/p/foray/code/12971
Author: victormote
Date: 2022-12-28 05:19:42 +0000 (Wed, 28 Dec 2022)
Log Message:
-----------
Minor improvements to property parsing.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdDominantBaseline.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnAbstractNamedProperty.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnFromNearestSpecifiedValue.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnFromPageMasterRegion.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnFromParent.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnFromTableColumn.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnInheritedPropertyValue.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnMergePropertyValues.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdDominantBaseline.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdDominantBaseline.java 2022-12-28 05:12:51 UTC (rev 12970)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdDominantBaseline.java 2022-12-28 05:19:42 UTC (rev 12971)
@@ -29,10 +29,13 @@
package org.foray.fotree.fo.prop;
import org.foray.fotree.FoObj;
+import org.foray.fotree.PropertyException;
import org.foray.fotree.fo.AbstractFoProperty;
import org.foray.fotree.fo.FoPropertyId;
import org.foray.fotree.fo.FoPropertyKeyword;
import org.foray.fotree.fo.FoValue;
+import org.foray.fotree.parse.PropertyParser;
+import org.foray.fotree.value.FnAbstractNamedProperty;
import org.foray.fotree.value.PropertyValue;
import org.axsl.fotree.FoContext;
@@ -114,6 +117,15 @@
}
/**
+ * Private constructor.
+ * To obtain an instance of this class, use {@link #getInstance(String)}.
+ * @param attributeValue The unparsed property value.
+ */
+ private PdDominantBaseline(final FnAbstractNamedProperty attributeValue) {
+ this.value = attributeValue;
+ }
+
+ /**
* Converts the unparsed property value into its parsed, storable value.
* @param value The unparsed property value.
* @return The instance of this property whose value is {@code value}, or null if it is not valid.
@@ -147,7 +159,24 @@
case "inherit":
return PdDominantBaseline.INHERIT;
default:
- return null;
+ try {
+ final PropertyValue parsedValue =
+ PropertyParser.getInstance().parse(value, FoPropertyId.DOMINANT_BASELINE);
+ if (parsedValue == null) {
+ return null;
+ }
+ if (! (parsedValue instanceof FnAbstractNamedProperty)) {
+ return null;
+ }
+ final FnAbstractNamedProperty named = (FnAbstractNamedProperty) parsedValue;
+ if (! (named.getPropertyType() == FoPropertyId.DOMINANT_BASELINE)
+ && ! (named.getPropertyType() == null)) {
+ return null;
+ }
+ return new PdDominantBaseline(named);
+ } catch (final PropertyException e) {
+ return null;
+ }
}
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnAbstractNamedProperty.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnAbstractNamedProperty.java 2022-12-28 05:12:51 UTC (rev 12970)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnAbstractNamedProperty.java 2022-12-28 05:19:42 UTC (rev 12971)
@@ -42,7 +42,7 @@
* Returns the property type to be operated on by the subclass.
* @return The property type operand.
*/
- protected abstract FoPropertyId getPropertyType();
+ public abstract FoPropertyId getPropertyType();
@Override
public boolean canEvalNumeric() {
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnFromNearestSpecifiedValue.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnFromNearestSpecifiedValue.java 2022-12-28 05:12:51 UTC (rev 12970)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnFromNearestSpecifiedValue.java 2022-12-28 05:19:42 UTC (rev 12971)
@@ -86,7 +86,7 @@
}
@Override
- protected FoPropertyId getPropertyType() {
+ public FoPropertyId getPropertyType() {
return this.operand;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnFromPageMasterRegion.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnFromPageMasterRegion.java 2022-12-28 05:12:51 UTC (rev 12970)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnFromPageMasterRegion.java 2022-12-28 05:19:42 UTC (rev 12971)
@@ -85,7 +85,7 @@
}
@Override
- protected FoPropertyId getPropertyType() {
+ public FoPropertyId getPropertyType() {
return this.operand;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnFromParent.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnFromParent.java 2022-12-28 05:12:51 UTC (rev 12970)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnFromParent.java 2022-12-28 05:19:42 UTC (rev 12971)
@@ -86,7 +86,7 @@
}
@Override
- protected FoPropertyId getPropertyType() {
+ public FoPropertyId getPropertyType() {
return this.operand;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnFromTableColumn.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnFromTableColumn.java 2022-12-28 05:12:51 UTC (rev 12970)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnFromTableColumn.java 2022-12-28 05:19:42 UTC (rev 12971)
@@ -83,7 +83,7 @@
}
@Override
- protected FoPropertyId getPropertyType() {
+ public FoPropertyId getPropertyType() {
return this.operand;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnInheritedPropertyValue.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnInheritedPropertyValue.java 2022-12-28 05:12:51 UTC (rev 12970)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnInheritedPropertyValue.java 2022-12-28 05:19:42 UTC (rev 12971)
@@ -86,7 +86,7 @@
}
@Override
- protected FoPropertyId getPropertyType() {
+ public FoPropertyId getPropertyType() {
return this.operand;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnMergePropertyValues.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnMergePropertyValues.java 2022-12-28 05:12:51 UTC (rev 12970)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnMergePropertyValues.java 2022-12-28 05:19:42 UTC (rev 12971)
@@ -85,7 +85,7 @@
}
@Override
- protected FoPropertyId getPropertyType() {
+ public FoPropertyId getPropertyType() {
return this.operand;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-12-28 19:17:23
|
Revision: 12972
http://sourceforge.net/p/foray/code/12972
Author: victormote
Date: 2022-12-28 19:17:20 +0000 (Wed, 28 Dec 2022)
Log Message:
-----------
Add some metadata to the property ID classes.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyId.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/AxslPropertyId.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/FoPropertyId.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/XmlPropertyId.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyId.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyId.java 2022-12-28 05:19:42 UTC (rev 12971)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyId.java 2022-12-28 19:17:20 UTC (rev 12972)
@@ -35,6 +35,21 @@
public interface PropertyId {
/**
+ * Enumeration of the various types of atomicity of properties.
+ */
+ enum Atomicity {
+
+ /** The property has a one-to-one relationship with traits. */
+ ATOMIC,
+
+ /** The property is a shorthand for more than one trait. */
+ SHORTHAND,
+
+ /** The property is a compound of more than one trait. */
+ COMPOUND
+ }
+
+ /**
* Returns the attribute name of this property as it appears in an XML input file.
* For example, an implementation might be an enum with an element called WRITING_MODE that was derived from an
* attribute named "writing-mode".
@@ -42,4 +57,16 @@
*/
String getAttributeName();
+ /**
+ * Returns the general atomicity of this property.
+ * @return The general atomicity of this property.
+ */
+ Atomicity getType();
+
+ /**
+ * Indicates whether this property is inherited or not.
+ * @return True if and only if this property is inherited.
+ */
+ boolean isInherited();
+
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/AxslPropertyId.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/AxslPropertyId.java 2022-12-28 05:19:42 UTC (rev 12971)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/AxslPropertyId.java 2022-12-28 19:17:20 UTC (rev 12972)
@@ -77,4 +77,14 @@
return AxslPropertyId.values()[ordinal];
}
+ @Override
+ public Atomicity getType() {
+ return Atomicity.ATOMIC;
+ }
+
+ @Override
+ public boolean isInherited() {
+ return false;
+ }
+
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/FoPropertyId.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/FoPropertyId.java 2022-12-28 05:19:42 UTC (rev 12971)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/FoPropertyId.java 2022-12-28 19:17:20 UTC (rev 12972)
@@ -40,825 +40,825 @@
public enum FoPropertyId implements PropertyId {
/** Constant indicating an "absolute-position" FO property. */
- ABSOLUTE_POSITION, // 0
+ ABSOLUTE_POSITION(Atomicity.ATOMIC, false), // 0
/** Constant indicating an "active-state" FO property. */
- ACTIVE_STATE, // 1
+ ACTIVE_STATE(Atomicity.ATOMIC, false), // 1
/** Constant indicating an "alignment-adjust" FO property. */
- ALIGNMENT_ADJUST, // 2
+ ALIGNMENT_ADJUST(Atomicity.ATOMIC, false), // 2
/** Constant indicating an "alignment-baseline" FO property. */
- ALIGNMENT_BASELINE, // 3
+ ALIGNMENT_BASELINE(Atomicity.ATOMIC, false), // 3
/** Constant indicating an "allowed-height-scale" FO property. */
- ALLOWED_HEIGHT_SCALE, // 4
+ ALLOWED_HEIGHT_SCALE(Atomicity.ATOMIC, true), // 4
/** Constant indicating an "allowed-width-scale" FO property. */
- ALLOWED_WIDTH_SCALE, // 5
+ ALLOWED_WIDTH_SCALE(Atomicity.ATOMIC, true), // 5
/** Constant indicating an "auto-restore" FO property. */
- AUTO_RESTORE, // 6
+ AUTO_RESTORE(Atomicity.ATOMIC, true), // 6
/** Constant indicating an "azimuth" FO property. */
- AZIMUTH, // 7
+ AZIMUTH(Atomicity.ATOMIC, true), // 7
/** Constant indicating a "background" FO property. */
- BACKGROUND, // 8
+ BACKGROUND(Atomicity.SHORTHAND, false), // 8
/** Constant indicating a "background-attachment" FO property. */
- BACKGROUND_ATTACHMENT, // 9
+ BACKGROUND_ATTACHMENT(Atomicity.ATOMIC, false), // 9
/** Constant indicating a "background-color" FO property. */
- BACKGROUND_COLOR, // 10
+ BACKGROUND_COLOR(Atomicity.ATOMIC, false), // 10
/** Constant indicating a "background-image" FO property. */
- BACKGROUND_IMAGE, // 11
+ BACKGROUND_IMAGE(Atomicity.ATOMIC, false), // 11
/** Constant indicating a "background-position" FO property. */
- BACKGROUND_POSITION, // 12
+ BACKGROUND_POSITION(Atomicity.SHORTHAND, false), // 12
/** Constant indicating a "background-position-horizontal" FO property. */
- BACKGROUND_POSITION_HORIZONTAL, // 13
+ BACKGROUND_POSITION_HORIZONTAL(Atomicity.ATOMIC, false), // 13
/** Constant indicating a "background-position-vertical" FO property. */
- BACKGROUND_POSITION_VERTICAL, // 14
+ BACKGROUND_POSITION_VERTICAL(Atomicity.ATOMIC, false), // 14
/** Constant indicating a "background-repeat" FO property. */
- BACKGROUND_REPEAT, // 15
+ BACKGROUND_REPEAT(Atomicity.ATOMIC, false), // 15
/** Constant indicating a "baseline-shift" FO property. */
- BASELINE_SHIFT, // 16
+ BASELINE_SHIFT(Atomicity.ATOMIC, false), // 16
/** Constant indicating a "blank-or-not-blank" FO property. */
- BLANK_OR_NOT_BLANK, // 17
+ BLANK_OR_NOT_BLANK(Atomicity.ATOMIC, false), // 17
/** Constant indicating a "block-progression-dimension" FO property. */
- BLOCK_PROGRESSION_DIMENSION, // 18
+ BLOCK_PROGRESSION_DIMENSION(Atomicity.ATOMIC, false), // 18
/** Constant indicating a "border" FO property. */
- BORDER, // 19
+ BORDER(Atomicity.SHORTHAND, false), // 19
/** Constant indicating a "border-after-color" FO property. */
- BORDER_AFTER_COLOR, // 20
+ BORDER_AFTER_COLOR(Atomicity.ATOMIC, false), // 20
/** Constant indicating a "border-after-precedence" FO property. */
- BORDER_AFTER_PRECEDENCE, // 21
+ BORDER_AFTER_PRECEDENCE(Atomicity.ATOMIC, false), // 21
/** Constant indicating a "border-after-style" FO property. */
- BORDER_AFTER_STYLE, // 22
+ BORDER_AFTER_STYLE(Atomicity.ATOMIC, false), // 22
/** Constant indicating a "border-after-width" FO property. */
- BORDER_AFTER_WIDTH, // 23
+ BORDER_AFTER_WIDTH(Atomicity.ATOMIC, false), // 23
/** Constant indicating a "border-before-color" FO property. */
- BORDER_BEFORE_COLOR, // 24
+ BORDER_BEFORE_COLOR(Atomicity.ATOMIC, false), // 24
/** Constant indicating a "border-before-precedence" FO property. */
- BORDER_BEFORE_PRECEDENCE, // 25
+ BORDER_BEFORE_PRECEDENCE(Atomicity.ATOMIC, false), // 25
/** Constant indicating a "border-before-style" FO property. */
- BORDER_BEFORE_STYLE, // 26
+ BORDER_BEFORE_STYLE(Atomicity.ATOMIC, false), // 26
/** Constant indicating a "border-before-width" FO property. */
- BORDER_BEFORE_WIDTH, // 27
+ BORDER_BEFORE_WIDTH(Atomicity.ATOMIC, false), // 27
/** Constant indicating a "border-bottom" FO property. */
- BORDER_BOTTOM, // 28
+ BORDER_BOTTOM(Atomicity.SHORTHAND, false), // 28
/** Constant indicating a "border-bottom-color" FO property. */
- BORDER_BOTTOM_COLOR, // 29
+ BORDER_BOTTOM_COLOR(Atomicity.ATOMIC, false), // 29
/** Constant indicating a "border-bottom-style" FO property. */
- BORDER_BOTTOM_STYLE, // 30
+ BORDER_BOTTOM_STYLE(Atomicity.ATOMIC, false), // 30
/** Constant indicating a "border-bottom-width" FO property. */
- BORDER_BOTTOM_WIDTH, // 31
+ BORDER_BOTTOM_WIDTH(Atomicity.ATOMIC, false), // 31
/** Constant indicating a "border-collapse" FO property. */
- BORDER_COLLAPSE, // 32
+ BORDER_COLLAPSE(Atomicity.ATOMIC, true), // 32
/** Constant indicating a "border-color" FO property. */
- BORDER_COLOR, // 33
+ BORDER_COLOR(Atomicity.SHORTHAND, false), // 33
/** Constant indicating a "border-end-color" FO property. */
- BORDER_END_COLOR, // 34
+ BORDER_END_COLOR(Atomicity.ATOMIC, false), // 34
/** Constant indicating a "border-end-precedence" FO property. */
- BORDER_END_PRECEDENCE, // 35
+ BORDER_END_PRECEDENCE(Atomicity.ATOMIC, false), // 35
/** Constant indicating a "border-end-style" FO property. */
- BORDER_END_STYLE, // 36
+ BORDER_END_STYLE(Atomicity.ATOMIC, false), // 36
/** Constant indicating a "border-end-width" FO property. */
- BORDER_END_WIDTH, // 37
+ BORDER_END_WIDTH(Atomicity.ATOMIC, false), // 37
/** Constant indicating a "border-left" FO property. */
- BORDER_LEFT, // 38
+ BORDER_LEFT(Atomicity.SHORTHAND, false), // 38
/** Constant indicating a "border-left-color" FO property. */
- BORDER_LEFT_COLOR, // 39
+ BORDER_LEFT_COLOR(Atomicity.ATOMIC, false), // 39
/** Constant indicating a "border-left-style" FO property. */
- BORDER_LEFT_STYLE, // 40
+ BORDER_LEFT_STYLE(Atomicity.ATOMIC, false), // 40
/** Constant indicating a "border-left-width" FO property. */
- BORDER_LEFT_WIDTH, // 41
+ BORDER_LEFT_WIDTH(Atomicity.ATOMIC, false), // 41
/** Constant indicating a "border-right" FO property. */
- BORDER_RIGHT, // 42
+ BORDER_RIGHT(Atomicity.SHORTHAND, false), // 42
/** Constant indicating a "border-right-color" FO property. */
- BORDER_RIGHT_COLOR, // 43
+ BORDER_RIGHT_COLOR(Atomicity.ATOMIC, false), // 43
/** Constant indicating a "border-right-style" FO property. */
- BORDER_RIGHT_STYLE, // 44
+ BORDER_RIGHT_STYLE(Atomicity.ATOMIC, false), // 44
/** Constant indicating a "border-right-width" FO property. */
- BORDER_RIGHT_WIDTH, // 45
+ BORDER_RIGHT_WIDTH(Atomicity.ATOMIC, false), // 45
/** Constant indicating a "border-separation" FO property. */
- BORDER_SEPARATION, // 46
+ BORDER_SEPARATION(Atomicity.ATOMIC, true), // 46
/** Constant indicating a "border-spacing" FO property. */
- BORDER_SPACING, // 47
+ BORDER_SPACING(Atomicity.SHORTHAND, true), // 47
/** Constant indicating a "border-start-color" FO property. */
- BORDER_START_COLOR, // 48
+ BORDER_START_COLOR(Atomicity.ATOMIC, false), // 48
/** Constant indicating a "border-start-precedence" FO property. */
- BORDER_START_PRECEDENCE, // 49
+ BORDER_START_PRECEDENCE(Atomicity.ATOMIC, false), // 49
/** Constant indicating a "border-start-style" FO property. */
- BORDER_START_STYLE, // 50
+ BORDER_START_STYLE(Atomicity.ATOMIC, false), // 50
/** Constant indicating a "border-start-width" FO property. */
- BORDER_START_WIDTH, // 51
+ BORDER_START_WIDTH(Atomicity.ATOMIC, false), // 51
/** Constant indicating a "border-style" FO property. */
- BORDER_STYLE, // 52
+ BORDER_STYLE(Atomicity.SHORTHAND, false), // 52
/** Constant indicating a "border-top" FO property. */
- BORDER_TOP, // 53
+ BORDER_TOP(Atomicity.SHORTHAND, false), // 53
/** Constant indicating a "border-top-color" FO property. */
- BORDER_TOP_COLOR, // 54
+ BORDER_TOP_COLOR(Atomicity.ATOMIC, false), // 54
/** Constant indicating a "border-top-style" FO property. */
- BORDER_TOP_STYLE, // 55
+ BORDER_TOP_STYLE(Atomicity.ATOMIC, false), // 55
/** Constant indicating a "border-top-width" FO property. */
- BORDER_TOP_WIDTH, // 56
+ BORDER_TOP_WIDTH(Atomicity.ATOMIC, false), // 56
/** Constant indicating a "border-width" FO property. */
- BORDER_WIDTH, // 57
+ BORDER_WIDTH(Atomicity.SHORTHAND, false), // 57
/** Constant indicating a "bottom" FO property. */
- BOTTOM, // 58
+ BOTTOM(Atomicity.ATOMIC, false), // 58
/** Constant indicating a "break-after" FO property. */
- BREAK_AFTER, // 59
+ BREAK_AFTER(Atomicity.ATOMIC, false), // 59
/** Constant indicating a "break-before" FO property. */
- BREAK_BEFORE, // 60
+ BREAK_BEFORE(Atomicity.ATOMIC, false), // 60
/** Constant indicating a "caption-side" FO property. */
- CAPTION_SIDE, // 61
+ CAPTION_SIDE(Atomicity.ATOMIC, true), // 61
/** Constant indicating a "case-name" FO property. */
- CASE_NAME, // 62
+ CASE_NAME(Atomicity.ATOMIC, false), // 62
/** Constant indicating a "case-title" FO property. */
- CASE_TITLE, // 63
+ CASE_TITLE(Atomicity.ATOMIC, false), // 63
/** Constant indicating a "change-bar-class" FO property. */
- CHANGE_BAR_CLASS, // 64
+ CHANGE_BAR_CLASS(Atomicity.ATOMIC, false), // 64
/** Constant indicating a "change-bar-color" FO property. */
- CHANGE_BAR_COLOR, // 65
+ CHANGE_BAR_COLOR(Atomicity.ATOMIC, true), // 65
/** Constant indicating a "change-bar-offset" FO property. */
- CHANGE_BAR_OFFSET, // 66
+ CHANGE_BAR_OFFSET(Atomicity.ATOMIC, true), // 66
/** Constant indicating a "change-bar-placement" FO property. */
- CHANGE_BAR_PLACEMENT, // 67
+ CHANGE_BAR_PLACEMENT(Atomicity.ATOMIC, true), // 67
/** Constant indicating a "change-bar-style" FO property. */
- CHANGE_BAR_STYLE, // 68
+ CHANGE_BAR_STYLE(Atomicity.ATOMIC, true), // 68
/** Constant indicating a "change-bar-width" FO property. */
- CHANGE_BAR_WIDTH, // 69
+ CHANGE_BAR_WIDTH(Atomicity.ATOMIC, true), // 69
/** Constant indicating a "character" FO property. */
- CHARACTER, // 70
+ CHARACTER(Atomicity.ATOMIC, false), // 70
/** Constant indicating a "clear" FO property. */
- CLEAR, // 71
+ CLEAR(Atomicity.ATOMIC, false), // 71
/** Constant indicating a "clip" FO property. */
- CLIP, // 72
+ CLIP(Atomicity.ATOMIC, false), // 72
/** Constant indicating a "color" FO property. */
- COLOR, // 73
+ COLOR(Atomicity.ATOMIC, true), // 73
/** Constant indicating a "color-profile-name" FO property. */
- COLOR_PROFILE_NAME, // 74
+ COLOR_PROFILE_NAME(Atomicity.ATOMIC, false), // 74
/** Constant indicating a "column-count" FO property. */
- COLUMN_COUNT, // 75
+ COLUMN_COUNT(Atomicity.ATOMIC, false), // 75
/** Constant indicating a "column-gap" FO property. */
- COLUMN_GAP, // 76
+ COLUMN_GAP(Atomicity.ATOMIC, false), // 76
/** Constant indicating a "column-number" FO property. */
- COLUMN_NUMBER, // 77
+ COLUMN_NUMBER(Atomicity.ATOMIC, false), // 77
/** Constant indicating a "column-width" FO property. */
- COLUMN_WIDTH, // 78
+ COLUMN_WIDTH(Atomicity.ATOMIC, false), // 78
/** Constant indicating a "content-height" FO property. */
- CONTENT_HEIGHT, // 79
+ CONTENT_HEIGHT(Atomicity.ATOMIC, false), // 79
/** Constant indicating a "content-type" FO property. */
- CONTENT_TYPE, // 80
+ CONTENT_TYPE(Atomicity.ATOMIC, false), // 80
/** Constant indicating a "content-width" FO property. */
- CONTENT_WIDTH, // 81
+ CONTENT_WIDTH(Atomicity.ATOMIC, false), // 81
/** Constant indicating a "country" FO property. */
- COUNTRY, // 82
+ COUNTRY(Atomicity.ATOMIC, true), // 82
/** Constant indicating a "cue" FO property. */
- CUE, // 83
+ CUE(Atomicity.SHORTHAND, false), // 83
/** Constant indicating a "cue-after" FO property. */
- CUE_AFTER, // 84
+ CUE_AFTER(Atomicity.ATOMIC, false), // 84
/** Constant indicating a "cue-before" FO property. */
- CUE_BEFORE, // 85
+ CUE_BEFORE(Atomicity.ATOMIC, false), // 85
/** Constant indicating a "destination-placement-offset" FO property. */
- DESTINATION_PLACEMENT_OFFSET, // 86
+ DESTINATION_PLACEMENT_OFFSET(Atomicity.ATOMIC, false), // 86
/** Constant indicating a "direction" FO property. */
- DIRECTION, // 87
+ DIRECTION(Atomicity.ATOMIC, true), // 87
/** Constant indicating a "display-align" FO property. */
- DISPLAY_ALIGN, // 88
+ DISPLAY_ALIGN(Atomicity.ATOMIC, true), // 88
/** Constant indicating a "dominant-baseline" FO property. */
- DOMINANT_BASELINE, // 89
+ DOMINANT_BASELINE(Atomicity.ATOMIC, false), // 89
/** Constant indicating an "elevation" FO property. */
- ELEVATION, // 90
+ ELEVATION(Atomicity.ATOMIC, true), // 90
/** Constant indicating an "empty-cells" FO property. */
- EMPTY_CELLS, // 91
+ EMPTY_CELLS(Atomicity.ATOMIC, true), // 91
/** Constant indicating an "end-indent" FO property. */
- END_INDENT, // 92
+ END_INDENT(Atomicity.ATOMIC, true), // 92
/** Constant indicating an "ends-row" FO property. */
- ENDS_ROW, // 93
+ ENDS_ROW(Atomicity.ATOMIC, false), // 93
/** Constant indicating an "extent" FO property. */
- EXTENT, // 94
+ EXTENT(Atomicity.ATOMIC, false), // 94
/** Constant indicating an "external-destination" FO property. */
- EXTERNAL_DESTINATION, // 95
+ EXTERNAL_DESTINATION(Atomicity.ATOMIC, false), // 95
/** Constant indicating a "float" FO property. */
- FLOAT, // 96
+ FLOAT(Atomicity.ATOMIC, false), // 96
/** Constant indicating a "flow-map-name" FO property. */
- FLOW_MAP_NAME, // 97
+ FLOW_MAP_NAME(Atomicity.ATOMIC, false), // 97
/** Constant indicating a "flow-map-reference" FO property. */
- FLOW_MAP_REFERENCE, // 98
+ FLOW_MAP_REFERENCE(Atomicity.ATOMIC, false), // 98
/** Constant indicating a "flow-name" FO property. */
- FLOW_NAME, // 99
+ FLOW_NAME(Atomicity.ATOMIC, false), // 99
/** Constant indicating a "flow-name-reference" FO property. */
- FLOW_NAME_REFERENCE, // 100
+ FLOW_NAME_REFERENCE(Atomicity.ATOMIC, false), // 100
/** Constant indicating a "font" FO property. */
- FONT, // 101
+ FONT(Atomicity.SHORTHAND, true), // 101
/** Constant indicating a "font-family" FO property. */
- FONT_FAMILY, // 102
+ FONT_FAMILY(Atomicity.ATOMIC, true), // 102
/** Constant indicating a "font-selection-strategy" FO property. */
- FONT_SELECTION_STRATEGY, // 103
+ FONT_SELECTION_STRATEGY(Atomicity.ATOMIC, true), // 103
/** Constant indicating a "font-size" FO property. */
- FONT_SIZE, // 104
+ FONT_SIZE(Atomicity.ATOMIC, true), // 104
/** Constant indicating a "font-size-adjust" FO property. */
- FONT_SIZE_ADJUST, // 105
+ FONT_SIZE_ADJUST(Atomicity.ATOMIC, true), // 105
/** Constant indicating a "font-stretch" FO property. */
- FONT_STRETCH, // 106
+ FONT_STRETCH(Atomicity.ATOMIC, true), // 106
/** Constant indicating a "font-style" FO property. */
- FONT_STYLE, // 107
+ FONT_STYLE(Atomicity.ATOMIC, true), // 107
/** Constant indicating a "font-variant" FO property. */
- FONT_VARIANT, // 108
+ FONT_VARIANT(Atomicity.ATOMIC, true), // 108
/** Constant indicating a "font-weight" FO property. */
- FONT_WEIGHT, // 109
+ FONT_WEIGHT(Atomicity.ATOMIC, true), // 109
/** Constant indicating a "force-page-count" FO property. */
- FORCE_PAGE_COUNT, // 110
+ FORCE_PAGE_COUNT(Atomicity.ATOMIC, false), // 110
/** Constant indicating a "format" FO property. */
- FORMAT, // 111
+ FORMAT(Atomicity.ATOMIC, false), // 111
/** Constant indicating a "glyph-orientation-horizontal" FO property. */
- GLYPH_ORIENTATION_HORIZONTAL, // 112
+ GLYPH_ORIENTATION_HORIZONTAL(Atomicity.ATOMIC, true), // 112
/** Constant indicating a "glyph-orientation-vertical" FO property. */
- GLYPH_ORIENTATION_VERTICAL, // 113
+ GLYPH_ORIENTATION_VERTICAL(Atomicity.ATOMIC, true), // 113
/** Constant indicating a "grouping-separator" FO property. */
- GROUPING_SEPARATOR, // 114
+ GROUPING_SEPARATOR(Atomicity.ATOMIC, false), // 114
/** Constant indicating a "grouping-size" FO property. */
- GROUPING_SIZE, // 115
+ GROUPING_SIZE(Atomicity.ATOMIC, false), // 115
/** Constant indicating a "height" FO property. */
- HEIGHT, // 116
+ HEIGHT(Atomicity.ATOMIC, false), // 116
/** Constant indicating a "hyphenate" FO property. */
- HYPHENATE, // 117
+ HYPHENATE(Atomicity.ATOMIC, true), // 117
/** Constant indicating a "hyphenation-character" FO property. */
- HYPHENATION_CHARACTER, // 118
+ HYPHENATION_CHARACTER(Atomicity.ATOMIC, true), // 118
/** Constant indicating a "hyphenation-keep" FO property. */
- HYPHENATION_KEEP, // 119
+ HYPHENATION_KEEP(Atomicity.ATOMIC, true), // 119
/** Constant indicating a "hyphenation-ladder-count" FO property. */
- HYPHENATION_LADDER_COUNT, // 120
+ HYPHENATION_LADDER_COUNT(Atomicity.ATOMIC, true), // 120
/** Constant indicating a "hyphenation-push-character-count" FO
* property. */
- HYPHENATION_PUSH_CHARACTER_COUNT, // 121
+ HYPHENATION_PUSH_CHARACTER_COUNT(Atomicity.ATOMIC, true), // 121
/** Constant indicating a "hyphenation-remain-character-count" FO
* property. */
- HYPHENATION_REMAIN_CHARACTER_COUNT, // 122
+ HYPHENATION_REMAIN_CHARACTER_COUNT(Atomicity.ATOMIC, true), // 122
/** Constant indicating an "id" FO property. */
- ID, // 123
+ ID(Atomicity.ATOMIC, false), // 123
/** Constant indicating an "index-class" FO property. */
- INDEX_CLASS, // 124
+ INDEX_CLASS(Atomicity.ATOMIC, false), // 124
/** Constant indicating an "index-key" FO property. */
- INDEX_KEY, // 125
+ INDEX_KEY(Atomicity.ATOMIC, false), // 125
/** Constant indicating an "indicate-destination" FO property. */
- INDICATE_DESTINATION, // 126
+ INDICATE_DESTINATION(Atomicity.ATOMIC, false), // 126
/** Constant indicating an "initial-page-number" FO property. */
- INITIAL_PAGE_NUMBER, // 127
+ INITIAL_PAGE_NUMBER(Atomicity.ATOMIC, false), // 127
/** Constant indicating an "inline-progression-dimension" FO property. */
- INLINE_PROGRESSION_DIMENSION, // 128
+ INLINE_PROGRESSION_DIMENSION(Atomicity.ATOMIC, false), // 128
/** Constant indicating an "internal-destination" FO property. */
- INTERNAL_DESTINATION, // 129
+ INTERNAL_DESTINATION(Atomicity.ATOMIC, false), // 129
/** Constant indicating an "intrinsic-scale-value" FO property. */
- INTRINSIC_SCALE_VALUE, // 130
+ INTRINSIC_SCALE_VALUE(Atomicity.ATOMIC, true), // 130
/** Constant indicating an "intrusion-displace" FO property. */
- INTRUSION_DISPLACE, // 131
+ INTRUSION_DISPLACE(Atomicity.ATOMIC, false), // 131
/** Constant indicating a "keep-...
[truncated message content] |
|
From: <vic...@us...> - 2022-12-28 21:12:32
|
Revision: 12973
http://sourceforge.net/p/foray/code/12973
Author: victormote
Date: 2022-12-28 21:12:29 +0000 (Wed, 28 Dec 2022)
Log Message:
-----------
Add identification of compound properties.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyId.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/FoPropertyId.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyId.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyId.java 2022-12-28 19:17:20 UTC (rev 12972)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyId.java 2022-12-28 21:12:29 UTC (rev 12973)
@@ -59,6 +59,9 @@
/**
* Returns the general atomicity of this property.
+ * Knowing whether a property is shorthand or compound is useful when evaluating certain functions, such as
+ * inherited-property-value().
+ * This information is used when evala
* @return The general atomicity of this property.
*/
Atomicity getType();
@@ -65,6 +68,8 @@
/**
* Indicates whether this property is inherited or not.
+ * Knowing whether a property is inherited or not is useful when evaluating certain functions, such as
+ * inherited-property-value().
* @return True if and only if this property is inherited.
*/
boolean isInherited();
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/FoPropertyId.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/FoPropertyId.java 2022-12-28 19:17:20 UTC (rev 12972)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/FoPropertyId.java 2022-12-28 21:12:29 UTC (rev 12973)
@@ -94,7 +94,7 @@
BLANK_OR_NOT_BLANK(Atomicity.ATOMIC, false), // 17
/** Constant indicating a "block-progression-dimension" FO property. */
- BLOCK_PROGRESSION_DIMENSION(Atomicity.ATOMIC, false), // 18
+ BLOCK_PROGRESSION_DIMENSION(Atomicity.COMPOUND, false), // 18
/** Constant indicating a "border" FO property. */
BORDER(Atomicity.SHORTHAND, false), // 19
@@ -109,7 +109,7 @@
BORDER_AFTER_STYLE(Atomicity.ATOMIC, false), // 22
/** Constant indicating a "border-after-width" FO property. */
- BORDER_AFTER_WIDTH(Atomicity.ATOMIC, false), // 23
+ BORDER_AFTER_WIDTH(Atomicity.COMPOUND, false), // 23
/** Constant indicating a "border-before-color" FO property. */
BORDER_BEFORE_COLOR(Atomicity.ATOMIC, false), // 24
@@ -121,7 +121,7 @@
BORDER_BEFORE_STYLE(Atomicity.ATOMIC, false), // 26
/** Constant indicating a "border-before-width" FO property. */
- BORDER_BEFORE_WIDTH(Atomicity.ATOMIC, false), // 27
+ BORDER_BEFORE_WIDTH(Atomicity.COMPOUND, false), // 27
/** Constant indicating a "border-bottom" FO property. */
BORDER_BOTTOM(Atomicity.SHORTHAND, false), // 28
@@ -151,7 +151,7 @@
BORDER_END_STYLE(Atomicity.ATOMIC, false), // 36
/** Constant indicating a "border-end-width" FO property. */
- BORDER_END_WIDTH(Atomicity.ATOMIC, false), // 37
+ BORDER_END_WIDTH(Atomicity.COMPOUND, false), // 37
/** Constant indicating a "border-left" FO property. */
BORDER_LEFT(Atomicity.SHORTHAND, false), // 38
@@ -178,7 +178,7 @@
BORDER_RIGHT_WIDTH(Atomicity.ATOMIC, false), // 45
/** Constant indicating a "border-separation" FO property. */
- BORDER_SEPARATION(Atomicity.ATOMIC, true), // 46
+ BORDER_SEPARATION(Atomicity.COMPOUND, true), // 46
/** Constant indicating a "border-spacing" FO property. */
BORDER_SPACING(Atomicity.SHORTHAND, true), // 47
@@ -193,7 +193,7 @@
BORDER_START_STYLE(Atomicity.ATOMIC, false), // 50
/** Constant indicating a "border-start-width" FO property. */
- BORDER_START_WIDTH(Atomicity.ATOMIC, false), // 51
+ BORDER_START_WIDTH(Atomicity.COMPOUND, false), // 51
/** Constant indicating a "border-style" FO property. */
BORDER_STYLE(Atomicity.SHORTHAND, false), // 52
@@ -307,7 +307,7 @@
DISPLAY_ALIGN(Atomicity.ATOMIC, true), // 88
/** Constant indicating a "dominant-baseline" FO property. */
- DOMINANT_BASELINE(Atomicity.ATOMIC, false), // 89
+ DOMINANT_BASELINE(Atomicity.COMPOUND, false), // 89
/** Constant indicating an "elevation" FO property. */
ELEVATION(Atomicity.ATOMIC, true), // 90
@@ -426,7 +426,7 @@
INITIAL_PAGE_NUMBER(Atomicity.ATOMIC, false), // 127
/** Constant indicating an "inline-progression-dimension" FO property. */
- INLINE_PROGRESSION_DIMENSION(Atomicity.ATOMIC, false), // 128
+ INLINE_PROGRESSION_DIMENSION(Atomicity.COMPOUND, false), // 128
/** Constant indicating an "internal-destination" FO property. */
INTERNAL_DESTINATION(Atomicity.ATOMIC, false), // 129
@@ -438,13 +438,13 @@
INTRUSION_DISPLACE(Atomicity.ATOMIC, false), // 131
/** Constant indicating a "keep-together" FO property. */
- KEEP_TOGETHER(Atomicity.ATOMIC, true), // 132
+ KEEP_TOGETHER(Atomicity.COMPOUND, true), // 132
/** Constant indicating a "keep-with-next" FO property. */
- KEEP_WITH_NEXT(Atomicity.ATOMIC, false), // 133
+ KEEP_WITH_NEXT(Atomicity.COMPOUND, false), // 133
/** Constant indicating a "keep-with-previous" FO property. */
- KEEP_WITH_PREVIOUS(Atomicity.ATOMIC, false), // 134
+ KEEP_WITH_PREVIOUS(Atomicity.COMPOUND, false), // 134
/** Constant indicating a "language" FO property. */
LANGUAGE(Atomicity.ATOMIC, true), // 135
@@ -456,7 +456,7 @@
LEADER_ALIGNMENT(Atomicity.ATOMIC, true), // 137
/** Constant indicating a "leader-length" FO property. */
- LEADER_LENGTH(Atomicity.ATOMIC, true), // 138
+ LEADER_LENGTH(Atomicity.COMPOUND, true), // 138
/** Constant indicating a "leader-pattern" FO property. */
LEADER_PATTERN(Atomicity.ATOMIC, true), // 139
@@ -468,13 +468,13 @@
LEFT(Atomicity.ATOMIC, false), // 141
/** Constant indicating a "letter-spacing" FO property. */
- LETTER_SPACING(Atomicity.ATOMIC, true), // 142
+ LETTER_SPACING(Atomicity.COMPOUND, true), // 142
/** Constant indicating a "letter-value" FO property. */
LETTER_VALUE(Atomicity.ATOMIC, false), // 143
/** Constant indicating a "line-height" FO property. */
- LINE_HEIGHT(Atomicity.ATOMIC, true), // 144
+ LINE_HEIGHT(Atomicity.COMPOUND, true), // 144
/** Constant indicating a "line-height-shift-adjustment" FO property. */
LINE_HEIGHT_SHIFT_ADJUSTMENT(Atomicity.ATOMIC, true), // 145
@@ -560,16 +560,16 @@
PADDING(Atomicity.SHORTHAND, false), // 171
/** Constant indicating a "padding-after" FO property. */
- PADDING_AFTER(Atomicity.ATOMIC, false), // 172
+ PADDING_AFTER(Atomicity.COMPOUND, false), // 172
/** Constant indicating a "padding-before" FO property. */
- PADDING_BEFORE(Atomicity.ATOMIC, false), // 173
+ PADDING_BEFORE(Atomicity.COMPOUND, false), // 173
/** Constant indicating a "padding-bottom" FO property. */
PADDING_BOTTOM(Atomicity.ATOMIC, false), // 174
/** Constant indicating a "padding-end" FO property. */
- PADDING_END(Atomicity.ATOMIC, false), // 175
+ PADDING_END(Atomicity.COMPOUND, false), // 175
/** Constant indicating a "padding-left" FO property. */
PADDING_LEFT(Atomicity.ATOMIC, false), // 176
@@ -578,7 +578,7 @@
PADDING_RIGHT(Atomicity.ATOMIC, false), // 177
/** Constant indicating a "padding-start" FO property. */
- PADDING_START(Atomicity.ATOMIC, false), // 178
+ PADDING_START(Atomicity.COMPOUND, false), // 178
/** Constant indicating a "padding-top" FO property. */
PADDING_TOP(Atomicity.ATOMIC, false), // 179
@@ -717,16 +717,16 @@
SOURCE_DOCUMENT(Atomicity.ATOMIC, false), // 223
/** Constant indicating a "space-after" FO property. */
- SPACE_AFTER(Atomicity.ATOMIC, false), // 224
+ SPACE_AFTER(Atomicity.COMPOUND, false), // 224
/** Constant indicating a "space-before" FO property. */
- SPACE_BEFORE(Atomicity.ATOMIC, false), // 225
+ SPACE_BEFORE(Atomicity.COMPOUND, false), // 225
/** Constant indicating a "space-end" FO property. */
- SPACE_END(Atomicity.ATOMIC, false), // 226
+ SPACE_END(Atomicity.COMPOUND, false), // 226
/** Constant indicating a "space-start" FO property. */
- SPACE_START(Atomicity.ATOMIC, false), // 227
+ SPACE_START(Atomicity.COMPOUND, false), // 227
/** Constant indicating a "span" FO property. */
SPAN(Atomicity.ATOMIC, false), // 228
@@ -846,7 +846,7 @@
WIDTH(Atomicity.ATOMIC, false), // 266
/** Constant indicating a "word-spacing" FO property. */
- WORD_SPACING(Atomicity.ATOMIC, true), // 267
+ WORD_SPACING(Atomicity.COMPOUND, true), // 267
/** Constant indicating a "wrap-option" FO property. */
WRAP_OPTION(Atomicity.ATOMIC, true), // 268
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-12-30 18:45:37
|
Revision: 12977
http://sourceforge.net/p/foray/code/12977
Author: victormote
Date: 2022-12-30 18:45:34 +0000 (Fri, 30 Dec 2022)
Log Message:
-----------
Conform to aXSL change: Change return types for <time> values from double to int.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractPause.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtTime.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java 2022-12-29 16:54:28 UTC (rev 12976)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java 2022-12-30 18:45:34 UTC (rev 12977)
@@ -2705,12 +2705,12 @@
}
@Override
- public double traitPauseBefore(final FoContext context) {
+ public int traitPauseBefore(final FoContext context) {
return getPropertyList().traitPauseBefore(this, context);
}
@Override
- public double traitPauseAfter(final FoContext context) {
+ public int traitPauseAfter(final FoContext context) {
return getPropertyList().traitPauseAfter(this, context);
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java 2022-12-29 16:54:28 UTC (rev 12976)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java 2022-12-30 18:45:34 UTC (rev 12977)
@@ -4062,7 +4062,7 @@
* @param context An object that knows how to resolve FO Tree context issues.
* @return The pause-before property.
*/
- public double traitPauseBefore(final FoObj fobj, final FoContext context) {
+ public int traitPauseBefore(final FoObj fobj, final FoContext context) {
AbstractPause property = (AbstractPause) getProperty(FoPropertyId.PAUSE_BEFORE);
if (property != null) {
return property.getValue(context, fobj, FoPropertyId.PAUSE_BEFORE);
@@ -4081,7 +4081,7 @@
* @param context An object that knows how to resolve FO Tree context issues.
* @return The pause-after property.
*/
- public double traitPauseAfter(final FoObj fobj, final FoContext context) {
+ public int traitPauseAfter(final FoObj fobj, final FoContext context) {
AbstractPause property = (AbstractPause) getProperty(FoPropertyId.PAUSE_AFTER);
if (property != null) {
return property.getValue(context, fobj, FoPropertyId.PAUSE_AFTER);
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractPause.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractPause.java 2022-12-29 16:54:28 UTC (rev 12976)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractPause.java 2022-12-30 18:45:34 UTC (rev 12977)
@@ -140,8 +140,7 @@
* compound property.
* @return The value of this property.
*/
- public double getValue(final FoContext context, final FoObj fobj,
- final FoPropertyId propertyType) {
+ public int getValue(final FoContext context, final FoObj fobj, final FoPropertyId propertyType) {
if (value() instanceof DtTime) {
return ((DtTime) value()).getValue();
}
@@ -154,7 +153,7 @@
* 60,000 to convert from minutes to milliseconds.
*/
final double base = 1 / fobj.traitSpeechRate(context) * 60000;
- return base * percentage;
+ return (int) Math.round(base * percentage);
}
if (value().canEvalKeyword()) {
final FoValue keyword = this.convertValueToFoValue(value());
@@ -193,8 +192,7 @@
* compound property.
* @return The value of this property.
*/
- public double getShorthandValue(final FoContext context, final FoObj fobj,
- final FoPropertyId propertyType) {
+ public int getShorthandValue(final FoContext context, final FoObj fobj, final FoPropertyId propertyType) {
if (value().canEvalKeyword()) {
final FoValue keyword = this.convertValueToFoValue(value());
switch (keyword) {
@@ -252,7 +250,7 @@
* Returns the default (initial) value for this property.
* @return The initial value for this property.
*/
- public static double getValueNoInstance() {
+ public static int getValueNoInstance() {
return 0;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtTime.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtTime.java 2022-12-29 16:54:28 UTC (rev 12976)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtTime.java 2022-12-30 18:45:34 UTC (rev 12977)
@@ -28,8 +28,6 @@
package org.foray.fotree.value;
-import org.foray.fotree.PropertyException;
-
import org.axsl.constants.MeasurementConstants;
import java.awt.Color;
@@ -39,31 +37,33 @@
*/
public class DtTime extends Datatype {
- /** Constant indicating that the unit of time stored in this instance is
- * seconds. */
- public static final byte UNITS_SECONDS = 1;
+ /**
+ * Enumeration of valid units of time.
+ */
+ public enum Units {
- /** Constant indicating that the unit of time stored in this instance is
- * milliseconds. */
- public static final byte UNITS_MILLISECONDS = 2;
+ /** The unit of time is seconds. */
+ SECONDS,
+ /** The unit of time is milliseconds. */
+ MILLISECONDS;
+
+ }
+
/** The number of seconds or milliseconds in this time. */
- private double quantity;
+ private Number quantity;
/** The units (seconds or milliseconds) stored by this time. */
- private byte units;
+ private Units units;
/**
* Constructor.
* @param quantity The number of seconds or milliseconds in this time.
- * @param units Either {@link DtTime#UNITS_SECONDS} or
- * {@link DtTime#UNITS_MILLISECONDS}.
- * @throws PropertyException For an invalid {@code units} specifier.
+ * @param units The units for this time measurement.
*/
- public DtTime(final double quantity, final byte units)
- throws PropertyException {
- if (units < 1 || units > 2) {
- throw new PropertyException("Invalid TimeDT unit ID.");
+ public DtTime(final Number quantity, final Units units) {
+ if (units == null) {
+ throw new NullPointerException("Time units cannot be null.");
}
this.quantity = quantity;
this.units = units;
@@ -73,13 +73,13 @@
* Returns the value, normalized to a unit of milliseconds.
* @return The value, normalized to a unit of milliseconds.
*/
- public double getValue() {
+ public int getValue() {
switch (this.units) {
- case DtTime.UNITS_SECONDS: {
- return this.quantity * MeasurementConstants.MILLISECONDS_PER_SECOND;
+ case SECONDS: {
+ return (int) Math.round(this.quantity.doubleValue() * MeasurementConstants.MILLISECONDS_PER_SECOND);
}
- case DtTime.UNITS_MILLISECONDS: {
- return this.quantity;
+ case MILLISECONDS: {
+ return this.quantity.intValue();
}
}
return -1;
@@ -88,27 +88,24 @@
/**
* Factory method for creating a TimeDT from a String input.
* @param input The String from which a TimeDT should be constructed.
- * @return The TimeDT instance constructed, or null if input is not
- * valid.
+ * @return The TimeDT instance constructed, or null if input is not valid.
*/
public static DtTime makeTimeDT(final String input) {
// Make a copy of input
final String useInput = new String(input);
useInput.trim();
- byte units = -1;
+ Units units = null;
int unitsLength = -1;
if (useInput.endsWith("ms")) {
- units = DtTime.UNITS_MILLISECONDS;
+ units = Units.MILLISECONDS;
unitsLength = 2;
} else if (useInput.endsWith("s")) {
- units = DtTime.UNITS_SECONDS;
+ units = Units.SECONDS;
unitsLength = 1;
- }
- if (units < 1) {
+ } else {
return null;
}
- final String quantityPart = useInput.substring(0, useInput.length()
- - unitsLength);
+ final String quantityPart = useInput.substring(0, useInput.length() - unitsLength);
final double quantity;
try {
quantity = Double.parseDouble(quantityPart);
@@ -115,15 +112,7 @@
} catch (final NumberFormatException e) {
return null;
}
- try {
- return new DtTime(quantity, units);
- } catch (final PropertyException e1) {
- /*
- * This should never happen, because we have already validated the
- * input.
- */
- return null;
- }
+ return new DtTime(quantity, units);
}
@Override
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-12-31 00:38:52
|
Revision: 12983
http://sourceforge.net/p/foray/code/12983
Author: victormote
Date: 2022-12-31 00:38:49 +0000 (Sat, 31 Dec 2022)
Log Message:
-----------
Move common code related to canEvalLength and evalLength to default implementation in the interface.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/Property.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBorderWidth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtAngle.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtBorderWidth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtCharacter.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtColor.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtCountry.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtFrequency.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtInteger.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtKeep.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtLanguage.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtLengthBpIpDirection.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtLengthConditional.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtLengthRange.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtName.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtNumber.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtPercentage.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtRectangle.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtScript.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtShadowEffect.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtSpace.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtString.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtTextDeco.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtTime.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtUri.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtWritingMode.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/Expr.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/ExprAdditiveOper.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/ExprMultiplicativeOper.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/ExprUnaryOper.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnAbstractColor.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnAbstractNamedProperty.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnBodyStart.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnCeiling.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnFloor.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnLabelEnd.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnMax.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnMin.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnRound.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnSystemFont.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/PropertyValue.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/PropertyValueStatic.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/Property.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/Property.java 2022-12-30 23:04:26 UTC (rev 12982)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/Property.java 2022-12-31 00:38:49 UTC (rev 12983)
@@ -225,8 +225,7 @@
* @param context An object that knows how to resolve FO context issues.
* @return The length of the property, in millipoints.
*/
- protected int convertValueToLength(final PropertyValue value,
- final FoObj fobj, final FoContext context) {
+ protected int convertValueToLength(final PropertyValue value, final FoObj fobj, final FoContext context) {
int fontSize = 0;
if (value.lengthRequiresFontSize()) {
fontSize = fobj.traitFontSize(context);
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBorderWidth.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBorderWidth.java 2022-12-30 23:04:26 UTC (rev 12982)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBorderWidth.java 2022-12-31 00:38:49 UTC (rev 12983)
@@ -113,8 +113,7 @@
return getKeywordValue(context, direction, fobj);
}
if (value().canEvalLength()) {
- final int length = this.convertValueToLength(value(), fobj,
- context);
+ final int length = this.convertValueToLength(value(), fobj, context);
return Math.max(length, 0);
}
if (value() instanceof DtLengthConditional
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtAngle.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtAngle.java 2022-12-30 23:04:26 UTC (rev 12982)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtAngle.java 2022-12-31 00:38:49 UTC (rev 12983)
@@ -173,16 +173,6 @@
}
@Override
- public boolean canEvalLength() {
- return false;
- }
-
- @Override
- public int evalLength(final int pointSize) {
- throw this.evalLengthException();
- }
-
- @Override
public boolean canEvalColor() {
return false;
}
@@ -193,11 +183,6 @@
}
@Override
- public boolean lengthRequiresFontSize() {
- return false;
- }
-
- @Override
public boolean canEvalKeyword() {
return false;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtBorderWidth.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtBorderWidth.java 2022-12-30 23:04:26 UTC (rev 12982)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtBorderWidth.java 2022-12-31 00:38:49 UTC (rev 12983)
@@ -124,8 +124,7 @@
*/
public static boolean isBorderWidth(final PropertyValue value) {
if (value == null) {
- throw new NullPointerException("DtBorderWidth value cannot be " +
- "null");
+ throw new NullPointerException("DtBorderWidth value cannot be null");
}
if (value.canEvalLength()) {
return true;
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtCharacter.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtCharacter.java 2022-12-30 23:04:26 UTC (rev 12982)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtCharacter.java 2022-12-31 00:38:49 UTC (rev 12983)
@@ -55,16 +55,6 @@
}
@Override
- public boolean canEvalLength() {
- return false;
- }
-
- @Override
- public int evalLength(final int pointSize) {
- throw this.evalLengthException();
- }
-
- @Override
public boolean canEvalColor() {
return false;
}
@@ -75,11 +65,6 @@
}
@Override
- public boolean lengthRequiresFontSize() {
- return false;
- }
-
- @Override
public boolean canEvalKeyword() {
return false;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtColor.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtColor.java 2022-12-30 23:04:26 UTC (rev 12982)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtColor.java 2022-12-31 00:38:49 UTC (rev 12983)
@@ -773,21 +773,6 @@
}
@Override
- public boolean canEvalLength() {
- return false;
- }
-
- @Override
- public int evalLength(final int pointSize) {
- throw this.evalLengthException();
- }
-
- @Override
- public boolean lengthRequiresFontSize() {
- return false;
- }
-
- @Override
public boolean canEvalKeyword() {
return false;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtCountry.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtCountry.java 2022-12-30 23:04:26 UTC (rev 12982)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtCountry.java 2022-12-31 00:38:49 UTC (rev 12983)
@@ -98,16 +98,6 @@
}
@Override
- public boolean canEvalLength() {
- return false;
- }
-
- @Override
- public int evalLength(final int pointSize) {
- throw this.evalLengthException();
- }
-
- @Override
public boolean canEvalColor() {
return false;
}
@@ -118,11 +108,6 @@
}
@Override
- public boolean lengthRequiresFontSize() {
- return false;
- }
-
- @Override
public boolean canEvalKeyword() {
return false;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtFrequency.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtFrequency.java 2022-12-30 23:04:26 UTC (rev 12982)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtFrequency.java 2022-12-31 00:38:49 UTC (rev 12983)
@@ -124,16 +124,6 @@
}
@Override
- public boolean canEvalLength() {
- return false;
- }
-
- @Override
- public int evalLength(final int pointSize) {
- throw this.evalLengthException();
- }
-
- @Override
public boolean canEvalColor() {
return false;
}
@@ -144,11 +134,6 @@
}
@Override
- public boolean lengthRequiresFontSize() {
- return false;
- }
-
- @Override
public boolean canEvalKeyword() {
return false;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtInteger.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtInteger.java 2022-12-30 23:04:26 UTC (rev 12982)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtInteger.java 2022-12-31 00:38:49 UTC (rev 12983)
@@ -91,11 +91,6 @@
}
@Override
- public boolean canEvalLength() {
- return false;
- }
-
- @Override
public boolean canEvalInteger() {
return true;
}
@@ -106,11 +101,6 @@
}
@Override
- public int evalLength(final int pointSize) {
- throw this.evalLengthException();
- }
-
- @Override
public boolean canEvalColor() {
return false;
}
@@ -121,11 +111,6 @@
}
@Override
- public boolean lengthRequiresFontSize() {
- return false;
- }
-
- @Override
public boolean canEvalKeyword() {
return false;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtKeep.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtKeep.java 2022-12-30 23:04:26 UTC (rev 12982)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtKeep.java 2022-12-31 00:38:49 UTC (rev 12983)
@@ -162,16 +162,6 @@
}
@Override
- public boolean canEvalLength() {
- return false;
- }
-
- @Override
- public int evalLength(final int pointSize) {
- throw this.evalLengthException();
- }
-
- @Override
public boolean canEvalColor() {
return false;
}
@@ -182,11 +172,6 @@
}
@Override
- public boolean lengthRequiresFontSize() {
- return false;
- }
-
- @Override
public boolean canEvalKeyword() {
return false;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtLanguage.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtLanguage.java 2022-12-30 23:04:26 UTC (rev 12982)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtLanguage.java 2022-12-31 00:38:49 UTC (rev 12983)
@@ -74,16 +74,6 @@
}
@Override
- public boolean canEvalLength() {
- return false;
- }
-
- @Override
- public int evalLength(final int pointSize) {
- throw this.evalLengthException();
- }
-
- @Override
public boolean canEvalColor() {
return false;
}
@@ -94,11 +84,6 @@
}
@Override
- public boolean lengthRequiresFontSize() {
- return false;
- }
-
- @Override
public boolean canEvalKeyword() {
return false;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtLengthBpIpDirection.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtLengthBpIpDirection.java 2022-12-30 23:04:26 UTC (rev 12982)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtLengthBpIpDirection.java 2022-12-31 00:38:49 UTC (rev 12983)
@@ -107,16 +107,6 @@
}
@Override
- public boolean canEvalLength() {
- return false;
- }
-
- @Override
- public int evalLength(final int pointSize) {
- throw this.evalLengthException();
- }
-
- @Override
public boolean canEvalColor() {
return false;
}
@@ -127,11 +117,6 @@
}
@Override
- public boolean lengthRequiresFontSize() {
- return false;
- }
-
- @Override
public boolean canEvalKeyword() {
return false;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtLengthConditional.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtLengthConditional.java 2022-12-30 23:04:26 UTC (rev 12982)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtLengthConditional.java 2022-12-31 00:38:49 UTC (rev 12983)
@@ -72,16 +72,6 @@
}
@Override
- public boolean canEvalLength() {
- return false;
- }
-
- @Override
- public int evalLength(final int pointSize) {
- throw this.evalLengthException();
- }
-
- @Override
public boolean canEvalColor() {
return false;
}
@@ -92,11 +82,6 @@
}
@Override
- public boolean lengthRequiresFontSize() {
- return false;
- }
-
- @Override
public boolean canEvalKeyword() {
return false;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtLengthRange.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtLengthRange.java 2022-12-30 23:04:26 UTC (rev 12982)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtLengthRange.java 2022-12-31 00:38:49 UTC (rev 12983)
@@ -174,16 +174,6 @@
}
@Override
- public boolean canEvalLength() {
- return false;
- }
-
- @Override
- public int evalLength(final int pointSize) {
- throw this.evalLengthException();
- }
-
- @Override
public boolean canEvalColor() {
return false;
}
@@ -194,11 +184,6 @@
}
@Override
- public boolean lengthRequiresFontSize() {
- return false;
- }
-
- @Override
public boolean canEvalKeyword() {
return false;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtName.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtName.java 2022-12-30 23:04:26 UTC (rev 12982)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtName.java 2022-12-31 00:38:49 UTC (rev 12983)
@@ -71,16 +71,6 @@
}
@Override
- public boolean canEvalLength() {
- return false;
- }
-
- @Override
- public int evalLength(final int pointSize) {
- throw this.evalLengthException();
- }
-
- @Override
public boolean canEvalColor() {
final DtColor dtColor = DtColor.mapNameToColorRGB(this.value);
return dtColor != null;
@@ -96,11 +86,6 @@
}
@Override
- public boolean lengthRequiresFontSize() {
- return false;
- }
-
- @Override
public boolean canEvalKeyword() {
return false;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtNumber.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtNumber.java 2022-12-30 23:04:26 UTC (rev 12982)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtNumber.java 2022-12-31 00:38:49 UTC (rev 12983)
@@ -87,16 +87,6 @@
}
@Override
- public boolean canEvalLength() {
- return false;
- }
-
- @Override
- public int evalLength(final int pointSize) {
- throw this.evalLengthException();
- }
-
- @Override
public boolean canEvalColor() {
return false;
}
@@ -107,11 +97,6 @@
}
@Override
- public boolean lengthRequiresFontSize() {
- return false;
- }
-
- @Override
public boolean canEvalKeyword() {
return false;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtPercentage.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtPercentage.java 2022-12-30 23:04:26 UTC (rev 12982)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtPercentage.java 2022-12-31 00:38:49 UTC (rev 12983)
@@ -97,16 +97,6 @@
}
@Override
- public boolean canEvalLength() {
- return false;
- }
-
- @Override
- public int evalLength(final int pointSize) {
- throw this.evalLengthException();
- }
-
- @Override
public boolean canEvalColor() {
return false;
}
@@ -117,11 +107,6 @@
}
@Override
- public boolean lengthRequiresFontSize() {
- return false;
- }
-
- @Override
public boolean canEvalKeyword() {
return false;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtRectangle.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtRectangle.java 2022-12-30 23:04:26 UTC (rev 12982)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtRectangle.java 2022-12-31 00:38:49 UTC (rev 12983)
@@ -218,16 +218,6 @@
}
@Override
- public boolean canEvalLength() {
- return false;
- }
-
- @Override
- public int evalLength(final int pointSize) {
- throw this.evalLengthException();
- }
-
- @Override
public boolean canEvalColor() {
return false;
}
@@ -238,11 +228,6 @@
}
@Override
- public boolean lengthRequiresFontSize() {
- return false;
- }
-
- @Override
public boolean canEvalKeyword() {
return false;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtScript.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtScript.java 2022-12-30 23:04:26 UTC (rev 12982)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtScript.java 2022-12-31 00:38:49 UTC (rev 12983)
@@ -184,16 +184,6 @@
}
@Override
- public boolean canEvalLength() {
- return false;
- }
-
- @Override
- public int evalLength(final int pointSize) {
- throw this.evalLengthException();
- }
-
- @Override
public boolean canEvalColor() {
return false;
}
@@ -204,11 +194,6 @@
}
@Override
- public boolean lengthRequiresFontSize() {
- return false;
- }
-
- @Override
public boolean canEvalKeyword() {
return false;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtShadowEffect.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtShadowEffect.java 2022-12-30 23:04:26 UTC (rev 12982)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtShadowEffect.java 2022-12-31 00:38:49 UTC (rev 12983)
@@ -187,26 +187,11 @@
}
@Override
- public boolean canEvalLength() {
- return false;
- }
-
- @Override
- public int evalLength(final int pointSize) {
- throw this.evalLengthException();
- }
-
- @Override
public boolean canEvalColor() {
return false;
}
@Override
- public boolean lengthRequiresFontSize() {
- return false;
- }
-
- @Override
public boolean canEvalKeyword() {
return false;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtSpace.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtSpace.java 2022-12-30 23:04:26 UTC (rev 12982)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtSpace.java 2022-12-31 00:38:49 UTC (rev 12983)
@@ -100,11 +100,9 @@
* @param lengthMinimum The new minimum length.
* @throws PropertyException If the input value is not a valid length.
*/
- public void setLengthMinimum(final PropertyValue lengthMinimum)
- throws PropertyException {
+ public void setLengthMinimum(final PropertyValue lengthMinimum) throws PropertyException {
if (! lengthMinimum.canEvalLength()) {
- throw new PropertyException("Invalid length for minimum in "
- + this.getClass().getName());
+ throw new PropertyException("Invalid length for minimum in " + this.getClass().getName());
}
this.lengthMinimum = lengthMinimum;
}
@@ -114,11 +112,9 @@
* @param lengthOptimum The new optimum length.
* @throws PropertyException If the input value is not a valid length.
*/
- public void setLengthOptimum(final PropertyValue lengthOptimum)
- throws PropertyException {
+ public void setLengthOptimum(final PropertyValue lengthOptimum) throws PropertyException {
if (! lengthOptimum.canEvalLength()) {
- throw new PropertyException("Invalid length for optimum in "
- + this.getClass().getName());
+ throw new PropertyException("Invalid length for optimum in " + this.getClass().getName());
}
this.lengthOptimum = lengthOptimum;
}
@@ -128,11 +124,9 @@
* @param lengthMaximum The new maximum length.
* @throws PropertyException If the input value is not a valid length.
*/
- public void setLengthMaximum(final PropertyValue lengthMaximum)
- throws PropertyException {
+ public void setLengthMaximum(final PropertyValue lengthMaximum) throws PropertyException {
if (! lengthMaximum.canEvalLength()) {
- throw new PropertyException("Invalid length for maximum in "
- + this.getClass().getName());
+ throw new PropertyException("Invalid length for maximum in " + this.getClass().getName());
}
this.lengthMaximum = lengthMaximum;
}
@@ -323,16 +317,6 @@
}
@Override
- public boolean canEvalLength() {
- return false;
- }
-
- @Override
- public int evalLength(final int pointSize) {
- throw this.evalLengthException();
- }
-
- @Override
public boolean canEvalColor() {
return false;
}
@@ -343,11 +327,6 @@
}
@Override
- public boolean lengthRequiresFontSize() {
- return false;
- }
-
- @Override
public boolean canEvalKeyword() {
return false;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtString.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtString.java 2022-12-30 23:04:26 UTC (rev 12982)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtString.java 2022-12-31 00:38:49 UTC (rev 12983)
@@ -55,16 +55,6 @@
}
@Override
- public boolean canEvalLength() {
- return false;
- }
-
- @Override
- public int evalLength(final int pointSize) {
- throw this.evalLengthException();
- }
-
- @Override
public boolean canEvalColor() {
return false;
}
@@ -75,11 +65,6 @@
}
@Override
- public boolean lengthRequiresFontSize() {
- return false;
- }
-
- @Override
public boolean canEvalKeyword() {
return false;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtTextDeco.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtTextDeco.java 2022-12-30 23:04:26 UTC (rev 12982)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtTextDeco.java 2022-12-31 00:38:49 UTC (rev 12983)
@@ -129,16 +129,6 @@
}
@Override
- public boolean canEvalLength() {
- return false;
- }
-
- @Override
- public int evalLength(final int pointSize) {
- throw this.evalLengthException();
- }
-
- @Override
public boolean canEvalColor() {
return false;
}
@@ -149,11 +139,6 @@
}
@Override
- public boolean lengthRequiresFontSize() {
- return false;
- }
-
- @Override
public boolean canEvalKeyword() {
return false;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtTime.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtTime.java 2022-12-30 23:04:26 UTC (rev 12982)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtTime.java 2022-12-31 00:38:49 UTC (rev 12983)
@@ -116,16 +116,6 @@
}
@Override
- public boolean canEvalLength() {
- return false;
- }
-
- @Override
- public int evalLength(final int pointSize) {
- throw this.evalLengthException();
- }
-
- @Override
public boolean canEvalColor() {
return false;
}
@@ -136,11 +126,6 @@
}
@Override
- public boolean lengthRequiresFontSize() {
- return false;
- }
-
- @Override
public boolean canEvalKeyword() {
return false;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtUri.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtUri.java 2022-12-30 23:04:26 UTC (rev 12982)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtUri.java 2022-12-31 00:38:49 UTC (rev 12983)
@@ -111,16 +111,6 @@
}
@Override
- public boolean canEvalLength() {
- return false;
- }
-
- @Override
- public int evalLength(final int pointSize) {
- throw this.evalLengthException();
- }
-
- @Override
public boolean canEvalColor() {
return false;
}
@@ -131,11 +121,6 @@
}
@Override
- public boolean lengthRequiresFontSize() {
- return false;
- }
-
- @Override
public boolean canEvalKeyword() {
return false;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtWritingMode.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtWritingMode.java 2022-12-30 23:04:26 UTC (rev 12982)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtWritingMode.java 2022-12-31 00:38:49 UTC (rev 12983)
@@ -557,16 +557,6 @@
}
@Override
- public boolean canEvalLength() {
- return false;
- }
-
- @Override
- public int evalLength(final int pointSize) {
- throw this.evalLengthException();
- }
-
- @Override
public boolean canEvalColor() {
return false;
}
@@ -577,11 +567,6 @@
}
@Override
- public boolean lengthRequiresFontSize() {
- return false;
- }
-
- @Override
public boolean canEvalKeyword() {
return false;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/Expr.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/Expr.java 2022-12-30 23:04:26 UTC (rev 12982)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/Expr.java 2022-12-31 00:38:49 UTC (rev 12983)
@@ -77,15 +77,15 @@
+ "Color.");
}
- /**
- * Standard exception when trying to evaluate to a Length for a value that
- * cannot do so.
- * @return An appropriate Exception.
- */
- public IllegalStateException evalLengthException() {
- return new IllegalStateException("Property cannot evaluate to a "
- + "Length.");
- }
+// /**
+// * Standard exception when trying to evaluate to a Length for ...
[truncated message content] |
|
From: <vic...@us...> - 2022-12-31 01:28:28
|
Revision: 12984
http://sourceforge.net/p/foray/code/12984
Author: victormote
Date: 2022-12-31 01:28:25 +0000 (Sat, 31 Dec 2022)
Log Message:
-----------
Move common code related to canEvalPercentage and evalPercentage to default implementation in the interface.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAbsoluteDimension.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAbsoluteOffset.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAllowedAxisScale.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBackgroundPosition.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractContentDimension.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractIndent.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractMargin.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractPadding.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractPause.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractRelativeDimension.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractRelativeSpace.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdAlignmentAdjust.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBackgroundPosition.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdColumnGap.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdColumnWidth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdExtent.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdFontSize.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdLeaderLength.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdLeaderPatternWidth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdLineHeight.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdMargin.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPadding.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdProvisionalDistanceBetweenStarts.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdProvisionalLabelSeparation.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdTextAltitude.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdTextDepth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdTextIndent.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdVerticalAlign.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdVolume.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtAngle.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtBorderWidth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtCharacter.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtColor.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtCountry.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtFrequency.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtInteger.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtKeep.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtLanguage.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtLength.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtLengthBpIpDirection.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtLengthConditional.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtLengthRange.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtName.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtNumber.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtPercentage.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtRectangle.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtScript.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtShadowEffect.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtSpace.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtString.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtTextDeco.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtTime.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtUri.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtWritingMode.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/Expr.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/ExprAdditiveOper.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/ExprInner.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/ExprMultiplicativeOper.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/ExprUnaryOper.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnAbs.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnAbstractColor.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnAbstractNamedProperty.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnBodyStart.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnCeiling.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnFloor.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnLabelEnd.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnMax.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnMin.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnProportionalColumnWidth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnRound.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/FnSystemFont.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/PropertyValue.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/PropertyValueStatic.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAbsoluteDimension.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAbsoluteDimension.java 2022-12-31 00:38:49 UTC (rev 12983)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAbsoluteDimension.java 2022-12-31 01:28:25 UTC (rev 12984)
@@ -114,9 +114,8 @@
} else {
base = context.ipdAncestorBlockOrRa();
}
- final float percentage = value().evalPercentage();
- return Math.round(percentage * base
- / NumericConstants.PERCENT_CONVERSION);
+ final Number percentage = value().evalPercentage();
+ return (int) Math.round(percentage.doubleValue() * base / NumericConstants.PERCENT_CONVERSION);
}
if (value().canEvalLength()) {
return this.convertValueToLength(value(), fobj, context);
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAbsoluteOffset.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAbsoluteOffset.java 2022-12-31 00:38:49 UTC (rev 12983)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAbsoluteOffset.java 2022-12-31 01:28:25 UTC (rev 12984)
@@ -112,8 +112,8 @@
if (value().canEvalPercentage()) {
final int dimensionContainingBlock = this.dimensionContainingBlock(
context);
- final float percent = value().evalPercentage();
- return Math.round(dimensionContainingBlock * percent
+ final Number percent = value().evalPercentage();
+ return (int) Math.round(dimensionContainingBlock * percent.doubleValue()
/ NumericConstants.PERCENT_CONVERSION);
}
if (value().canEvalLength()) {
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAllowedAxisScale.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAllowedAxisScale.java 2022-12-31 00:38:49 UTC (rev 12983)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAllowedAxisScale.java 2022-12-31 01:28:25 UTC (rev 12984)
@@ -142,7 +142,7 @@
if (pv.canEvalKeyword()) {
returnValue[i] = java.lang.Float.POSITIVE_INFINITY;
} else if (pv.canEvalPercentage()) {
- returnValue[i] = pv.evalPercentage();
+ returnValue[i] = pv.evalPercentage().floatValue();
}
}
return returnValue;
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBackgroundPosition.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBackgroundPosition.java 2022-12-31 00:38:49 UTC (rev 12983)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBackgroundPosition.java 2022-12-31 01:28:25 UTC (rev 12984)
@@ -90,10 +90,9 @@
final int paddingRectangleDimension,
final int backgroundImageDimension) {
if (value().canEvalPercentage()) {
- final float percent = value().evalPercentage();
- return Math.round(percent / NumericConstants.PERCENT_CONVERSION
- * (paddingRectangleDimension
- - backgroundImageDimension));
+ final Number percent = value().evalPercentage();
+ return (int) Math.round(percent.doubleValue() / NumericConstants.PERCENT_CONVERSION
+ * (paddingRectangleDimension - backgroundImageDimension));
}
if (value().canEvalLength()) {
return this.convertValueToLength(value(), fobj, context);
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractContentDimension.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractContentDimension.java 2022-12-31 00:38:49 UTC (rev 12983)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractContentDimension.java 2022-12-31 01:28:25 UTC (rev 12984)
@@ -132,8 +132,8 @@
}
}
if (value().canEvalPercentage()) {
- final float percentage = value().evalPercentage();
- return percentage / NumericConstants.PERCENT_CONVERSION;
+ final Number percentage = value().evalPercentage();
+ return (float) percentage.doubleValue() / NumericConstants.PERCENT_CONVERSION;
}
if (value().canEvalLength()) {
final int length = this.convertValueToLength(value(), fobj,
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractIndent.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractIndent.java 2022-12-31 00:38:49 UTC (rev 12983)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractIndent.java 2022-12-31 01:28:25 UTC (rev 12984)
@@ -109,10 +109,9 @@
}
}
if (value().canEvalPercentage()) {
- final float percentage = value().evalPercentage();
+ final Number percentage = value().evalPercentage();
final int base = context.ipdContainingRefArea();
- return Math.round(percentage * base /
- NumericConstants.PERCENT_CONVERSION);
+ return (int) Math.round(percentage.doubleValue() * base / NumericConstants.PERCENT_CONVERSION);
}
if (value().canEvalLength()) {
return this.convertValueToLength(value(), fobj, context);
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractMargin.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractMargin.java 2022-12-31 00:38:49 UTC (rev 12983)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractMargin.java 2022-12-31 01:28:25 UTC (rev 12984)
@@ -103,9 +103,8 @@
} else {
base = context.widthContainingBlock();
}
- final float percent = value().evalPercentage();
- return Math.round(base * percent
- / NumericConstants.PERCENT_CONVERSION);
+ final Number percent = value().evalPercentage();
+ return (int) Math.round(base * percent.doubleValue() / NumericConstants.PERCENT_CONVERSION);
}
if (value().canEvalLength()) {
return this.convertValueToLength(value(), fobj, context);
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractPadding.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractPadding.java 2022-12-31 00:38:49 UTC (rev 12983)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractPadding.java 2022-12-31 01:28:25 UTC (rev 12984)
@@ -104,7 +104,7 @@
if (value().canEvalPercentage()) {
/* TODO: This base is probably not quite right. */
final int base = context.ipdAncestorBlockOrRa();
- return Math.round(value().evalPercentage() * base);
+ return (int) Math.round(value().evalPercentage().doubleValue() * base);
}
if (value() instanceof DtLengthConditional) {
final DtLengthConditional lengthConditional
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractPause.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractPause.java 2022-12-31 00:38:49 UTC (rev 12983)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractPause.java 2022-12-31 01:28:25 UTC (rev 12984)
@@ -145,7 +145,7 @@
return ((DtTime) value()).getValue();
}
if (value().canEvalPercentage()) {
- final float percentage = value().evalPercentage();
+ final Number percentage = value().evalPercentage();
/*
* The base is computed as the reciprocal of the speech-rate,
* and we wish to express the value in milliseconds. speech-rate
@@ -153,7 +153,7 @@
* 60,000 to convert from minutes to milliseconds.
*/
final double base = 1 / fobj.traitSpeechRate(context).doubleValue() * 60000;
- return (int) Math.round(base * percentage);
+ return (int) Math.round(base * percentage.doubleValue());
}
if (value().canEvalKeyword()) {
final FoValue keyword = this.convertValueToFoValue(value());
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractRelativeDimension.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractRelativeDimension.java 2022-12-31 00:38:49 UTC (rev 12983)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractRelativeDimension.java 2022-12-31 01:28:25 UTC (rev 12984)
@@ -137,9 +137,8 @@
if (base < 0) {
return FoPropertyConstants.DIMENSION_AUTO;
}
- final float percentage = value().evalPercentage();
- return Math.round(percentage * base
- / NumericConstants.PERCENT_CONVERSION);
+ final Number percentage = value().evalPercentage();
+ return (int) Math.round(percentage.doubleValue() * base / NumericConstants.PERCENT_CONVERSION);
}
if (value().canEvalLength()) {
return this.convertValueToLength(value(), fobj, context);
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractRelativeSpace.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractRelativeSpace.java 2022-12-31 00:38:49 UTC (rev 12983)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractRelativeSpace.java 2022-12-31 01:28:25 UTC (rev 12984)
@@ -155,8 +155,8 @@
if (ipdAncestorBlockArea < 0) {
return 0;
}
- final float percentage = value().evalPercentage();
- return Math.round(percentage * ipdAncestorBlockArea);
+ final Number percentage = value().evalPercentage();
+ return (int) Math.round(percentage.doubleValue() * ipdAncestorBlockArea);
}
if (this.isKeywordInherit(this.value())) {
return getValueInherited(context, subProperty, fobj);
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdAlignmentAdjust.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdAlignmentAdjust.java 2022-12-31 00:38:49 UTC (rev 12983)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdAlignmentAdjust.java 2022-12-31 01:28:25 UTC (rev 12984)
@@ -134,7 +134,7 @@
}
}
if (value().canEvalPercentage()) {
- return PdAlignmentAdjust.evalPercentage(value().evalPercentage(), inlineContext);
+ return PdAlignmentAdjust.evalPercentage(value().evalPercentage().floatValue(), inlineContext);
}
if (value().canEvalLength()) {
return this.convertValueToLength(value(), fobj, context);
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBackgroundPosition.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBackgroundPosition.java 2022-12-31 00:38:49 UTC (rev 12983)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBackgroundPosition.java 2022-12-31 01:28:25 UTC (rev 12984)
@@ -188,10 +188,9 @@
final AbsoluteAxis axis, final int paddingRectangleDimension,
final int backgroundImageDimension) {
if (value().canEvalPercentage()) {
- final float percent = value().evalPercentage();
- return Math.round(percent / NumericConstants.PERCENT_CONVERSION
- * (paddingRectangleDimension
- - backgroundImageDimension));
+ final Number percent = value().evalPercentage();
+ return (int) Math.round(percent.doubleValue() / NumericConstants.PERCENT_CONVERSION
+ * (paddingRectangleDimension - backgroundImageDimension));
}
if (value().canEvalLength()) {
return this.convertValueToLength(value(), fobj, context);
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdColumnGap.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdColumnGap.java 2022-12-31 00:38:49 UTC (rev 12983)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdColumnGap.java 2022-12-31 01:28:25 UTC (rev 12984)
@@ -114,9 +114,8 @@
final RegionBody4a rb = (RegionBody4a) fobj;
base = rb.crWidth(context);
}
- final float percentage = value().evalPercentage();
- return Math.round(percentage * base
- / NumericConstants.PERCENT_CONVERSION);
+ final Number percentage = value().evalPercentage();
+ return (int) Math.round(percentage.doubleValue() * base / NumericConstants.PERCENT_CONVERSION);
}
if (value().canEvalLength()) {
return this.convertValueToLength(value(), fobj, context);
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdColumnWidth.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdColumnWidth.java 2022-12-31 00:38:49 UTC (rev 12983)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdColumnWidth.java 2022-12-31 01:28:25 UTC (rev 12984)
@@ -86,8 +86,8 @@
public int getValue(final FoContext context, final FoObj fobj) {
if (value().canEvalPercentage()) {
final int tableWidth = context.tableWidth();
- final float percentage = value().evalPercentage();
- return Math.round(percentage * tableWidth);
+ final Number percentage = value().evalPercentage();
+ return (int) Math.round(percentage.doubleValue() * tableWidth);
}
if (value().canEvalLength()) {
return this.convertValueToLength(value(), fobj, context);
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdExtent.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdExtent.java 2022-12-31 00:38:49 UTC (rev 12983)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdExtent.java 2022-12-31 01:28:25 UTC (rev 12984)
@@ -114,9 +114,8 @@
}
if (value().canEvalPercentage()) {
final int base = computeBase(context, fobj);
- final float percentage = value().evalPercentage();
- return Math.round(percentage * base
- / NumericConstants.PERCENT_CONVERSION);
+ final Number percentage = value().evalPercentage();
+ return (int) Math.round(percentage.doubleValue() * base / NumericConstants.PERCENT_CONVERSION);
}
if (value().canEvalLength()) {
return this.convertValueToLength(value(), fobj, context);
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdFontSize.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdFontSize.java 2022-12-31 00:38:49 UTC (rev 12983)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdFontSize.java 2022-12-31 01:28:25 UTC (rev 12984)
@@ -195,9 +195,9 @@
return this.convertValueToLength(value(), fobj, context);
}
if (value().canEvalPercentage()) {
- final float percentage = value().evalPercentage();
- return Math.round(percentage * getBaseFontSize(context,
- fobj) / NumericConstants.PERCENT_CONVERSION);
+ final Number percentage = value().evalPercentage();
+ return (int) Math.round(percentage.doubleValue() * getBaseFontSize(context, fobj)
+ / NumericConstants.PERCENT_CONVERSION);
}
if (value().canEvalNumber()) {
return value().evalLength(getBaseFontSize(context, fobj));
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdLeaderLength.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdLeaderLength.java 2022-12-31 00:38:49 UTC (rev 12983)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdLeaderLength.java 2022-12-31 01:28:25 UTC (rev 12984)
@@ -160,8 +160,8 @@
return length.evalLength(fobj.traitFontSize(context));
}
if (length.canEvalPercentage()) {
- final float percent = length.evalPercentage();
- return Math.round(context.ipdAncestorBlockOrRa() * percent
+ final Number percent = length.evalPercentage();
+ return (int) Math.round(context.ipdAncestorBlockOrRa() * percent.doubleValue()
/ NumericConstants.PERCENT_CONVERSION);
}
throw this.unexpectedRetrieval();
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdLeaderPatternWidth.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdLeaderPatternWidth.java 2022-12-31 00:38:49 UTC (rev 12983)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdLeaderPatternWidth.java 2022-12-31 01:28:25 UTC (rev 12984)
@@ -104,10 +104,9 @@
}
}
if (value().canEvalPercentage()) {
- final float percentage = value().evalPercentage();
+ final Number percentage = value().evalPercentage();
final int base = context.ipdParentArea();
- return Math.round(percentage * base /
- NumericConstants.PERCENT_CONVERSION);
+ return (int) Math.round(percentage.doubleValue() * base / NumericConstants.PERCENT_CONVERSION);
}
if (value().canEvalLength()) {
return this.convertValueToLength(value(), fobj, context);
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdLineHeight.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdLineHeight.java 2022-12-31 00:38:49 UTC (rev 12983)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdLineHeight.java 2022-12-31 01:28:25 UTC (rev 12984)
@@ -99,7 +99,7 @@
return pv;
}
if (pv.canEvalPercentage()) {
- if (pv.evalPercentage() < 0) {
+ if (pv.evalPercentage().doubleValue() < 0) {
throw unexpectedValue(value);
}
return pv;
@@ -164,9 +164,8 @@
}
if (value().canEvalPercentage()) {
final int base = fobj.traitFontSize(context);
- final float percentage = value().evalPercentage();
- return Math.round(percentage * base /
- NumericConstants.PERCENT_CONVERSION);
+ final Number percentage = value().evalPercentage();
+ return (int) Math.round(percentage.doubleValue() * base / NumericConstants.PERCENT_CONVERSION);
}
if (value().canEvalNumber()) {
final int fontSize = fobj.traitFontSize(context);
@@ -219,7 +218,7 @@
if (value().canEvalPercentage()) {
/* Not sure from the spec whether percentages are inherited or
* not. It is possible we should return a value of 1.0F here. */
- return value().evalPercentage() / NumericConstants.PERCENT_CONVERSION;
+ return (float) value().evalPercentage().doubleValue() / NumericConstants.PERCENT_CONVERSION;
}
if (value().canEvalNumber()) {
if (value().canEvalLength()) {
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdMargin.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdMargin.java 2022-12-31 00:38:49 UTC (rev 12983)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdMargin.java 2022-12-31 01:28:25 UTC (rev 12984)
@@ -137,8 +137,8 @@
} else {
base = context.widthContainingBlock();
}
- final float percent = value.evalPercentage();
- return Math.round(base * percent / NumericConstants.PERCENT_CONVERSION);
+ final Number percent = value.evalPercentage();
+ return (int) Math.round(base * percent.doubleValue() / NumericConstants.PERCENT_CONVERSION);
}
if (value.canEvalLength()) {
return this.convertValueToLength(value, fobj, context);
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPadding.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPadding.java 2022-12-31 00:38:49 UTC (rev 12983)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPadding.java 2022-12-31 01:28:25 UTC (rev 12984)
@@ -137,8 +137,8 @@
} else {
base = context.widthContainingBlock();
}
- final float percent = value.evalPercentage();
- return Math.round(base * percent / NumericConstants.PERCENT_CONVERSION);
+ final Number percent = value.evalPercentage();
+ return (int) Math.round(base * percent.doubleValue() / NumericConstants.PERCENT_CONVERSION);
}
if (value.canEvalLength()) {
return this.convertValueToLength(value, fobj, context);
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdProvisionalDistanceBetweenStarts.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdProvisionalDistanceBetweenStarts.java 2022-12-31 00:38:49 UTC (rev 12983)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdProvisionalDistanceBetweenStarts.java 2022-12-31 01:28:25 UTC (rev 12984)
@@ -105,9 +105,8 @@
}
if (value().canEvalPercentage()) {
final int base = context.ipdAncestorBlockArea();
- final float percentage = value().evalPercentage();
- return Math.round(percentage * base /
- NumericConstants.PERCENT_CONVERSION);
+ ...
[truncated message content] |
|
From: <vic...@us...> - 2022-12-31 19:01:50
|
Revision: 12990
http://sourceforge.net/p/foray/code/12990
Author: victormote
Date: 2022-12-31 19:01:48 +0000 (Sat, 31 Dec 2022)
Log Message:
-----------
Make DtAngle abstract and move unit differences to subclasses.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractGlyphOrientation.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdAzimuth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtAngle.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtLength.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/PropertyValue.java
Added Paths:
-----------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtAngle_Degrees.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtAngle_Grads.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtAngle_Radians.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractGlyphOrientation.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractGlyphOrientation.java 2022-12-31 18:06:36 UTC (rev 12989)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractGlyphOrientation.java 2022-12-31 19:01:48 UTC (rev 12990)
@@ -86,7 +86,7 @@
if (pv != null) {
return pv;
}
- pv = DtAngle.makeAngleDT(value);
+ pv = DtAngle.procureInstance(value);
if (pv != null) {
return pv;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdAzimuth.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdAzimuth.java 2022-12-31 18:06:36 UTC (rev 12989)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdAzimuth.java 2022-12-31 19:01:48 UTC (rev 12990)
@@ -176,7 +176,7 @@
if (this.isBehind) {
throw unexpectedValue(value);
}
- pv = DtAngle.makeAngleDT(value);
+ pv = DtAngle.procureInstance(value);
if (pv != null) {
return pv;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtAngle.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtAngle.java 2022-12-31 18:06:36 UTC (rev 12989)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtAngle.java 2022-12-31 19:01:48 UTC (rev 12990)
@@ -28,146 +28,61 @@
package org.foray.fotree.value;
-import org.foray.fotree.PropertyException;
-
import org.axsl.constants.NumericConstants;
+import java.util.regex.Matcher;
+
/**
* An "angle" property datatype in XSL-FO.
+ * @see "XSL-FO Recommendation 1.1, Section 5.11."
*/
-public class DtAngle extends Datatype {
+public abstract class DtAngle extends Datatype {
- /** Constant indicating that the units in this angle are degrees. */
- public static final byte DEGREES = 1;
-
- /** Constant indicating that the units in this angle are grads. */
- public static final byte GRADS = 2;
-
- /** Constant indicating that the units in this angle are radians. */
- public static final byte RADIANS = 3;
-
- /** The signed number value. */
- private float value = 0;
-
- /** The unit identifier. **/
- private byte unitID;
-
/**
- * Constructor.
- * @param value The signed angle value.
- * @param units One of {@link DtAngle#DEGREES}, {@link DtAngle#GRADS}, or
- * {@link DtAngle#RADIANS}.
- * @throws PropertyException For illegal {@code units} value.
- */
- public DtAngle(final float value, final byte units)
- throws PropertyException {
- if (! validUnits(units)) {
- throw new PropertyException("Illegal angle unit ID: " + units);
- }
- this.value = value;
- this.unitID = units;
- }
-
- /**
* Returns the value of this angle.
- * @return The normalized value of this angle, i.e. a value between 0
- * and 360 degrees, in degrees.
+ * @return The normalized value of this angle, i.e. a value between 0 and 360 degrees, in degrees.
*/
public float getValue() {
- float returnValue = DtAngle.convertToDegrees(this.value, this.unitID);
- returnValue %= NumericConstants.DEGREES_PER_CIRCLE;
- if (returnValue < 0) {
+ float returnValue = asDegrees();
+ while (returnValue < 0) {
returnValue += NumericConstants.DEGREES_PER_CIRCLE;
}
+ returnValue %= NumericConstants.DEGREES_PER_CIRCLE;
return returnValue;
}
/**
- * Converts input degrees, grads, or radians to degrees.
- * @param value The quantity to be converted, e.g. to convert 180 degrees,
- * set value to 180.
- * @param units One of AngleDT.DEGREES, AngleDT.GRADS, or AngleDT.RADIANS.
- * @return The value, in degrees, of the angle.
+ * Returns this value as degrees.
+ * @return This value as degrees.
*/
- public static float convertToDegrees(final float value, final byte units) {
- switch (units) {
- case DtAngle.DEGREES: {
- return value;
- }
- case DtAngle.GRADS: {
- /*
- * Conversion factor is per
- * http://www.metrication.com/conversions/tables.htm
- */
- return value * NumericConstants.DEGREES_PER_CIRCLE
- / NumericConstants.GRADS_PER_CIRCLE;
- }
- case DtAngle.RADIANS: {
- return (float) Math.toDegrees(value);
- }
- }
- return 0;
- }
+ public abstract float asDegrees();
/**
- * Factory method that creates an AngleDT instance if the input is valid.
- * @param input A String that conforms to the definition of the "angle"
- * datatype in the XSL-FO spec, 1.0, Section 5.11.
- * @return An AngleDT instance if input is valid, otherwise null;
+ * Factory method that creates or obtains a {@link DtAngle} instance if the input is valid.
+ * @param input A String that conforms to the definition of the "angle" datatype.
+ * @return A {@link DtAngle} instance, or null if the input is not valid.
*/
- public static DtAngle makeAngleDT(final String input) {
- byte unitID = 0;
- int index = input.indexOf("deg");
- if (index > -1) {
- unitID = DtAngle.DEGREES;
- }
- if (unitID == 0) {
- index = input.indexOf("grad");
- if (index > -1) {
- unitID = DtAngle.GRADS;
- }
- }
- if (unitID == 0) {
- index = input.indexOf("rad");
- if (index > -1) {
- unitID = DtAngle.RADIANS;
- }
- }
- if (! validUnits(unitID)) {
+ public static DtAngle procureInstance(final String input) {
+ final Matcher matcher = NUMBER_AND_UNITS_PATTERN.matcher(input);
+ if (! matcher.matches()) {
return null;
}
- final String valuePortion = input.substring(0, index - 1);
- float value = 0;
+ final String numericPart = matcher.group(1);
+ final String unitsPart = matcher.group(2);
+
+ final float numeric;
try {
- value = Float.parseFloat(valuePortion);
+ numeric = Float.parseFloat(numericPart);
} catch (final NumberFormatException e) {
return null;
}
- try {
- return new DtAngle(value, unitID);
- } catch (final PropertyException e1) {
- /*
- * The exception thrown by the constructor is to ensure that the
- * units are valid, which we have already done above. Therefore,
- * simply ignore this exception, as it should never occur.
- */
- return null;
- }
- }
- /**
- * Validates the units.
- * @param units The units value to be tested.
- * @return True if and only if the units value is valid.
- */
- public static boolean validUnits(final byte units) {
- if (units < DtAngle.DEGREES) {
- return false;
+ switch(unitsPart) {
+ case "deg": return new DtAngle_Degrees(numeric);
+ case "grad": return new DtAngle_Grads(numeric);
+ case "rad": return new DtAngle_Radians(numeric);
}
- if (units > DtAngle.RADIANS) {
- return false;
- }
- return true;
+ return null;
}
}
Added: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtAngle_Degrees.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtAngle_Degrees.java (rev 0)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtAngle_Degrees.java 2022-12-31 19:01:48 UTC (rev 12990)
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2022 The FOray Project.
+ * http://www.foray.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ * Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ * $LastChangedBy$
+ */
+
+package org.foray.fotree.value;
+
+/**
+ * An "angle" property datatype in XSL-FO, stored as "degrees".
+ * Members of this class are immutable.
+ */
+public final class DtAngle_Degrees extends DtAngle {
+
+ /** The signed number value. Stored locally to ensure immutability. */
+ private float value = 0;
+
+ /**
+ * Constructor.
+ * @param value The signed angle value.
+ */
+ public DtAngle_Degrees(final float value) {
+ this.value = value;
+ }
+
+ @Override
+ public float asDegrees() {
+ return this.value;
+ }
+
+}
Property changes on: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtAngle_Degrees.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev
\ No newline at end of property
Added: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtAngle_Grads.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtAngle_Grads.java (rev 0)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtAngle_Grads.java 2022-12-31 19:01:48 UTC (rev 12990)
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2022 The FOray Project.
+ * http://www.foray.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ * Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ * $LastChangedBy$
+ */
+
+package org.foray.fotree.value;
+
+import org.axsl.constants.NumericConstants;
+
+/**
+ * An "angle" property datatype in XSL-FO, stored as "degrees".
+ * Members of this class are immutable.
+ */
+public final class DtAngle_Grads extends DtAngle {
+
+ /** The signed number value. Stored locally to ensure immutability. */
+ private float value = 0;
+
+ /**
+ * Constructor.
+ * @param value The signed angle value.
+ */
+ public DtAngle_Grads(final float value) {
+ this.value = value;
+ }
+
+ @Override
+ public float asDegrees() {
+ return value * NumericConstants.DEGREES_PER_CIRCLE / NumericConstants.GRADS_PER_CIRCLE;
+ }
+
+}
Property changes on: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtAngle_Grads.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev
\ No newline at end of property
Added: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtAngle_Radians.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtAngle_Radians.java (rev 0)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtAngle_Radians.java 2022-12-31 19:01:48 UTC (rev 12990)
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2022 The FOray Project.
+ * http://www.foray.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ * Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ * $LastChangedBy$
+ */
+
+package org.foray.fotree.value;
+
+/**
+ * An "angle" property datatype in XSL-FO, stored as "degrees".
+ * Members of this class are immutable.
+ */
+public final class DtAngle_Radians extends DtAngle {
+
+ /** The signed number value. Stored locally to ensure immutability. */
+ private float value = 0;
+
+ /**
+ * Constructor.
+ * @param value The signed angle value.
+ */
+ public DtAngle_Radians(final float value) {
+ this.value = value;
+ }
+
+ @Override
+ public float asDegrees() {
+ return (float) Math.toDegrees(this.value);
+ }
+
+}
Property changes on: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtAngle_Radians.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev
\ No newline at end of property
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtLength.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtLength.java 2022-12-31 18:06:36 UTC (rev 12989)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtLength.java 2022-12-31 19:01:48 UTC (rev 12990)
@@ -29,7 +29,6 @@
package org.foray.fotree.value;
import java.util.regex.Matcher;
-import java.util.regex.Pattern;
/**
@@ -41,11 +40,6 @@
/** A property value that evaluates to a length of zero, suitable for use as a default. */
public static final DtLength ZERO_LENGTH = new DtLength_Points(0);
- /** Regex pattern for matching/parsing XSL-FO length expressions. This handles leading and trailing whitespace
- * and separates the numeric part from the units part, but does not attempt to validate either part as that is
- * done downstream. */
- private static final Pattern LENGTH_PATTERN = Pattern.compile("^\\s?([+-]?[0-9]*\\.?[0-9]*)([a-z]+)\\s?$");
-
/**
* Returns the value of this length, normalized to millipoints.
* @param fontSize The font-size, in millipoints. This is used only for "em" computations.
@@ -68,7 +62,7 @@
* @return A {@link DtLength} instance, or null if input is not valid.
*/
public static DtLength procureInstance(final String input) {
- final Matcher matcher = LENGTH_PATTERN.matcher(input);
+ final Matcher matcher = NUMBER_AND_UNITS_PATTERN.matcher(input);
if (! matcher.matches()) {
return null;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/PropertyValue.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/PropertyValue.java 2022-12-31 18:06:36 UTC (rev 12989)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/PropertyValue.java 2022-12-31 19:01:48 UTC (rev 12990)
@@ -31,6 +31,7 @@
import org.foray.fotree.FoObj;
import java.awt.Color;
+import java.util.regex.Pattern;
/**
* Interface for all XSL-FO property values.
@@ -37,6 +38,12 @@
*/
public interface PropertyValue {
+ /** Regex pattern for matching/parsing XSL-FO numbers that have trailing units.
+ * This expression handles leading and trailing whitespace and separates the numeric part from the units part, but
+ * does not attempt to validate either part as that is done downstream.
+ * Useful in parsing lengths, angles, times, and frequencies. */
+ Pattern NUMBER_AND_UNITS_PATTERN = Pattern.compile("^\\s?([+-]?[0-9]*\\.?[0-9]*)([a-z]+)\\s?$");
+
/** Constant indicating an invalid unit power, that is, a non-numeric item.*/
byte UNIT_POWER_NON_NUMERIC = -1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-12-31 19:57:21
|
Revision: 12991
http://sourceforge.net/p/foray/code/12991
Author: victormote
Date: 2022-12-31 19:57:19 +0000 (Sat, 31 Dec 2022)
Log Message:
-----------
Make DtTime abstract and move unit differences to subclasses.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractPause.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtTime.java
Added Paths:
-----------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtTime_Milliseconds.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtTime_Seconds.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractPause.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractPause.java 2022-12-31 19:01:48 UTC (rev 12990)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractPause.java 2022-12-31 19:57:19 UTC (rev 12991)
@@ -119,7 +119,7 @@
while (st.hasMoreTokens()) {
PropertyValue insideValue = null;
Property insideProperty = null;
- insideValue = DtTime.makeTimeDT(value);
+ insideValue = DtTime.procureInstance(value);
if (insideValue == null) {
insideValue = DtPercentage.makePercentageDT(value);
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtTime.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtTime.java 2022-12-31 19:01:48 UTC (rev 12990)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtTime.java 2022-12-31 19:57:19 UTC (rev 12991)
@@ -28,89 +28,46 @@
package org.foray.fotree.value;
-import org.axsl.constants.MeasurementConstants;
+import java.util.regex.Matcher;
/**
- * A "time" datatype in XSL. See XSL-FO Specification 1.0, Section 5.11.
+ * A "time" datatype in XSL.
+ * @see "XSL-FO Recommendation 1.0, Section 5.11."
+ * @see "XSL-FO Recommendation 1.1, Section 5.11."
*/
-public class DtTime extends Datatype {
+public abstract class DtTime extends Datatype {
/**
- * Enumeration of valid units of time.
- */
- public enum Units {
-
- /** The unit of time is seconds. */
- SECONDS,
-
- /** The unit of time is milliseconds. */
- MILLISECONDS;
-
- }
-
- /** The number of seconds or milliseconds in this time. */
- private Number quantity;
-
- /** The units (seconds or milliseconds) stored by this time. */
- private Units units;
-
- /**
- * Constructor.
- * @param quantity The number of seconds or milliseconds in this time.
- * @param units The units for this time measurement.
- */
- public DtTime(final Number quantity, final Units units) {
- if (units == null) {
- throw new NullPointerException("Time units cannot be null.");
- }
- this.quantity = quantity;
- this.units = units;
- }
-
- /**
* Returns the value, normalized to a unit of milliseconds.
* @return The value, normalized to a unit of milliseconds.
*/
- public int getValue() {
- switch (this.units) {
- case SECONDS: {
- return (int) Math.round(this.quantity.doubleValue() * MeasurementConstants.MILLISECONDS_PER_SECOND);
- }
- case MILLISECONDS: {
- return this.quantity.intValue();
- }
- }
- return -1;
- }
+ public abstract int getValue();
/**
- * Factory method for creating a TimeDT from a String input.
- * @param input The String from which a TimeDT should be constructed.
- * @return The TimeDT instance constructed, or null if input is not valid.
+ * Factory method for creating or obtaining an instance of {@link DtTime} from string input.
+ * @param input The String from which a {@link DtTime} instance should be constructed.
+ * @return The {@link DtTime}, or null if input is not valid.
*/
- public static DtTime makeTimeDT(final String input) {
- // Make a copy of input
- final String useInput = new String(input);
- useInput.trim();
- Units units = null;
- int unitsLength = -1;
- if (useInput.endsWith("ms")) {
- units = Units.MILLISECONDS;
- unitsLength = 2;
- } else if (useInput.endsWith("s")) {
- units = Units.SECONDS;
- unitsLength = 1;
- } else {
+ public static DtTime procureInstance(final String input) {
+ final Matcher matcher = NUMBER_AND_UNITS_PATTERN.matcher(input);
+ if (! matcher.matches()) {
return null;
}
- final String quantityPart = useInput.substring(0, useInput.length() - unitsLength);
- final double quantity;
+ final String numericPart = matcher.group(1);
+ final String unitsPart = matcher.group(2);
+
+ final float numeric;
try {
- quantity = Double.parseDouble(quantityPart);
+ numeric = Float.parseFloat(numericPart);
} catch (final NumberFormatException e) {
return null;
}
- return new DtTime(quantity, units);
+
+ switch(unitsPart) {
+ case "s": return new DtTime_Seconds(numeric);
+ case "ms": return new DtTime_Milliseconds(numeric);
+ }
+ return null;
}
}
Added: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtTime_Milliseconds.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtTime_Milliseconds.java (rev 0)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtTime_Milliseconds.java 2022-12-31 19:57:19 UTC (rev 12991)
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2022 The FOray Project.
+ * http://www.foray.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ * Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ * $LastChangedBy$
+ */
+
+package org.foray.fotree.value;
+
+/**
+ * A "time" datatype in XSL expressed in units of "milliseconds".
+ * Members of this class are immutable.
+ */
+public final class DtTime_Milliseconds extends DtTime {
+
+ /** The number of seconds. Stored locally to ensure immutability. */
+ private Number quantity;
+
+ /**
+ * Constructor.
+ * @param quantity The number of seconds in this time.
+ */
+ public DtTime_Milliseconds(final Number quantity) {
+ this.quantity = quantity;
+ }
+
+ @Override
+ public int getValue() {
+ return this.quantity.intValue();
+ }
+
+}
Property changes on: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtTime_Milliseconds.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev
\ No newline at end of property
Added: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtTime_Seconds.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtTime_Seconds.java (rev 0)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtTime_Seconds.java 2022-12-31 19:57:19 UTC (rev 12991)
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2022 The FOray Project.
+ * http://www.foray.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ * Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ * $LastChangedBy$
+ */
+
+package org.foray.fotree.value;
+
+import org.axsl.constants.MeasurementConstants;
+
+/**
+ * A "time" datatype in XSL expressed in units of "seconds".
+ * Members of this class are immutable.
+ */
+public final class DtTime_Seconds extends DtTime {
+
+ /** The number of seconds. Stored locally to ensure immutability. */
+ private Number quantity;
+
+ /**
+ * Constructor.
+ * @param quantity The number of seconds in this time.
+ */
+ public DtTime_Seconds(final Number quantity) {
+ this.quantity = quantity;
+ }
+
+ @Override
+ public int getValue() {
+ return (int) Math.round(this.quantity.doubleValue() * MeasurementConstants.MILLISECONDS_PER_SECOND);
+ }
+
+}
Property changes on: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtTime_Seconds.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-12-31 20:16:19
|
Revision: 12992
http://sourceforge.net/p/foray/code/12992
Author: victormote
Date: 2022-12-31 20:16:16 +0000 (Sat, 31 Dec 2022)
Log Message:
-----------
Make DtFrequency abstract and move unit differences to subclasses.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPitch.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtFrequency.java
Added Paths:
-----------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtFrequency_Hertz.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtFrequency_Kilohertz.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPitch.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPitch.java 2022-12-31 19:57:19 UTC (rev 12991)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPitch.java 2022-12-31 20:16:16 UTC (rev 12992)
@@ -80,7 +80,7 @@
if (pv.canEvalKeyword()) {
return pv;
}
- pv = DtFrequency.makeFrequencyDT(value);
+ pv = DtFrequency.procureInstance(value);
if (pv != null) {
return pv;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtFrequency.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtFrequency.java 2022-12-31 19:57:19 UTC (rev 12991)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtFrequency.java 2022-12-31 20:16:16 UTC (rev 12992)
@@ -28,97 +28,46 @@
package org.foray.fotree.value;
-import org.foray.fotree.PropertyException;
+import java.util.regex.Matcher;
-import org.axsl.constants.MeasurementConstants;
-
/**
- * A "frequency" datatype in XSL. See XSL-FO Specification 1.0, Section 5.11.
+ * A "frequency" datatype in XSL.
+ * @see "XSL-FO Recommendation 1.0, Section 5.11."
+ * @see "XSL-FO Recommendation 1.1, Section 5.11."
*/
-public class DtFrequency extends Datatype {
+public abstract class DtFrequency extends Datatype {
- /** Constant indicating a unit type of hertz. */
- public static final byte UNITS_HERTZ = 1;
-
- /** Constant indicating a unit type of kilohertz. */
- public static final byte UNITS_KILOHERTZ = 2;
-
- /** The quantity of units. */
- private double quantity;
-
- /** The unit type, either hertz or kilohertz. */
- private byte units;
-
/**
- * Constructor.
- * @param quantity The quantity of units.
- * @param units The unit type, either {@link DtFrequency#UNITS_HERTZ} or
- * {@link DtFrequency#UNITS_KILOHERTZ}.
- * @throws PropertyException For an invalid units value.
- */
- public DtFrequency(final double quantity, final byte units)
- throws PropertyException {
- if (units < 1 || units > 2) {
- throw new PropertyException("Invalid FrequencyDT unit ID.");
- }
- this.quantity = quantity;
- this.units = units;
- }
-
- /**
* Returns the value, normalized to a unit of Hertz.
* @return The value, normalized to a unit of Hertz.
*/
- public double getValue() {
- switch (this.units) {
- case DtFrequency.UNITS_HERTZ: {
- return this.quantity;
- }
- case DtFrequency.UNITS_KILOHERTZ: {
- return this.quantity * MeasurementConstants.HERTZ_PER_KILOHERTZ;
- }
- }
- return -1;
- }
+ public abstract double getValue();
/**
- * Factory method for creating a FrequencyDT from a String input.
- * @param input The String from which a FrequencyDT should be constructed.
- * @return The FrequencyDT instance constructed, or null if input is not
- * valid.
+ * Factory method for creating a {@link DtFrequency} from String input.
+ * @param input The String from which a {@link DtFrequency} should be constructed.
+ * @return The {@link DtFrequency} procured, or null if input is not valid.
*/
- public static DtFrequency makeFrequencyDT(final String input) {
- // Make a copy of input
- final String useInput = new String(input);
- useInput.trim();
- byte units = -1;
- int unitsLength = -1;
- if (useInput.endsWith("Hz")) {
- units = DtFrequency.UNITS_HERTZ;
- unitsLength = "Hz".length();
- } else if (useInput.endsWith("kHz")) {
- units = DtFrequency.UNITS_KILOHERTZ;
- unitsLength = "kHz".length();
- } else {
+ public static DtFrequency procureInstance(final String input) {
+ final Matcher matcher = NUMBER_AND_UNITS_PATTERN.matcher(input);
+ if (! matcher.matches()) {
return null;
}
- final String quantityPart = useInput.substring(0, useInput.length()
- - unitsLength);
- final double quantity;
+ final String numericPart = matcher.group(1);
+ final String unitsPart = matcher.group(2);
+
+ final float numeric;
try {
- quantity = Double.parseDouble(quantityPart);
+ numeric = Float.parseFloat(numericPart);
} catch (final NumberFormatException e) {
return null;
}
- try {
- return new DtFrequency(quantity, units);
- } catch (final PropertyException e1) {
- /*
- * This should never happen, because we have already validated the
- * input.
- */
- return null;
+
+ switch(unitsPart) {
+ case "Hz": return new DtFrequency_Hertz(numeric);
+ case "kHz": return new DtFrequency_Kilohertz(numeric);
}
+ return null;
}
}
Added: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtFrequency_Hertz.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtFrequency_Hertz.java (rev 0)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtFrequency_Hertz.java 2022-12-31 20:16:16 UTC (rev 12992)
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2022 The FOray Project.
+ * http://www.foray.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ * Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ * $LastChangedBy$
+ */
+
+package org.foray.fotree.value;
+
+/**
+ * A "frequency" datatype in XSL using units of "hertz".
+ * Members of this class are immutable.
+ */
+public class DtFrequency_Hertz extends DtFrequency {
+
+ /** The quantity of units. */
+ private double quantity;
+
+ /**
+ * Constructor.
+ * @param quantity The quantity of units.
+ */
+ public DtFrequency_Hertz(final double quantity) {
+ this.quantity = quantity;
+ }
+
+ @Override
+ public double getValue() {
+ return this.quantity;
+ }
+
+}
Property changes on: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtFrequency_Hertz.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev
\ No newline at end of property
Added: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtFrequency_Kilohertz.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtFrequency_Kilohertz.java (rev 0)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtFrequency_Kilohertz.java 2022-12-31 20:16:16 UTC (rev 12992)
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2022 The FOray Project.
+ * http://www.foray.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ * Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ * $LastChangedBy$
+ */
+
+package org.foray.fotree.value;
+
+import org.axsl.constants.MeasurementConstants;
+
+/**
+ * A "frequency" datatype in XSL using units of "kilohertz".
+ * Members of this class are immutable.
+ */
+public class DtFrequency_Kilohertz extends DtFrequency {
+
+ /** The quantity of units. */
+ private double quantity;
+
+ /**
+ * Constructor.
+ * @param quantity The quantity of units.
+ */
+ public DtFrequency_Kilohertz(final double quantity) {
+ this.quantity = quantity;
+ }
+
+ @Override
+ public double getValue() {
+ return this.quantity * MeasurementConstants.HERTZ_PER_KILOHERTZ;
+ }
+
+}
Property changes on: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtFrequency_Kilohertz.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2023-01-01 01:30:19
|
Revision: 12994
http://sourceforge.net/p/foray/code/12994
Author: victormote
Date: 2023-01-01 01:30:16 +0000 (Sun, 01 Jan 2023)
Log Message:
-----------
Conform to aXSL change: Normalize angle property return values to millidegrees instead of fractional degrees.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractGlyphOrientation.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdAzimuth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdElevation.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtAngle.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtAngle_Degrees.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtAngle_Grads.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtAngle_Radians.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java 2023-01-01 00:58:40 UTC (rev 12993)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java 2023-01-01 01:30:16 UTC (rev 12994)
@@ -2612,12 +2612,12 @@
}
@Override
- public Number traitAzimuth(final FoContext context) {
+ public int traitAzimuth(final FoContext context) {
return getPropertyList().traitAzimuth(this, context);
}
@Override
- public Number traitElevation(final FoContext context) {
+ public int traitElevation(final FoContext context) {
return getPropertyList().traitElevation(this, context);
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java 2023-01-01 00:58:40 UTC (rev 12993)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java 2023-01-01 01:30:16 UTC (rev 12994)
@@ -3811,7 +3811,7 @@
* @param context An object that knows how to resolve FO Tree context issues.
* @return The azimuth property.
*/
- public Number traitAzimuth(final FoObj fobj, final FoContext context) {
+ public int traitAzimuth(final FoObj fobj, final FoContext context) {
final PdAzimuth property = (PdAzimuth) getProperty(FoPropertyId.AZIMUTH);
if (property != null) {
return property.getValue(context, fobj);
@@ -3825,7 +3825,7 @@
* @param context An object that knows how to resolve FO Tree context issues.
* @return The elevation property.
*/
- public Number traitElevation(final FoObj fobj, final FoContext context) {
+ public int traitElevation(final FoObj fobj, final FoContext context) {
final PdElevation property = (PdElevation) getProperty(FoPropertyId.ELEVATION);
if (property != null) {
return property.getValue(context, fobj);
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractGlyphOrientation.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractGlyphOrientation.java 2023-01-01 00:58:40 UTC (rev 12993)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractGlyphOrientation.java 2023-01-01 01:30:16 UTC (rev 12994)
@@ -102,7 +102,7 @@
throw new IllegalStateException("Value must be an angle to round.");
}
final DtAngle angle = (DtAngle) value();
- final double angleValue = angle.getValue();
+ final int angleValue = angle.getValue();
if (angleValue < AbstractGlyphOrientation.ANGLE_ROUNDING_0_CUTOFF) {
return 0;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdAzimuth.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdAzimuth.java 2023-01-01 00:58:40 UTC (rev 12993)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdAzimuth.java 2023-01-01 01:30:16 UTC (rev 12994)
@@ -189,7 +189,7 @@
* @param fobj The FO for which this value is needed.
* @return The value of this property.
*/
- public Number getValue(final FoContext context, final FoObj fobj) {
+ public int getValue(final FoContext context, final FoObj fobj) {
if (value() instanceof DtAngle) {
return ((DtAngle) value()).getValue();
}
@@ -248,12 +248,12 @@
return PdAzimuth.ANGLE_RIGHT_SIDE;
}
case LEFTWARDS: {
- return (getValueNoInstance(context, fobj).doubleValue()
+ return (getValueNoInstance(context, fobj)
- PdAzimuth.ANGLE_RELATIVE_INCREMENTOR)
% NumericConstants.DEGREES_PER_CIRCLE;
}
case RIGHTWARDS: {
- return (getValueNoInstance(context, fobj).doubleValue()
+ return (getValueNoInstance(context, fobj)
+ PdAzimuth.ANGLE_RELATIVE_INCREMENTOR)
% NumericConstants.DEGREES_PER_CIRCLE;
}
@@ -271,8 +271,7 @@
* @param fobj The FO for which this value is needed.
* @return The initial value for this property.
*/
- public static Number getValueNoInstance(final FoContext context,
- final FoObj fobj) {
+ public static int getValueNoInstance(final FoContext context, final FoObj fobj) {
final FoObj parent = fobj.effectiveParent(context);
if (parent != null) {
return parent.traitAzimuth(context);
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdElevation.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdElevation.java 2023-01-01 00:58:40 UTC (rev 12993)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdElevation.java 2023-01-01 01:30:16 UTC (rev 12994)
@@ -107,7 +107,7 @@
* @param fobj The FO for which this value is needed.
* @return The value of this property.
*/
- public Number getValue(final FoContext context, final FoObj fobj) {
+ public int getValue(final FoContext context, final FoObj fobj) {
if (value() instanceof DtAngle) {
return ((DtAngle) value()).getValue();
}
@@ -127,12 +127,12 @@
return PdElevation.ANGLE_ABOVE;
}
case HIGHER: {
- return Math.min(getValueNoInstance(context, fobj).doubleValue()
+ return Math.min(getValueNoInstance(context, fobj)
+ PdElevation.ANGLE_RELATIVE_INCREMENT,
PdElevation.ANGLE_ABOVE);
}
case LOWER: {
- return Math.max(getValueNoInstance(context, fobj).doubleValue()
+ return Math.max(getValueNoInstance(context, fobj)
- PdElevation.ANGLE_RELATIVE_INCREMENT,
PdElevation.ANGLE_BELOW);
}
@@ -150,8 +150,7 @@
* @param fobj The FO for which this value is needed.
* @return The initial value for this property.
*/
- public static Number getValueNoInstance(final FoContext context,
- final FoObj fobj) {
+ public static int getValueNoInstance(final FoContext context, final FoObj fobj) {
final FoObj parent = fobj.effectiveParent(context);
if (parent != null) {
return parent.traitAzimuth(context);
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtAngle.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtAngle.java 2023-01-01 00:58:40 UTC (rev 12993)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtAngle.java 2023-01-01 01:30:16 UTC (rev 12994)
@@ -30,6 +30,7 @@
import org.axsl.constants.NumericConstants;
+import java.math.BigDecimal;
import java.util.regex.Matcher;
/**
@@ -39,16 +40,16 @@
public abstract class DtAngle extends Datatype {
/**
- * Returns the value of this angle.
+ * Returns the value of this angle, in millidegrees.
* @return The normalized value of this angle, i.e. a value between 0 and 360 degrees, in degrees.
*/
- public float getValue() {
- float returnValue = asDegrees();
- while (returnValue < 0) {
- returnValue += NumericConstants.DEGREES_PER_CIRCLE;
+ public int getValue() {
+ double degrees = asDegrees();
+ while (degrees < 0) {
+ degrees += NumericConstants.DEGREES_PER_CIRCLE;
}
- returnValue %= NumericConstants.DEGREES_PER_CIRCLE;
- return returnValue;
+ degrees %= NumericConstants.DEGREES_PER_CIRCLE;
+ return (int) Math.round(degrees * NumericConstants.MILLIDEGREES_PER_DEGREE);
}
/**
@@ -55,7 +56,7 @@
* Returns this value as degrees.
* @return This value as degrees.
*/
- public abstract float asDegrees();
+ public abstract double asDegrees();
/**
* Factory method that creates or obtains a {@link DtAngle} instance if the input is valid.
@@ -70,9 +71,9 @@
final String numericPart = matcher.group(1);
final String unitsPart = matcher.group(2);
- final float numeric;
+ final BigDecimal numeric;
try {
- numeric = Float.parseFloat(numericPart);
+ numeric = new BigDecimal(numericPart);
} catch (final NumberFormatException e) {
return null;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtAngle_Degrees.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtAngle_Degrees.java 2023-01-01 00:58:40 UTC (rev 12993)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtAngle_Degrees.java 2023-01-01 01:30:16 UTC (rev 12994)
@@ -28,6 +28,8 @@
package org.foray.fotree.value;
+import java.math.BigDecimal;
+
/**
* An "angle" property datatype in XSL-FO, stored as "degrees".
* Members of this class are immutable.
@@ -35,19 +37,19 @@
public final class DtAngle_Degrees extends DtAngle {
/** The signed number value. Stored locally to ensure immutability. */
- private float value = 0;
+ private BigDecimal value;
/**
* Constructor.
* @param value The signed angle value.
*/
- public DtAngle_Degrees(final float value) {
+ public DtAngle_Degrees(final BigDecimal value) {
this.value = value;
}
@Override
- public float asDegrees() {
- return this.value;
+ public double asDegrees() {
+ return this.value.doubleValue();
}
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtAngle_Grads.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtAngle_Grads.java 2023-01-01 00:58:40 UTC (rev 12993)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtAngle_Grads.java 2023-01-01 01:30:16 UTC (rev 12994)
@@ -30,6 +30,8 @@
import org.axsl.constants.NumericConstants;
+import java.math.BigDecimal;
+
/**
* An "angle" property datatype in XSL-FO, stored as "degrees".
* Members of this class are immutable.
@@ -37,19 +39,19 @@
public final class DtAngle_Grads extends DtAngle {
/** The signed number value. Stored locally to ensure immutability. */
- private float value = 0;
+ private BigDecimal value;
/**
* Constructor.
* @param value The signed angle value.
*/
- public DtAngle_Grads(final float value) {
+ public DtAngle_Grads(final BigDecimal value) {
this.value = value;
}
@Override
- public float asDegrees() {
- return value * NumericConstants.DEGREES_PER_CIRCLE / NumericConstants.GRADS_PER_CIRCLE;
+ public double asDegrees() {
+ return value.doubleValue() * NumericConstants.DEGREES_PER_CIRCLE / NumericConstants.GRADS_PER_CIRCLE;
}
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtAngle_Radians.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtAngle_Radians.java 2023-01-01 00:58:40 UTC (rev 12993)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtAngle_Radians.java 2023-01-01 01:30:16 UTC (rev 12994)
@@ -28,6 +28,8 @@
package org.foray.fotree.value;
+import java.math.BigDecimal;
+
/**
* An "angle" property datatype in XSL-FO, stored as "degrees".
* Members of this class are immutable.
@@ -35,19 +37,19 @@
public final class DtAngle_Radians extends DtAngle {
/** The signed number value. Stored locally to ensure immutability. */
- private float value = 0;
+ private BigDecimal value;
/**
* Constructor.
* @param value The signed angle value.
*/
- public DtAngle_Radians(final float value) {
+ public DtAngle_Radians(final BigDecimal value) {
this.value = value;
}
@Override
- public float asDegrees() {
- return (float) Math.toDegrees(this.value);
+ public double asDegrees() {
+ return Math.toDegrees(this.value.doubleValue());
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2023-01-01 12:42:20
|
Revision: 12995
http://sourceforge.net/p/foray/code/12995
Author: victormote
Date: 2023-01-01 12:42:15 +0000 (Sun, 01 Jan 2023)
Log Message:
-----------
Conform to aXSL changes: Convert more return types from Number to 1000x int.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAudioDial.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractPause.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdSpeechRate.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdVolume.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java 2023-01-01 01:30:16 UTC (rev 12994)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java 2023-01-01 12:42:15 UTC (rev 12995)
@@ -2701,7 +2701,7 @@
}
@Override
- public Number traitSpeechRate(final FoContext context) {
+ public int traitSpeechRate(final FoContext context) {
return getPropertyList().traitSpeechRate(this, context);
}
@@ -2726,12 +2726,12 @@
}
@Override
- public Number traitPitchRange(final FoContext context) {
+ public int traitPitchRange(final FoContext context) {
return getPropertyList().traitPitchRange(this, context);
}
@Override
- public Number traitVolume(final FoContext context) {
+ public int traitVolume(final FoContext context) {
return getPropertyList().traitVolume(this, context);
}
@@ -2756,12 +2756,12 @@
}
@Override
- public Number traitRichness(final FoContext context) {
+ public int traitRichness(final FoContext context) {
return getPropertyList().traitRichness(this, context);
}
@Override
- public Number traitStress(final FoContext context) {
+ public int traitStress(final FoContext context) {
return getPropertyList().traitStress(this, context);
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java 2023-01-01 01:30:16 UTC (rev 12994)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java 2023-01-01 12:42:15 UTC (rev 12995)
@@ -4048,7 +4048,7 @@
* @param context An object that knows how to resolve FO Tree context issues.
* @return The speech-rate property.
*/
- public Number traitSpeechRate(final FoObj fobj, final FoContext context) {
+ public int traitSpeechRate(final FoObj fobj, final FoContext context) {
final PdSpeechRate property = (PdSpeechRate) getProperty(FoPropertyId.SPEECH_RATE);
if (property != null) {
return property.getValue(context, fobj);
@@ -4128,7 +4128,7 @@
* @param context An object that knows how to resolve FO Tree context issues.
* @return The pitch-range property.
*/
- public Number traitPitchRange(final FoObj fobj, final FoContext context) {
+ public int traitPitchRange(final FoObj fobj, final FoContext context) {
final AbstractAudioDial property = (AbstractAudioDial) getProperty(FoPropertyId.PITCH_RANGE);
if (property != null) {
return property.getValue(context, fobj);
@@ -4142,7 +4142,7 @@
* @param context An object that knows how to resolve FO Tree context issues.
* @return The volume property.
*/
- public Number traitVolume(final FoObj fobj, final FoContext context) {
+ public int traitVolume(final FoObj fobj, final FoContext context) {
final PdVolume property = (PdVolume) getProperty(FoPropertyId.VOLUME);
if (property != null) {
return property.getValue(context, fobj);
@@ -4208,7 +4208,7 @@
* @param context An object that knows how to resolve FO Tree context issues.
* @return The richness property.
*/
- public Number traitRichness(final FoObj fobj, final FoContext context) {
+ public int traitRichness(final FoObj fobj, final FoContext context) {
final AbstractAudioDial property = (AbstractAudioDial) getProperty(FoPropertyId.RICHNESS);
if (property != null) {
return property.getValue(context, fobj);
@@ -4222,7 +4222,7 @@
* @param context An object that knows how to resolve FO Tree context issues.
* @return The stress property.
*/
- public Number traitStress(final FoObj fobj, final FoContext context) {
+ public int traitStress(final FoObj fobj, final FoContext context) {
final AbstractAudioDial property = (AbstractAudioDial) getProperty(FoPropertyId.STRESS);
if (property != null) {
return property.getValue(context, fobj);
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAudioDial.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAudioDial.java 2023-01-01 01:30:16 UTC (rev 12994)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAudioDial.java 2023-01-01 12:42:15 UTC (rev 12995)
@@ -95,9 +95,9 @@
* @param fobj The FO for which this value is needed.
* @return The value of this property.
*/
- public Number getValue(final FoContext context, final FoObj fobj) {
+ public int getValue(final FoContext context, final FoObj fobj) {
if (value().canEvalNumber()) {
- return value().evalNumber();
+ return value().evalNumber().intValue();
}
if (value().canEvalKeyword()) {
final FoValue keyword = this.convertValueToFoValue(value());
@@ -121,8 +121,7 @@
* is needed.
* @return The initial value for this property.
*/
- public static Number getValueNoInstance(final FoContext context,
- final FoObj fobj, final FoPropertyId propertyType) {
+ public static int getValueNoInstance(final FoContext context, final FoObj fobj, final FoPropertyId propertyType) {
final FoObj parent = fobj.effectiveParent(context);
if (parent != null) {
switch (propertyType) {
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractPause.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractPause.java 2023-01-01 01:30:16 UTC (rev 12994)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractPause.java 2023-01-01 12:42:15 UTC (rev 12995)
@@ -152,7 +152,7 @@
* is computed in units of words-per-minute, so we multiply by
* 60,000 to convert from minutes to milliseconds.
*/
- final double base = 1 / fobj.traitSpeechRate(context).doubleValue() * 60000;
+ final double base = 1 / fobj.traitSpeechRate(context) * 60000;
return (int) Math.round(base * percentage.doubleValue());
}
if (value().canEvalKeyword()) {
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdSpeechRate.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdSpeechRate.java 2023-01-01 01:30:16 UTC (rev 12994)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdSpeechRate.java 2023-01-01 12:42:15 UTC (rev 12995)
@@ -117,9 +117,9 @@
* @param fobj The FO for which this value is needed.
* @return The value of this property.
*/
- public Number getValue(final FoContext context, final FoObj fobj) {
+ public int getValue(final FoContext context, final FoObj fobj) {
if (value().canEvalNumber()) {
- return value().evalNumber();
+ return value().evalNumber().intValue();
}
if (value().canEvalKeyword()) {
final FoValue keyword = this.convertValueToFoValue(value());
@@ -143,12 +143,10 @@
return PdSpeechRate.SPEECH_RATE_X_FAST;
}
case FASTER: {
- return getValueNoInstance(context, fobj).doubleValue()
- + PdSpeechRate.SPEECH_RATE_RELATIVE_INCREMENT;
+ return getValueNoInstance(context, fobj) + PdSpeechRate.SPEECH_RATE_RELATIVE_INCREMENT;
}
case SLOWER: {
- return getValueNoInstance(context, fobj).doubleValue()
- - PdSpeechRate.SPEECH_RATE_RELATIVE_INCREMENT;
+ return getValueNoInstance(context, fobj) - PdSpeechRate.SPEECH_RATE_RELATIVE_INCREMENT;
}
default: {
throw this.unexpectedRetrieval();
@@ -164,8 +162,7 @@
* @param fobj The FO for which this value is needed.
* @return The initial value for this property.
*/
- public static Number getValueNoInstance(final FoContext context,
- final FoObj fobj) {
+ public static int getValueNoInstance(final FoContext context, final FoObj fobj) {
final FoObj parent = fobj.effectiveParent(context);
if (parent != null) {
return parent.traitSpeechRate(context);
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdVolume.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdVolume.java 2023-01-01 01:30:16 UTC (rev 12994)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdVolume.java 2023-01-01 12:42:15 UTC (rev 12995)
@@ -49,22 +49,22 @@
* VOLUME_SILENT, which was invented here. */
/** The numeric equivalent of "silent". */
- public static final double VOLUME_SILENT = -1;
+ public static final int VOLUME_SILENT = -1;
/** The numeric equivalent of "extra-soft". */
- public static final double VOLUME_X_SOFT = 0;
+ public static final int VOLUME_X_SOFT = 0;
/** The numeric equivalent of "soft". */
- public static final double VOLUME_SOFT = 25;
+ public static final int VOLUME_SOFT = 25_000;
/** The numeric equivalent of "medium". */
- public static final double VOLUME_MEDIUM = 50;
+ public static final int VOLUME_MEDIUM = 50_000;
/** The numeric equivalent of "loud". */
- public static final double VOLUME_LOUD = 75;
+ public static final int VOLUME_LOUD = 75_000;
/** The numeric equivalent of "extra-loud". */
- public static final double VOLUME_X_LOUD = 100;
+ public static final int VOLUME_X_LOUD = 100_000;
/** Array of valid keywords. */
private static final FoValue[] VALID_KEYWORDS = {
@@ -121,21 +121,21 @@
* @param fobj The FO for which this value is needed.
* @return The value of this property.
*/
- public Number getValue(final FoContext context, final FoObj fobj) {
+ public int getValue(final FoContext context, final FoObj fobj) {
if (value().canEvalPercentage()) {
- final Number base = getInheritedValue(context, fobj);
- if (base.doubleValue() < 0) {
+ final int base = getInheritedValue(context, fobj);
+ if (base < 0) {
// Handle the special case of "silent"
return base;
}
final Number percent = value().evalPercentage();
- double product = percent.doubleValue() * base.doubleValue();
+ int product = (int) Math.round(percent.doubleValue() * base);
product = Math.max(product, 0);
product = Math.min(product, NumericConstants.PERCENT_CONVERSION);
return product;
}
if (value().canEvalNumber()) {
- return value().evalNumber();
+ return value().evalNumber().intValue();
}
if (value().canEvalKeyword()) {
final FoValue keyword = this.convertValueToFoValue(value());
@@ -175,8 +175,7 @@
* @param fobj The FO for which this value is needed.
* @return The initial value for this property.
*/
- public static Number getValueNoInstance(final FoContext context,
- final FoObj fobj) {
+ public static int getValueNoInstance(final FoContext context, final FoObj fobj) {
return getInheritedValue(context, fobj);
}
@@ -186,8 +185,7 @@
* @param fobj The FO for which this value is needed.
* @return The initial value for this property.
*/
- private static Number getInheritedValue(final FoContext context,
- final FoObj fobj) {
+ private static int getInheritedValue(final FoContext context, final FoObj fobj) {
final FoObj parent = fobj.effectiveParent(context);
if (parent != null) {
return parent.traitVolume(context);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2023-01-02 14:48:26
|
Revision: 13002
http://sourceforge.net/p/foray/code/13002
Author: victormote
Date: 2023-01-02 14:48:23 +0000 (Mon, 02 Jan 2023)
Log Message:
-----------
Rename PropertyCollection to PvShorthandSubproperties, for clarity.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBorder.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractCue.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractPause.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBackground.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBackgroundPosition.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderColor.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderStyle.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderWidth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdFont.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdMargin.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPadding.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdSize.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/package-info.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/package-info.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/prop/Lang.java
Added Paths:
-----------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/PvShorthandSubproperties.java
Removed Paths:
-------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/PropertyCollection.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBorder.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBorder.java 2023-01-02 13:16:45 UTC (rev 13001)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBorder.java 2023-01-02 14:48:23 UTC (rev 13002)
@@ -35,8 +35,8 @@
import org.foray.fotree.fo.FoPropertyKeyword;
import org.foray.fotree.fo.FoValue;
import org.foray.fotree.value.DtColor;
-import org.foray.fotree.value.PropertyCollection;
import org.foray.fotree.value.PropertyValue;
+import org.foray.fotree.value.PvShorthandSubproperties;
import org.axsl.value.AbsoluteCompass;
@@ -72,7 +72,7 @@
* @throws PropertyException For an invalid property value.
*/
private PropertyValue createPropertyValue(final String value) throws PropertyException {
- PropertyCollection collection = null;
+ PvShorthandSubproperties collection = null;
/*
* Must handle inherit specially, because it essentially propogates
* to style, width, and color.
@@ -81,7 +81,7 @@
final PdBorderStyle borderStyle = new PdBorderStyle("inherit");
final PdBorderWidth borderWidth = new PdBorderWidth("inherit");
final PdBorderColor borderColor = new PdBorderColor("inherit");
- collection = new PropertyCollection();
+ collection = new PvShorthandSubproperties();
collection.addItem(borderStyle);
collection.addItem(borderWidth);
collection.addItem(borderColor);
@@ -94,7 +94,7 @@
throw unexpectedValue(value);
}
if (collection == null) {
- collection = new PropertyCollection();
+ collection = new PvShorthandSubproperties();
}
collection.addItem(property);
}
@@ -146,10 +146,10 @@
* @return The border-style component of this compound property.
*/
public AbstractBorderStyle getBorderStyle() {
- if (! (value() instanceof PropertyCollection)) {
+ if (! (value() instanceof PvShorthandSubproperties)) {
return null;
}
- final PropertyCollection collection = (PropertyCollection) value();
+ final PvShorthandSubproperties collection = (PvShorthandSubproperties) value();
final Property property = collection.findProperty(
FoPropertyId.BORDER_STYLE);
if (property instanceof AbstractBorderStyle) {
@@ -163,10 +163,10 @@
* @return The border-width component of this compound property.
*/
public AbstractBorderWidth getBorderWidth() {
- if (! (value() instanceof PropertyCollection)) {
+ if (! (value() instanceof PvShorthandSubproperties)) {
return null;
}
- final PropertyCollection collection = (PropertyCollection) value();
+ final PvShorthandSubproperties collection = (PvShorthandSubproperties) value();
final Property property = collection.findProperty(
FoPropertyId.BORDER_WIDTH);
if (property instanceof AbstractBorderWidth) {
@@ -180,10 +180,10 @@
* @return The border-color component of this compound property.
*/
public AbstractBorderColor getBorderColor() {
- if (! (value() instanceof PropertyCollection)) {
+ if (! (value() instanceof PvShorthandSubproperties)) {
return null;
}
- final PropertyCollection collection = (PropertyCollection) value();
+ final PvShorthandSubproperties collection = (PvShorthandSubproperties) value();
final Property property = collection.findProperty(
FoPropertyId.BORDER_COLOR);
if (property instanceof AbstractBorderColor) {
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractCue.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractCue.java 2023-01-02 13:16:45 UTC (rev 13001)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractCue.java 2023-01-02 14:48:23 UTC (rev 13002)
@@ -34,8 +34,8 @@
import org.foray.fotree.fo.FoPropertyId;
import org.foray.fotree.fo.FoValue;
import org.foray.fotree.value.DtUri;
-import org.foray.fotree.value.PropertyCollection;
import org.foray.fotree.value.PropertyValue;
+import org.foray.fotree.value.PvShorthandSubproperties;
import org.axsl.fotree.FoContext;
@@ -108,7 +108,7 @@
if (st.countTokens() != 1 && st.countTokens() != 2) {
throw unexpectedValue(value);
}
- final PropertyCollection collection = new PropertyCollection();
+ final PvShorthandSubproperties collection = new PvShorthandSubproperties();
while (st.hasMoreTokens()) {
final PropertyValue pv = createPropertyValue(st.nextToken());
final PdCue cueProperty = new PdCue(pv);
@@ -169,10 +169,10 @@
* @return The value of this property.
*/
public URL getShorthandValue(final FoContext context, final FoObj fobj, final FoPropertyId propertyType) {
- if (! (value() instanceof PropertyCollection)) {
+ if (! (value() instanceof PvShorthandSubproperties)) {
return null;
}
- final PropertyCollection collection = (PropertyCollection) value();
+ final PvShorthandSubproperties collection = (PvShorthandSubproperties) value();
int index = -1;
switch (propertyType) {
case CUE_BEFORE: {
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractPause.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractPause.java 2023-01-02 13:16:45 UTC (rev 13001)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractPause.java 2023-01-02 14:48:23 UTC (rev 13002)
@@ -36,8 +36,8 @@
import org.foray.fotree.fo.FoValue;
import org.foray.fotree.value.DtPercentage;
import org.foray.fotree.value.DtTime;
-import org.foray.fotree.value.PropertyCollection;
import org.foray.fotree.value.PropertyValue;
+import org.foray.fotree.value.PvShorthandSubproperties;
import org.axsl.fotree.FoContext;
@@ -111,7 +111,7 @@
if (pv != null) {
return pv;
}
- final PropertyCollection collection = new PropertyCollection();
+ final PvShorthandSubproperties collection = new PvShorthandSubproperties();
final StringTokenizer st = new StringTokenizer(value);
if (st.countTokens() < 1 || st.countTokens() > 2) {
throw unexpectedValue(value);
@@ -219,10 +219,10 @@
}
}
}
- if (! (value() instanceof PropertyCollection)) {
+ if (! (value() instanceof PvShorthandSubproperties)) {
return 0;
}
- final PropertyCollection collection = (PropertyCollection) value();
+ final PvShorthandSubproperties collection = (PvShorthandSubproperties) value();
int index = -1;
switch (propertyType) {
case PAUSE_BEFORE: {
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBackground.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBackground.java 2023-01-02 13:16:45 UTC (rev 13001)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBackground.java 2023-01-02 14:48:23 UTC (rev 13002)
@@ -37,8 +37,8 @@
import org.foray.fotree.value.DtColor;
import org.foray.fotree.value.DtLength;
import org.foray.fotree.value.DtPercentage;
-import org.foray.fotree.value.PropertyCollection;
import org.foray.fotree.value.PropertyValue;
+import org.foray.fotree.value.PvShorthandSubproperties;
import java.util.ArrayList;
import java.util.List;
@@ -79,7 +79,7 @@
*/
private PropertyValue createPropertyValue(final String propertyFullName, final String value)
throws PropertyException {
- final PropertyCollection collection = new PropertyCollection();
+ final PvShorthandSubproperties collection = new PvShorthandSubproperties();
final PropertyValue pv = checkKeywords(this.getValidKeywords(), value);
if (pv != null) {
collection.addItem(new PdBackgroundColor(pv));
@@ -228,7 +228,7 @@
* @return The background-color component of this compound property.
*/
public PdBackgroundColor getColor() {
- final PropertyCollection collection = (PropertyCollection) value();
+ final PvShorthandSubproperties collection = (PvShorthandSubproperties) value();
return (PdBackgroundColor) collection.findProperty(
FoPropertyId.BACKGROUND_COLOR);
}
@@ -238,7 +238,7 @@
* @return The background-image component of this compound property.
*/
public PdBackgroundImage getImage() {
- final PropertyCollection collection = (PropertyCollection) value();
+ final PvShorthandSubproperties collection = (PvShorthandSubproperties) value();
return (PdBackgroundImage) collection.findProperty(
FoPropertyId.BACKGROUND_IMAGE);
}
@@ -248,7 +248,7 @@
* @return The background-repeat component of this compound property.
*/
public PdBackgroundRepeat getRepeat() {
- final PropertyCollection collection = (PropertyCollection) value();
+ final PvShorthandSubproperties collection = (PvShorthandSubproperties) value();
return (PdBackgroundRepeat) collection.findProperty(
FoPropertyId.BACKGROUND_REPEAT);
}
@@ -258,7 +258,7 @@
* @return The background-attachment component of this compound property.
*/
public PdBackgroundAttachment getAttachment() {
- final PropertyCollection collection = (PropertyCollection) value();
+ final PvShorthandSubproperties collection = (PvShorthandSubproperties) value();
return (PdBackgroundAttachment) collection.findProperty(
FoPropertyId.BACKGROUND_ATTACHMENT);
}
@@ -268,7 +268,7 @@
* @return The background-position component of this compound property.
*/
public PdBackgroundPosition getPosition() {
- final PropertyCollection collection = (PropertyCollection) value();
+ final PvShorthandSubproperties collection = (PvShorthandSubproperties) value();
return (PdBackgroundPosition) collection.findProperty(
FoPropertyId.BACKGROUND_POSITION);
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBackgroundPosition.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBackgroundPosition.java 2023-01-02 13:16:45 UTC (rev 13001)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBackgroundPosition.java 2023-01-02 14:48:23 UTC (rev 13002)
@@ -37,8 +37,8 @@
import org.foray.fotree.fo.FoValue;
import org.foray.fotree.value.DtLength;
import org.foray.fotree.value.DtPercentage;
-import org.foray.fotree.value.PropertyCollection;
import org.foray.fotree.value.PropertyValue;
+import org.foray.fotree.value.PvShorthandSubproperties;
import org.axsl.constants.NumericConstants;
import org.axsl.fotree.FoContext;
@@ -89,7 +89,7 @@
* @throws PropertyException For an invalid property value.
*/
private PropertyValue createShorthandValue(final String value) throws PropertyException {
- final PropertyCollection collection = new PropertyCollection();
+ final PvShorthandSubproperties collection = new PvShorthandSubproperties();
PropertyValue pv = checkKeywords(this.getValidKeywords(), value);
if (pv != null) {
final PdBackgroundPosition property =
@@ -249,7 +249,7 @@
public int getShorthandValue(final FoContext context, final FoObj fobj,
final AbsoluteAxis axis, final int paddingRectangleDimension,
final int backgroundImageDimension) {
- final PropertyCollection collection = (PropertyCollection) value();
+ final PvShorthandSubproperties collection = (PvShorthandSubproperties) value();
final PdBackgroundPosition bpProperty =
(PdBackgroundPosition) collection
.getItem(0);
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderColor.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderColor.java 2023-01-02 13:16:45 UTC (rev 13001)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderColor.java 2023-01-02 14:48:23 UTC (rev 13002)
@@ -33,8 +33,8 @@
import org.foray.fotree.fo.AbstractFoProperty;
import org.foray.fotree.fo.FoPropertyId;
import org.foray.fotree.fo.FoValue;
-import org.foray.fotree.value.PropertyCollection;
import org.foray.fotree.value.PropertyValue;
+import org.foray.fotree.value.PvShorthandSubproperties;
import org.foray.fotree.value.ValueCollection;
import org.axsl.fotree.FoContext;
@@ -154,7 +154,7 @@
private Color getCollectionValue(final RelativeCompass direction,
final FoObj fobj, final FoContext context) {
final ValueCollection collection = (ValueCollection) value();
- final int whichElement = PropertyCollection.whichElementForDirectional(
+ final int whichElement = PvShorthandSubproperties.whichElementForDirectional(
direction, collection.getCount());
final PropertyValue insideProperty = collection.getItem(whichElement);
return insideProperty.evalColor();
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderStyle.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderStyle.java 2023-01-02 13:16:45 UTC (rev 13001)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderStyle.java 2023-01-02 14:48:23 UTC (rev 13002)
@@ -35,8 +35,8 @@
import org.foray.fotree.fo.FoPropertyId;
import org.foray.fotree.fo.FoValue;
import org.foray.fotree.value.DtBorderStyle;
-import org.foray.fotree.value.PropertyCollection;
import org.foray.fotree.value.PropertyValue;
+import org.foray.fotree.value.PvShorthandSubproperties;
import org.foray.fotree.value.ValueCollection;
import org.axsl.fotree.FoContext;
@@ -152,7 +152,7 @@
private org.axsl.value.BorderStyle getCollectionValue(
final FoContext context, final Compass direction, final FoObj fobj) {
final ValueCollection collection = (ValueCollection) value();
- final int whichElement = PropertyCollection.whichElementForDirectional(
+ final int whichElement = PvShorthandSubproperties.whichElementForDirectional(
direction, collection.getCount());
final PropertyValue insideValue = collection.getItem(whichElement);
final DtBorderStyle borderStyleProperty = (DtBorderStyle)
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderWidth.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderWidth.java 2023-01-02 13:16:45 UTC (rev 13001)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderWidth.java 2023-01-02 14:48:23 UTC (rev 13002)
@@ -36,8 +36,8 @@
import org.foray.fotree.fo.FoPropertyKeyword;
import org.foray.fotree.fo.FoValue;
import org.foray.fotree.value.DtBorderWidth;
-import org.foray.fotree.value.PropertyCollection;
import org.foray.fotree.value.PropertyValue;
+import org.foray.fotree.value.PvShorthandSubproperties;
import org.foray.fotree.value.ValueCollection;
import org.axsl.fotree.FoContext;
@@ -144,7 +144,7 @@
private int getCollectionValue(final FoContext context,
final RelativeCompass direction, final FoObj fobj) {
final ValueCollection collection = (ValueCollection) value();
- final int whichElement = PropertyCollection.whichElementForDirectional(
+ final int whichElement = PvShorthandSubproperties.whichElementForDirectional(
direction, collection.getCount());
final PropertyValue value = collection.getItem(whichElement);
if (value.canEvalLength()) {
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdFont.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdFont.java 2023-01-02 13:16:45 UTC (rev 13001)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdFont.java 2023-01-02 14:48:23 UTC (rev 13002)
@@ -35,8 +35,8 @@
import org.foray.fotree.fo.FoValue;
import org.foray.fotree.value.DtLength;
import org.foray.fotree.value.DtPercentage;
-import org.foray.fotree.value.PropertyCollection;
import org.foray.fotree.value.PropertyValue;
+import org.foray.fotree.value.PvShorthandSubproperties;
import java.util.ArrayList;
import java.util.List;
@@ -85,7 +85,7 @@
*/
private PropertyValue createPropertyValue(final String propertyFullName, final String value)
throws PropertyException {
- final PropertyCollection collection = new PropertyCollection();
+ final PvShorthandSubproperties collection = new PvShorthandSubproperties();
final PropertyValue pv = checkKeywords(this.getValidKeywords(), value);
if (pv != null) {
collection.addItem(new PdFontStyle(pv));
@@ -250,7 +250,7 @@
* @return The "font-style" component from this compound property.
*/
public PdFontStyle getStyle() {
- final PropertyCollection collection = (PropertyCollection) value();
+ final PvShorthandSubproperties collection = (PvShorthandSubproperties) value();
return (PdFontStyle) collection.findProperty(FoPropertyId.FONT_STYLE);
}
@@ -259,7 +259,7 @@
* @return The "font-variant" component from this compound property.
*/
public PdFontVariant getVariant() {
- final PropertyCollection collection = (PropertyCollection) value();
+ final PvShorthandSubproperties collection = (PvShorthandSubproperties) value();
return (PdFontVariant) collection.findProperty(
FoPropertyId.FONT_VARIANT);
}
@@ -269,7 +269,7 @@
* @return The "font-weight" component from this compound property.
*/
public PdFontWeight getWeight() {
- final PropertyCollection collection = (PropertyCollection) value();
+ final PvShorthandSubproperties collection = (PvShorthandSubproperties) value();
return (PdFontWeight) collection.findProperty(
FoPropertyId.FONT_WEIGHT);
}
@@ -279,7 +279,7 @@
* @return The "font-size" component from this compound property.
*/
public PdFontSize getSize() {
- final PropertyCollection collection = (PropertyCollection) value();
+ final PvShorthandSubproperties collection = (PvShorthandSubproperties) value();
return (PdFontSize) collection.findProperty(FoPropertyId.FONT_SIZE);
}
@@ -288,7 +288,7 @@
* @return The "line-height" component from this compound property.
*/
public PdLineHeight getLineHeight() {
- final PropertyCollection collection = (PropertyCollection) value();
+ final PvShorthandSubproperties collection = (PvShorthandSubproperties) value();
return (PdLineHeight) collection.findProperty(
FoPropertyId.LINE_HEIGHT);
}
@@ -298,7 +298,7 @@
* @return The "font-family" component from this compound property.
*/
public PdFontFamily getFamily() {
- final PropertyCollection collection = (PropertyCollection) value();
+ final PvShorthandSubproperties collection = (PvShorthandSubproperties) value();
return (PdFontFamily) collection.findProperty(
FoPropertyId.FONT_FAMILY);
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdMargin.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdMargin.java 2023-01-02 13:16:45 UTC (rev 13001)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdMargin.java 2023-01-02 14:48:23 UTC (rev 13002)
@@ -34,8 +34,8 @@
import org.foray.fotree.fo.FoPropertyId;
import org.foray.fotree.fo.FoValue;
import org.foray.fotree.fo.obj.SimplePageMaster4a;
-import org.foray.fotree.value.PropertyCollection;
import org.foray.fotree.value.PropertyValue;
+import org.foray.fotree.value.PvShorthandSubproperties;
import org.foray.fotree.value.ValueCollection;
import org.axsl.constants.NumericConstants;
@@ -126,7 +126,7 @@
private int getCollectionValue(final FoContext context,
final AbsoluteCompass direction, final FoObj fobj) {
final ValueCollection collection = (ValueCollection) value();
- final int whichElement = PropertyCollection.whichElementForDirectional(
+ final int whichElement = PvShorthandSubproperties.whichElementForDirectional(
direction, collection.getCount());
final PropertyValue value = collection.getItem(whichElement);
if (value.canEvalPercentage()) {
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPadding.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPadding.java 2023-01-02 13:16:45 UTC (rev 13001)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPadding.java 2023-01-02 14:48:23 UTC (rev 13002)
@@ -34,8 +34,8 @@
import org.foray.fotree.fo.FoPropertyId;
import org.foray.fotree.fo.FoValue;
import org.foray.fotree.fo.obj.SimplePageMaster4a;
-import org.foray.fotree.value.PropertyCollection;
import org.foray.fotree.value.PropertyValue;
+import org.foray.fotree.value.PvShorthandSubproperties;
import org.foray.fotree.value.ValueCollection;
import org.axsl.constants.NumericConstants;
@@ -126,7 +126,7 @@
private int getCollectionValue(final FoContext context,
final AbsoluteCompass direction, final FoObj fobj) {
final ValueCollection collection = (ValueCollection) value();
- final int whichElement = PropertyCollection.whichElementForDirectional(
+ final int whichElement = PvShorthandSubproperties.whichElementForDirectional(
direction, collection.getCount());
final PropertyValue value = collection.getItem(whichElement);
if (value.canEvalPercentage()) {
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdSize.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdSize.java 2023-01-02 13:16:45 UTC (rev 13001)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdSize.java 2023-01-02 14:48:23 UTC (rev 13002)
@@ -35,8 +35,8 @@
import org.foray.fotree.fo.FoPropertyId;
import org.foray.fotree.fo.FoValue;
import org.foray.fotree.value.DtLength;
-import org.foray.fotree.value.PropertyCollection;
import org.foray.fotree.value.PropertyValue;
+import org.foray.fotree.value.PvShorthandSubproperties;
import org.axsl.fotree.FoContext;
import org.axsl.value.AbsoluteAxis;
@@ -93,7 +93,7 @@
if (st.countTokens() < 1 || st.countTokens() > 2) {
throw unexpectedValue(value);
}
- final PropertyCollection collection = new PropertyCollection();
+ final PvShorthandSubproperties collection = new PvShorthandSubproperties();
while (st.hasMoreTokens()) {
final String token = st.nextToken();
final DtLength length = DtLength.procureInstance(token);
@@ -115,9 +115,9 @@
*/
public int getValue(final FoContext context, final FoObj fobj,
final AbsoluteAxis axis) {
- if (value() instanceof PropertyCollection) {
- final PropertyCollection collection =
- (PropertyCollection) value();
+ if (value() instanceof PvShorthandSubproperties) {
+ final PvShorthandSubproperties collection =
+ (PvShorthandSubproperties) value();
if (collection.getCount() < 1) {
return getValueNoInstance(axis);
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/package-info.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/package-info.java 2023-01-02 13:16:45 UTC (rev 13001)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/package-info.java 2023-01-02 14:48:23 UTC (rev 13002)
@@ -27,10 +27,9 @@
*/
/**
- * <p>Classes representing XSL-FO properties (See Section 7 of the XSL-FO 1.0 Standard).</p>
- *
- * <p>The classes in this package that represent concrete FO properties are named with "Pd" at the beginning of the
- * class name, meaning "property description", to distinguish them from the property value enumerations in aXSL.</p>
+ * <p>Classes representing XSL-FO properties.</p>
+ * @see "XSL-FO Recommendation 1.0, Section 7."
+ * @see "XSL-FO Recommendation 1.1, Section 7."
*/
package org.foray.fotree.fo.prop;
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/package-info.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/package-info.java 2023-01-02 13:16:45 UTC (rev 13001)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/package-info.java 2023-01-02 14:48:23 UTC (rev 13002)
@@ -30,6 +30,17 @@
* <p>Classes for parsing and representing the XSL-FO document input objects and properties in the various
* namespaces.</p>
*
+ * <p>Abbreviations used in foray-fotree:</p>
+ * <ul>
+ * <li>Types whose names begin with "Dt" are XSL-FO data types.</li>
+ * <li>Types whose names begin with "Expr" are XSL-FO expressions.</li>
+ * <li>Types whose names begin with "Fn" are XSL-FO functions.</li>
+ * <li>Types whose names begin with "Pv" are property value types.</li>
+ * <li>Types whose names begin with "Pd" are property descriptor types. They serve as conceptual (but not actual)
+ * concrete implementations of property interfaces in aXSL, but are actually helper classes to the property/trait
+ * resolution process whose root is in {@link FoObj}.</li>
+ * </ul>
+ *
* <p>Design considerations:</p>
* <ul>
* <li>The FO Tree faces two directions. First, it faces the incoming document. The guiding document for this process
Deleted: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/PropertyCollection.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/PropertyCollection.java 2023-01-02 13:16:45 UTC (rev 13001)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/PropertyCollection.java 2023-01-02 14:48:23 UTC (rev 13002)
@@ -1,213 +0,0 @@
-/*
- * Copyright 2004 The FOray Project.
- * http://www.foray.org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This work is in part derived from the following work(s), used with the
- * permission of the licensor:
- * Apache FOP, licensed by the Apache Software Foundation
- *
- */
-
-/*
- * $LastChangedRevision$
- * $LastChangedDate$
- * $LastChangedBy$
- */
-
-package org.foray.fotree.value;
-
-import org.foray.fotree.Property;
-import org.foray.fotree.fo.FoPropertyId;
-
-import org.axsl.value.AbsoluteCompa...
[truncated message content] |
|
From: <vic...@us...> - 2023-01-03 10:58:42
|
Revision: 13006
http://sourceforge.net/p/foray/code/13006
Author: victormote
Date: 2023-01-03 10:58:38 +0000 (Tue, 03 Jan 2023)
Log Message:
-----------
Replace separate list of keywords with a copy of the FoKeyword enum and a custom binary search through it.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/FoKeyword.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/RetrieveMarker4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderWidth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdFontFamily.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdVoiceFamily.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtBorderStyle.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtSpace.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java 2023-01-02 18:14:33 UTC (rev 13005)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java 2023-01-03 10:58:38 UTC (rev 13006)
@@ -756,7 +756,7 @@
case NO_WRAP: return WrapOption.NO_WRAP;
case WRAP: return WrapOption.WRAP;
default: throw new IllegalArgumentException(
- "Illegal wrap-option value: " + foWrapOption.toXslFo());
+ "Illegal wrap-option value: " + foWrapOption.getText());
}
}
@@ -849,7 +849,7 @@
switch (foSpan) {
case NONE: return Span.NONE;
case ALL: return Span.ALL;
- default: throw new IllegalArgumentException("Illegal span value: " + foSpan.toXslFo());
+ default: throw new IllegalArgumentException("Illegal span value: " + foSpan.getText());
}
}
@@ -930,7 +930,7 @@
case BEFORE: return DisplayAlign.BEFORE;
case CENTER: return DisplayAlign.CENTER;
case AFTER: return DisplayAlign.AFTER;
- default: throw new IllegalArgumentException("Illegal display-align value: " + foDisplayAlign.toXslFo());
+ default: throw new IllegalArgumentException("Illegal display-align value: " + foDisplayAlign.getText());
}
}
@@ -956,7 +956,7 @@
switch (foRelativeAlign) {
case BEFORE: return RelativeAlign.BEFORE;
case BASELINE: return RelativeAlign.BASELINE;
- default: throw new IllegalArgumentException("Illegal display-align value: " + foRelativeAlign.toXslFo());
+ default: throw new IllegalArgumentException("Illegal display-align value: " + foRelativeAlign.getText());
}
}
@@ -993,7 +993,7 @@
case PAGE: return Break.PAGE;
case EVEN_PAGE: return Break.EVEN_PAGE;
case ODD_PAGE: return Break.ODD_PAGE;
- default: throw new IllegalArgumentException("Illegal break value: " + foBreak.toXslFo());
+ default: throw new IllegalArgumentException("Illegal break value: " + foBreak.getText());
}
}
@@ -1136,7 +1136,7 @@
case END_ON_EVEN: return ForcePageCount.END_ON_EVEN;
case END_ON_ODD: return ForcePageCount.END_ON_ODD;
case NO_FORCE: return ForcePageCount.NO_FORCE;
- default: throw new IllegalArgumentException("Illegal force-page-count value: " + foForcePageCount.toXslFo());
+ default: throw new IllegalArgumentException("Illegal force-page-count value: " + foForcePageCount.getText());
}
}
@@ -1185,7 +1185,7 @@
case AUTO: return Overflow.AUTO;
case ERROR_IF_OVERFLOW: return Overflow.ERROR_IF_OVERFLOW;
case REPEAT: return Overflow.REPEAT;
- default: throw new IllegalArgumentException("Illegal overflow value: " + foOverflow.toXslFo());
+ default: throw new IllegalArgumentException("Illegal overflow value: " + foOverflow.getText());
}
}
@@ -1236,7 +1236,7 @@
case LEFT: return TextAlign.START;
/* As per XSL-FO 1.1 Section 7.16.9, normalize "right" to "end". */
case RIGHT: return TextAlign.END;
- default: throw new IllegalArgumentException("Illegal text-align value: " + foTextAlign.toXslFo());
+ default: throw new IllegalArgumentException("Illegal text-align value: " + foTextAlign.getText());
}
}
@@ -1269,7 +1269,7 @@
case LEFT: return TextAlignLast.START;
/* As per XSL-FO 1.1 Section 7.16.10, normalize "right" to "end". */
case RIGHT: return TextAlignLast.END;
- default: throw new IllegalArgumentException("Illegal text-align-last value: " + foTextAlignLast.toXslFo());
+ default: throw new IllegalArgumentException("Illegal text-align-last value: " + foTextAlignLast.getText());
}
}
@@ -1437,7 +1437,7 @@
switch (foScaling) {
case UNIFORM: return Scaling.UNIFORM;
case NON_UNIFORM: return Scaling.NON_UNIFORM;
- default: throw new IllegalArgumentException("Illegal scaling value: " + foScaling.toXslFo());
+ default: throw new IllegalArgumentException("Illegal scaling value: " + foScaling.getText());
}
}
@@ -1464,7 +1464,7 @@
case RULE: return LeaderPattern.RULE;
case DOTS: return LeaderPattern.DOTS;
case USE_CONTENT: return LeaderPattern.USE_CONTENT;
- default: throw new IllegalArgumentException("Illegal leader-pattern value: " + foLeaderPattern.toXslFo());
+ default: throw new IllegalArgumentException("Illegal leader-pattern value: " + foLeaderPattern.getText());
}
}
@@ -1511,7 +1511,7 @@
case DOUBLE: return RuleStyle.DOUBLE;
case GROOVE: return RuleStyle.GROOVE;
case RIDGE: return RuleStyle.RIDGE;
- default: throw new IllegalArgumentException("Illegal rule style: " + foRuleStyle.toXslFo());
+ default: throw new IllegalArgumentException("Illegal rule style: " + foRuleStyle.getText());
}
}
@@ -1536,7 +1536,7 @@
case NONE: return LeaderAlignment.NONE;
case REFERENCE_AREA: return LeaderAlignment.REFERENCE_AREA;
case PAGE: return LeaderAlignment.PAGE;
- default: throw new IllegalArgumentException("Illegal leader-alignment: " + foLeaderAlignment.toXslFo());
+ default: throw new IllegalArgumentException("Illegal leader-alignment: " + foLeaderAlignment.getText());
}
}
@@ -1560,7 +1560,7 @@
switch (foTableLayout) {
case AUTO: return TableLayout.AUTO;
case FIXED: return TableLayout.FIXED;
- default: throw new IllegalArgumentException("Illegal table-layout: " + foTableLayout.toXslFo());
+ default: throw new IllegalArgumentException("Illegal table-layout: " + foTableLayout.getText());
}
}
@@ -1787,7 +1787,7 @@
case REPEAT_X: return BackgroundRepeat.REPEAT_X;
case REPEAT_Y: return BackgroundRepeat.REPEAT_Y;
case NO_REPEAT: return BackgroundRepeat.NO_REPEAT;
- default: throw new IllegalArgumentException("Illegal background-repeat: " + foBackgroundRepeat.toXslFo());
+ default: throw new IllegalArgumentException("Illegal background-repeat: " + foBackgroundRepeat.getText());
}
}
@@ -2004,7 +2004,7 @@
case AUTO: return AbsolutePosition.AUTO;
case ABSOLUTE: return AbsolutePosition.ABSOLUTE;
case FIXED: return AbsolutePosition.FIXED;
- default: throw new IllegalArgumentException("Illegal absolute-position: " + foAbsolutePosition.toXslFo());
+ default: throw new IllegalArgumentException("Illegal absolute-position: " + foAbsolutePosition.getText());
}
}
@@ -2024,7 +2024,7 @@
case SCROLL: return BackgroundAttachment.SCROLL;
case FIXED: return BackgroundAttachment.FIXED;
default: throw new IllegalArgumentException("Illegal background-attachment: " +
- foBackgroundAttachment.toXslFo());
+ foBackgroundAttachment.getText());
}
}
@@ -2050,7 +2050,7 @@
case BOTTOM: return writingMode.getBottom();
case LEFT: return writingMode.getLeft();
case RIGHT: return writingMode.getRight();
- default: throw new IllegalArgumentException("Illegal caption-side: " + foCaptionSide.toXslFo());
+ default: throw new IllegalArgumentException("Illegal caption-side: " + foCaptionSide.getText());
}
}
@@ -2069,7 +2069,7 @@
switch (foDirection) {
case LTR: return AbsoluteDirection.LEFT_TO_RIGHT;
case RTL: return AbsoluteDirection.RIGHT_TO_LEFT;
- default: throw new IllegalArgumentException("Illegal direction: " + foDirection.toXslFo());
+ default: throw new IllegalArgumentException("Illegal direction: " + foDirection.getText());
}
}
@@ -2090,7 +2090,7 @@
case AUTO: return FontSelectionStrategy.AUTO;
case CHARACTER_BY_CHARACTER: return FontSelectionStrategy.CHARACTER_BY_CHARACTER;
default: throw new IllegalArgumentException("Illegal font-selection-strategy: " +
- foFontSelectionStrategy.toXslFo());
+ foFontSelectionStrategy.getText());
}
}
@@ -2110,7 +2110,7 @@
case AUTO: return HyphenationKeep.AUTO;
case COLUMN: return HyphenationKeep.COLUMN;
case PAGE: return HyphenationKeep.PAGE;
- default: throw new IllegalArgumentException("Illegal hyphenation-keep: " + foHyphenationKeep.toXslFo());
+ default: throw new IllegalArgumentException("Illegal hyphenation-keep: " + foHyphenationKeep.getText());
}
}
@@ -2131,7 +2131,7 @@
case PRESERVE: return LinefeedTreatment.PRESERVE;
case TREAT_AS_SPACE: return LinefeedTreatment.TREAT_AS_SPACE;
case TREAT_AS_ZERO_WIDTH_SPACE: return LinefeedTreatment.TREAT_AS_ZERO_WIDTH_SPACE;
- default: throw new IllegalArgumentException("Illegal linefeed-treatment: " + foLinefeedTreatment.toXslFo());
+ default: throw new IllegalArgumentException("Illegal linefeed-treatment: " + foLinefeedTreatment.getText());
}
}
@@ -2153,7 +2153,7 @@
case CONSIDER_SHIFTS: return LineHeightShiftAdjustment.CONSIDER_SHIFTS;
case DISREGARD_SHIFTS: return LineHeightShiftAdjustment.DISREGARD_SHIFTS;
default: throw new IllegalArgumentException("Illegal line-height-shift-adjustment: " +
- foLineHeightShiftAdjustment.toXslFo());
+ foLineHeightShiftAdjustment.getText());
}
}
@@ -2175,7 +2175,7 @@
case FONT_HEIGHT: return LineStackingStrategy.FONT_HEIGHT;
case MAX_HEIGHT: return LineStackingStrategy.MAX_HEIGHT;
default: throw new IllegalArgumentException("Illegal line-stacking-strategy: " +
- foLineStackingStrategy.toXslFo());
+ foLineStackingStrategy.getText());
}
}
@@ -2194,7 +2194,7 @@
switch (foRelativePosition) {
case STATIC: return RelativePosition.STATIC;
case RELATIVE: return RelativePosition.RELATIVE;
- default: throw new IllegalArgumentException("Illegal relative-position: " + foRelativePosition.toXslFo());
+ default: throw new IllegalArgumentException("Illegal relative-position: " + foRelativePosition.getText());
}
}
@@ -2214,7 +2214,7 @@
case AUTO: return ScalingMethod.AUTO;
case INTEGER_PIXELS: return ScalingMethod.INTEGER_PIXELS;
case RESAMPLE_ANY_METHOD: return ScalingMethod.RESAMPLE_ANY_METHOD;
- default: throw new IllegalArgumentException("Illegal scaling-method: " + foScalingMethod.toXslFo());
+ default: throw new IllegalArgumentException("Illegal scaling-method: " + foScalingMethod.getText());
}
}
@@ -2240,7 +2240,7 @@
case SUPPRESS: return SuppressAtLineBreak.SUPPRESS;
case RETAIN: return SuppressAtLineBreak.RETAIN;
default: throw new IllegalArgumentException("Illegal suppress-at-line-break: " +
- foSuppressAtLineBreak.toXslFo());
+ foSuppressAtLineBreak.getText());
}
}
@@ -2260,7 +2260,7 @@
case NORMAL: return UnicodeBidi.NORMAL;
case EMBED: return UnicodeBidi.EMBED;
case BIDI_OVERRIDE: return UnicodeBidi.BIDI_OVERRIDE;
- default: throw new IllegalArgumentException("Illegal unicode-bidi: " + foUnicodeBidi.toXslFo());
+ default: throw new IllegalArgumentException("Illegal unicode-bidi: " + foUnicodeBidi.getText());
}
}
@@ -2283,7 +2283,7 @@
case IGNORE_IF_AFTER_LINEFEED: return WhiteSpaceTreatment.IGNORE_IF_AFTER_LINEFEED;
case IGNORE_IF_SURROUNDING_LINEFEED: return WhiteSpaceTreatment.IGNORE_IF_SURROUNDING_LINEFEED;
default: throw new IllegalArgumentException("Illegal white-space-treatment: " +
- foWhiteSpaceTreatment.toXslFo());
+ foWhiteSpaceTreatment.getText());
}
}
@@ -2310,7 +2310,7 @@
case ACTIVE: return ActiveState.ACTIVE;
case HOVER: return ActiveState.HOVER;
case FOCUS: return ActiveState.FOCUS;
- default: throw new IllegalArgumentException("Illegal active-state: " + foActiveState.toXslFo());
+ default: throw new IllegalArgumentException("Illegal active-state: " + foActiveState.getText());
}
}
@@ -2333,7 +2333,7 @@
case OUTSIDE: return Clear.OUTSIDE;
case BOTH: return Clear.BOTH;
case NONE: return Clear.NONE;
- default: throw new IllegalArgumentException("Illegal clear: " + foClear.toXslFo());
+ default: throw new IllegalArgumentException("Illegal clear: " + foClear.getText());
}
}
@@ -2352,7 +2352,7 @@
switch (foEmptyCells) {
case SHOW: return EmptyCells.SHOW;
case HIDE: return EmptyCells.HIDE;
- default: throw new IllegalArgumentException("Illegal empty-cells: " + foEmptyCells.toXslFo());
+ default: throw new IllegalArgumentException("Illegal empty-cells: " + foEmptyCells.getText());
}
}
@@ -2375,7 +2375,7 @@
case INSIDE: return Float.INSIDE;
case OUTSIDE: return Float.OUTSIDE;
case NONE: return Float.NONE;
- default: throw new IllegalArgumentException("Illegal float: " + foFloat.toXslFo());
+ default: throw new IllegalArgumentException("Illegal float: " + foFloat.getText());
}
}
@@ -2395,7 +2395,7 @@
case PAGINATE: return MediaUsage.PAGINATE;
case BOUNDED_IN_ONE_DIMENSION: return MediaUsage.BOUNDED_IN_ONE_DIMENSION;
case UNBOUNDED: return MediaUsage.UNBOUNDED;
- default: throw new IllegalArgumentException("Illegal media-usage: " + foMediaUsage.toXslFo());
+ default: throw new IllegalArgumentException("Illegal media-usage: " + foMediaUsage.getText());
}
}
@@ -2420,7 +2420,7 @@
case NUM_NEGATIVE_180: return ReferenceOrientation.ROTATION_180_DEGREES;
case NUM_NEGATIVE_270: return ReferenceOrientation.ROTATION_90_DEGREES;
default: throw new IllegalArgumentException("Illegal reference-orientation: " +
- foReferenceOrientation.toXslFo());
+ foReferenceOrientation.getText());
}
}
@@ -2447,7 +2447,7 @@
case RELATIVE_COLORIMETRIC: return RenderingIntent.RELATIVE_COLORIMETRIC;
case SATURATION: return RenderingIntent.SATURATION;
case ABSOLUTE_COLORIMETRIC: return RenderingIntent.ABSOLUTE_COLORIMETRIC;
- default: throw new IllegalArgumentException("Illegal rendering-intent: " + foRenderingIntent.toXslFo());
+ default: throw new IllegalArgumentException("Illegal rendering-intent: " + foRenderingIntent.getText());
}
}
@@ -2466,7 +2466,7 @@
switch (foShowDestination) {
case REPLACE: return ShowDestination.REPLACE;
case NEW: return ShowDestination.NEW;
- default: throw new IllegalArgumentException("Illegal show-destination: " + foShowDestination.toXslFo());
+ default: throw new IllegalArgumentException("Illegal show-destination: " + foShowDestination.getText());
}
}
@@ -2485,7 +2485,7 @@
switch (foSpeakHeader) {
case ONCE: return SpeakHeader.ONCE;
case ALWAYS: return SpeakHeader.ALWAYS;
- default: throw new IllegalArgumentException("Illegal speak-header: " + foSpeakHeader.toXslFo());
+ default: throw new IllegalArgumentException("Illegal speak-header: " + foSpeakHeader.getText());
}
}
@@ -2505,7 +2505,7 @@
case NORMAL: return Speak.NORMAL;
case NONE: return Speak.NONE;
case SPELL_OUT: return Speak.SPELL_OUT;
- default: throw new IllegalArgumentException("Illegal speak: " + foSpeak.toXslFo());
+ default: throw new IllegalArgumentException("Illegal speak: " + foSpeak.getText());
}
}
@@ -2524,7 +2524,7 @@
switch (foSpeakNumeral) {
case DIGITS: return SpeakNumeral.DIGITS;
case CONTINUOUS: return SpeakNumeral.CONTINUOUS;
- default: throw new IllegalArgumentException("Illegal speak-numeral: " + foSpeakNumeral.toXslFo());
+ default: throw new IllegalArgumentException("Illegal speak-numeral: " + foSpeakNumeral.getText());
}
}
@@ -2543,7 +2543,7 @@
switch (foSpeakPunctuation) {
case CODE: return SpeakPunctuation.CODE;
case NONE: return SpeakPunctuation.NONE;
- default: throw new IllegalArgumentException("Illegal speak-punctuation: " + foSpeakPunctuation.toXslFo());
+ default: throw new IllegalArgumentException("Illegal speak-punctuation: " + foSpeakPunctuation.getText());
}
}
@@ -2562,7 +2562,7 @@
switch (foStartingState) {
case SHOW: return StartingState.SHOW;
case HIDE: return StartingState.HIDE;
- default: throw new IllegalArgumentException("Illegal starting-state: " + foStartingState.toXslFo());
+ default: throw new IllegalArgumentException("Illegal starting-state: " + foStartingState.getText());
}
}
@@ -2583,7 +2583,7 @@
case UPPERCASE: return TextTransform.UPPERCASE;
case LOWERCASE: return TextTransform.LOWERCASE;
case NONE: return TextTransform.NONE;
- default: throw new IllegalArgumentException("Illegal text-transform: " + foTextTransform.toXslFo());
+ default: throw new IllegalArgumentException("Illegal text-transform: " + foTextTransform.getText());
}
}
@@ -2603,7 +2603,7 @@
case VISIBLE: return Visibility.VISIBLE;
case HIDDEN: return Visibility.HIDDEN;
case COLLAPSE: return Visibility.COLLAPSE;
- default: throw new IllegalArgumentException("Illegal visibility: " + foVisibility.toXslFo());
+ default: throw new IllegalArgumentException("Illegal visibility: " + foVisibility.getText());
}
}
@@ -2814,7 +2814,7 @@
case XSL_FOLLOWING: return SwitchTo.XSL_FOLLOWING;
case XSL_ANY: return SwitchTo.XSL_ANY;
case NOT_A_KEYWORD: return SwitchTo.NAME_LIST;
- default: throw new IllegalArgumentException("Illegal switch-to: " + foSwitchTo.toXslFo());
+ default: throw new IllegalArgumentException("Illegal switch-to: " + foSwitchTo.getText());
}
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/FoKeyword.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/FoKeyword.java 2023-01-02 18:14:33 UTC (rev 13005)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/FoKeyword.java 2023-01-03 10:58:38 UTC (rev 13006)
@@ -28,8 +28,6 @@
package org.foray.fotree.fo;
-import java.util.Arrays;
-
/**
* An enumeration of the XSL-FO property value keywords.
*/
@@ -829,276 +827,12 @@
/** The "xx-small" FO property value. */
XX_SMALL("xx-small"); // 261
- /**
- * An array of property keyword values.
- * These are kept in alphabetical order so that they can be used in a
- * binary search, and to make them easier to find.
- */
- private static final String[] PROPERTY_KEYWORD_VALUES = {
- "-180", // 0
- "-270", // 1
- "-90", // 2
- "0", // 3
- "180", // 4
- "270", // 5
- "90", // 6
- "above", // 7
- "absolute", // 8
- "absolute-colorimetric", // 9
- "active", // 10
- "after", // 11
- "after-edge", // 12
- "all", // 13
- "alphabetic", // 14
- "alternate", // 15
- "always", // 16
- "any", // 17
- "auto", // 18
- "auto-even", // 19
- "auto-odd", // 20
- "avoid", // 21
- "backslant", // 22
- "baseline", // 23
- "before", // 24
- "before-edge", // 25
- "below", // 26
- "bidi-override", // 27
- "blank", // 28
- "blink", // 29
- "block", // 30
- "bold", // 31
- "bolder", // 32
- "both", // 33
- "bottom", // 34
- "bounded-in-one-dimension", // 35
- "capitalize", // 36
- "center", // 37
- "center-left", // 38
- "center-right", // 39
- "central", // 40
- "character-by-character", // 41
- "child", // 42
- "code", // 43
- "collapse", // 44
- "collapse-with-precedence", // 45
- "column", // 46
- "condensed", // 47
- "consider-shifts", // 48
- "continuous", // 49
- "cursive", // 50
- "dashed", // 51
- "digits", // 52
- "discard", // 53
- "disregard-shifts", // 54
- "document", // 55
- "document-root", // 56
- "dots", // 57
- "dotted", // 58
- "double", // 59
- "embed", // 60
- "end", // 61
- "end-on-even", // 62
- "end-on-odd", // 63
- "error-if-overflow", // 64
- "even", // 65
- "even-page", // 66
- "expanded", // 67
- "extra-condensed", // 68
- "extra-expanded", // 69
- "false", // 70
- "fantasy", // 71
- "far-left", // 72
- "far-right", // 73
- "fast", // 74
- "faster", // 75
- "female", // 76
- "first", // 77
- "first-including-carryover", // 78
- "first-starting", // 79
- "first-starting-within-page", // 80
- "fixed", // 81
- "focus", // 82
- "font-height", // 83
- "force", // 84
- "groove", // 85
- "hanging", // 86
- "height", // 87
- "hidden", // 88
- "hide", // 89
- "high", // 90
- "higher", // 91
- "hover", // 92
- "ideographic", // 93
- "ignore", // 94
- "ignore-if-after-linefeed", // 95
- "ignore-if-before-linefeed", // 96
- "ignore-if-surrounding-linefeed", // 97
- "indefinite", // 98
- "indent", // 99
- "inherit", // 100
- "inset", // 101
- "inside", // 102
- "integer-pixels", // 103
- "italic", // 104
- "justify", // 105
- "landscape", // 106
- "large", // 107
- "larger", // 108
- "last", // 109
- "last-ending", // 110
- "last-ending-within-page", // 111
- "last-starting", // 112
- "last-starting-within-page", // 113
- "leave-separate", // 114
- "left", // 115
- "left-side", // 116
- "leftwards", // 117
- "level", // 118
- "lighter", // 119
- "line", // 120
- "line-height", // 121
- "line-through", // 122
- "link", // 123
- "loud", // 124
- "low", // 125
- "lower", // 126
- "lowercase", // 127
- "lr", // 128
- "lr-tb", // 129
- "ltr", // 130
- "male", // 131
- "mathematical", // 132
- "max-height", // 133
- "medium", // 134
- "merge", // 135
- "middle", // 136
- "monospace", // 137
- "narrower", // 138
- "new", // 139
- "no-blink", // 140
- "no-change", // 141
- "no-force", // 142
- "no-limit", // 143
- "no-line-through", // 144
- "no-link", // 145
- "no-overline", // 146
- "no-repeat", // 147
- "no-underline", // 148
- "no-wrap", // 149
- "non-blank", // 150
- "non-uniform", // 151
- "none", // 152
- "normal", // 153
- "not-a-keyword", // 154
- "not-blank", // 155
- "nowrap", // 156
- "oblique", // 157
- "odd", // 158
- "odd-page", // 159
- "once", // 160
- "only", // 161
- "outset", // 162
- "outside", // 163
- "overline", // 164
- "page", // 165
- "page-sequence", // 166
- "paginate", // 167
- "perceptual", // 168
- "portrait", // 169
- "pre", // 170
- "preserve", // 171
- "reference-area", // 172
- "relative", // 173
- "relative-colorimetric", // 174
- "repeat", // 175
- "repeat-x", // 176
- "repeat-y", // 177
- "rep...
[truncated message content] |
|
From: <vic...@us...> - 2023-01-03 13:50:24
|
Revision: 13009
http://sourceforge.net/p/foray/code/13009
Author: victormote
Date: 2023-01-03 13:50:22 +0000 (Tue, 03 Jan 2023)
Log Message:
-----------
Conform to aXSL change: Switch the numeric aural return types from int x 1000 back to Number.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAudioDial.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractPause.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdSpeechRate.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdVolume.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java 2023-01-03 11:59:29 UTC (rev 13008)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java 2023-01-03 13:50:22 UTC (rev 13009)
@@ -2703,7 +2703,7 @@
}
@Override
- public int traitSpeechRate(final FoContext context) {
+ public Number traitSpeechRate(final FoContext context) {
return getPropertyList().traitSpeechRate(this, context);
}
@@ -2728,12 +2728,12 @@
}
@Override
- public int traitPitchRange(final FoContext context) {
+ public Number traitPitchRange(final FoContext context) {
return getPropertyList().traitPitchRange(this, context);
}
@Override
- public int traitVolume(final FoContext context) {
+ public Number traitVolume(final FoContext context) {
return getPropertyList().traitVolume(this, context);
}
@@ -2758,12 +2758,12 @@
}
@Override
- public int traitRichness(final FoContext context) {
+ public Number traitRichness(final FoContext context) {
return getPropertyList().traitRichness(this, context);
}
@Override
- public int traitStress(final FoContext context) {
+ public Number traitStress(final FoContext context) {
return getPropertyList().traitStress(this, context);
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java 2023-01-03 11:59:29 UTC (rev 13008)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java 2023-01-03 13:50:22 UTC (rev 13009)
@@ -4049,7 +4049,7 @@
* @param context An object that knows how to resolve FO Tree context issues.
* @return The speech-rate property.
*/
- public int traitSpeechRate(final FoObj fobj, final FoContext context) {
+ public Number traitSpeechRate(final FoObj fobj, final FoContext context) {
final PdSpeechRate property = (PdSpeechRate) getProperty(FoPropertyId.SPEECH_RATE);
if (property != null) {
return property.getValue(context, fobj);
@@ -4129,7 +4129,7 @@
* @param context An object that knows how to resolve FO Tree context issues.
* @return The pitch-range property.
*/
- public int traitPitchRange(final FoObj fobj, final FoContext context) {
+ public Number traitPitchRange(final FoObj fobj, final FoContext context) {
final AbstractAudioDial property = (AbstractAudioDial) getProperty(FoPropertyId.PITCH_RANGE);
if (property != null) {
return property.getValue(context, fobj);
@@ -4143,7 +4143,7 @@
* @param context An object that knows how to resolve FO Tree context issues.
* @return The volume property.
*/
- public int traitVolume(final FoObj fobj, final FoContext context) {
+ public Number traitVolume(final FoObj fobj, final FoContext context) {
final PdVolume property = (PdVolume) getProperty(FoPropertyId.VOLUME);
if (property != null) {
return property.getValue(context, fobj);
@@ -4209,7 +4209,7 @@
* @param context An object that knows how to resolve FO Tree context issues.
* @return The richness property.
*/
- public int traitRichness(final FoObj fobj, final FoContext context) {
+ public Number traitRichness(final FoObj fobj, final FoContext context) {
final AbstractAudioDial property = (AbstractAudioDial) getProperty(FoPropertyId.RICHNESS);
if (property != null) {
return property.getValue(context, fobj);
@@ -4223,7 +4223,7 @@
* @param context An object that knows how to resolve FO Tree context issues.
* @return The stress property.
*/
- public int traitStress(final FoObj fobj, final FoContext context) {
+ public Number traitStress(final FoObj fobj, final FoContext context) {
final AbstractAudioDial property = (AbstractAudioDial) getProperty(FoPropertyId.STRESS);
if (property != null) {
return property.getValue(context, fobj);
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAudioDial.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAudioDial.java 2023-01-03 11:59:29 UTC (rev 13008)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAudioDial.java 2023-01-03 13:50:22 UTC (rev 13009)
@@ -95,7 +95,7 @@
* @param fobj The FO for which this value is needed.
* @return The value of this property.
*/
- public int getValue(final FoContext context, final FoObj fobj) {
+ public Number getValue(final FoContext context, final FoObj fobj) {
if (value().canEvalNumber()) {
return value().evalNumber().intValue();
}
@@ -121,7 +121,8 @@
* is needed.
* @return The initial value for this property.
*/
- public static int getValueNoInstance(final FoContext context, final FoObj fobj, final FoPropertyId propertyType) {
+ public static Number getValueNoInstance(final FoContext context, final FoObj fobj,
+ final FoPropertyId propertyType) {
final FoObj parent = fobj.effectiveParent(context);
if (parent != null) {
switch (propertyType) {
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractPause.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractPause.java 2023-01-03 11:59:29 UTC (rev 13008)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractPause.java 2023-01-03 13:50:22 UTC (rev 13009)
@@ -152,7 +152,7 @@
* is computed in units of words-per-minute, so we multiply by
* 60,000 to convert from minutes to milliseconds.
*/
- final double base = 1 / fobj.traitSpeechRate(context) * 60000;
+ final double base = 1 / fobj.traitSpeechRate(context).floatValue() * 60000;
return (int) Math.round(base * percentage.doubleValue());
}
if (value().canEvalKeyword()) {
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdSpeechRate.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdSpeechRate.java 2023-01-03 11:59:29 UTC (rev 13008)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdSpeechRate.java 2023-01-03 13:50:22 UTC (rev 13009)
@@ -117,7 +117,7 @@
* @param fobj The FO for which this value is needed.
* @return The value of this property.
*/
- public int getValue(final FoContext context, final FoObj fobj) {
+ public Number getValue(final FoContext context, final FoObj fobj) {
if (value().canEvalNumber()) {
return value().evalNumber().intValue();
}
@@ -143,10 +143,10 @@
return PdSpeechRate.SPEECH_RATE_X_FAST;
}
case FASTER: {
- return getValueNoInstance(context, fobj) + PdSpeechRate.SPEECH_RATE_RELATIVE_INCREMENT;
+ return getValueNoInstance(context, fobj).floatValue() + PdSpeechRate.SPEECH_RATE_RELATIVE_INCREMENT;
}
case SLOWER: {
- return getValueNoInstance(context, fobj) - PdSpeechRate.SPEECH_RATE_RELATIVE_INCREMENT;
+ return getValueNoInstance(context, fobj).floatValue() - PdSpeechRate.SPEECH_RATE_RELATIVE_INCREMENT;
}
default: {
throw this.unexpectedRetrieval();
@@ -162,7 +162,7 @@
* @param fobj The FO for which this value is needed.
* @return The initial value for this property.
*/
- public static int getValueNoInstance(final FoContext context, final FoObj fobj) {
+ public static Number getValueNoInstance(final FoContext context, final FoObj fobj) {
final FoObj parent = fobj.effectiveParent(context);
if (parent != null) {
return parent.traitSpeechRate(context);
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdVolume.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdVolume.java 2023-01-03 11:59:29 UTC (rev 13008)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdVolume.java 2023-01-03 13:50:22 UTC (rev 13009)
@@ -121,15 +121,15 @@
* @param fobj The FO for which this value is needed.
* @return The value of this property.
*/
- public int getValue(final FoContext context, final FoObj fobj) {
+ public Number getValue(final FoContext context, final FoObj fobj) {
if (value().canEvalPercentage()) {
- final int base = getInheritedValue(context, fobj);
- if (base < 0) {
+ final Number base = getInheritedValue(context, fobj);
+ if (base.floatValue() < 0) {
// Handle the special case of "silent"
return base;
}
final Number percent = value().evalPercentage();
- int product = (int) Math.round(percent.doubleValue() * base);
+ int product = (int) Math.round(percent.doubleValue() * base.floatValue());
product = Math.max(product, 0);
product = Math.min(product, NumericConstants.PERCENT_CONVERSION);
return product;
@@ -175,7 +175,7 @@
* @param fobj The FO for which this value is needed.
* @return The initial value for this property.
*/
- public static int getValueNoInstance(final FoContext context, final FoObj fobj) {
+ public static Number getValueNoInstance(final FoContext context, final FoObj fobj) {
return getInheritedValue(context, fobj);
}
@@ -185,7 +185,7 @@
* @param fobj The FO for which this value is needed.
* @return The initial value for this property.
*/
- private static int getInheritedValue(final FoContext context, final FoObj fobj) {
+ private static Number getInheritedValue(final FoContext context, final FoObj fobj) {
final FoObj parent = fobj.effectiveParent(context);
if (parent != null) {
return parent.traitVolume(context);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2023-01-09 20:28:39
|
Revision: 13046
http://sourceforge.net/p/foray/code/13046
Author: victormote
Date: 2023-01-09 20:28:36 +0000 (Mon, 09 Jan 2023)
Log Message:
-----------
Embed the DOM document directly into the InstreamForeignObject instance instead of wrapping it in ForeignXml, which adds no value.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/InstreamForeignObject4a.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java 2023-01-09 20:17:52 UTC (rev 13045)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java 2023-01-09 20:28:36 UTC (rev 13046)
@@ -35,8 +35,6 @@
import org.foray.fotree.fo.obj.InstreamForeignObject4a;
import org.foray.fotree.fo.obj.PageSequence4a;
import org.foray.fotree.fo.obj.Root4a;
-import org.foray.fotree.foreign.InstreamMathElement;
-import org.foray.fotree.foreign.InstreamSvgElement;
import org.foray.primitive.StringUtils;
import org.foray.xml.Sax2DomParser;
import org.foray.xml.SaxParser;
@@ -385,18 +383,14 @@
&& "instream-foreign-object".equals(localName)) {
final InstreamForeignObject4a parent = (InstreamForeignObject4a) this.currentFObj;
- ForeignXml<? extends Document> foreignXml = null;
-
if (this.foreignDocument instanceof SVGDocument) {
- foreignXml = new InstreamSvgElement(parent, (SVGDocument) this.foreignDocument);
} else if (this.foreignDocument instanceof MathMLDocument) {
- foreignXml = new InstreamMathElement(parent, (MathMLDocument) this.foreignDocument);
} else {
throw new IllegalStateException(
"Unexpected document type:" + this.foreignDocument.getClass().getName());
}
- parent.setForeignXml(foreignXml);
+ parent.setForeignXml(this.foreignDocument);
this.proxyParser = null;
this.foreignDocument = null;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/InstreamForeignObject4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/InstreamForeignObject4a.java 2023-01-09 20:17:52 UTC (rev 13045)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/InstreamForeignObject4a.java 2023-01-09 20:28:36 UTC (rev 13046)
@@ -29,7 +29,6 @@
package org.foray.fotree.fo.obj;
import org.foray.fotree.FoObj;
-import org.foray.fotree.ForeignXml;
import org.foray.fotree.NamespaceNative;
import org.foray.fotree.PropertyList;
import org.foray.fotree.fo.NamespaceFo;
@@ -56,7 +55,7 @@
private FoObj parent;
/** The attached foreign XML. */
- private ForeignXml<? extends Document> foreignXml;
+ private Document foreignXml;
/**
* Constructor.
@@ -170,7 +169,7 @@
@Override
public Document getXmlDocument() {
- return this.foreignXml.getDocument();
+ return this.foreignXml;
}
/**
@@ -177,7 +176,7 @@
* Sets the foreign XML.
* @param foreignXml The foreign XML to set.
*/
- public void setForeignXml(final ForeignXml<? extends Document> foreignXml) {
+ public void setForeignXml(final Document foreignXml) {
this.foreignXml = foreignXml;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2023-01-09 20:34:37
|
Revision: 13047
http://sourceforge.net/p/foray/code/13047
Author: victormote
Date: 2023-01-09 20:34:34 +0000 (Mon, 09 Jan 2023)
Log Message:
-----------
Remove no-longer-needed wrapper classes for the embedded XML Documents.
Removed Paths:
-------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/ForeignXml.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/InstreamMathElement.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/InstreamSvgElement.java
Deleted: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/ForeignXml.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/ForeignXml.java 2023-01-09 20:28:36 UTC (rev 13046)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/ForeignXml.java 2023-01-09 20:34:34 UTC (rev 13047)
@@ -1,168 +0,0 @@
-/*
- * Copyright 2004 The FOray Project.
- * http://www.foray.org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This work is in part derived from the following work(s), used with the
- * permission of the licensor:
- * Apache FOP, licensed by the Apache Software Foundation
- *
- */
-
-/*
- * $LastChangedRevision$
- * $LastChangedDate$
- * $LastChangedBy$
- */
-
-package org.foray.fotree;
-
-import org.foray.fotree.fo.obj.InstreamForeignObject4a;
-
-import org.axsl.fotree.FoTreeException;
-import org.axsl.fotree.FoVisitor;
-
-import org.w3c.dom.Document;
-
-import java.util.Collections;
-import java.util.List;
-
-/**
- * <p>Abstract base class for the root node of XML documents or document fragments that are wrapped inside of an
- * fo:instream-foreign-object.
- * Note that instances of this class are <em>not</em> the fo:instream-foreign-object itself, but rather its
- * content.</p>
- *
- * <p>Since the document represented by this object is by definition
- * <em>foreign,</em> no attempt is made to do anything with it other than
- * create a DOM document that can be used by the external application that
- * does know how to handle this content.
- * The primary example currently used is instream SVG, which is later passed
- * to Batik for it to process.</p>
- *
- * <p>Note that only the root element of the foreign XML is represented
- * directly in the FO Tree.
- * All other elements of the foreign XML are added to the DOM instance, which
- * is encapsulated in the ForeignXml instance.</p>
- *
- * @param <D> The type of XML document contained in this object.
- *
- * @see InstreamForeignObject4a
- */
-public abstract class ForeignXml<D extends Document> extends FoObj {
-
- /** The parent of this node. */
- private InstreamForeignObject4a parent;
-
- /**
- * Constructor.
- * @param parent The parent FoObj.
- */
- public ForeignXml(final InstreamForeignObject4a parent) {
- super(parent);
- this.parent = parent;
- }
-
- @Override
- protected void validateAncestry() throws FoTreeException {
- /* Ancestry validated at construction. */
- return;
- }
-
- @Override
- protected void validateProperties() throws FoTreeException {
- return;
- }
-
- @Override
- protected void validateDescendants() throws FoTreeException {
- this.validateEmptyContent();
- }
-
- @Override
- protected void setup() throws FoTreeException {
- return;
- }
-
- /**
- * Returns the DOM Document accumulated within this foreign XML.
- * @return The DOM Document.
- */
- public abstract D getDocument();
-
- @Override
- public String getName() {
- return "foreign-xml";
- }
-
- @Override
- public InstreamForeignObject4a getParent() {
- return this.parent;
- }
-
- @Override
- public List<FoObj> getChildren() {
- return Collections.emptyList();
- }
-
- @Override
- public void addChild(final FoObj child) throws FoTreeException {
- this.addChildToEmptyContentModel(child);
- }
-
- @Override
- public PropertyList getPropertyList() {
- return PropertyList.emptyPropertyList();
- }
-
- @Override
- public boolean isPcdataContent() {
- return false;
- }
-
- @Override
- protected void end() throws FoTreeException {
- }
-
- @Override
- public <T> T acceptVisitor(final FoVisitor<T> visitor) {
- return visitor.visit(this);
- }
-
- @Override
- public boolean isValid() {
- return this.getDocument() != null;
- }
-
- @Override
- public boolean canHaveMarkerChildren() {
- return false;
- }
-
- @Override
- public boolean canHavePcdataChildren() {
- return false;
- }
-
- @Override
- public boolean canHaveInlineChildren() {
- return false;
- }
-
- @Override
- public boolean canHaveBlockChildren() {
- return false;
- }
-
-}
Deleted: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/InstreamMathElement.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/InstreamMathElement.java 2023-01-09 20:28:36 UTC (rev 13046)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/InstreamMathElement.java 2023-01-09 20:34:34 UTC (rev 13047)
@@ -1,66 +0,0 @@
-/*
- * Copyright 2004 The FOray Project.
- * http://www.foray.org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This work is in part derived from the following work(s), used with the
- * permission of the licensor:
- * Apache FOP, licensed by the Apache Software Foundation
- *
- */
-
-/*
- * $LastChangedRevision$
- * $LastChangedDate$
- * $LastChangedBy$
- */
-
-package org.foray.fotree.foreign;
-
-import org.foray.fotree.ForeignXml;
-import org.foray.fotree.NamespaceNative;
-import org.foray.fotree.fo.obj.InstreamForeignObject4a;
-
-import org.w3c.dom.mathml.MathMLDocument;
-
-/**
- * The content of an instream Math (MathML) document.
- */
-public class InstreamMathElement extends ForeignXml<MathMLDocument> {
-
- /** The parsed instream document. */
- private MathMLDocument document;
-
- /**
- * Constructor.
- * @param parent The parent FoObj.
- * @param document The DOM document.
- */
- public InstreamMathElement(final InstreamForeignObject4a parent, final MathMLDocument document) {
- super(parent);
- this.document = document;
- }
-
- @Override
- public NamespaceNative getNamespace() {
- return null;
-// return NamespaceMath.getInstance();
- }
-
- @Override
- public MathMLDocument getDocument() {
- return this.document;
- }
-
-}
Deleted: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/InstreamSvgElement.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/InstreamSvgElement.java 2023-01-09 20:28:36 UTC (rev 13046)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/InstreamSvgElement.java 2023-01-09 20:34:34 UTC (rev 13047)
@@ -1,66 +0,0 @@
-/*
- * Copyright 2004 The FOray Project.
- * http://www.foray.org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This work is in part derived from the following work(s), used with the
- * permission of the licensor:
- * Apache FOP, licensed by the Apache Software Foundation
- *
- */
-
-/*
- * $LastChangedRevision$
- * $LastChangedDate$
- * $LastChangedBy$
- */
-
-package org.foray.fotree.foreign;
-
-import org.foray.fotree.ForeignXml;
-import org.foray.fotree.NamespaceNative;
-import org.foray.fotree.fo.obj.InstreamForeignObject4a;
-
-import org.w3c.dom.svg.SVGDocument;
-
-/**
- * The content of an inline SVG document.
- */
-public class InstreamSvgElement extends ForeignXml<SVGDocument> {
-
- /** The parsed instream document. */
- private SVGDocument document;
-
- /**
- * Constructor.
- * @param parent The parent FoObj.
- * @param document The DOM document.
- */
- public InstreamSvgElement(final InstreamForeignObject4a parent, final SVGDocument document) {
- super(parent);
- this.document = document;
- }
-
- @Override
- public NamespaceNative getNamespace() {
- return null;
-// return NamespaceSvg.getInstance();
- }
-
- @Override
- public SVGDocument getDocument() {
- return this.document;
- }
-
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2023-01-10 12:41:21
|
Revision: 13051
http://sourceforge.net/p/foray/code/13051
Author: victormote
Date: 2023-01-10 12:41:18 +0000 (Tue, 10 Jan 2023)
Log Message:
-----------
1. Allow any DefaultHandler when parsing instream-foreign-object. 2. Make createSaxParser in ForeignNamespace abstract so that each namespace can choose its own implementation.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceForeign.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/NamespaceMath.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/NamespaceSvg.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java 2023-01-10 11:34:08 UTC (rev 13050)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java 2023-01-10 12:41:18 UTC (rev 13051)
@@ -36,7 +36,6 @@
import org.foray.fotree.fo.obj.PageSequence4a;
import org.foray.fotree.fo.obj.Root4a;
import org.foray.primitive.StringUtils;
-import org.foray.xml.Sax2DomParser;
import org.foray.xml.SaxParser;
import org.axsl.constants.XmlConstants;
@@ -56,6 +55,7 @@
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.DefaultHandler;
import java.io.IOException;
import java.net.URL;
@@ -99,7 +99,7 @@
/** The current proxy parser, if any. This will be null during normal FO document parsing, but will contain a parser
* when instream-foreign-object content is being parsed. */
- private Sax2DomParser proxyParser = null;
+ private DefaultHandler proxyParser = null;
/** The current foreign document, if any. This will be null during normal FO document parsing, but will contain the
* document being parsed by {@link #proxyParser} when instream-foreign-object content is being parsed. */
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceForeign.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceForeign.java 2023-01-10 11:34:08 UTC (rev 13050)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceForeign.java 2023-01-10 12:41:18 UTC (rev 13051)
@@ -30,12 +30,12 @@
import org.foray.fotree.foreign.NamespaceMath;
import org.foray.fotree.foreign.NamespaceSvg;
-import org.foray.xml.Sax2DomParser;
import org.axsl.constants.XmlConstants;
import org.apache.commons.logging.LogFactory;
import org.w3c.dom.Document;
+import org.xml.sax.helpers.DefaultHandler;
import java.util.HashMap;
import java.util.Map;
@@ -77,10 +77,7 @@
* @param document The document which is to be built by the parser.
* @return The parser.
*/
- public Sax2DomParser createSaxParser(final Document document) {
- final Sax2DomParser parser = new Sax2DomParser(document);
- return parser;
- }
+ public abstract DefaultHandler createSaxParser(Document document);
/**
* Registers a foreign namespace for use by the FO tree parser.
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/NamespaceMath.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/NamespaceMath.java 2023-01-10 11:34:08 UTC (rev 13050)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/NamespaceMath.java 2023-01-10 12:41:18 UTC (rev 13051)
@@ -29,10 +29,13 @@
package org.foray.fotree.foreign;
import org.foray.fotree.NamespaceForeign;
+import org.foray.xml.Sax2DomParser;
import org.foray.xml.domImpl.MathMlDocument4a;
import org.axsl.constants.XmlConstants;
+import org.w3c.dom.Document;
+
/**
* This class manages the namespace that is used for the Math Markup Language
* (MathML).
@@ -68,4 +71,9 @@
return new MathMlDocument4a(null, null, null);
}
+ @Override
+ public Sax2DomParser createSaxParser(final Document document) {
+ return new Sax2DomParser(document);
+ }
+
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/NamespaceSvg.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/NamespaceSvg.java 2023-01-10 11:34:08 UTC (rev 13050)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/NamespaceSvg.java 2023-01-10 12:41:18 UTC (rev 13051)
@@ -29,12 +29,15 @@
package org.foray.fotree.foreign;
import org.foray.fotree.NamespaceForeign;
+import org.foray.xml.Sax2DomParser;
import org.axsl.constants.XmlConstants;
import org.apache.batik.anim.dom.SVGDOMImplementation;
import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.Document;
import org.w3c.dom.svg.SVGDocument;
+import org.xml.sax.helpers.DefaultHandler;
/**
* This class manages the namespace that is used for SVG.
@@ -72,4 +75,11 @@
return (SVGDocument) impl.createDocument(XmlConstants.SVG_NS_URI, "svg", null);
}
+ @Override
+ public DefaultHandler createSaxParser(final Document document) {
+ /* TODO: Get the SVG-specific SAX DefaultHandler working here. */
+// return new SAXSVGDocumentFactory(SaxParser.getParserClassName());
+ return new Sax2DomParser(document);
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2023-01-10 22:01:36
|
Revision: 13052
http://sourceforge.net/p/foray/code/13052
Author: victormote
Date: 2023-01-10 22:01:34 +0000 (Tue, 10 Jan 2023)
Log Message:
-----------
Change proxy parser type from DefaultHandler to ContentHandler.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceForeign.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java 2023-01-10 12:41:18 UTC (rev 13051)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java 2023-01-10 22:01:34 UTC (rev 13052)
@@ -55,7 +55,6 @@
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.DefaultHandler;
import java.io.IOException;
import java.net.URL;
@@ -99,7 +98,7 @@
/** The current proxy parser, if any. This will be null during normal FO document parsing, but will contain a parser
* when instream-foreign-object content is being parsed. */
- private DefaultHandler proxyParser = null;
+ private ContentHandler proxyParser = null;
/** The current foreign document, if any. This will be null during normal FO document parsing, but will contain the
* document being parsed by {@link #proxyParser} when instream-foreign-object content is being parsed. */
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceForeign.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceForeign.java 2023-01-10 12:41:18 UTC (rev 13051)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceForeign.java 2023-01-10 22:01:34 UTC (rev 13052)
@@ -35,7 +35,7 @@
import org.apache.commons.logging.LogFactory;
import org.w3c.dom.Document;
-import org.xml.sax.helpers.DefaultHandler;
+import org.xml.sax.ContentHandler;
import java.util.HashMap;
import java.util.Map;
@@ -77,7 +77,7 @@
* @param document The document which is to be built by the parser.
* @return The parser.
*/
- public abstract DefaultHandler createSaxParser(Document document);
+ public abstract ContentHandler createSaxParser(Document document);
/**
* Registers a foreign namespace for use by the FO tree parser.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2023-01-11 17:24:56
|
Revision: 13054
http://sourceforge.net/p/foray/code/13054
Author: victormote
Date: 2023-01-11 17:24:53 +0000 (Wed, 11 Jan 2023)
Log Message:
-----------
Move ErrorHandler interface from Namespace to NamespaceNative as it is only used by native namespaces.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/Namespace.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java 2023-01-11 17:08:11 UTC (rev 13053)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java 2023-01-11 17:24:53 UTC (rev 13054)
@@ -71,7 +71,7 @@
/**
* SAX Handler that builds the formatting object tree.
*/
-public class FoTreeParser4a extends SaxParser<FoTree4a> implements FoTreeParser, Namespace.ErrorHandler {
+public class FoTreeParser4a extends SaxParser<FoTree4a> implements FoTreeParser, NamespaceNative.ErrorHandler {
/** The initial size of the text buffer for accumulating text. */
private static final int INITIAL_TEXT_BUFFER_SIZE = 4096;
@@ -113,14 +113,13 @@
/** The text buffer used to accumulate the text portion of the mixed content. */
private StringBuilder textBuffer = new StringBuilder(INITIAL_TEXT_BUFFER_SIZE);
- /* TODO: This should possibly be configurable. */
/** The strategy to use for storing text. Defaults to {@link TextStrategy#WORD}, but can be changed by
* {@link #setTextStrategy(TextStrategy)}. */
private TextStrategy textStrategy = TextStrategy.WORD;
- /** Map whose key is a {@link Namespace} instance, and whose value is the set of elements that were parsed in that
- * namespace that could not be converted to FO Objects. */
- private Map<Namespace, Set<String>> invalidElementsMap = new HashMap<Namespace, Set<String>>();
+ /** Map whose key is a {@link NamespaceNative} instance, and whose value is the set of elements that were parsed in
+ * that namespace that could not be converted to FO Objects. */
+ private Map<NamespaceNative, Set<String>> invalidElementsMap = new HashMap<NamespaceNative, Set<String>>();
/** List of base URLs to be used when resolving relative locations as they are parsed. */
private List<URL> resourceSearchPath;
@@ -512,7 +511,7 @@
}
@Override
- public void processUnknownElement(final Namespace namespace, final String unknownElementName) {
+ public void processUnknownElement(final NamespaceNative namespace, final String unknownElementName) {
Set<String> unknownElements = this.invalidElementsMap.get(namespace);
if (unknownElements == null) {
unknownElements = new HashSet<String>();
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/Namespace.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/Namespace.java 2023-01-11 17:08:11 UTC (rev 13053)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/Namespace.java 2023-01-11 17:24:53 UTC (rev 13054)
@@ -42,20 +42,6 @@
public abstract class Namespace {
/**
- * Implementations (usually FO Tree parsers) receive events when the {@link Namespace} instance encounters errors.
- */
- public interface ErrorHandler {
-
- /**
- * Process an unknown element that was encountered in this namespace.
- * @param namespace The Namespace instance that encountered the error.
- * @param unknownElementName The name of the unknown element encountered by {@code namespace}.
- */
- void processUnknownElement(Namespace namespace, String unknownElementName);
-
- }
-
- /**
* Finds the {@link Namespace} instance for a given namespace URI.
* @param namespaceUri The URI for which a namespace is needed.
* @return The namespace matching {@code namespaceUri}, or null if none is found.
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java 2023-01-11 17:08:11 UTC (rev 13053)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceNative.java 2023-01-11 17:24:53 UTC (rev 13054)
@@ -45,6 +45,20 @@
public abstract class NamespaceNative extends Namespace {
/**
+ * Implementations (usually FO Tree parsers) receive events when the {@link Namespace} instance encounters errors.
+ */
+ public interface ErrorHandler {
+
+ /**
+ * Process an unknown element that was encountered in this namespace.
+ * @param namespace The Namespace instance that encountered the error.
+ * @param unknownElementName The name of the unknown element encountered by {@code namespace}.
+ */
+ void processUnknownElement(NamespaceNative namespace, String unknownElementName);
+
+ }
+
+ /**
* Finds the {@link NamespaceNative} instance for a given namespace URI.
* @param namespaceUri The URI for which a native namespace is needed.
* @return The native namespace matching {@code namespaceUri}, or null if none is found.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2023-01-11 20:19:58
|
Revision: 13055
http://sourceforge.net/p/foray/code/13055
Author: victormote
Date: 2023-01-11 20:19:55 +0000 (Wed, 11 Jan 2023)
Log Message:
-----------
Put the document and content handler into a single logical object so that they can be created and managed together as needed.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceForeign.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/NamespaceMath.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/NamespaceSvg.java
Added Paths:
-----------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/ForeignNamespaceHandler.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java 2023-01-11 17:24:53 UTC (rev 13054)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java 2023-01-11 20:19:55 UTC (rev 13055)
@@ -35,6 +35,7 @@
import org.foray.fotree.fo.obj.InstreamForeignObject4a;
import org.foray.fotree.fo.obj.PageSequence4a;
import org.foray.fotree.fo.obj.Root4a;
+import org.foray.fotree.foreign.ForeignNamespaceHandler;
import org.foray.primitive.StringUtils;
import org.foray.xml.SaxParser;
@@ -96,14 +97,10 @@
/** Collection of objects that have registered to be notified about FOTreeEvent firings. */
private List<FoTreeListener> foTreeListeners = new ArrayList<FoTreeListener>();
- /** The current proxy parser, if any. This will be null during normal FO document parsing, but will contain a parser
- * when instream-foreign-object content is being parsed. */
- private ContentHandler proxyParser = null;
+ /** The current proxy handler/parser, if any. This will be null during normal FO document parsing, but will contain
+ * a handler/parser when instream-foreign-object content is being parsed. */
+ private ForeignNamespaceHandler proxyHandler = null;
- /** The current foreign document, if any. This will be null during normal FO document parsing, but will contain the
- * document being parsed by {@link #proxyParser} when instream-foreign-object content is being parsed. */
- private Document foreignDocument;
-
/** The parent server. */
private FoTreeServer4a server;
@@ -179,9 +176,9 @@
return;
}
- if (this.proxyParser != null) {
+ if (this.proxyHandler != null) {
// If inside foreign XML, let the ForeignXml instance handle it.
- this.proxyParser.characters(data, start, length);
+ this.proxyHandler.getContentHandler().characters(data, start, length);
return;
}
@@ -273,9 +270,9 @@
@Override
public void startElement(final String namespaceURI, final String localName, final String rawName,
final Attributes attlist) throws SAXException {
- if (this.proxyParser != null) {
+ if (this.proxyHandler != null) {
// If inside foreign XML, let the ForeignXml instance handle it.
- this.proxyParser.startElement(namespaceURI, localName, rawName, attlist);
+ this.proxyHandler.getContentHandler().startElement(namespaceURI, localName, rawName, attlist);
return;
}
final Namespace namespace = Namespace.getNamespace(namespaceURI);
@@ -288,9 +285,8 @@
if (namespace instanceof NamespaceForeign) {
if (this.currentFObj instanceof InstreamForeignObject) {
final NamespaceForeign foreignNamespace = (NamespaceForeign) namespace;
- this.foreignDocument = foreignNamespace.createDomDocument();
- this.proxyParser = foreignNamespace.createSaxParser(this.foreignDocument);
- this.proxyParser.startElement(namespaceURI, localName, rawName, attlist);
+ this.proxyHandler = foreignNamespace.getHandler();
+ this.proxyHandler.getContentHandler().startElement(namespaceURI, localName, rawName, attlist);
return;
} else {
try {
@@ -381,21 +377,20 @@
&& "instream-foreign-object".equals(localName)) {
final InstreamForeignObject4a parent = (InstreamForeignObject4a) this.currentFObj;
- if (this.foreignDocument instanceof SVGDocument) {
- } else if (this.foreignDocument instanceof MathMLDocument) {
+ final Document document = this.proxyHandler.getDocument();
+ if (document instanceof SVGDocument) {
+ } else if (document instanceof MathMLDocument) {
} else {
- throw new IllegalStateException(
- "Unexpected document type:" + this.foreignDocument.getClass().getName());
+ throw new IllegalStateException("Unexpected document type:" + document.getClass().getName());
}
- parent.setForeignXml(this.foreignDocument);
- this.proxyParser = null;
- this.foreignDocument = null;
+ parent.setForeignXml(document);
+ this.proxyHandler = null;
}
- if (this.proxyParser != null) {
+ if (this.proxyHandler != null) {
// If inside foreign XML, let the ForeignXml instance handle it.
- this.proxyParser.endElement(uri, localName, rawName);
+ this.proxyHandler.getContentHandler().endElement(uri, localName, rawName);
return;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceForeign.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceForeign.java 2023-01-11 17:24:53 UTC (rev 13054)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceForeign.java 2023-01-11 20:19:55 UTC (rev 13055)
@@ -28,6 +28,7 @@
package org.foray.fotree;
+import org.foray.fotree.foreign.ForeignNamespaceHandler;
import org.foray.fotree.foreign.NamespaceMath;
import org.foray.fotree.foreign.NamespaceSvg;
@@ -34,8 +35,6 @@
import org.axsl.constants.XmlConstants;
import org.apache.commons.logging.LogFactory;
-import org.w3c.dom.Document;
-import org.xml.sax.ContentHandler;
import java.util.HashMap;
import java.util.Map;
@@ -64,22 +63,6 @@
}
/**
- * Create a DOM {@link Document} instance.
- * @return The newly-created {@link Document} instance for this namespace.
- */
- protected abstract Document createDomDocument();
-
- /**
- * Create a SAX parser suitable for parsing a document created in this namespace.
- * The parser should be ready to build {@code document} from SAX events that are fed to it.
- * This parser will be interposed in the process of parsing the FO document, and will serve as a proxy parser to
- * parse the foreign XML.
- * @param document The document which is to be built by the parser.
- * @return The parser.
- */
- public abstract ContentHandler createSaxParser(Document document);
-
- /**
* Registers a foreign namespace for use by the FO tree parser.
* @param namespaceUri The URI of the namespace to be registered.
* @param namespace The namespace instance to be used to process elements and attributes in the {@code namespaceUri}
@@ -93,4 +76,10 @@
namespaceMap.put(namespaceUri, namespace);
}
+ /**
+ * Returns a new handler for foreign content in this namespace.
+ * @return A new handler for foreign content in this namespace.
+ */
+ public abstract ForeignNamespaceHandler getHandler();
+
}
Added: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/ForeignNamespaceHandler.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/ForeignNamespaceHandler.java (rev 0)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/ForeignNamespaceHandler.java 2023-01-11 20:19:55 UTC (rev 13055)
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2023 The FOray Project.
+ * http://www.foray.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ * Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ * $LastChangedBy$
+ */
+
+package org.foray.fotree.foreign;
+
+import org.w3c.dom.Document;
+import org.xml.sax.ContentHandler;
+
+/**
+ * Provides namespace-specific information to the FO parser for purposes of parsing foreign XML content.
+ * The {@link #getDocument()} and the {@link #getContentHandler()} must be related to each other.
+ * In other words, when the content handler is handling content, it needs to be updating the document.
+ */
+public class ForeignNamespaceHandler {
+
+ /** The foreign XML document being parsed. */
+ private Document document;
+
+ /** The content handler to be used to parse the foreign XML. */
+ private ContentHandler contentHandler;
+
+ /**
+ * Returns the document.
+ * @return The document.
+ */
+ public Document getDocument() {
+ return document;
+ }
+
+ /**
+ * Sets the document.
+ * @param document The document to set.
+ */
+ public void setDocument(final Document document) {
+ this.document = document;
+ }
+
+ /**
+ * Returns the content handler to be used to parse the foreign XML.
+ * @return the content handler to be used to parse the foreign XML..
+ */
+ public ContentHandler getContentHandler() {
+ return contentHandler;
+ }
+
+ /**
+ * Sets the content handler.
+ * @param contentHandler The content handler to set.
+ */
+ public void setContentHandler(final ContentHandler contentHandler) {
+ this.contentHandler = contentHandler;
+ }
+
+
+}
Property changes on: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/ForeignNamespaceHandler.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev
\ No newline at end of property
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/NamespaceMath.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/NamespaceMath.java 2023-01-11 17:24:53 UTC (rev 13054)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/NamespaceMath.java 2023-01-11 20:19:55 UTC (rev 13055)
@@ -34,7 +34,7 @@
import org.axsl.constants.XmlConstants;
-import org.w3c.dom.Document;
+import org.xml.sax.ContentHandler;
/**
* This class manages the namespace that is used for the Math Markup Language
@@ -67,13 +67,16 @@
}
@Override
- protected MathMlDocument4a createDomDocument() {
- return new MathMlDocument4a(null, null, null);
- }
+ public ForeignNamespaceHandler getHandler() {
+ final MathMlDocument4a document = new MathMlDocument4a(null, null, null);
- @Override
- public Sax2DomParser createSaxParser(final Document document) {
- return new Sax2DomParser(document);
+ final ContentHandler contentHandler = new Sax2DomParser(document);
+
+ final ForeignNamespaceHandler handler = new ForeignNamespaceHandler();
+ handler.setDocument(document);
+ handler.setContentHandler(contentHandler);
+
+ return handler;
}
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/NamespaceSvg.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/NamespaceSvg.java 2023-01-11 17:24:53 UTC (rev 13054)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/NamespaceSvg.java 2023-01-11 20:19:55 UTC (rev 13055)
@@ -35,9 +35,8 @@
import org.apache.batik.anim.dom.SVGDOMImplementation;
import org.w3c.dom.DOMImplementation;
-import org.w3c.dom.Document;
import org.w3c.dom.svg.SVGDocument;
-import org.xml.sax.helpers.DefaultHandler;
+import org.xml.sax.ContentHandler;
/**
* This class manages the namespace that is used for SVG.
@@ -70,16 +69,19 @@
}
@Override
- protected SVGDocument createDomDocument() {
+ public ForeignNamespaceHandler getHandler() {
final DOMImplementation impl = SVGDOMImplementation.getDOMImplementation();
- return (SVGDocument) impl.createDocument(XmlConstants.SVG_NS_URI, "svg", null);
- }
+ final SVGDocument document = (SVGDocument) impl.createDocument(XmlConstants.SVG_NS_URI, "svg", null);
- @Override
- public DefaultHandler createSaxParser(final Document document) {
/* TODO: Get the SVG-specific SAX DefaultHandler working here. */
// return new SAXSVGDocumentFactory(SaxParser.getParserClassName());
- return new Sax2DomParser(document);
+ final ContentHandler contentHandler = new Sax2DomParser(document);
+
+ final ForeignNamespaceHandler handler = new ForeignNamespaceHandler();
+ handler.setDocument(document);
+ handler.setContentHandler(contentHandler);
+
+ return handler;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2023-01-12 19:22:40
|
Revision: 13058
http://sourceforge.net/p/foray/code/13058
Author: victormote
Date: 2023-01-12 19:22:37 +0000 (Thu, 12 Jan 2023)
Log Message:
-----------
Allow foreign namespace to do some post-parse processing.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceForeign.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/ForeignNamespaceHandler.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/NamespaceMath.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/NamespaceSvg.java
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java 2023-01-12 18:14:40 UTC (rev 13057)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java 2023-01-12 19:22:37 UTC (rev 13058)
@@ -387,7 +387,9 @@
throw new IllegalStateException("Unexpected document type:" + document.getClass().getName());
}
- parent.setForeignXml(document);
+ this.proxyHandler.finalizeParsing();
+ /* The document instance can change during finalizeParsing, so get it again. */
+ parent.setForeignXml(this.proxyHandler.getDocument());
this.proxyHandler = null;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceForeign.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceForeign.java 2023-01-12 18:14:40 UTC (rev 13057)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/NamespaceForeign.java 2023-01-12 19:22:37 UTC (rev 13058)
@@ -82,4 +82,13 @@
*/
public abstract ForeignNamespaceHandler getHandler();
+ /**
+ * Gives subclasses an opportunity to do any post-parsing finalization work.
+ * CAVEAT: The subclass may replace the object returned by {@link ForeignNamespaceHandler#getDocument()} as part of
+ * this process.
+ * Always use the value returned after running this method for any downstream processing.
+ * @param handler The handler containing the parsed document and content handler.
+ */
+ public abstract void finalizeHandler(ForeignNamespaceHandler handler);
+
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/ForeignNamespaceHandler.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/ForeignNamespaceHandler.java 2023-01-12 18:14:40 UTC (rev 13057)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/ForeignNamespaceHandler.java 2023-01-12 19:22:37 UTC (rev 13058)
@@ -28,6 +28,8 @@
package org.foray.fotree.foreign;
+import org.foray.fotree.NamespaceForeign;
+
import org.w3c.dom.Document;
import org.xml.sax.ContentHandler;
@@ -44,7 +46,18 @@
/** The content handler to be used to parse the foreign XML. */
private ContentHandler contentHandler;
+ /** The foreign namespace that created this handler. */
+ private NamespaceForeign namespace;
+
/**
+ * Constructor.
+ * @param namespace The foreign namespace that created this handler.
+ */
+ public ForeignNamespaceHandler(final NamespaceForeign namespace) {
+ this.namespace = namespace;
+ }
+
+ /**
* Returns the document.
* @return The document.
*/
@@ -62,7 +75,7 @@
/**
* Returns the content handler to be used to parse the foreign XML.
- * @return the content handler to be used to parse the foreign XML..
+ * @return the content handler to be used to parse the foreign XML.
*/
public ContentHandler getContentHandler() {
return contentHandler;
@@ -76,5 +89,11 @@
this.contentHandler = contentHandler;
}
+ /**
+ * Allow the namespace to do any specific post-parse processing that is needed.
+ */
+ public void finalizeParsing() {
+ this.namespace.finalizeHandler(this);
+ }
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/NamespaceMath.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/NamespaceMath.java 2023-01-12 18:14:40 UTC (rev 13057)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/NamespaceMath.java 2023-01-12 19:22:37 UTC (rev 13058)
@@ -72,7 +72,7 @@
final ContentHandler contentHandler = new Sax2DomParser(document);
- final ForeignNamespaceHandler handler = new ForeignNamespaceHandler();
+ final ForeignNamespaceHandler handler = new ForeignNamespaceHandler(this);
handler.setDocument(document);
handler.setContentHandler(contentHandler);
@@ -79,4 +79,9 @@
return handler;
}
+ @Override
+ public void finalizeHandler(final ForeignNamespaceHandler handler) {
+ /* Nothing to do here. */
+ }
+
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/NamespaceSvg.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/NamespaceSvg.java 2023-01-12 18:14:40 UTC (rev 13057)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foreign/NamespaceSvg.java 2023-01-12 19:22:37 UTC (rev 13058)
@@ -29,15 +29,25 @@
package org.foray.fotree.foreign;
import org.foray.fotree.NamespaceForeign;
+import org.foray.primitive.StringUtils;
+import org.foray.xml.DomUtil;
import org.foray.xml.Sax2DomParser;
import org.axsl.constants.XmlConstants;
+import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
import org.apache.batik.anim.dom.SVGDOMImplementation;
+import org.apache.batik.util.XMLResourceDescriptor;
import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.ls.LSOutput;
+import org.w3c.dom.ls.LSSerializer;
import org.w3c.dom.svg.SVGDocument;
import org.xml.sax.ContentHandler;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
/**
* This class manages the namespace that is used for SVG.
*/
@@ -77,7 +87,7 @@
// return new SAXSVGDocumentFactory(SaxParser.getParserClassName());
final ContentHandler contentHandler = new Sax2DomParser(document);
- final ForeignNamespaceHandler handler = new ForeignNamespaceHandler();
+ final ForeignNamespaceHandler handler = new ForeignNamespaceHandler(this);
handler.setDocument(document);
handler.setContentHandler(contentHandler);
@@ -84,4 +94,26 @@
return handler;
}
+ @Override
+ public void finalizeHandler(final ForeignNamespaceHandler handler) {
+ /* Reparse the SVG document using the standard Batik approach. */
+ final LSSerializer lss = DomUtil.createLSSerializer();
+ final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ final LSOutput lso = DomUtil.createLSOutput(baos, StringUtils.EMPTY_STRING);
+ lso.setByteStream(baos);
+ lss.write(handler.getDocument(), lso);
+ final byte[] bytes = baos.toByteArray();
+ final ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
+
+ final String parser = XMLResourceDescriptor.getXMLParserClassName();
+ final SAXSVGDocumentFactory factory = new SAXSVGDocumentFactory(parser);
+ try {
+ final SVGDocument document = factory.createSVGDocument("", bais);
+ handler.setDocument(document);
+ } catch (final IOException e) {
+ /* This shouldn't happen. We aren't actually doing IO. */
+ throw new IllegalStateException(e);
+ }
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
