renamed org.apache.fop.area.inline.Word to .TextArea (.Text not used to avoid

conflicts with org.w3c.dom.Text)
changed Renderer.renderWord() method to renderText().


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196973 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 31 insertions, 32 deletions

diff --git a/src/java/org/apache/fop/area/inline/InlineAreaVisitor.java b/src/java/org/apache/fop/area/inline/InlineAreaVisitor.java
index 35e7a4a42..0a5911b39 100644
--- a/src/java/org/apache/fop/area/inline/InlineAreaVisitor.java
+++ b/src/java/org/apache/fop/area/inline/InlineAreaVisitor.java
@@ -66,11 +66,11 @@ public interface InlineAreaVisitor {
     void serveVisitor(Viewport viewport);
 
     /**
-     * Handle a visitor request to process an inline word.
+     * Handle a visitor request to process inline text.
      *
-     * @param area  The word area
+     * @param area  The text area
      */
-    void serveVisitor(Word area);
+    void serveVisitor(TextArea area);
 
     /**
      * Handle a visitor request to process an inline parent area.
diff --git a/src/java/org/apache/fop/area/inline/Word.java b/src/java/org/apache/fop/area/inline/TextArea.java
index 462cf0bc3..00e90193d 100644
--- a/src/java/org/apache/fop/area/inline/Word.java
+++ b/src/java/org/apache/fop/area/inline/TextArea.java
@@ -1,5 +1,5 @@
 /*
- * $Id: Word.java,v 1.10 2003/03/05 16:45:42 jeremias Exp $
+ * $Id$
  * ============================================================================
  *                    The Apache Software License, Version 1.1
  * ============================================================================
@@ -51,21 +51,20 @@
 package org.apache.fop.area.inline;
 
 /**
- * A word inline area.
- * This is really a collection character inline areas collected together
- * into a single word.
+ * A text inline area.
  */
-public class Word extends InlineArea {
+public class TextArea extends InlineArea {
+
     /**
-     * The word for this word area.
+     * The text for this inline area
      */
-    protected String word;
-    private int iWSadjust = 0;
+    protected String text;
+    private int iTSadjust = 0;
 
     /**
-     * Create a word area.
+     * Create a text inline area
      */
-    public Word() {
+    public TextArea() {
     }
 
     /**
@@ -79,39 +78,39 @@ public class Word extends InlineArea {
     }
 
     /**
-     * Set the word.
+     * Set the text string
      *
-     * @param w the word string
+     * @param t the text string
      */
-    public void setWord(String w) {
-        word = w;
+    public void setTextArea(String t) {
+        text = t;
     }
 
     /**
-     * Get the word string.
+     * Get the text string.
      *
-     * @return the word string
+     * @return the text string
      */
-    public String getWord() {
-        return word;
+    public String getTextArea() {
+        return text;
     }
 
     /**
-     * Get word space adjust.
+     * Get text space adjust.
      *
-     * @return the word space adjustment
+     * @return the text space adjustment
      */
-    public int getWSadjust() {
-        return iWSadjust;
+    public int getTSadjust() {
+        return iTSadjust;
     }
 
     /**
-     * Set word space adjust.
+     * Set text space adjust.
      *
-     * @param iWSadjust the word space adjustment
+     * @param iTSadjust the text space adjustment
      */
-    public void setWSadjust(int iWSadjust) {
-        this.iWSadjust = iWSadjust;
+    public void setTSadjust(int iTSadjust) {
+        this.iTSadjust = iTSadjust;
     }
 }
 
diff --git a/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java b/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java
index 0a46d87b1..657490c58 100644
--- a/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java
+++ b/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java
@@ -60,7 +60,7 @@ import java.util.List;
  * This is a word area that resolves itself to a page number
  * from an id reference.
  */
-public class UnresolvedPageNumber extends Word implements Resolveable {
+public class UnresolvedPageNumber extends TextArea implements Resolveable {
     private boolean resolved = false;
     private String pageRefId;
 
@@ -71,7 +71,7 @@ public class UnresolvedPageNumber extends Word implements Resolveable {
      */
     public UnresolvedPageNumber(String id) {
         pageRefId = id;
-        word = "?";
+        text = "?";
     }
 
     /**
@@ -98,7 +98,7 @@ public class UnresolvedPageNumber extends Word implements Resolveable {
         if (pages != null) {
             PageViewport page = (PageViewport)pages.get(0);
             String str = page.getPageNumber();
-            word = str;
+            text = str;
 
             /**@todo Update IPD ??? */
         }