foray-commit Mailing List for FOray (Page 39)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 12926
          http://sourceforge.net/p/foray/code/12926
Author:   victormote
Date:     2022-12-23 18:06:01 +0000 (Fri, 23 Dec 2022)
Log Message:
-----------
Remove no-longer-needed FoObj method parameters.

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-23 17:54:48 UTC (rev 12925)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/AbstractAxslProperty.java	2022-12-23 18:06:01 UTC (rev 12926)
@@ -58,8 +58,7 @@
         if (pv != null) {
             return pv;
         }
-        pv = PropertyParser.parse(fobj, rawPropertyValue,
-                this.getPropertyType());
+        pv = PropertyParser.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-23 17:54:48 UTC (rev 12925)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/AbstractFoProperty.java	2022-12-23 18:06:01 UTC (rev 12926)
@@ -82,7 +82,7 @@
         if (pv != null) {
             return pv;
         }
-        return PropertyParser.parse(fobj, rawPropertyValue, this.getPropertyType());
+        return PropertyParser.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-23 17:54:48 UTC (rev 12925)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/parse/PropertyParser.java	2022-12-23 18:06:01 UTC (rev 12926)
@@ -29,7 +29,6 @@
 package org.foray.fotree.parse;
 
 
-import org.foray.fotree.FoObj;
 import org.foray.fotree.PropertyException;
 import org.foray.fotree.PropertyId;
 import org.foray.fotree.value.DtColor;
@@ -71,16 +70,14 @@
     /**
      * Public entrypoint to the Property expression parser.
      * @param expr The specified value (attribute on the xml element).
-     * @param fobj The parent FoObj of the expression being parsed.
      * @param propertyType The property type for which the value is being parsed.
      * This is needed for some functions, for example "from-parent".
      * @return A PropertyValue instance holding the parsed result.
      * @throws PropertyException If the "expr" cannot be parsed as a Property.
      */
-    public static PropertyValue parse(final FoObj fobj, final String expr, final PropertyId propertyType)
-            throws PropertyException {
+    public static PropertyValue parse(final String expr, final PropertyId propertyType) throws PropertyException {
         final PropertyParser parser = new PropertyParser(expr);
-        PropertyValue pv = parser.parseProperty(fobj, propertyType);
+        PropertyValue pv = parser.parseProperty(propertyType);
         if (pv == null) {
             pv = new DtString(expr);
         }
@@ -90,12 +87,11 @@
     /**
      * 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 fobj The FoObj of the expression being parsed.
      * @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 FoObj fobj, final PropertyId propertyType) throws PropertyException {
+    private PropertyValue parseProperty(final PropertyId propertyType) throws PropertyException {
         next();
         if (getCurrentToken() == Token.EOF) {
             // if prop value is empty string, force to StringProperty
@@ -102,7 +98,7 @@
             return new DtString("");
         }
         while (true) {
-            final PropertyValue prop = parseAdditiveExpr(fobj, propertyType);
+            final PropertyValue prop = parseAdditiveExpr(propertyType);
             if (getCurrentToken() == Token.EOF) {
                 return prop;
             }
@@ -117,25 +113,24 @@
 
     /**
      * Parse an addition or subtraction expression.
-     * @param fobj The FoObj of the expression being parsed.
      * @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 FoObj fobj, final PropertyId propertyType) throws PropertyException {
+    private ExprAdditive parseAdditiveExpr(final PropertyId propertyType) throws PropertyException {
         // Evaluate and put result on the operand stack
-        ExprAdditive prop = parseMultiplicativeExpr(fobj, propertyType);
+        ExprAdditive prop = parseMultiplicativeExpr(propertyType);
         loop:
         for (;;) {
             switch (getCurrentToken()) {
             case PLUS:
                 next();
-                prop = evalAddition(prop, parseMultiplicativeExpr(fobj, propertyType));
+                prop = evalAddition(prop, parseMultiplicativeExpr(propertyType));
                 break;
             case MINUS:
                 next();
                 prop =
-                    evalSubtraction(prop, parseMultiplicativeExpr(fobj, propertyType));
+                    evalSubtraction(prop, parseMultiplicativeExpr(propertyType));
                 break;
             default:
                 break loop;
@@ -146,28 +141,27 @@
 
     /**
      * Parse a multiply, divide or modulo expression.
-     * @param fobj The FoObj of the expression being parsed.
      * @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 FoObj fobj, final PropertyId propertyType)
+    private ExprMultiplicative parseMultiplicativeExpr(final PropertyId propertyType)
             throws PropertyException {
-        ExprMultiplicative prop = parseUnaryExpr(fobj, propertyType);
+        ExprMultiplicative prop = parseUnaryExpr(propertyType);
         loop:
         for (;;) {
             switch (getCurrentToken()) {
             case DIV:
                 next();
-                prop = evalDivide(prop, parseUnaryExpr(fobj, propertyType));
+                prop = evalDivide(prop, parseUnaryExpr(propertyType));
                 break;
             case MOD:
                 next();
-                prop = evalModulo(prop, parseUnaryExpr(fobj, propertyType));
+                prop = evalModulo(prop, parseUnaryExpr(propertyType));
                 break;
             case MULTIPLY:
                 next();
-                prop = evalMultiply(prop, parseUnaryExpr(fobj, propertyType));
+                prop = evalMultiply(prop, parseUnaryExpr(propertyType));
                 break;
             default:
                 break loop;
@@ -178,17 +172,16 @@
 
     /**
      * Parse a unary minus expression.
-     * @param fobj The FoObj of the expression being parsed.
      * @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 FoObj fobj, final PropertyId propertyType) throws PropertyException {
+    private ExprUnary parseUnaryExpr(final PropertyId propertyType) throws PropertyException {
         if (getCurrentToken() == Token.MINUS) {
             next();
-            return evalNegate(parseUnaryExpr(fobj, propertyType));
+            return evalNegate(parseUnaryExpr(propertyType));
         }
-        return parsePrimaryExpr(fobj, propertyType);
+        return parsePrimaryExpr(propertyType);
     }
 
 
@@ -209,12 +202,11 @@
      * 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 fobj The FoObj of the expression being parsed.
      * @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 FoObj fobj, final PropertyId propertyType)
+    private ExprPrimary parsePrimaryExpr(final PropertyId propertyType)
             throws PropertyException {
         final ExprPrimary prop;
         final Token currentToken = this.getCurrentToken();
@@ -221,7 +213,7 @@
         switch (currentToken) {
         case LPAR:
             next();
-            prop = parseInnerExpression(fobj, propertyType);
+            prop = parseInnerExpression(propertyType);
             expectRpar();
             return prop;
 
@@ -270,7 +262,7 @@
         case FUNCTION_LPAR: {
             next();
             final String functionType = getCurrentTokenValue();
-            final Expr[] functionArguments = parseArgs(fobj, propertyType);
+            final Expr[] functionArguments = parseArgs(propertyType);
             final Function function = Function.makeFunction(functionType, functionArguments, propertyType);
             if (function == null) {
                 throw new PropertyException("No such function: " + getCurrentTokenValue());
@@ -286,13 +278,12 @@
 
     /**
      * Parse an inner expression.
-     * @param fobj The FoObj of the expression being parsed.
      * @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 FoObj fobj, final PropertyId propertyType) throws PropertyException {
-        final ExprAdditive expr = parseAdditiveExpr(fobj, propertyType);
+    private ExprInner parseInnerExpression(final PropertyId propertyType) throws PropertyException {
+        final ExprAdditive expr = parseAdditiveExpr(propertyType);
         return new ExprInner(expr);
     }
 
@@ -304,11 +295,10 @@
      * It simply parses them and passes them on.
      * They can be counted and evaluated downstream.
      * @param propertyType The property type for which the value is being parsed.
-     * @param fobj The FoObj of the expression 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 FoObj fobj, final PropertyId propertyType) throws PropertyException {
+    Expr[] parseArgs(final PropertyId propertyType) throws PropertyException {
         final List<PropertyValue> args = new ArrayList<PropertyValue>();
         PropertyValue prop;
         if (getCurrentToken() == Token.RPAR) {
@@ -316,7 +306,7 @@
             next();
         } else {
             while (true) {
-                prop = parseAdditiveExpr(fobj, propertyType);
+                prop = parseAdditiveExpr(propertyType);
                 args.add(prop);
                 if (getCurrentToken() != Token.COMMA) {
                     break;

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-23 17:54:48 UTC (rev 12925)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/AbstractXmlProperty.java	2022-12-23 18:06:01 UTC (rev 12926)
@@ -54,8 +54,7 @@
         if (pv != null) {
             return pv;
         }
-        pv = PropertyParser.parse(fobj, rawPropertyValue,
-                this.getPropertyType());
+        pv = PropertyParser.parse(rawPropertyValue, getPropertyType());
         return pv;
     }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





2006	Jan	Feb	Mar (139)	Apr (98)	May (250)	Jun (394)	Jul (84)	Aug (13)	Sep (420)	Oct (186)	Nov (1)	Dec (3)
2007	Jan (108)	Feb (202)	Mar (291)	Apr (247)	May (374)	Jun (227)	Jul (231)	Aug (60)	Sep (31)	Oct (45)	Nov (18)	Dec
2008	Jan (38)	Feb (71)	Mar (142)	Apr	May (59)	Jun (6)	Jul (10)	Aug	Sep	Oct	Nov	Dec
2009	Jan (12)	Feb (4)	Mar (88)	Apr (121)	May (17)	Jun (30)	Jul	Aug (5)	Sep	Oct (1)	Nov	Dec
2010	Jan (11)	Feb (76)	Mar (11)	Apr	May (11)	Jun	Jul	Aug (44)	Sep (14)	Oct (7)	Nov	Dec
2011	Jan	Feb	Mar	Apr	May (9)	Jun	Jul	Aug	Sep	Oct (10)	Nov	Dec
2012	Jan	Feb	Mar	Apr	May	Jun (3)	Jul (4)	Aug	Sep	Oct	Nov	Dec
2016	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (168)
2017	Jan (77)	Feb (11)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2018	Jan	Feb	Mar (1)	Apr (6)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2019	Jan	Feb (88)	Mar (118)	Apr (1)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2020	Jan	Feb	Mar	Apr	May (6)	Jun	Jul	Aug	Sep	Oct	Nov	Dec (141)
2021	Jan (170)	Feb (20)	Mar	Apr	May	Jun	Jul (1)	Aug	Sep	Oct (62)	Nov (189)	Dec (162)
2022	Jan (201)	Feb (118)	Mar (8)	Apr	May (2)	Jun (47)	Jul (19)	Aug (14)	Sep (3)	Oct	Nov (28)	Dec (235)
2023	Jan (112)	Feb (23)	Mar (2)	Apr (2)	May	Jun (1)	Jul	Aug (70)	Sep (92)	Oct (20)	Nov (1)	Dec (1)
2024	Jan	Feb	Mar (1)	Apr (1)	May (14)	Jun (11)	Jul (1)	Aug	Sep	Oct	Nov	Dec
2025	Jan (10)	Feb (29)	Mar	Apr (162)	May (245)	Jun (83)	Jul	Aug (1)	Sep	Oct	Nov (2)	Dec

foray-commit Mailing List for FOray (Page 39)

Modular XSL-FO Implementation for Java.

foray-commit — FOray repository commit log messages