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

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

Revision: 10127
          http://foray.svn.sourceforge.net/foray/?rev=10127&view=rev
Author:   victormote
Date:     2007-07-28 11:07:02 -0700 (Sat, 28 Jul 2007)

Log Message:
-----------
Conform to axsl change renaming interface.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/AbstractAncestralInlineArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/CharacterSequence4a.java
    trunk/foray/foray-layout/src/java/org/foray/layout/LayoutStrategy.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AbstractAncestralInlineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractAncestralInlineArea.java	2007-07-28 17:59:14 UTC (rev 10126)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AbstractAncestralInlineArea.java	2007-07-28 18:07:02 UTC (rev 10127)
@@ -31,7 +31,7 @@
 import org.axsl.area.AreaTreeException;
 import org.axsl.fo.fo.BasicLink;
 import org.axsl.fo.fo.BidiOverride;
-import org.axsl.fo.fo.CharacterContent;
+import org.axsl.fo.fo.CharacterSequence;
 import org.axsl.fo.fo.ExternalGraphic;
 import org.axsl.fo.fo.GraftingPoint;
 import org.axsl.fo.fo.IndexPageCitationList;
@@ -80,7 +80,7 @@
     /**
      * {@inheritDoc}
      */
-    public TextArea makeGlyphAreaSequence(final CharacterContent foText,
+    public TextArea makeGlyphAreaSequence(final CharacterSequence foText,
             final int startOffset, final int sizeInChars, final int ipd,
             final boolean hasDiscretionaryHyphen,
             final boolean hasFauxSmallCaps, final boolean isLastItemOnLine,

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java	2007-07-28 17:59:14 UTC (rev 10126)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java	2007-07-28 18:07:02 UTC (rev 10127)
@@ -44,7 +44,7 @@
 import org.axsl.fo.fo.BasicLink;
 import org.axsl.fo.fo.BidiOverride;
 import org.axsl.fo.fo.Block;
-import org.axsl.fo.fo.CharacterContent;
+import org.axsl.fo.fo.CharacterSequence;
 import org.axsl.fo.fo.ExternalGraphic;
 import org.axsl.fo.fo.GraftingPoint;
 import org.axsl.fo.fo.IndexPageCitationList;
@@ -966,7 +966,7 @@
      * @param context An object that knows how to resolve FO context issues.
      * @return True iff a text area should be created for the text item.
      */
-    static boolean shouldCreateTextArea(final CharacterContent foText,
+    static boolean shouldCreateTextArea(final CharacterSequence foText,
             final Area parentArea, final int startOffset, final int sizeInChars,
             final boolean isLastItemOnLine, final FoContext context) {
         /* If the raw text is empty, don't create the TextArea. */
@@ -1005,7 +1005,7 @@
     /**
      * {@inheritDoc}
      */
-    public TextArea makeGlyphAreaSequence(final CharacterContent foText,
+    public TextArea makeGlyphAreaSequence(final CharacterSequence foText,
             final int startOffset, final int sizeInChars, final int ipd,
             final boolean hasDiscretionaryHyphen,
             final boolean hasFauxSmallCaps, final boolean isLastItemOnLine,

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-28 17:59:14 UTC (rev 10126)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java	2007-07-28 18:07:02 UTC (rev 10127)
@@ -35,7 +35,7 @@
 import org.axsl.common.value.WhiteSpaceTreatment;
 import org.axsl.fo.Fo;
 import org.axsl.fo.fo.Block;
-import org.axsl.fo.fo.CharacterContent;
+import org.axsl.fo.fo.CharacterSequence;
 import org.axsl.fo.fo.GraftingPoint;
 import org.axsl.font.Font;
 import org.axsl.font.FontUse;
@@ -158,7 +158,7 @@
      * will be applied.
      * @return The newly-created TextArea.
      */
-    static TextArea makeTextArea(final CharacterContent generatedBy,
+    static TextArea makeTextArea(final CharacterSequence generatedBy,
             final LineArea parentArea,
             final GraftingPoint graftingPoint, final int backingOffset,
             final int backingSize, final int progressionDimensionUsed,
@@ -203,7 +203,7 @@
      * will be applied.
      * @return The newly-created TextArea.
      */
-    static TextArea makeTextArea(final CharacterContent generatedBy,
+    static TextArea makeTextArea(final CharacterSequence generatedBy,
             final AbstractInlineArea parentArea,
             final GraftingPoint graftingPoint, final int backingOffset,
             final int backingSize, final int progressionDimensionUsed,
@@ -329,12 +329,12 @@
      * Returns the raw value of the text content backing this area.
      * @return The text content backing this area.
      */
-    public CharacterContent getTextContent() {
+    public CharacterSequence getTextContent() {
         /* Do NOT use the traitGeneratedBy() method here, because we need the
          * raw value, and this class overrides that method. */
         final Fo foNode = this.getLinkage().getFONode();
         /* Cast verified at construction. */
-        return (CharacterContent) foNode;
+        return (CharacterSequence) foNode;
     }
 
     /**
@@ -736,7 +736,7 @@
      * Overrides the Area method because it needs to handle faux-small-caps.
      */
     public int traitFontSize() {
-        final CharacterContent generatedBy = this.traitGeneratedBy();
+        final CharacterSequence generatedBy = this.traitGeneratedBy();
         final int nominalFontSize = generatedBy.traitFontSize(this);
         if (this.hasFauxSmallCaps) {
             final FontUse fontUse = getPrimaryFont();
@@ -755,8 +755,8 @@
     /**
      * {@inheritDoc}
      */
-    public CharacterContent traitGeneratedBy() {
-        return (CharacterContent) this.getLinkage().getFONode();
+    public CharacterSequence traitGeneratedBy() {
+        return (CharacterSequence) this.getLinkage().getFONode();
     }
 
     /**
@@ -830,8 +830,8 @@
     public int traitHyphenationCharacter() {
         /* TODO: Clean this method up after we clean up the construction. */
         final Fo generatedBy = this.traitGeneratedBy();
-        if (generatedBy instanceof CharacterContent) {
-            final CharacterContent character = (CharacterContent) generatedBy;
+        if (generatedBy instanceof CharacterSequence) {
+            final CharacterSequence character = (CharacterSequence) generatedBy;
             return character.traitHyphenationCharacter(this);
         } else {
             final NormalBlockArea blockArea = this.ancestorNormalBlockArea();
@@ -846,10 +846,10 @@
      * @return The "generated-by" Character, or null if this area was not
      * generated by an fo:character.
      */
-    private CharacterContent generatedByCharacter() {
+    private CharacterSequence generatedByCharacter() {
         final Fo generatedBy = this.traitGeneratedBy();
-        if (generatedBy instanceof CharacterContent) {
-            return (CharacterContent) generatedBy;
+        if (generatedBy instanceof CharacterSequence) {
+            return (CharacterSequence) generatedBy;
         }
         return null;
     }
@@ -858,7 +858,7 @@
      * {@inheritDoc}
      */
     public int traitSpaceStartOptimum() {
-        final CharacterContent character = this.generatedByCharacter();
+        final CharacterSequence character = this.generatedByCharacter();
         if (character == null) {
             return 0;
         } else {
@@ -870,7 +870,7 @@
      * {@inheritDoc}
      */
     public int traitSpaceEndOptimum() {
-        final CharacterContent character = this.generatedByCharacter();
+        final CharacterSequence character = this.generatedByCharacter();
         if (character == null) {
             return 0;
         } else {

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java	2007-07-28 17:59:14 UTC (rev 10126)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java	2007-07-28 18:07:02 UTC (rev 10127)
@@ -48,7 +48,8 @@
 /**
  * A "character" object in XSL-FO.
  */
-public class Character extends FObj implements org.axsl.fo.fo.CharacterContent {
+public class Character extends FObj
+        implements org.axsl.fo.fo.CharacterSequence {
 
     /** The parent of this node. */
     private FObj parent;

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/CharacterSequence4a.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/CharacterSequence4a.java	2007-07-28 17:59:14 UTC (rev 10126)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/CharacterSequence4a.java	2007-07-28 18:07:02 UTC (rev 10127)
@@ -44,7 +44,7 @@
 import org.axsl.fo.FoContext;
 import org.axsl.fo.FoTreeException;
 import org.axsl.fo.ProxyFactory;
-import org.axsl.fo.fo.CharacterContent;
+import org.axsl.fo.fo.CharacterSequence;
 import org.axsl.fo.fo.GraftingPoint;
 import org.axsl.fo.fo.Marker;
 import org.axsl.font.Font;
@@ -56,7 +56,7 @@
 /**
  * A text node in the formatting object tree.
  */
-public class CharacterSequence4a extends FObj implements CharacterContent {
+public class CharacterSequence4a extends FObj implements CharacterSequence {
 
     /** Constant indicating that a given character should be discarded. */
     public static final char DISCARD_CHAR = 0xFFFF;

Modified: trunk/foray/foray-layout/src/java/org/foray/layout/LayoutStrategy.java
===================================================================
--- trunk/foray/foray-layout/src/java/org/foray/layout/LayoutStrategy.java	2007-07-28 17:59:14 UTC (rev 10126)
+++ trunk/foray/foray-layout/src/java/org/foray/layout/LayoutStrategy.java	2007-07-28 18:07:02 UTC (rev 10127)
@@ -37,7 +37,7 @@
 import org.axsl.area.RegionRefArea;
 import org.axsl.fo.FoLineNonText;
 import org.axsl.fo.FoLineText;
-import org.axsl.fo.fo.CharacterContent;
+import org.axsl.fo.fo.CharacterSequence;
 import org.axsl.fo.fo.ExternalGraphic;
 import org.axsl.fo.fo.GraftingPoint;
 import org.axsl.fo.fo.InstreamForeignObject;
@@ -149,8 +149,8 @@
         if (this.areaStack.size() > 0) {
             factory = this.areaStack.peek();
         }
-        if (textToUse instanceof CharacterContent) {
-            final CharacterContent foText = (CharacterContent) textToUse;
+        if (textToUse instanceof CharacterSequence) {
+            final CharacterSequence foText = (CharacterSequence) textToUse;
             factory.makeGlyphAreaSequence(foText, startOffset, sizeInChars,
                     sizeInline,
                     hasDiscretionaryHyphen, hasFauxSmallCaps, isLastItemOnLine,

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java	2007-07-28 17:59:14 UTC (rev 10126)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java	2007-07-28 18:07:02 UTC (rev 10127)
@@ -32,23 +32,23 @@
 import org.axsl.area.AreaTreeException;
 import org.axsl.area.LineArea;
 import org.axsl.fo.FoLineText;
-import org.axsl.fo.fo.CharacterContent;
+import org.axsl.fo.fo.CharacterSequence;
 import org.axsl.fo.fo.GraftingPoint;
 
 /**
- * Pioneer Layout for {@link CharacterContent}.
+ * Pioneer Layout for {@link CharacterSequence}.
  */
 public class FOTextPL extends FONodePL {
 
     /** The real FONode which this proxy represents. */
-    private CharacterContent node;
+    private CharacterSequence node;
 
     /**
      * Constructor.
      * @param text The FO Tree object which is being laid out.
      * @param layout The ancestor layout system.
      */
-    public FOTextPL(final CharacterContent text, final PioneerLS layout) {
+    public FOTextPL(final CharacterSequence text, final PioneerLS layout) {
         super(text, layout);
         this.node = text;
     }
@@ -103,7 +103,7 @@
     /**
      * {@inheritDoc}
      */
-    public CharacterContent getFONode() {
+    public CharacterSequence getFONode() {
         return this.node;
     }
 

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java	2007-07-28 17:59:14 UTC (rev 10126)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java	2007-07-28 18:07:02 UTC (rev 10127)
@@ -46,7 +46,7 @@
 import org.axsl.fo.fo.BlockContainer;
 import org.axsl.fo.fo.Bookmark;
 import org.axsl.fo.fo.BookmarkTitle;
-import org.axsl.fo.fo.CharacterContent;
+import org.axsl.fo.fo.CharacterSequence;
 import org.axsl.fo.fo.ColorProfile;
 import org.axsl.fo.fo.Declarations;
 import org.axsl.fo.fo.ExternalGraphic;
@@ -391,7 +391,7 @@
     /**
      * {@inheritDoc}
      */
-    public FOTextPL makeProxy(final CharacterContent node) {
+    public FOTextPL makeProxy(final CharacterSequence node) {
         return new FOTextPL(node, this);
     }
 


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