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

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

Revision: 10049
          http://svn.sourceforge.net/foray/?rev=10049&view=rev
Author:   victormote
Date:     2007-07-19 14:15:13 -0700 (Thu, 19 Jul 2007)

Log Message:
-----------
Conform to axsl changes moving methods from Fo to new property-specific interfaces.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
    trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/InlineContainerArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java	2007-07-19 20:57:31 UTC (rev 10048)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java	2007-07-19 21:15:13 UTC (rev 10049)
@@ -45,7 +45,6 @@
 import org.axsl.font.FontUse;
 import org.axsl.galley.BackgroundArea;
 
-import java.awt.Color;
 import java.awt.geom.Rectangle2D;
 import java.util.List;
 
@@ -203,60 +202,6 @@
     }
 
     /**
-     * Returns the underline-score trait of this area.
-     * @return The underline-score trait of this area.
-     * @see Fo#traitUnderlineScore(FoContext)
-     */
-    public boolean traitUnderlineScore() {
-        return traitGeneratedBy().traitUnderlineScore(this);
-    }
-
-    /**
-     * Returns the overline-score trait of this area.
-     * @return The overline-score trait of this area.
-     * @see Fo#traitOverlineScore(FoContext)
-     */
-    public boolean traitOverlineScore() {
-        return traitGeneratedBy().traitOverlineScore(this);
-    }
-
-    /**
-     * Returns the through-score trait of this area.
-     * @return The through-score trait of this area.
-     * @see Fo#traitThroughScore(FoContext)
-     */
-    public boolean traitThroughScore() {
-        return traitGeneratedBy().traitThroughScore(this);
-    }
-
-    /**
-     * Returns the underline-score-color trait of this area.
-     * @return The underline-score-color trait of this area.
-     * @see Fo#traitUnderlineScoreColor(FoContext)
-     */
-    public Color traitUnderlineScoreColor() {
-        return traitGeneratedBy().traitUnderlineScoreColor(this);
-    }
-
-    /**
-     * Returns the overline-score-color trait of this area.
-     * @return The overline-score-color trait of this area.
-     * @see Fo#traitOverlineScoreColor(FoContext)
-     */
-    public Color traitOverlineScoreColor() {
-        return traitGeneratedBy().traitOverlineScoreColor(this);
-    }
-
-    /**
-     * Returns the through-score-color trait of this area.
-     * @return The through-score-color trait of this area.
-     * @see Fo#traitThroughScoreColor(FoContext)
-     */
-    public Color traitThroughScoreColor() {
-        return traitGeneratedBy().traitThroughScoreColor(this);
-    }
-
-    /**
      * Returns the parent Area.
      * @return The parent if it is an Area, or null if it is not.
      */

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java	2007-07-19 20:57:31 UTC (rev 10048)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java	2007-07-19 21:15:13 UTC (rev 10049)
@@ -34,6 +34,7 @@
 import org.axsl.galley.RenderVisitor;
 import org.axsl.graphic.Graphic;
 
+import java.awt.Color;
 import java.util.Collections;
 import java.util.List;
 
@@ -302,4 +303,46 @@
         return traitGeneratedBy().traitSpaceEndOptimum(this);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public boolean traitUnderlineScore() {
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean traitOverlineScore() {
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean traitThroughScore() {
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public Color traitUnderlineScoreColor() {
+        return null;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public Color traitOverlineScoreColor() {
+        return null;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public Color traitThroughScoreColor() {
+        return null;
+    }
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java	2007-07-19 20:57:31 UTC (rev 10048)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java	2007-07-19 21:15:13 UTC (rev 10049)
@@ -36,6 +36,7 @@
 import org.axsl.galley.ForeignContent;
 import org.axsl.galley.RenderVisitor;
 
+import java.awt.Color;
 import java.util.Collections;
 import java.util.List;
 
@@ -314,4 +315,46 @@
         return traitGeneratedBy().traitSpaceEndOptimum(this);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public boolean traitUnderlineScore() {
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean traitOverlineScore() {
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean traitThroughScore() {
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public Color traitUnderlineScoreColor() {
+        return null;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public Color traitOverlineScoreColor() {
+        return null;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public Color traitThroughScoreColor() {
+        return null;
+    }
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java	2007-07-19 20:57:31 UTC (rev 10048)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java	2007-07-19 21:15:13 UTC (rev 10049)
@@ -445,4 +445,46 @@
         return traitGeneratedBy().traitSpaceEndOptimum(this);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public boolean traitUnderlineScore() {
+        return traitGeneratedBy().traitUnderlineScore(this);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean traitOverlineScore() {
+        return traitGeneratedBy().traitOverlineScore(this);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean traitThroughScore() {
+        return traitGeneratedBy().traitThroughScore(this);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public Color traitUnderlineScoreColor() {
+        return traitGeneratedBy().traitUnderlineScoreColor(this);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public Color traitOverlineScoreColor() {
+        return traitGeneratedBy().traitOverlineScoreColor(this);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public Color traitThroughScoreColor() {
+        return traitGeneratedBy().traitThroughScoreColor(this);
+    }
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/InlineContainerArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/InlineContainerArea.java	2007-07-19 20:57:31 UTC (rev 10048)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/InlineContainerArea.java	2007-07-19 21:15:13 UTC (rev 10049)
@@ -34,6 +34,7 @@
 import org.axsl.fo.fo.InlineContainer;
 import org.axsl.galley.RenderVisitor;
 
+import java.awt.Color;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -241,4 +242,46 @@
         return traitGeneratedBy().traitSpaceEndOptimum(this);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public boolean traitUnderlineScore() {
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean traitOverlineScore() {
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean traitThroughScore() {
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public Color traitUnderlineScoreColor() {
+        return null;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public Color traitOverlineScoreColor() {
+        return null;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public Color traitThroughScoreColor() {
+        return null;
+    }
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java	2007-07-19 20:57:31 UTC (rev 10048)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java	2007-07-19 21:15:13 UTC (rev 10049)
@@ -46,6 +46,7 @@
 import org.axsl.font.FontUse;
 import org.axsl.galley.RenderVisitor;
 
+import java.awt.Color;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -675,4 +676,46 @@
                 + this.traitGeneratedBy().traitLetterSpacingOpt(this);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public boolean traitUnderlineScore() {
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean traitOverlineScore() {
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean traitThroughScore() {
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public Color traitUnderlineScoreColor() {
+        return null;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public Color traitOverlineScoreColor() {
+        return null;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public Color traitThroughScoreColor() {
+        return null;
+    }
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java	2007-07-19 20:57:31 UTC (rev 10048)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java	2007-07-19 21:15:13 UTC (rev 10049)
@@ -36,6 +36,7 @@
 import org.axsl.font.FontUse;
 import org.axsl.galley.RenderVisitor;
 
+import java.awt.Color;
 import java.util.Collections;
 import java.util.List;
 
@@ -296,4 +297,46 @@
                 traitGeneratedBy().traitWordSpacingOpt(this));
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public boolean traitUnderlineScore() {
+        return traitGeneratedBy().traitUnderlineScore(this);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean traitOverlineScore() {
+        return traitGeneratedBy().traitOverlineScore(this);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean traitThroughScore() {
+        return traitGeneratedBy().traitThroughScore(this);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public Color traitUnderlineScoreColor() {
+        return traitGeneratedBy().traitUnderlineScoreColor(this);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public Color traitOverlineScoreColor() {
+        return traitGeneratedBy().traitOverlineScoreColor(this);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public Color traitThroughScoreColor() {
+        return traitGeneratedBy().traitThroughScoreColor(this);
+    }
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java	2007-07-19 20:57:31 UTC (rev 10048)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java	2007-07-19 21:15:13 UTC (rev 10049)
@@ -36,6 +36,7 @@
 import org.axsl.font.FontUse;
 import org.axsl.galley.RenderVisitor;
 
+import java.awt.Color;
 import java.util.Collections;
 import java.util.List;
 
@@ -325,4 +326,46 @@
                 traitGeneratedBy().traitWordSpacingOpt(this));
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public boolean traitUnderlineScore() {
+        return traitGeneratedBy().traitUnderlineScore(this);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean traitOverlineScore() {
+        return traitGeneratedBy().traitOverlineScore(this);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean traitThroughScore() {
+        return traitGeneratedBy().traitThroughScore(this);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public Color traitUnderlineScoreColor() {
+        return traitGeneratedBy().traitUnderlineScoreColor(this);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public Color traitOverlineScoreColor() {
+        return traitGeneratedBy().traitOverlineScoreColor(this);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public Color traitThroughScoreColor() {
+        return traitGeneratedBy().traitThroughScoreColor(this);
+    }
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java	2007-07-19 20:57:31 UTC (rev 10048)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java	2007-07-19 21:15:13 UTC (rev 10049)
@@ -42,6 +42,7 @@
 import org.axsl.font.FontUse;
 import org.axsl.galley.RenderVisitor;
 
+import java.awt.Color;
 import java.util.Collections;
 import java.util.List;
 
@@ -930,4 +931,46 @@
         return traitGeneratedBy().traitLetterSpacingMin(this);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public boolean traitUnderlineScore() {
+        return traitGeneratedBy().traitUnderlineScore(this);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean traitOverlineScore() {
+        return traitGeneratedBy().traitOverlineScore(this);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean traitThroughScore() {
+        return traitGeneratedBy().traitThroughScore(this);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public Color traitUnderlineScoreColor() {
+        return traitGeneratedBy().traitUnderlineScoreColor(this);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public Color traitOverlineScoreColor() {
+        return traitGeneratedBy().traitOverlineScoreColor(this);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public Color traitThroughScoreColor() {
+        return traitGeneratedBy().traitThroughScoreColor(this);
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java	2007-07-19 20:57:31 UTC (rev 10048)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java	2007-07-19 21:15:13 UTC (rev 10049)
@@ -161,6 +161,7 @@
 import org.axsl.fo.fo.prop.SwitchToPa;
 import org.axsl.fo.fo.prop.TableBorderPrecedencePa;
 import org.axsl.fo.fo.prop.TablePa;
+import org.axsl.fo.fo.prop.TextDecorationPa;
 import org.axsl.fo.fo.prop.TextShadowPa;
 import org.axsl.fo.fo.prop.TreatAsWordSpacePa;
 import org.axsl.fo.fo.prop.UnicodeBidiPa;
@@ -210,7 +211,8 @@
         RenderingIntentPa,
         ScoreSpacesPa, SpanPa, SrcPa, StartingStatePa, SuppressAtLineBreakPa,
         SwitchToPa,
-        TableBorderPrecedencePa, TablePa, TextShadowPa, TreatAsWordSpacePa,
+        TableBorderPrecedencePa, TablePa, TextDecorationPa, TextShadowPa,
+        TreatAsWordSpacePa,
         UnicodeBidiPa, VisibilityPa, WrapOptionPa,
         ZIndexPa {
 


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