Thread: [FOray-commit] SF.net SVN: foray: [9131] trunk/foray (Page 10)

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

Revision: 9131
          http://svn.sourceforge.net/foray/?rev=9131&view=rev
Author:   victormote
Date:     2007-04-06 18:06:14 -0700 (Fri, 06 Apr 2007)

Log Message:
-----------
Conform to axsl changes for new generic LeaderPattern enum.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Enumerated.java
    trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java
    trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java
===================================================================

--- trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java	2007-04-07 00:46:22 UTC (rev 9130)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java	2007-04-07 01:06:14 UTC (rev 9131)
@@ -30,6 +30,7 @@
 
 import org.axsl.areaR.RenderVisitor;
 import org.axsl.common.FoValue;
+import org.axsl.common.LeaderPattern;
 import org.axsl.common.RuleStyle;
 import org.axsl.foR.FOText;
 import org.axsl.foR.FObj;
@@ -176,11 +177,11 @@
      * unintended side-effects of this override logic.
      * @see FObj#traitLeaderPattern
      */
-    public FoValue traitLeaderPattern() {
+    public LeaderPattern traitLeaderPattern() {
         /* */
-        if (traitGeneratedBy().traitLeaderPattern(this) == FoValue.RULE
+        if (traitGeneratedBy().traitLeaderPattern(this) == LeaderPattern.RULE
                 && traitGeneratedBy().traitRuleThickness(this) <= 0) {
-            return FoValue.SPACE;
+            return LeaderPattern.SPACE;
         }
         return traitGeneratedBy().traitLeaderPattern(this);
     }
@@ -249,7 +250,7 @@
      * and the start-edge of the next.
      */
     public int actualWordSpacing() {
-        if (traitLeaderPattern() == FoValue.DOTS) {
+        if (traitLeaderPattern() == LeaderPattern.DOTS) {
             return dotLeaderPatternWidth()
                     - getCharWidth('.')
                     - getCharWidth(' ');

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java	2007-04-07 00:46:22 UTC (rev 9130)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java	2007-04-07 01:06:14 UTC (rev 9131)
@@ -40,6 +40,7 @@
 import org.axsl.common.BorderStyle;
 import org.axsl.common.Compass;
 import org.axsl.common.FoValue;
+import org.axsl.common.LeaderPattern;
 import org.axsl.common.Overflow;
 import org.axsl.common.RelativeAxis;
 import org.axsl.common.RuleStyle;
@@ -1293,10 +1294,29 @@
     }
 
     /**
+     * Converts an {@link FoValue} leader-pattern value to the more generic
+     * {@link LeaderPattern} value.
+     * @param foLeaderPattern The raw FO leader-pattern value to be converted.
+     * @return The matching LeaderPattern instance.
+     */
+    private static LeaderPattern convertLeaderPattern(
+            final FoValue foLeaderPattern) {
+        switch (foLeaderPattern) {
+        case SPACE: return LeaderPattern.SPACE;
+        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());
+        }
+    }
+
+    /**
      * {@inheritDoc}
      */
-    public FoValue traitLeaderPattern(final FOContext context) {
-        return propertyList.getLeaderPattern(context);
+    public LeaderPattern traitLeaderPattern(final FOContext context) {
+        final FoValue foLeaderPattern = propertyList.getLeaderPattern(context);
+        return convertLeaderPattern(foLeaderPattern);
     }
 
     /**

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	2007-04-07 00:46:22 UTC (rev 9130)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Enumerated.java	2007-04-07 01:06:14 UTC (rev 9131)
@@ -137,7 +137,7 @@
         }
         case LEADER_PATTERN: {
             if (parent != null) {
-                return parent.traitLeaderPattern(context);
+                return parent.getPropertyList().getLeaderPattern(context);
             }
             return FoValue.SPACE;
         }
@@ -388,7 +388,7 @@
             return fobj.traitLeaderAlignment(context);
         }
         case LEADER_PATTERN: {
-            return fobj.traitLeaderPattern(context);
+            return fobj.getPropertyList().getLeaderPattern(context);
         }
         case LINEFEED_TREATMENT: {
             return fobj.traitLinefeedTreatment(context);

Modified: trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java	2007-04-07 00:46:22 UTC (rev 9130)
+++ trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java	2007-04-07 01:06:14 UTC (rev 9131)
@@ -34,7 +34,7 @@
 import org.axsl.areaR.GeneralInlineArea;
 import org.axsl.areaR.LeaderArea;
 import org.axsl.areaR.TextArea;
-import org.axsl.common.FoValue;
+import org.axsl.common.LeaderPattern;
 import org.axsl.common.RuleStyle;
 import org.axsl.fontR.Font;
 import org.axsl.fontR.FontConsumer;
@@ -172,10 +172,10 @@
         // Handle text decoration.
         renderGenericSpace(area);
 
-        if (area.traitLeaderPattern() == FoValue.SPACE) {
+        if (area.traitLeaderPattern() == LeaderPattern.SPACE) {
             return;
         }
-        if (area.traitLeaderPattern() == FoValue.DOTS) {
+        if (area.traitLeaderPattern() == LeaderPattern.DOTS) {
             final char[] text = area.dotLeaderText();
             if (text == null) {
                 return;

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-04-07 00:46:22 UTC (rev 9130)
+++ trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java	2007-04-07 01:06:14 UTC (rev 9131)
@@ -415,7 +415,7 @@
         final StringBuilder buffer = new StringBuilder();
         outputGeneratedBy(area, buffer);
         outputAttribute(buffer, "leader-pattern",
-                area.traitLeaderPattern().toXslFo());
+                area.traitLeaderPattern().toString());
         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.




Thread: [FOray-commit] SF.net SVN: foray: [9131] trunk/foray (Page 10)

Modular XSL-FO Implementation for Java.

foray-commit