[FOray-commit] SF.net SVN: foray: [7602] trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Enumerated.java

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

Revision: 7602
Author:   victormote
Date:     2006-06-14 14:49:49 -0700 (Wed, 14 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7602&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/fo/prop/Enumerated.java
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Enumerated.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Enumerated.java	2006-06-14 21:19:35 UTC (rev 7601)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Enumerated.java	2006-06-14 21:49:49 UTC (rev 7602)
@@ -78,34 +78,28 @@
         return getValueNoInstance(context, propertyType, fobj);
     }
 
+    /**
+     * An overloaded version of {@link #getValue()} for properties that have
+     * no inheritance, either implicit or explicit.
+     */
+    public short getValue() {
+        if (this.value instanceof PropertyKeyword) {
+            short keyword = ((PropertyKeyword) this.value).getValue();
+            return keyword;
+        }
+        return getValueNoInstance(propertyType);
+    }
+
     public static short getValueNoInstance(FOContext context,
             short propertyType, FObj fobj) {
         FObj parent = fobj.effectiveParent(context);
         switch (propertyType) {
-        case Constants.FOPROP_ABSOLUTE_POSITION: {
-            return Constants.FOVAL_AUTO;
-        }
-        case Constants.FOPROP_BACKGROUND_ATTACHMENT: {
-            return Constants.FOVAL_SCROLL;
-        }
-        case Constants.FOPROP_BACKGROUND_REPEAT: {
-            return Constants.FOVAL_REPEAT;
-        }
-        case Constants.FOPROP_BLANK_OR_NOT_BLANK: {
-            return Constants.FOVAL_ANY;
-        }
         case Constants.FOPROP_BORDER_COLLAPSE: {
             if (parent != null) {
                 return parent.traitBorderCollapse(context);
             }
             return Constants.FOVAL_COLLAPSE;
         }
-        case Constants.FOPROP_BREAK_AFTER: {
-            return Constants.FOVAL_AUTO;
-        }
-        case Constants.FOPROP_BREAK_BEFORE: {
-            return Constants.FOVAL_AUTO;
-        }
         case Constants.FOPROP_CAPTION_SIDE: {
             if (parent != null) {
                 return parent.traitCaptionSide(context);
@@ -142,9 +136,6 @@
             }
             return Constants.FOVAL_SPACE;
         }
-        case Constants.FOPROP_LETTER_VALUE: {
-            return Constants.FOVAL_AUTO;
-        }
         case Constants.FOPROP_LINEFEED_TREATMENT: {
             if (parent != null) {
                 return parent.traitLinefeedTreatment(context);
@@ -163,54 +154,18 @@
             }
             return Constants.FOVAL_MAX_HEIGHT;
         }
-        case Constants.FOPROP_ODD_OR_EVEN: {
-            return Constants.FOVAL_ANY;
-        }
-        case Constants.FOPROP_OVERFLOW: {
-            return Constants.FOVAL_AUTO;
-        }
-        case Constants.FOPROP_PAGE_POSITION: {
-            return Constants.FOVAL_ANY;
-        }
-        case Constants.FOPROP_POSITION: {
-            return Constants.FOVAL_STATIC;
-        }
         case Constants.FOPROP_RELATIVE_ALIGN: {
             if (parent != null) {
                 return parent.traitRelativeAlign(context);
             }
             return Constants.FOVAL_BEFORE;
         }
-        case Constants.FOPROP_RELATIVE_POSITION: {
-            return Constants.FOVAL_STATIC;
-        }
-        case Constants.FOPROP_RETRIEVE_BOUNDARY: {
-            return Constants.FOVAL_PAGE_SEQUENCE;
-        }
-        case Constants.FOPROP_RETRIEVE_POSITION: {
-            return Constants.FOVAL_FIRST_STARTING_WITHIN_PAGE;
-        }
         case Constants.FOPROP_RULE_STYLE: {
             if (parent != null) {
                 return parent.traitRuleStyle(context);
             }
             return Constants.FOVAL_SOLID;
         }
-        case Constants.FOPROP_SCALING: {
-            return Constants.FOVAL_UNIFORM;
-        }
-        case Constants.FOPROP_SCALING_METHOD: {
-            return Constants.FOVAL_AUTO;
-        }
-        case Constants.FOPROP_SPAN: {
-            return Constants.FOVAL_NONE;
-        }
-        case Constants.FOPROP_SUPPRESS_AT_LINE_BREAK: {
-            return Constants.FOVAL_AUTO;
-        }
-        case Constants.FOPROP_UNICODE_BIDI: {
-            return Constants.FOVAL_NORMAL;
-        }
         case Constants.FOPROP_WHITE_SPACE: {
             if (parent != null) {
                 return parent.propertyList.traitWhiteSpace(context);
@@ -229,27 +184,12 @@
             }
             return Constants.FOVAL_WRAP;
         }
-        case Constants.FOPROP_CLEAR: {
-            return Constants.FOVAL_NONE;
-        }
         case Constants.FOPROP_EMPTY_CELLS: {
             if (parent != null) {
                 return parent.traitEmptyCells(context);
             }
             return Constants.FOVAL_SHOW;
         }
-        case Constants.FOPROP_FLOAT: {
-            return Constants.FOVAL_NONE;
-        }
-        case Constants.FOPROP_MEDIA_USAGE: {
-            return Constants.FOVAL_AUTO;
-        }
-        case Constants.FOPROP_PAGE_BREAK_AFTER: {
-            return Constants.FOVAL_AUTO;
-        }
-        case Constants.FOPROP_PAGE_BREAK_BEFORE: {
-            return Constants.FOVAL_AUTO;
-        }
         case Constants.FOPROP_PAGE_BREAK_INSIDE: {
             if (parent != null) {
                 return parent.propertyList.traitPageBreakInside(context);
@@ -262,12 +202,6 @@
             }
             return Constants.FOVAL_NUM_ZERO;
         }
-        case Constants.FOPROP_RENDERING_INTENT: {
-            return Constants.FOVAL_AUTO;
-        }
-        case Constants.FOPROP_SHOW_DESTINATION: {
-            return Constants.FOVAL_REPLACE;
-        }
         case Constants.FOPROP_SPEAK_HEADER: {
             if (parent != null) {
                 return parent.traitSpeakHeader(context);
@@ -292,9 +226,6 @@
             }
             return Constants.FOVAL_NONE;
         }
-        case Constants.FOPROP_STARTING_STATE: {
-            return Constants.FOVAL_SHOW;
-        }
         case Constants.FOPROP_TEXT_TRANSFORM: {
             if (parent != null) {
                 return parent.traitTextTransform(context);
@@ -308,6 +239,98 @@
             return Constants.FOVAL_VISIBLE;
         }
         }
+        return getValueNoInstance(propertyType);
+    }
+
+    /**
+     * An overloaded version of
+     * {@link #getValueNoInstance(FOContext, short, FObj)} for properties that
+     * have no inheritance, either implicit or explicit.
+     */
+    public static short getValueNoInstance(short propertyType) {
+        switch (propertyType) {
+        case Constants.FOPROP_ABSOLUTE_POSITION: {
+            return Constants.FOVAL_AUTO;
+        }
+        case Constants.FOPROP_BACKGROUND_ATTACHMENT: {
+            return Constants.FOVAL_SCROLL;
+        }
+        case Constants.FOPROP_BACKGROUND_REPEAT: {
+            return Constants.FOVAL_REPEAT;
+        }
+        case Constants.FOPROP_BLANK_OR_NOT_BLANK: {
+            return Constants.FOVAL_ANY;
+        }
+        case Constants.FOPROP_BREAK_AFTER: {
+            return Constants.FOVAL_AUTO;
+        }
+        case Constants.FOPROP_BREAK_BEFORE: {
+            return Constants.FOVAL_AUTO;
+        }
+        case Constants.FOPROP_LETTER_VALUE: {
+            return Constants.FOVAL_AUTO;
+        }
+        case Constants.FOPROP_ODD_OR_EVEN: {
+            return Constants.FOVAL_ANY;
+        }
+        case Constants.FOPROP_OVERFLOW: {
+            return Constants.FOVAL_AUTO;
+        }
+        case Constants.FOPROP_PAGE_POSITION: {
+            return Constants.FOVAL_ANY;
+        }
+        case Constants.FOPROP_POSITION: {
+            return Constants.FOVAL_STATIC;
+        }
+        case Constants.FOPROP_RELATIVE_POSITION: {
+            return Constants.FOVAL_STATIC;
+        }
+        case Constants.FOPROP_RETRIEVE_BOUNDARY: {
+            return Constants.FOVAL_PAGE_SEQUENCE;
+        }
+        case Constants.FOPROP_RETRIEVE_POSITION: {
+            return Constants.FOVAL_FIRST_STARTING_WITHIN_PAGE;
+        }
+        case Constants.FOPROP_SCALING: {
+            return Constants.FOVAL_UNIFORM;
+        }
+        case Constants.FOPROP_SCALING_METHOD: {
+            return Constants.FOVAL_AUTO;
+        }
+        case Constants.FOPROP_SPAN: {
+            return Constants.FOVAL_NONE;
+        }
+        case Constants.FOPROP_SUPPRESS_AT_LINE_BREAK: {
+            return Constants.FOVAL_AUTO;
+        }
+        case Constants.FOPROP_UNICODE_BIDI: {
+            return Constants.FOVAL_NORMAL;
+        }
+        case Constants.FOPROP_CLEAR: {
+            return Constants.FOVAL_NONE;
+        }
+        case Constants.FOPROP_FLOAT: {
+            return Constants.FOVAL_NONE;
+        }
+        case Constants.FOPROP_MEDIA_USAGE: {
+            return Constants.FOVAL_AUTO;
+        }
+        case Constants.FOPROP_PAGE_BREAK_AFTER: {
+            return Constants.FOVAL_AUTO;
+        }
+        case Constants.FOPROP_PAGE_BREAK_BEFORE: {
+            return Constants.FOVAL_AUTO;
+        }
+        case Constants.FOPROP_RENDERING_INTENT: {
+            return Constants.FOVAL_AUTO;
+        }
+        case Constants.FOPROP_SHOW_DESTINATION: {
+            return Constants.FOVAL_REPLACE;
+        }
+        case Constants.FOPROP_STARTING_STATE: {
+            return Constants.FOVAL_SHOW;
+        }
+        }
         return -1;
     }
 


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