diff options
| author | Ben Culkin <scorpress@gmail.com> | 2020-04-13 18:52:30 -0400 |
|---|---|---|
| committer | Ben Culkin <scorpress@gmail.com> | 2020-04-13 18:52:30 -0400 |
| commit | e71ef0d03e87df19900db8328cda68d38d523b0b (patch) | |
| tree | ab826b24d1022a06eedea0e8cbbc4e705b4f2211 | |
| parent | 2f6a7807f7180fb467e3d06f2af4263a45759c28 (diff) | |
Cleanup some latent bugs
Cleanup some latent bugs
4 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/bjc/inflexion/EnglishUtils.java b/src/main/java/bjc/inflexion/EnglishUtils.java index 0fafe86..942a2a0 100644 --- a/src/main/java/bjc/inflexion/EnglishUtils.java +++ b/src/main/java/bjc/inflexion/EnglishUtils.java @@ -93,7 +93,7 @@ public class EnglishUtils { // Special capital words (UK, UN) if (word.matches("^U[NK][AIEO].*") == true) { return "a"; - } else if (word == word.toUpperCase()) { + } else if (word.equals(word.toUpperCase())) { if ("aedhilmnorsx".indexOf(lowercaseWord.substring(0, 1)) >= 0) { return "an"; } diff --git a/src/main/java/bjc/inflexion/InflectionString.java b/src/main/java/bjc/inflexion/InflectionString.java index 30ac60a..5c87771 100644 --- a/src/main/java/bjc/inflexion/InflectionString.java +++ b/src/main/java/bjc/inflexion/InflectionString.java @@ -88,7 +88,7 @@ public class InflectionString { boolean doBrief = false; if (doBrief) - return String.format("Encountered errors attempting to parse string %s", + return String.format("Encountered %d errors attempting to parse string %s", parseErrors.size(), inp); StringBuilder sb = new StringBuilder(parseErrors.size()); diff --git a/src/main/java/bjc/inflexion/nouns/CategoricalNounInflection.java b/src/main/java/bjc/inflexion/nouns/CategoricalNounInflection.java index eb5e4ea..8f1fde9 100644 --- a/src/main/java/bjc/inflexion/nouns/CategoricalNounInflection.java +++ b/src/main/java/bjc/inflexion/nouns/CategoricalNounInflection.java @@ -111,7 +111,7 @@ public class CategoricalNounInflection implements NounInflection { return singular.affix(classicalPlural.deaffix(plural)); } else { final String msg = String - .format("Noun '%s' doesn't belong to this inflection", plural, this); + .format("Noun '%s' doesn't belong to this (%s) inflection", plural, this); throw new InflectionException(msg); } @@ -128,7 +128,7 @@ public class CategoricalNounInflection implements NounInflection { return singlar; } else { final String msg = String - .format("Noun '%s' doesn't belong to this inflection", singlar, this); + .format("Noun '%s' doesn't belong to this (%s) inflection", singlar, this); throw new InflectionException(msg); } diff --git a/src/main/java/bjc/inflexion/nouns/IrregularNounInflection.java b/src/main/java/bjc/inflexion/nouns/IrregularNounInflection.java index 6dbd353..6b21733 100644 --- a/src/main/java/bjc/inflexion/nouns/IrregularNounInflection.java +++ b/src/main/java/bjc/inflexion/nouns/IrregularNounInflection.java @@ -124,7 +124,7 @@ public class IrregularNounInflection implements NounInflection { @Override public String pluralize(final String singlar) { - if (singlar.equalsIgnoreCase(singlar)) { + if (singular.equalsIgnoreCase(singlar)) { return getPlural(); } else if (matchesPlural(singlar)) { return getPlural(); |