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

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

Revision: 12374
          http://sourceforge.net/p/foray/code/12374
Author:   victormote
Date:     2022-01-10 15:38:41 +0000 (Mon, 10 Jan 2022)
Log Message:
-----------
Conform to aXSL changes: Remove no-longer-needed methods.

Modified Paths:
--------------
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FoTextWords4a.java
    trunk/foray/foray-orthography/src/main/java/org/foray/orthography/Orthography4a.java
    trunk/foray/foray-orthography/src/main/java/org/foray/orthography/TokenFlow4a.java

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FoTextWords4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FoTextWords4a.java	2022-01-10 14:18:28 UTC (rev 12373)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FoTextWords4a.java	2022-01-10 15:38:41 UTC (rev 12374)
@@ -88,7 +88,7 @@
 
     @Override
     public void addNode(final ParaNode node) {
-        this.paraBranch.addToken((FoToken) node);
+        throw new UnsupportedOperationException();
     }
 
     @Override
@@ -186,11 +186,6 @@
     }
 
     @Override
-    public void addToken(final FoToken token) {
-        this.paraBranch.addToken(token);
-    }
-
-    @Override
     public CharSequence extract(final int startToken, final int startSegment, final int startChar, final int endToken,
             final int endSegment, final int endChar) {
         // TODO Auto-generated method stub

Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/Orthography4a.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/Orthography4a.java	2022-01-10 14:18:28 UTC (rev 12373)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/Orthography4a.java	2022-01-10 15:38:41 UTC (rev 12374)
@@ -36,10 +36,8 @@
 import org.foray.orthography.wrapper.UppercaseWord;
 
 import org.axsl.fotree.text.FoOrthography;
-import org.axsl.fotree.text.FoToken;
 import org.axsl.fotree.text.FoWord;
 import org.axsl.orthography.OrthographyException;
-import org.axsl.orthography.TokenFlow;
 import org.axsl.orthography.Word;
 import org.axsl.orthography.optional.Dictionary;
 import org.axsl.orthography.optional.Lexer;
@@ -438,7 +436,7 @@
         return wordSequence;
     }
 
-    private void parseInterwordContent(final TokenFlow<FoToken> wordSequence, final CharSequence interword)
+    private void parseInterwordContent(final TokenFlow4a wordSequence, final CharSequence interword)
             throws OrthographyException {
         int index = 0;
         while (index < interword.length()) {

Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/TokenFlow4a.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/TokenFlow4a.java	2022-01-10 14:18:28 UTC (rev 12373)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/TokenFlow4a.java	2022-01-10 15:38:41 UTC (rev 12374)
@@ -49,6 +49,14 @@
     /** The tokens (children) of this text flow. */
     private List<FoToken> tokens = new ArrayList<FoToken>();
 
+    /**
+     * Add a token.
+     * @param token The token to be added.
+     */
+    public void addToken(final FoToken token) {
+        this.tokens.add(token);
+    }
+
     @Override
     public int qtyTokens() {
         return this.tokens.size();
@@ -60,11 +68,6 @@
     }
 
     @Override
-    public void addToken(final FoToken segment) {
-        this.tokens.add(segment);
-    }
-
-    @Override
     public ParaNode paraNodeAt(final int nodeIndex) {
         return this.tokens.get(nodeIndex);
     }

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