|
From: <vic...@us...> - 2026-07-28 12:42:39
|
Revision: 14936
http://sourceforge.net/p/foray/code/14936
Author: victormote
Date: 2026-07-28 12:42:36 +0000 (Tue, 28 Jul 2026)
Log Message:
-----------
Remove no-longer useful abstract subclasses of InflectedWord.
Modified Paths:
--------------
trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_2c_ed.java
trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_apos_s.java
trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_ed.java
trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_ed2.java
trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_er.java
trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_er2.java
trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_es.java
trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_est.java
trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_est2.java
trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_ies.java
trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_ing.java
trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_ing2.java
trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_s.java
Removed Paths:
-------------
trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/FinalSegmentAddedWord.java
trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/FinalSegmentModifiedWord.java
Deleted: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/FinalSegmentAddedWord.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/FinalSegmentAddedWord.java 2026-07-28 12:37:32 UTC (rev 14935)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/FinalSegmentAddedWord.java 2026-07-28 12:42:36 UTC (rev 14936)
@@ -1,49 +0,0 @@
-/*
- * Copyright 2019 The FOray Project.
- * http://www.foray.org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This work is in part derived from the following work(s), used with the
- * permission of the licensor:
- * Apache FOP, licensed by the Apache Software Foundation
- *
- */
-
-/*
- * $LastChangedRevision$
- * $LastChangedDate$
- * $LastChangedBy$
- */
-
-package org.foray.orthography.inflection;
-
-import org.foray.orthography.Word4a;
-
-/**
- * Wraps a word to add a final segment.
- */
-public abstract class FinalSegmentAddedWord extends InflectedWord {
-
- /** Constant needed for serialization. */
- private static final long serialVersionUID = -2950517772926478039L;
-
- /**
- * Constructor.
- * @param wrappedWord The wrapped word.
- */
- public FinalSegmentAddedWord(final Word4a wrappedWord) {
- super(wrappedWord);
- }
-
-}
Deleted: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/FinalSegmentModifiedWord.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/FinalSegmentModifiedWord.java 2026-07-28 12:37:32 UTC (rev 14935)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/FinalSegmentModifiedWord.java 2026-07-28 12:42:36 UTC (rev 14936)
@@ -1,49 +0,0 @@
-/*
- * Copyright 2019 The FOray Project.
- * http://www.foray.org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This work is in part derived from the following work(s), used with the
- * permission of the licensor:
- * Apache FOP, licensed by the Apache Software Foundation
- *
- */
-
-/*
- * $LastChangedRevision$
- * $LastChangedDate$
- * $LastChangedBy$
- */
-
-package org.foray.orthography.inflection;
-
-import org.foray.orthography.Word4a;
-
-/**
- * Abstract superclass for word wrappers that modify the final segment of the word.
- */
-public abstract class FinalSegmentModifiedWord extends InflectedWord {
-
- /** Constant needed for serialization. */
- private static final long serialVersionUID = 8075477767144178967L;
-
- /**
- * Constructor.
- * @param wrappedWord The wrapped word.
- */
- protected FinalSegmentModifiedWord(final Word4a wrappedWord) {
- super(wrappedWord);
- }
-
-}
Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_2c_ed.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_2c_ed.java 2026-07-28 12:37:32 UTC (rev 14935)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_2c_ed.java 2026-07-28 12:42:36 UTC (rev 14936)
@@ -30,7 +30,7 @@
import org.foray.orthography.Word4a;
import org.foray.orthography.WordSegment4a;
-import org.foray.orthography.inflection.FinalSegmentModifiedWord;
+import org.foray.orthography.inflection.InflectedWord;
import org.foray.orthography.inflection.mods.Add_2c_ed;
import java.util.regex.Pattern;
@@ -40,7 +40,7 @@
* to make it past tense or a past participle.
* For example, the English word "plan" would be wrapped to make the word "planned".
*/
-public class EngLatnSuffix_2c_ed extends FinalSegmentModifiedWord {
+public class EngLatnSuffix_2c_ed extends InflectedWord {
/** The pattern to be matched by words with this inflection. */
public static final Pattern PATTERN = Pattern.compile("^(" + EngLatn.WORD_CHARS + "+)([bcdfgklmnprstvz])(\\2)ed");
Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_apos_s.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_apos_s.java 2026-07-28 12:37:32 UTC (rev 14935)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_apos_s.java 2026-07-28 12:42:36 UTC (rev 14936)
@@ -30,7 +30,7 @@
import org.foray.orthography.Word4a;
import org.foray.orthography.WordSegment4a;
-import org.foray.orthography.inflection.FinalSegmentModifiedWord;
+import org.foray.orthography.inflection.InflectedWord;
import org.foray.orthography.inflection.mods.Add_apos_s;
import java.util.regex.Pattern;
@@ -38,7 +38,7 @@
/**
* Wraps a singular word and adds the suffix "’s" to make it possessive or a contraction.
*/
-public class EngLatnSuffix_apos_s extends FinalSegmentModifiedWord {
+public class EngLatnSuffix_apos_s extends InflectedWord {
/** The pattern to be matched by words with this inflection. */
public static final Pattern PATTERN = Pattern.compile("^(" + EngLatn.WORD_CHARS + "+)’s$");
Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_ed.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_ed.java 2026-07-28 12:37:32 UTC (rev 14935)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_ed.java 2026-07-28 12:42:36 UTC (rev 14936)
@@ -30,7 +30,7 @@
import org.foray.orthography.Word4a;
import org.foray.orthography.WordSegment4a;
-import org.foray.orthography.inflection.FinalSegmentModifiedWord;
+import org.foray.orthography.inflection.InflectedWord;
import org.foray.orthography.inflection.mods.Add_ed;
import java.util.regex.Pattern;
@@ -39,7 +39,7 @@
* Wraps a word, usually a verb, and adds a syllable "ed" to the end to make it past tense.
* For example, the English word "astonish" would be wrapped to make the word "astonished".
*/
-public class EngLatnSuffix_ed extends FinalSegmentModifiedWord {
+public class EngLatnSuffix_ed extends InflectedWord {
/** The pattern to be matched by words with this inflection. */
public static final Pattern PATTERN = Pattern.compile("^(" + EngLatn.WORD_CHARS + "+)ed$");
Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_ed2.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_ed2.java 2026-07-28 12:37:32 UTC (rev 14935)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_ed2.java 2026-07-28 12:42:36 UTC (rev 14936)
@@ -30,7 +30,7 @@
import org.foray.orthography.Word4a;
import org.foray.orthography.WordSegment4a;
-import org.foray.orthography.inflection.FinalSegmentModifiedWord;
+import org.foray.orthography.inflection.InflectedWord;
import org.foray.orthography.inflection.mods.Add_d;
import java.util.regex.Pattern;
@@ -39,7 +39,7 @@
* Wraps a word, usually a verb ending in "e", and adds a "d" to the end to make it past tense.
* For example, the English word "enable" would be wrapped to make the word "enabled".
*/
-public class EngLatnSuffix_ed2 extends FinalSegmentModifiedWord {
+public class EngLatnSuffix_ed2 extends InflectedWord {
/** The pattern to be matched by words with this inflection. */
public static final Pattern PATTERN = Pattern.compile("^(" + EngLatn.WORD_CHARS + "+e)d$");
Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_er.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_er.java 2026-07-28 12:37:32 UTC (rev 14935)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_er.java 2026-07-28 12:42:36 UTC (rev 14936)
@@ -30,7 +30,7 @@
import org.foray.orthography.Word4a;
import org.foray.orthography.WordSegment4a;
-import org.foray.orthography.inflection.FinalSegmentAddedWord;
+import org.foray.orthography.inflection.InflectedWord;
import java.util.regex.Pattern;
@@ -39,7 +39,7 @@
* than the lemma.
* For example, the English word "hard" would be wrapped to make the word "harder".
*/
-public class EngLatnSuffix_er extends FinalSegmentAddedWord {
+public class EngLatnSuffix_er extends InflectedWord {
/** The pattern to be matched by words with this inflection. */
public static final Pattern PATTERN = Pattern.compile("^(" + EngLatn.WORD_CHARS + "+)er$");
Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_er2.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_er2.java 2026-07-28 12:37:32 UTC (rev 14935)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_er2.java 2026-07-28 12:42:36 UTC (rev 14936)
@@ -30,7 +30,7 @@
import org.foray.orthography.Word4a;
import org.foray.orthography.WordSegment4a;
-import org.foray.orthography.inflection.FinalSegmentAddedWord;
+import org.foray.orthography.inflection.InflectedWord;
import org.foray.orthography.inflection.mods.Delete_e;
import java.util.regex.Pattern;
@@ -40,7 +40,7 @@
* end to make it comparatively greater than the lemma.
* For example, the English word "wise" would be wrapped to make the word "wis-er".
*/
-public class EngLatnSuffix_er2 extends FinalSegmentAddedWord {
+public class EngLatnSuffix_er2 extends InflectedWord {
/** The pattern to be matched by words with this inflection. */
public static final Pattern PATTERN = Pattern.compile("^(" + EngLatn.WORD_CHARS + "+e)r$");
Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_es.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_es.java 2026-07-28 12:37:32 UTC (rev 14935)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_es.java 2026-07-28 12:42:36 UTC (rev 14936)
@@ -31,7 +31,7 @@
import org.foray.orthography.StringWordSegmentUtf16;
import org.foray.orthography.Word4a;
import org.foray.orthography.WordSegment4a;
-import org.foray.orthography.inflection.FinalSegmentAddedWord;
+import org.foray.orthography.inflection.InflectedWord;
import java.util.regex.Pattern;
@@ -45,7 +45,7 @@
* <li>Pluralize a cardinal like "six," converting it to "sixes."</li>
* </ol>
*/
-public class EngLatnSuffix_es extends FinalSegmentAddedWord {
+public class EngLatnSuffix_es extends InflectedWord {
/** The pattern to be matched by words with this inflection. */
public static final Pattern PATTERN = Pattern.compile("^(" + EngLatn.WORD_CHARS + "+)([sxz]|sh|ch)es$");
Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_est.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_est.java 2026-07-28 12:37:32 UTC (rev 14935)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_est.java 2026-07-28 12:42:36 UTC (rev 14936)
@@ -30,7 +30,7 @@
import org.foray.orthography.Word4a;
import org.foray.orthography.WordSegment4a;
-import org.foray.orthography.inflection.FinalSegmentAddedWord;
+import org.foray.orthography.inflection.InflectedWord;
import java.util.regex.Pattern;
@@ -38,7 +38,7 @@
* Wraps a word, usually a one-syllable adjective, and adds a syllable "est" to the end to make it a superlative.
* For example, the English word "great" would be wrapped to make the word "greatest".
*/
-public class EngLatnSuffix_est extends FinalSegmentAddedWord {
+public class EngLatnSuffix_est extends InflectedWord {
/** The pattern to be matched by words with this inflection. */
public static final Pattern PATTERN = Pattern.compile("^(" + EngLatn.WORD_CHARS + "+)est$");
Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_est2.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_est2.java 2026-07-28 12:37:32 UTC (rev 14935)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_est2.java 2026-07-28 12:42:36 UTC (rev 14936)
@@ -30,7 +30,7 @@
import org.foray.orthography.Word4a;
import org.foray.orthography.WordSegment4a;
-import org.foray.orthography.inflection.FinalSegmentAddedWord;
+import org.foray.orthography.inflection.InflectedWord;
import org.foray.orthography.inflection.mods.Delete_e;
import java.util.regex.Pattern;
@@ -40,7 +40,7 @@
* end to make it superlative to the lemma.
* For example, the English word "wise" would be wrapped to make the word "wis-est".
*/
-public class EngLatnSuffix_est2 extends FinalSegmentAddedWord {
+public class EngLatnSuffix_est2 extends InflectedWord {
/** The pattern to be matched by words with this inflection. */
public static final Pattern PATTERN = Pattern.compile("^(" + EngLatn.WORD_CHARS + "+e)st$");
Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_ies.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_ies.java 2026-07-28 12:37:32 UTC (rev 14935)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_ies.java 2026-07-28 12:42:36 UTC (rev 14936)
@@ -30,7 +30,7 @@
import org.foray.orthography.Word4a;
import org.foray.orthography.WordSegment4a;
-import org.foray.orthography.inflection.FinalSegmentModifiedWord;
+import org.foray.orthography.inflection.InflectedWord;
import org.foray.orthography.inflection.mods.Replace_y_by_ies;
import java.util.regex.Pattern;
@@ -40,7 +40,7 @@
* the "y" to "ies", thus making the plural form of the word.
* An example of a word where this might be used is to convert "com-pa-ny" to "com-pa-nies".
*/
-public class EngLatnSuffix_ies extends FinalSegmentModifiedWord {
+public class EngLatnSuffix_ies extends InflectedWord {
/** The pattern to be matched by words with this inflection. One or more characters, followed by a single consonant,
* followed by "ies". */
Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_ing.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_ing.java 2026-07-28 12:37:32 UTC (rev 14935)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_ing.java 2026-07-28 12:42:36 UTC (rev 14936)
@@ -30,7 +30,7 @@
import org.foray.orthography.Word4a;
import org.foray.orthography.WordSegment4a;
-import org.foray.orthography.inflection.FinalSegmentAddedWord;
+import org.foray.orthography.inflection.InflectedWord;
import java.util.regex.Pattern;
@@ -38,7 +38,7 @@
* Wraps a word, usually a verb, and adds a syllable "ing" to the end to make it a present participle.
* For example, the English word "talk" would be wrapped to make the word "talking".
*/
-public class EngLatnSuffix_ing extends FinalSegmentAddedWord {
+public class EngLatnSuffix_ing extends InflectedWord {
/** The pattern to be matched by words with this inflection. */
public static final Pattern PATTERN = Pattern.compile("^(" + EngLatn.WORD_CHARS + "+)ing$");
Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_ing2.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_ing2.java 2026-07-28 12:37:32 UTC (rev 14935)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_ing2.java 2026-07-28 12:42:36 UTC (rev 14936)
@@ -30,7 +30,7 @@
import org.foray.orthography.Word4a;
import org.foray.orthography.WordSegment4a;
-import org.foray.orthography.inflection.FinalSegmentAddedWord;
+import org.foray.orthography.inflection.InflectedWord;
import org.foray.orthography.inflection.mods.Delete_e;
import java.util.regex.Pattern;
@@ -40,7 +40,7 @@
* make it a present participle.
* For example, the English word "thrive" would be wrapped to make the word "thriving".
*/
-public class EngLatnSuffix_ing2 extends FinalSegmentAddedWord {
+public class EngLatnSuffix_ing2 extends InflectedWord {
/** The pattern to be matched by words with this inflection. */
public static final Pattern PATTERN = Pattern.compile("^(" + EngLatn.WORD_CHARS + "+)ing$");
Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_s.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_s.java 2026-07-28 12:37:32 UTC (rev 14935)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/inflection/eng/EngLatnSuffix_s.java 2026-07-28 12:42:36 UTC (rev 14936)
@@ -30,7 +30,7 @@
import org.foray.orthography.Word4a;
import org.foray.orthography.WordSegment4a;
-import org.foray.orthography.inflection.FinalSegmentModifiedWord;
+import org.foray.orthography.inflection.InflectedWord;
import org.foray.orthography.inflection.mods.Add_s;
import java.util.regex.Pattern;
@@ -38,7 +38,7 @@
/**
* Wraps a singular word and adds the suffix "s" to make it plural.
*/
-public final class EngLatnSuffix_s extends FinalSegmentModifiedWord {
+public final class EngLatnSuffix_s extends InflectedWord {
/** The pattern to be matched by words with this inflection. */
public static final Pattern PATTERN = Pattern.compile("^(" + EngLatn.WORD_CHARS + "+)s$");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
