[FOray-commit] SF.net SVN: foray: [7603] trunk/foray/foray-fotree/src/java/org/foray/fotree

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

Revision: 7603
Author:   victormote
Date:     2006-06-14 14:55:29 -0700 (Wed, 14 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7603&view=rev

Log Message:
-----------
For properties that don't inherit, move to new method that doesn't require the FOContext or the FObj.

Modified Paths:
--------------
    trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Name.java
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java	2006-06-14 21:49:49 UTC (rev 7602)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java	2006-06-14 21:55:29 UTC (rev 7603)
@@ -527,7 +527,7 @@
     public String getMarkerClassName(FOContext context) {
         Name property = (Name) getProperty(Constants.FOPROP_MARKER_CLASS_NAME);
         if (property != null) {
-            return property.getValue(context, fobj);
+            return property.getValue();
         }
         return Name.getValueNoInstance();
     }
@@ -536,7 +536,7 @@
         Name property = (Name) getProperty(Constants
                 .FOPROP_RETRIEVE_CLASS_NAME);
         if (property != null) {
-            return property.getValue(context, fobj);
+            return property.getValue();
         }
         return Name.getValueNoInstance();
     }
@@ -545,20 +545,20 @@
         Enumerated property = (Enumerated) getProperty(Constants
                 .FOPROP_RETRIEVE_POSITION);
         if (property != null) {
-            return property.getValue(context, fobj);
+            return property.getValue();
         }
         return Enumerated.getValueNoInstance
-                (context, Constants.FOPROP_RETRIEVE_POSITION, fobj);
+                (Constants.FOPROP_RETRIEVE_POSITION);
     }
 
     public short getRetrieveBoundary(FOContext context) {
         Enumerated property = (Enumerated) getProperty(Constants
                 .FOPROP_RETRIEVE_BOUNDARY);
         if (property != null) {
-            return property.getValue(context, fobj);
+            return property.getValue();
         }
         return Enumerated.getValueNoInstance
-                (context, Constants.FOPROP_RETRIEVE_BOUNDARY, fobj);
+                (Constants.FOPROP_RETRIEVE_BOUNDARY);
     }
 
     public int getColumnNumber(FOContext context) {

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Name.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Name.java	2006-06-14 21:49:49 UTC (rev 7602)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Name.java	2006-06-14 21:55:29 UTC (rev 7603)
@@ -86,6 +86,17 @@
         return getValueNoInstance();
     }
 
+    /**
+     * Overloaded version of {@link #getValue(FOContext, FObj)} for properties
+     * that have no inheritance, either implicit or explicit.
+     */
+    public String getValue() {
+        if (this.value instanceof DtName) {
+            return ((DtName) this.value).getValue();
+        }
+        return getValueNoInstance();
+    }
+
     public static String getValueNoInstance() {
         return "";
     }


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