[FOray-commit] SF.net SVN: foray: [8542] trunk/foray

[<vic...@us...>]

Revision: 8542
          http://svn.sourceforge.net/foray/?rev=8542&view=rev
Author:   victormote
Date:     2007-01-28 15:16:00 -0800 (Sun, 28 Jan 2007)

Log Message:
-----------
Conform to new method names in aXSL.

Modified Paths:
--------------
    trunk/foray/foray-app/.classpath
    trunk/foray/foray-fotree/src/java/org/foray/fotree/Property.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/NamespaceFO.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnFromParent.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnInheritedProp.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnNearestSpecProp.java
    trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java

Modified: trunk/foray/foray-app/.classpath
===================================================================
--- trunk/foray/foray-app/.classpath	2007-01-28 22:11:42 UTC (rev 8541)
+++ trunk/foray/foray-app/.classpath	2007-01-28 23:16:00 UTC (rev 8542)
@@ -36,6 +36,7 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/axslOutput"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/axslHyphen-R"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/FOrayHyphen-R"/>
+	<classpathentry kind="lib" path="/FOrayHyphen-R/build/ant/foray-hyphen-r-0.3-dev-rsrc.jar"/>
 	<classpathentry kind="var" path="FORAY_LIB_ROOT/foray-hyphen-r-0.3-rsrc.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/FOrayPS"/>
 	<classpathentry kind="lib" path="/FOray Lib-Build/junit/junit.jar"/>

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/Property.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/Property.java	2007-01-28 22:11:42 UTC (rev 8541)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/Property.java	2007-01-28 23:16:00 UTC (rev 8542)
@@ -139,7 +139,7 @@
         final StringBuffer buffer = new StringBuffer();
         final FObj fobj = propertyList.getFObj();
         buffer.append("Unexpected value for ");
-        buffer.append(FoProperty.expandPropertyNameEnumeration(propertyType));
+        buffer.append(FoProperty.toXslFo(propertyType));
         buffer.append(": \"" + value + "\"\n");
         if (reason != null) {
             buffer.append("  Reason: " + reason + "\n");
@@ -206,7 +206,7 @@
         }
         for (int i = 0; i < validKeywords.length; i++) {
             final short kwIndex = validKeywords[i];
-            final String keyword = FoValue.expandPropertyConstant(kwIndex);
+            final String keyword = FoValue.toXslFo(kwIndex);
             if (possibleKeyword.equals(keyword)) {
                 return kwIndex;
             }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/NamespaceFO.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/NamespaceFO.java	2007-01-28 22:11:42 UTC (rev 8541)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/NamespaceFO.java	2007-01-28 23:16:00 UTC (rev 8542)
@@ -113,7 +113,7 @@
     }
 
     public String getPropertyName(final short propertyType) {
-        return FoProperty.expandPropertyNameEnumeration(propertyType);
+        return FoProperty.toXslFo(propertyType);
     }
 
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnFromParent.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnFromParent.java	2007-01-28 22:11:42 UTC (rev 8541)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnFromParent.java	2007-01-28 23:16:00 UTC (rev 8542)
@@ -70,7 +70,7 @@
             throws PropertyException {
         String propertySought = null;
         if (getArgs() == null || getArgs().length == 0) {
-            propertySought = FoProperty.expandPropertyNameEnumeration(
+            propertySought = FoProperty.toXslFo(
                     callingProperty.getPropertyType());
         } else {
             final PropertyValue pv = getArgs()[0];

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnInheritedProp.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnInheritedProp.java	2007-01-28 22:11:42 UTC (rev 8541)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnInheritedProp.java	2007-01-28 23:16:00 UTC (rev 8542)
@@ -70,7 +70,7 @@
             throws PropertyException {
         String propertySought = null;
         if (getArgs() == null || getArgs().length == 0) {
-            propertySought = FoProperty.expandPropertyNameEnumeration(
+            propertySought = FoProperty.toXslFo(
                     callingProperty.getPropertyType());
         } else {
             final PropertyValue pv = getArgs()[0];

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnNearestSpecProp.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnNearestSpecProp.java	2007-01-28 22:11:42 UTC (rev 8541)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnNearestSpecProp.java	2007-01-28 23:16:00 UTC (rev 8542)
@@ -70,7 +70,7 @@
             throws PropertyException {
         String propertySought = null;
         if (getArgs() == null || getArgs().length == 0) {
-            propertySought = FoProperty.expandPropertyNameEnumeration(
+            propertySought = FoProperty.toXslFo(
                     callingProperty.getPropertyType());
         } else {
             final PropertyValue pv = getArgs()[0];

Modified: trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java	2007-01-28 22:11:42 UTC (rev 8541)
+++ trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java	2007-01-28 23:16:00 UTC (rev 8542)
@@ -452,7 +452,7 @@
         final StringBuffer buffer = new StringBuffer();
         outputGeneratedBy(area, buffer);
         outputAttribute(buffer, "leader-pattern",
-                FoValue.expandPropertyConstant(area.traitLeaderPattern()));
+                FoValue.toXslFo(area.traitLeaderPattern()));
         outputAttribute(buffer, "leader-length",
                 area.getProgressionDimension());
         outputAttribute(buffer, "rule-thickness", area.traitRuleThickness());


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