[FOray-commit] SF.net SVN: foray:[12363] trunk/foray/foray-orthography
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
[FOray-commit] SF.net SVN: foray:[12363] trunk/foray/foray-orthography
|
From: <vic...@us...> - 2022-01-09 21:08:45
|
Revision: 12363
http://sourceforge.net/p/foray/code/12363
Author: victormote
Date: 2022-01-09 21:08:43 +0000 (Sun, 09 Jan 2022)
Log Message:
-----------
Conform to aXSL chanes: Move fotree-related text content features from axsl-orthography to axsl-fotree.
Modified Paths:
--------------
trunk/foray/foray-orthography/build.gradle
trunk/foray/foray-orthography/src/main/java/org/foray/orthography/Orthography4a.java
trunk/foray/foray-orthography/src/main/java/org/foray/orthography/Punctuation4a.java
trunk/foray/foray-orthography/src/main/java/org/foray/orthography/Whitespace4a.java
trunk/foray/foray-orthography/src/main/java/org/foray/orthography/Word4a.java
trunk/foray/foray-orthography/src/main/java/org/foray/orthography/WordWrapper.java
trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/CapitalizedWord.java
trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/DecoratedWord.java
trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/ExactWord.java
trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/FinalSegmentModifiedWord.java
trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPast1Word.java
trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPast1WordFactory.java
trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPlural1Word.java
trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPlural1WordFactory.java
trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPlural2Word.java
trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPlural2WordFactory.java
trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPossessive1Word.java
trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPossessive1WordFactory.java
trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPossessive2Word.java
trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPossessive2WordFactory.java
trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/SuffixedWord.java
trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/UppercaseWord.java
Modified: trunk/foray/foray-orthography/build.gradle
===================================================================
--- trunk/foray/foray-orthography/build.gradle 2022-01-08 22:31:08 UTC (rev 12362)
+++ trunk/foray/foray-orthography/build.gradle 2022-01-09 21:08:43 UTC (rev 12363)
@@ -1,18 +1,19 @@
description = 'foray-orthography'
dependencies {
- api group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion
- api group: 'xml-resolver', name: 'xml-resolver', version: xmlResolverVersion
- api group: 'org.apache.ant', name: 'ant-launcher', version: antVersion
- api group: 'commons-cli', name: 'commons-cli', version: commonsCliVersion
- api group: 'com.ibm.icu', name: 'icu4j', version: icu4jVersion
- api group: 'org.axsl', name: 'axsl-orthography', version: axslVersion
+ api group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion
+ api group: 'xml-resolver', name: 'xml-resolver', version: xmlResolverVersion
+ api group: 'org.apache.ant', name: 'ant-launcher', version: antVersion
+ api group: 'commons-cli', name: 'commons-cli', version: commonsCliVersion
+ api group: 'com.ibm.icu', name: 'icu4j', version: icu4jVersion
+ api group: 'org.axsl', name: 'axsl-orthography', version: axslVersion
+ api group: 'org.axsl', name: 'axsl-fotree', version: axslVersion
api project(':foray-common')
- implementation group: 'ch.qos.logback', name: 'logback-classic', version: logbackClassicVersion
+ implementation group: 'ch.qos.logback', name: 'logback-classic', version: logbackClassicVersion
- testImplementation group: 'junit', name: 'junit', version: junitVersion
- testImplementation group: 'org.mockito', name: 'mockito-core', version: mockitoVersion
+ testImplementation group: 'junit', name: 'junit', version: junitVersion
+ testImplementation group: 'org.mockito', name: 'mockito-core', version: mockitoVersion
}
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-08 22:31:08 UTC (rev 12362)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/Orthography4a.java 2022-01-09 21:08:43 UTC (rev 12363)
@@ -35,6 +35,7 @@
import org.foray.orthography.wrapper.ExactWord;
import org.foray.orthography.wrapper.UppercaseWord;
+import org.axsl.fotree.text.FoWord;
import org.axsl.orthography.Orthography;
import org.axsl.orthography.OrthographyException;
import org.axsl.orthography.TokenFlow;
@@ -364,7 +365,7 @@
public Word hyphenateUnrecognizedWord(final CharSequence word, final int offset, final int length) {
/* The character sequence containing the characters in the word that we are looking for. */
final CharSequence chars = word.subSequence(offset, offset + length);
- Word hyphenatedWord = null;
+ FoWord hyphenatedWord = null;
/* Look in the dictionary first, as it should be more accurate. */
final SegmentDictionary dictionary = getDictionary();
Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/Punctuation4a.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/Punctuation4a.java 2022-01-08 22:31:08 UTC (rev 12362)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/Punctuation4a.java 2022-01-09 21:08:43 UTC (rev 12363)
@@ -37,7 +37,7 @@
import org.axsl.common.para.ParaLeaf;
import org.axsl.common.para.ParaNode;
import org.axsl.common.para.ParaPenalty;
-import org.axsl.orthography.Punctuation;
+import org.axsl.fotree.text.FoPunctuation;
import java.util.ArrayList;
import java.util.List;
@@ -46,7 +46,7 @@
* Handles punctuation between words.
* Instances of this class are immutable.
*/
-public final class Punctuation4a implements Punctuation, ParaLeaf, ParaBox {
+public final class Punctuation4a implements FoPunctuation {
/** Common punctuation item, a comma. */
public static final Punctuation4a COMMA = new Punctuation4a(",");
Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/Whitespace4a.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/Whitespace4a.java 2022-01-08 22:31:08 UTC (rev 12362)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/Whitespace4a.java 2022-01-09 21:08:43 UTC (rev 12363)
@@ -36,7 +36,7 @@
import org.axsl.common.para.ParaGlue;
import org.axsl.common.para.ParaLeaf;
import org.axsl.common.para.ParaPenalty;
-import org.axsl.orthography.Whitespace;
+import org.axsl.fotree.text.FoWhitespace;
import org.slf4j.LoggerFactory;
@@ -47,7 +47,7 @@
* Handles whitespace between words.
* Instances of this class are immutable.
*/
-public final class Whitespace4a implements Whitespace, ParaLeaf, ParaGlue {
+public final class Whitespace4a implements FoWhitespace {
/** Common whitespace item. */
public static final Whitespace4a SPACE = new Whitespace4a(" ");
Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/Word4a.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/Word4a.java 2022-01-08 22:31:08 UTC (rev 12362)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/Word4a.java 2022-01-09 21:08:43 UTC (rev 12363)
@@ -36,6 +36,7 @@
import org.axsl.common.para.ParaNode;
import org.axsl.common.para.ParaPenalty;
import org.axsl.common.sequence.ByteSequence;
+import org.axsl.fotree.text.FoWord;
import org.axsl.orthography.DiscretionaryHyphen;
import org.axsl.orthography.Word;
import org.axsl.orthography.WordComponent;
@@ -53,7 +54,7 @@
* Therefore this abstract superclass is able to do a lot of the grunt work needed to conform to the other three API
* subsets.</p>
*/
-public abstract class Word4a implements Word, Serializable, Comparable<CharSequence> {
+public abstract class Word4a implements FoWord, Serializable, Comparable<CharSequence> {
/** Constant needed for serialization. */
private static final long serialVersionUID = -5425415601308185409L;
Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/WordWrapper.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/WordWrapper.java 2022-01-08 22:31:08 UTC (rev 12362)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/WordWrapper.java 2022-01-09 21:08:43 UTC (rev 12363)
@@ -28,7 +28,7 @@
package org.foray.orthography;
-import org.axsl.orthography.Word;
+import org.axsl.fotree.text.FoWord;
import org.axsl.orthography.WordSegment;
/**
@@ -41,13 +41,13 @@
private static final long serialVersionUID = -4655467895699192446L;
/** The wrapped word. */
- private Word wrappedWord;
+ private FoWord wrappedWord;
/**
* Constructor.
* @param wrappedWord The word being wrapped.
*/
- public WordWrapper(final Word wrappedWord) {
+ public WordWrapper(final FoWord wrappedWord) {
this.wrappedWord = wrappedWord;
}
@@ -55,7 +55,7 @@
* Returns the wrapped word.
* @return The wrapped word.
*/
- public Word getWrappedWord() {
+ public FoWord getWrappedWord() {
return this.wrappedWord;
}
Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/CapitalizedWord.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/CapitalizedWord.java 2022-01-08 22:31:08 UTC (rev 12362)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/CapitalizedWord.java 2022-01-09 21:08:43 UTC (rev 12363)
@@ -31,7 +31,7 @@
import org.foray.orthography.WordSegmentWrapper;
import org.axsl.common.para.ParaLeaf;
-import org.axsl.orthography.Word;
+import org.axsl.fotree.text.FoWord;
import org.axsl.orthography.WordSegment;
/**
@@ -78,7 +78,7 @@
* Constructor.
* @param wrappedWord The word being wrapped.
*/
- public CapitalizedWord(final Word wrappedWord) {
+ public CapitalizedWord(final FoWord wrappedWord) {
super(wrappedWord);
}
Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/DecoratedWord.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/DecoratedWord.java 2022-01-08 22:31:08 UTC (rev 12362)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/DecoratedWord.java 2022-01-09 21:08:43 UTC (rev 12363)
@@ -34,7 +34,7 @@
import org.axsl.common.para.ParaNode;
import org.axsl.common.para.ParaPenalty;
-import org.axsl.orthography.Word;
+import org.axsl.fotree.text.FoWord;
import org.axsl.orthography.WordComponent;
/**
@@ -50,7 +50,7 @@
* Constructor.
* @param wrappedWord The word being wrapped.
*/
- public DecoratedWord(final Word wrappedWord) {
+ public DecoratedWord(final FoWord wrappedWord) {
super(wrappedWord);
}
Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/ExactWord.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/ExactWord.java 2022-01-08 22:31:08 UTC (rev 12362)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/ExactWord.java 2022-01-09 21:08:43 UTC (rev 12363)
@@ -33,7 +33,7 @@
import org.foray.orthography.StringWordSegmentUtf16;
import org.axsl.common.para.ParaLeaf;
-import org.axsl.orthography.Word;
+import org.axsl.fotree.text.FoWord;
import org.axsl.orthography.WordSegment;
/**
@@ -54,7 +54,7 @@
* @param wrappedWord The word being wrapped.
* @param exact The exact capitalization of the word.
*/
- public ExactWord(final Word wrappedWord, final String exact) {
+ public ExactWord(final FoWord wrappedWord, final String exact) {
super(wrappedWord);
if (wrappedWord.length() != exact.length()) {
throw new IllegalArgumentException("Length of normalized word: " + wrappedWord.length() +
Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/FinalSegmentModifiedWord.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/FinalSegmentModifiedWord.java 2022-01-08 22:31:08 UTC (rev 12362)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/FinalSegmentModifiedWord.java 2022-01-09 21:08:43 UTC (rev 12363)
@@ -30,7 +30,7 @@
import org.foray.orthography.WordWrapper;
-import org.axsl.orthography.Word;
+import org.axsl.fotree.text.FoWord;
import org.axsl.orthography.WordSegment;
/**
@@ -48,7 +48,7 @@
* Package-visible constructor. Use {@link LatinPlural1WordFactory} to create an instance.
* @param wrappedWord The wrapped word.
*/
- protected FinalSegmentModifiedWord(final Word wrappedWord) {
+ protected FinalSegmentModifiedWord(final FoWord wrappedWord) {
super(wrappedWord);
final int lastSegmentIndex = wrappedWord.qtyWordSegments() - 1;
final WordSegment unmodifiedSegment = wrappedWord.wordSegmentAt(lastSegmentIndex);
Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPast1Word.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPast1Word.java 2022-01-08 22:31:08 UTC (rev 12362)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPast1Word.java 2022-01-09 21:08:43 UTC (rev 12363)
@@ -31,7 +31,7 @@
import org.foray.orthography.StringWordSegmentUtf16;
import org.axsl.common.para.ParaLeaf;
-import org.axsl.orthography.Word;
+import org.axsl.fotree.text.FoWord;
/**
* Wraps a word, usually a verb, and adds a syllable "ed" to the end.
@@ -49,7 +49,7 @@
* Constructor.
* @param wrappedWord The wrapped word.
*/
- public LatinPast1Word(final Word wrappedWord) {
+ public LatinPast1Word(final FoWord wrappedWord) {
super(wrappedWord);
}
Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPast1WordFactory.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPast1WordFactory.java 2022-01-08 22:31:08 UTC (rev 12362)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPast1WordFactory.java 2022-01-09 21:08:43 UTC (rev 12363)
@@ -31,7 +31,7 @@
import org.foray.common.primitive.CharSequenceUtils;
import org.foray.orthography.WordWrapperFactory;
-import org.axsl.orthography.Word;
+import org.axsl.fotree.text.FoWord;
import org.axsl.orthography.optional.Dictionary;
/**
@@ -53,7 +53,7 @@
final int qtyToRemove = LatinPast1Word.SUFFIX.length();
final String baseWordChars = CharSequenceUtils.removeTrailing(chars, qtyToRemove).toString();
- final Word baseWord = dictionary.getWord(baseWordChars, 0);
+ final FoWord baseWord = (FoWord) dictionary.getWord(baseWordChars, 0);
if (baseWord != null) {
return new LatinPast1Word(baseWord);
}
Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPlural1Word.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPlural1Word.java 2022-01-08 22:31:08 UTC (rev 12362)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPlural1Word.java 2022-01-09 21:08:43 UTC (rev 12363)
@@ -29,7 +29,7 @@
package org.foray.orthography.wrapper;
import org.axsl.common.para.ParaLeaf;
-import org.axsl.orthography.Word;
+import org.axsl.fotree.text.FoWord;
import org.axsl.orthography.WordSegment;
/**
@@ -81,7 +81,7 @@
* Package-visible constructor. Use {@link LatinPlural1WordFactory} to create an instance.
* @param wrappedWord The wrapped word.
*/
- LatinPlural1Word(final Word wrappedWord) {
+ LatinPlural1Word(final FoWord wrappedWord) {
super(wrappedWord);
}
Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPlural1WordFactory.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPlural1WordFactory.java 2022-01-08 22:31:08 UTC (rev 12362)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPlural1WordFactory.java 2022-01-09 21:08:43 UTC (rev 12363)
@@ -31,7 +31,7 @@
import org.foray.common.primitive.CharSequenceUtils;
import org.foray.orthography.WordWrapperFactory;
-import org.axsl.orthography.Word;
+import org.axsl.fotree.text.FoWord;
import org.axsl.orthography.optional.Dictionary;
/**
@@ -53,7 +53,8 @@
final int qtyToRemove = LatinPlural1Word.Segment.WRAPPED_FORM.length();
final String baseWordChars = CharSequenceUtils.removeTrailing(chars, qtyToRemove).toString();
- final Word baseWord = dictionary.getWord(baseWordChars, 0);
+ /* TODO: Remove this cast. */
+ final FoWord baseWord = (FoWord) dictionary.getWord(baseWordChars, 0);
if (baseWord != null) {
return new LatinPlural1Word(baseWord);
}
Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPlural2Word.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPlural2Word.java 2022-01-08 22:31:08 UTC (rev 12362)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPlural2Word.java 2022-01-09 21:08:43 UTC (rev 12363)
@@ -29,7 +29,7 @@
package org.foray.orthography.wrapper;
import org.axsl.common.para.ParaLeaf;
-import org.axsl.orthography.Word;
+import org.axsl.fotree.text.FoWord;
import org.axsl.orthography.WordSegment;
/**
@@ -84,7 +84,7 @@
* Package-visible constructor. Use {@link LatinPlural2WordFactory} to create an instance.
* @param wrappedWord The wrapped word.
*/
- LatinPlural2Word(final Word wrappedWord) {
+ LatinPlural2Word(final FoWord wrappedWord) {
super(wrappedWord);
}
Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPlural2WordFactory.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPlural2WordFactory.java 2022-01-08 22:31:08 UTC (rev 12362)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPlural2WordFactory.java 2022-01-09 21:08:43 UTC (rev 12363)
@@ -31,7 +31,7 @@
import org.foray.common.primitive.CharSequenceUtils;
import org.foray.orthography.WordWrapperFactory;
-import org.axsl.orthography.Word;
+import org.axsl.fotree.text.FoWord;
import org.axsl.orthography.optional.Dictionary;
/**
@@ -72,7 +72,8 @@
builder.append('y');
final String baseWordChars = builder.toString();
- final Word baseWord = dictionary.getWord(baseWordChars, 0);
+ /* TODO: Remove this cast. */
+ final FoWord baseWord = (FoWord) dictionary.getWord(baseWordChars, 0);
if (baseWord != null) {
return new LatinPlural2Word(baseWord);
}
Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPossessive1Word.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPossessive1Word.java 2022-01-08 22:31:08 UTC (rev 12362)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPossessive1Word.java 2022-01-09 21:08:43 UTC (rev 12363)
@@ -29,7 +29,7 @@
package org.foray.orthography.wrapper;
import org.axsl.common.para.ParaLeaf;
-import org.axsl.orthography.Word;
+import org.axsl.fotree.text.FoWord;
import org.axsl.orthography.WordSegment;
/**
@@ -82,7 +82,7 @@
* Package-visible constructor. Use {@link LatinPossessive1WordFactory} to create an instance.
* @param wrappedWord The wrapped word.
*/
- LatinPossessive1Word(final Word wrappedWord) {
+ LatinPossessive1Word(final FoWord wrappedWord) {
super(wrappedWord);
}
Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPossessive1WordFactory.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPossessive1WordFactory.java 2022-01-08 22:31:08 UTC (rev 12362)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPossessive1WordFactory.java 2022-01-09 21:08:43 UTC (rev 12363)
@@ -31,7 +31,7 @@
import org.foray.common.primitive.CharSequenceUtils;
import org.foray.orthography.WordWrapperFactory;
-import org.axsl.orthography.Word;
+import org.axsl.fotree.text.FoWord;
import org.axsl.orthography.optional.Dictionary;
/**
@@ -53,7 +53,8 @@
final int qtyToRemove = LatinPossessive1Word.Segment.WRAPPED_FORM.length();
final String baseWordChars = CharSequenceUtils.removeTrailing(chars, qtyToRemove).toString();
- final Word baseWord = dictionary.getWord(baseWordChars, 0);
+ /* TODO: Remove this cast. */
+ final FoWord baseWord = (FoWord) dictionary.getWord(baseWordChars, 0);
if (baseWord != null) {
return new LatinPossessive1Word(baseWord);
}
Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPossessive2Word.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPossessive2Word.java 2022-01-08 22:31:08 UTC (rev 12362)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPossessive2Word.java 2022-01-09 21:08:43 UTC (rev 12363)
@@ -29,7 +29,7 @@
package org.foray.orthography.wrapper;
import org.axsl.common.para.ParaLeaf;
-import org.axsl.orthography.Word;
+import org.axsl.fotree.text.FoWord;
import org.axsl.orthography.WordSegment;
/**
@@ -82,7 +82,7 @@
* Package-visible constructor. Use {@link LatinPossessive2WordFactory} to create an instance.
* @param wrappedWord The wrapped word.
*/
- public LatinPossessive2Word(final Word wrappedWord) {
+ public LatinPossessive2Word(final FoWord wrappedWord) {
super(wrappedWord);
}
Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPossessive2WordFactory.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPossessive2WordFactory.java 2022-01-08 22:31:08 UTC (rev 12362)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPossessive2WordFactory.java 2022-01-09 21:08:43 UTC (rev 12363)
@@ -31,7 +31,7 @@
import org.foray.common.primitive.CharSequenceUtils;
import org.foray.orthography.WordWrapperFactory;
-import org.axsl.orthography.Word;
+import org.axsl.fotree.text.FoWord;
import org.axsl.orthography.optional.Dictionary;
/**
@@ -53,7 +53,8 @@
final int qtyToRemove = LatinPossessive2Word.Segment.WRAPPED_FORM.length();
final String baseWordChars = CharSequenceUtils.removeTrailing(chars, qtyToRemove).toString();
- final Word baseWord = dictionary.getWord(baseWordChars, 0);
+ /* TODO: Remove this cast. */
+ final FoWord baseWord = (FoWord) dictionary.getWord(baseWordChars, 0);
if (baseWord != null) {
return new LatinPossessive2Word(baseWord);
}
Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/SuffixedWord.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/SuffixedWord.java 2022-01-08 22:31:08 UTC (rev 12362)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/SuffixedWord.java 2022-01-09 21:08:43 UTC (rev 12363)
@@ -31,7 +31,7 @@
import org.foray.orthography.StringWordSegmentUtf16;
import org.foray.orthography.WordWrapper;
-import org.axsl.orthography.Word;
+import org.axsl.fotree.text.FoWord;
import org.axsl.orthography.WordSegment;
/**
@@ -47,7 +47,7 @@
* Constructor.
* @param wrappedWord The wrapped word.
*/
- public SuffixedWord(final Word wrappedWord) {
+ public SuffixedWord(final FoWord wrappedWord) {
super(wrappedWord);
}
Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/UppercaseWord.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/UppercaseWord.java 2022-01-08 22:31:08 UTC (rev 12362)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/UppercaseWord.java 2022-01-09 21:08:43 UTC (rev 12363)
@@ -31,7 +31,7 @@
import org.foray.orthography.WordSegmentWrapper;
import org.axsl.common.para.ParaLeaf;
-import org.axsl.orthography.Word;
+import org.axsl.fotree.text.FoWord;
import org.axsl.orthography.WordSegment;
/**
@@ -75,7 +75,7 @@
* Constructor.
* @param wrappedWord The word being wrapped.
*/
- public UppercaseWord(final Word wrappedWord) {
+ public UppercaseWord(final FoWord wrappedWord) {
super(wrappedWord);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
