diff --git a/languagetool-commandline/src/main/java/org/languagetool/commandline/Main.java b/languagetool-commandline/src/main/java/org/languagetool/commandline/Main.java index 5cbe62d89365..255ca1637bc4 100644 --- a/languagetool-commandline/src/main/java/org/languagetool/commandline/Main.java +++ b/languagetool-commandline/src/main/java/org/languagetool/commandline/Main.java @@ -22,7 +22,8 @@ import org.apache.commons.io.input.BOMInputStream; import org.languagetool.*; import org.languagetool.bitext.TabBitextReader; -import org.languagetool.language.*; +import org.languagetool.language.en.AmericanEnglish; +import org.languagetool.language.en.English; import org.languagetool.language.identifier.LanguageIdentifier; import org.languagetool.language.identifier.LanguageIdentifierService; import org.languagetool.rules.Rule; diff --git a/languagetool-core/pom.xml b/languagetool-core/pom.xml index 958f606ffc8f..fb76a7dc6dfb 100644 --- a/languagetool-core/pom.xml +++ b/languagetool-core/pom.xml @@ -277,6 +277,7 @@ ${project.version} ${maven.build.timestamp} + org.languagetool.core diff --git a/languagetool-core/src/main/java/org/languagetool/Languages.java b/languagetool-core/src/main/java/org/languagetool/Languages.java index 36f237685685..0dfd3dc5df52 100644 --- a/languagetool-core/src/main/java/org/languagetool/Languages.java +++ b/languagetool-core/src/main/java/org/languagetool/Languages.java @@ -152,9 +152,13 @@ private static Language createLanguageObjects(URL url, String className) { static boolean hasPremium(String className) { return className.matches("org\\.languagetool\\.language\\.(" + + "pt\\.Portuguese|pt\\.AngolaPortuguese|pt\\.BrazilianPortuguese|pt\\.MozambiquePortuguese|pt\\.PortugalPortuguese|" + "Portuguese|AngolaPortuguese|BrazilianPortuguese|MozambiquePortuguese|PortugalPortuguese|" + + "de\\.German|de\\.GermanyGerman|de\\.AustrianGerman|de\\.SwissGerman|" + "German|GermanyGerman|AustrianGerman|SwissGerman|" + + "nl\\.Dutch|fr\\.French|es\\.Spanish|" + "Dutch|French|Spanish|" + + "en\\.English|en\\.AustralianEnglish|en\\.AmericanEnglish|en\\.BritishEnglish|en\\.CanadianEnglish|en\\.NewZealandEnglish|en\\.SouthAfricanEnglish" + "English|AustralianEnglish|AmericanEnglish|BritishEnglish|CanadianEnglish|NewZealandEnglish|SouthAfricanEnglish" + ")"); } @@ -162,7 +166,7 @@ static boolean hasPremium(String className) { /** * Get the Language object for the given language class name or try to create it and add to dynamic languages. * - * @param className e.g. org.languagetool.language.English + * @param className e.g. org.languagetool.language.en.English * @return a Language object * @throws RuntimeException if language not found in classpath * @since 5.0 diff --git a/languagetool-core/src/main/java/org/languagetool/language/Contributor.java b/languagetool-core/src/main/java/org/languagetool/language/Contributor.java index 5fae3898f91f..ddd29611a439 100644 --- a/languagetool-core/src/main/java/org/languagetool/language/Contributor.java +++ b/languagetool-core/src/main/java/org/languagetool/language/Contributor.java @@ -40,11 +40,11 @@ public Contributor(String name, String url) { public Contributor(String name) { this(name, null); } - + public String getName() { return name; } - + public String getUrl() { return url; } @@ -53,5 +53,4 @@ public String getUrl() { public String toString() { return name; } - } diff --git a/languagetool-language-modules/ar/src/main/resources/org/languagetool/MessagesBundle_ar.properties b/languagetool-core/src/main/resources/org/languagetool/MessagesBundle_ar.properties similarity index 100% rename from languagetool-language-modules/ar/src/main/resources/org/languagetool/MessagesBundle_ar.properties rename to languagetool-core/src/main/resources/org/languagetool/MessagesBundle_ar.properties diff --git a/languagetool-language-modules/ast/src/main/resources/org/languagetool/MessagesBundle_ast.properties b/languagetool-core/src/main/resources/org/languagetool/MessagesBundle_ast.properties similarity index 100% rename from languagetool-language-modules/ast/src/main/resources/org/languagetool/MessagesBundle_ast.properties rename to languagetool-core/src/main/resources/org/languagetool/MessagesBundle_ast.properties diff --git a/languagetool-language-modules/be/src/main/resources/org/languagetool/MessagesBundle_be.properties b/languagetool-core/src/main/resources/org/languagetool/MessagesBundle_be.properties similarity index 100% rename from languagetool-language-modules/be/src/main/resources/org/languagetool/MessagesBundle_be.properties rename to languagetool-core/src/main/resources/org/languagetool/MessagesBundle_be.properties diff --git a/languagetool-language-modules/br/src/main/resources/org/languagetool/MessagesBundle_br.properties b/languagetool-core/src/main/resources/org/languagetool/MessagesBundle_br.properties similarity index 100% rename from languagetool-language-modules/br/src/main/resources/org/languagetool/MessagesBundle_br.properties rename to languagetool-core/src/main/resources/org/languagetool/MessagesBundle_br.properties diff --git a/languagetool-language-modules/ca/src/main/resources/org/languagetool/MessagesBundle_ca.properties b/languagetool-core/src/main/resources/org/languagetool/MessagesBundle_ca.properties similarity index 100% rename from languagetool-language-modules/ca/src/main/resources/org/languagetool/MessagesBundle_ca.properties rename to languagetool-core/src/main/resources/org/languagetool/MessagesBundle_ca.properties diff --git a/languagetool-language-modules/da/src/main/resources/org/languagetool/MessagesBundle_da.properties b/languagetool-core/src/main/resources/org/languagetool/MessagesBundle_da.properties similarity index 100% rename from languagetool-language-modules/da/src/main/resources/org/languagetool/MessagesBundle_da.properties rename to languagetool-core/src/main/resources/org/languagetool/MessagesBundle_da.properties diff --git a/languagetool-language-modules/de/src/main/resources/org/languagetool/MessagesBundle_de.properties b/languagetool-core/src/main/resources/org/languagetool/MessagesBundle_de.properties similarity index 100% rename from languagetool-language-modules/de/src/main/resources/org/languagetool/MessagesBundle_de.properties rename to languagetool-core/src/main/resources/org/languagetool/MessagesBundle_de.properties diff --git a/languagetool-language-modules/el/src/main/resources/org/languagetool/MessagesBundle_el.properties b/languagetool-core/src/main/resources/org/languagetool/MessagesBundle_el.properties similarity index 100% rename from languagetool-language-modules/el/src/main/resources/org/languagetool/MessagesBundle_el.properties rename to languagetool-core/src/main/resources/org/languagetool/MessagesBundle_el.properties diff --git a/languagetool-language-modules/eo/src/main/resources/org/languagetool/MessagesBundle_eo.properties b/languagetool-core/src/main/resources/org/languagetool/MessagesBundle_eo.properties similarity index 100% rename from languagetool-language-modules/eo/src/main/resources/org/languagetool/MessagesBundle_eo.properties rename to languagetool-core/src/main/resources/org/languagetool/MessagesBundle_eo.properties diff --git a/languagetool-language-modules/es/src/main/resources/org/languagetool/MessagesBundle_es.properties b/languagetool-core/src/main/resources/org/languagetool/MessagesBundle_es.properties similarity index 100% rename from languagetool-language-modules/es/src/main/resources/org/languagetool/MessagesBundle_es.properties rename to languagetool-core/src/main/resources/org/languagetool/MessagesBundle_es.properties diff --git a/languagetool-language-modules/fa/src/main/resources/org/languagetool/MessagesBundle_fa.properties b/languagetool-core/src/main/resources/org/languagetool/MessagesBundle_fa.properties similarity index 100% rename from languagetool-language-modules/fa/src/main/resources/org/languagetool/MessagesBundle_fa.properties rename to languagetool-core/src/main/resources/org/languagetool/MessagesBundle_fa.properties diff --git a/languagetool-language-modules/fr/src/main/resources/org/languagetool/MessagesBundle_fr.properties b/languagetool-core/src/main/resources/org/languagetool/MessagesBundle_fr.properties similarity index 100% rename from languagetool-language-modules/fr/src/main/resources/org/languagetool/MessagesBundle_fr.properties rename to languagetool-core/src/main/resources/org/languagetool/MessagesBundle_fr.properties diff --git a/languagetool-language-modules/gl/src/main/resources/org/languagetool/MessagesBundle_gl.properties b/languagetool-core/src/main/resources/org/languagetool/MessagesBundle_gl.properties similarity index 100% rename from languagetool-language-modules/gl/src/main/resources/org/languagetool/MessagesBundle_gl.properties rename to languagetool-core/src/main/resources/org/languagetool/MessagesBundle_gl.properties diff --git a/languagetool-language-modules/is/src/main/resources/org/languagetool/MessagesBundle_is.properties b/languagetool-core/src/main/resources/org/languagetool/MessagesBundle_is.properties similarity index 100% rename from languagetool-language-modules/is/src/main/resources/org/languagetool/MessagesBundle_is.properties rename to languagetool-core/src/main/resources/org/languagetool/MessagesBundle_is.properties diff --git a/languagetool-language-modules/it/src/main/resources/org/languagetool/MessagesBundle_it.properties b/languagetool-core/src/main/resources/org/languagetool/MessagesBundle_it.properties similarity index 100% rename from languagetool-language-modules/it/src/main/resources/org/languagetool/MessagesBundle_it.properties rename to languagetool-core/src/main/resources/org/languagetool/MessagesBundle_it.properties diff --git a/languagetool-language-modules/ja/src/main/resources/org/languagetool/MessagesBundle_ja.properties b/languagetool-core/src/main/resources/org/languagetool/MessagesBundle_ja.properties similarity index 100% rename from languagetool-language-modules/ja/src/main/resources/org/languagetool/MessagesBundle_ja.properties rename to languagetool-core/src/main/resources/org/languagetool/MessagesBundle_ja.properties diff --git a/languagetool-language-modules/km/src/main/resources/org/languagetool/MessagesBundle_km.properties b/languagetool-core/src/main/resources/org/languagetool/MessagesBundle_km.properties similarity index 100% rename from languagetool-language-modules/km/src/main/resources/org/languagetool/MessagesBundle_km.properties rename to languagetool-core/src/main/resources/org/languagetool/MessagesBundle_km.properties diff --git a/languagetool-language-modules/lt/src/main/resources/org/languagetool/MessagesBundle_lt.properties b/languagetool-core/src/main/resources/org/languagetool/MessagesBundle_lt.properties similarity index 100% rename from languagetool-language-modules/lt/src/main/resources/org/languagetool/MessagesBundle_lt.properties rename to languagetool-core/src/main/resources/org/languagetool/MessagesBundle_lt.properties diff --git a/languagetool-language-modules/nl/src/main/resources/org/languagetool/MessagesBundle_nl.properties b/languagetool-core/src/main/resources/org/languagetool/MessagesBundle_nl.properties similarity index 100% rename from languagetool-language-modules/nl/src/main/resources/org/languagetool/MessagesBundle_nl.properties rename to languagetool-core/src/main/resources/org/languagetool/MessagesBundle_nl.properties diff --git a/languagetool-language-modules/pl/src/main/resources/org/languagetool/MessagesBundle_pl.properties b/languagetool-core/src/main/resources/org/languagetool/MessagesBundle_pl.properties similarity index 100% rename from languagetool-language-modules/pl/src/main/resources/org/languagetool/MessagesBundle_pl.properties rename to languagetool-core/src/main/resources/org/languagetool/MessagesBundle_pl.properties diff --git a/languagetool-language-modules/pt/src/main/resources/org/languagetool/MessagesBundle_pt_BR.properties b/languagetool-core/src/main/resources/org/languagetool/MessagesBundle_pt_BR.properties similarity index 100% rename from languagetool-language-modules/pt/src/main/resources/org/languagetool/MessagesBundle_pt_BR.properties rename to languagetool-core/src/main/resources/org/languagetool/MessagesBundle_pt_BR.properties diff --git a/languagetool-language-modules/pt/src/main/resources/org/languagetool/MessagesBundle_pt_PT.properties b/languagetool-core/src/main/resources/org/languagetool/MessagesBundle_pt_PT.properties similarity index 100% rename from languagetool-language-modules/pt/src/main/resources/org/languagetool/MessagesBundle_pt_PT.properties rename to languagetool-core/src/main/resources/org/languagetool/MessagesBundle_pt_PT.properties diff --git a/languagetool-language-modules/ro/src/main/resources/org/languagetool/MessagesBundle_ro.properties b/languagetool-core/src/main/resources/org/languagetool/MessagesBundle_ro.properties similarity index 100% rename from languagetool-language-modules/ro/src/main/resources/org/languagetool/MessagesBundle_ro.properties rename to languagetool-core/src/main/resources/org/languagetool/MessagesBundle_ro.properties diff --git a/languagetool-language-modules/ru/src/main/resources/org/languagetool/MessagesBundle_ru.properties b/languagetool-core/src/main/resources/org/languagetool/MessagesBundle_ru.properties similarity index 100% rename from languagetool-language-modules/ru/src/main/resources/org/languagetool/MessagesBundle_ru.properties rename to languagetool-core/src/main/resources/org/languagetool/MessagesBundle_ru.properties diff --git a/languagetool-language-modules/sk/src/main/resources/org/languagetool/MessagesBundle_sk.properties b/languagetool-core/src/main/resources/org/languagetool/MessagesBundle_sk.properties similarity index 100% rename from languagetool-language-modules/sk/src/main/resources/org/languagetool/MessagesBundle_sk.properties rename to languagetool-core/src/main/resources/org/languagetool/MessagesBundle_sk.properties diff --git a/languagetool-language-modules/sl/src/main/resources/org/languagetool/MessagesBundle_sl.properties b/languagetool-core/src/main/resources/org/languagetool/MessagesBundle_sl.properties similarity index 100% rename from languagetool-language-modules/sl/src/main/resources/org/languagetool/MessagesBundle_sl.properties rename to languagetool-core/src/main/resources/org/languagetool/MessagesBundle_sl.properties diff --git a/languagetool-language-modules/sv/src/main/resources/org/languagetool/MessagesBundle_sv.properties b/languagetool-core/src/main/resources/org/languagetool/MessagesBundle_sv.properties similarity index 100% rename from languagetool-language-modules/sv/src/main/resources/org/languagetool/MessagesBundle_sv.properties rename to languagetool-core/src/main/resources/org/languagetool/MessagesBundle_sv.properties diff --git a/languagetool-language-modules/ta/src/main/resources/org/languagetool/MessagesBundle_ta.properties b/languagetool-core/src/main/resources/org/languagetool/MessagesBundle_ta.properties similarity index 100% rename from languagetool-language-modules/ta/src/main/resources/org/languagetool/MessagesBundle_ta.properties rename to languagetool-core/src/main/resources/org/languagetool/MessagesBundle_ta.properties diff --git a/languagetool-language-modules/tl/src/main/resources/org/languagetool/MessagesBundle_tl.properties b/languagetool-core/src/main/resources/org/languagetool/MessagesBundle_tl.properties similarity index 100% rename from languagetool-language-modules/tl/src/main/resources/org/languagetool/MessagesBundle_tl.properties rename to languagetool-core/src/main/resources/org/languagetool/MessagesBundle_tl.properties diff --git a/languagetool-language-modules/uk/src/main/resources/org/languagetool/MessagesBundle_uk.properties b/languagetool-core/src/main/resources/org/languagetool/MessagesBundle_uk.properties similarity index 100% rename from languagetool-language-modules/uk/src/main/resources/org/languagetool/MessagesBundle_uk.properties rename to languagetool-core/src/main/resources/org/languagetool/MessagesBundle_uk.properties diff --git a/languagetool-language-modules/zh/src/main/resources/org/languagetool/MessagesBundle_zh.properties b/languagetool-core/src/main/resources/org/languagetool/MessagesBundle_zh.properties similarity index 100% rename from languagetool-language-modules/zh/src/main/resources/org/languagetool/MessagesBundle_zh.properties rename to languagetool-core/src/main/resources/org/languagetool/MessagesBundle_zh.properties diff --git a/languagetool-core/src/test/java/org/languagetool/LanguageSpecificTest.java b/languagetool-core/src/test/java/org/languagetool/LanguageSpecificTest.java index 10b6095945b1..e7160cfc7d1b 100644 --- a/languagetool-core/src/test/java/org/languagetool/LanguageSpecificTest.java +++ b/languagetool-core/src/test/java/org/languagetool/LanguageSpecificTest.java @@ -53,12 +53,12 @@ protected void runTests(Language lang, String onlyRunCode, String additionalVali testNoQuotesAroundSuggestion(lang); testJavaRules(onlyRunCode); //testExampleAvailable(onlyRunCode); - testConfusionSetLoading(); + testConfusionSetLoading(onlyRunCode); countTempOffRules(lang); testCoherencyBaseformIsOtherForm(lang); testReplaceRuleReplacements(lang); try { - new DisambiguationRuleTest().testDisambiguationRulesFromXML(); + new DisambiguationRuleTest().testDisambiguationRulesFromXMLAndSpecificLanguage(onlyRunCode); } catch (Exception e) { throw new RuntimeException(e); } @@ -218,7 +218,8 @@ private void testJavaRules(String onlyRunCode) throws IOException { float printLimitSeconds = 0.2f; for (Language language : Languages.getWithDemoLanguage()) { if (onlyRunCode != null && !language.getShortCodeWithCountryAndVariant().equals(onlyRunCode)) { - System.out.println("Skipping " + language); // speed up for languages that are sub classes (e.g. simple German) + // System.out.println("Skipping " + language); + // speed up for languages that are sub classes (e.g. simple German) continue; } System.out.println("Running for " + language + ", printing only tests that take > " + printLimitSeconds + " seconds:"); @@ -244,8 +245,12 @@ private void testJavaRules(String onlyRunCode) throws IOException { } } - private void testConfusionSetLoading() { + private void testConfusionSetLoading(String onlyRunCode) { for (Language language : Languages.get()) { + if (onlyRunCode != null && !language.getShortCodeWithCountryAndVariant().equals(onlyRunCode)) { + continue; + } + System.out.println("Running " + language); try { List rules = language.getRelevantLanguageModelRules(JLanguageTool.getMessageBundle(), new FakeLanguageModel(), null); if (rules.size() > 0) { diff --git a/languagetool-core/src/test/java/org/languagetool/tagging/disambiguation/rules/DisambiguationRuleTest.java b/languagetool-core/src/test/java/org/languagetool/tagging/disambiguation/rules/DisambiguationRuleTest.java index f28f355a0b23..ce5f4c3fda0f 100644 --- a/languagetool-core/src/test/java/org/languagetool/tagging/disambiguation/rules/DisambiguationRuleTest.java +++ b/languagetool-core/src/test/java/org/languagetool/tagging/disambiguation/rules/DisambiguationRuleTest.java @@ -28,6 +28,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.Arrays; +import java.util.HashSet; import java.util.List; import java.util.Set; @@ -56,6 +57,18 @@ public void testDisambiguationRulesFromXML() throws Exception { testDisambiguationRulesFromXML(null); } + public void testDisambiguationRulesFromXMLAndSpecificLanguage(String onlyRunCode) throws Exception { + Set ignoredLanguages = new HashSet<>(); + if (onlyRunCode != null) { + for (Language lang : Languages.getWithDemoLanguage()) { + if (!lang.getShortCodeWithCountryAndVariant().contains(onlyRunCode)) { + ignoredLanguages.add(lang); + } + } + } + testDisambiguationRulesFromXML(ignoredLanguages); + } + private void testDisambiguationRulesFromXML(Set ignoredLanguages) throws IOException, ParserConfigurationException, SAXException { for (Language lang : Languages.getWithDemoLanguage()) { diff --git a/languagetool-dev/src/main/java/org/languagetool/dev/GenderWordFinder.java b/languagetool-dev/src/main/java/org/languagetool/dev/GenderWordFinder.java index 5c9ee4f45f13..363849124b78 100644 --- a/languagetool-dev/src/main/java/org/languagetool/dev/GenderWordFinder.java +++ b/languagetool-dev/src/main/java/org/languagetool/dev/GenderWordFinder.java @@ -19,7 +19,7 @@ package org.languagetool.dev; import org.languagetool.JLanguageTool; -import org.languagetool.language.GermanyGerman; +import org.languagetool.language.de.GermanyGerman; import org.languagetool.rules.Rule; import org.languagetool.rules.de.GermanSpellerRule; diff --git a/languagetool-dev/src/main/java/org/languagetool/dev/GermanOldSpellingFinder.java b/languagetool-dev/src/main/java/org/languagetool/dev/GermanOldSpellingFinder.java index 189d0d2de3ea..c28359ea7ab1 100644 --- a/languagetool-dev/src/main/java/org/languagetool/dev/GermanOldSpellingFinder.java +++ b/languagetool-dev/src/main/java/org/languagetool/dev/GermanOldSpellingFinder.java @@ -19,7 +19,7 @@ package org.languagetool.dev; import org.languagetool.AnalyzedToken; -import org.languagetool.language.GermanyGerman; +import org.languagetool.language.de.GermanyGerman; import org.languagetool.synthesis.Synthesizer; import java.io.IOException; diff --git a/languagetool-dev/src/main/java/org/languagetool/dev/MissingGermanCompoundAdjectiveFinder.java b/languagetool-dev/src/main/java/org/languagetool/dev/MissingGermanCompoundAdjectiveFinder.java index a9dd0728d183..0336f31aa53a 100644 --- a/languagetool-dev/src/main/java/org/languagetool/dev/MissingGermanCompoundAdjectiveFinder.java +++ b/languagetool-dev/src/main/java/org/languagetool/dev/MissingGermanCompoundAdjectiveFinder.java @@ -20,7 +20,7 @@ import de.danielnaber.jwordsplitter.GermanWordSplitter; import org.languagetool.AnalyzedTokenReadings; -import org.languagetool.language.GermanyGerman; +import org.languagetool.language.de.GermanyGerman; import org.languagetool.tagging.Tagger; import org.languagetool.tools.StringTools; diff --git a/languagetool-dev/src/main/java/org/languagetool/dev/MissingGermanCompoundsFinder.java b/languagetool-dev/src/main/java/org/languagetool/dev/MissingGermanCompoundsFinder.java index 6994ba57ac88..c2f219433d40 100644 --- a/languagetool-dev/src/main/java/org/languagetool/dev/MissingGermanCompoundsFinder.java +++ b/languagetool-dev/src/main/java/org/languagetool/dev/MissingGermanCompoundsFinder.java @@ -20,7 +20,7 @@ import de.danielnaber.jwordsplitter.GermanWordSplitter; import org.languagetool.JLanguageTool; -import org.languagetool.language.GermanyGerman; +import org.languagetool.language.de.GermanyGerman; import org.languagetool.rules.de.GermanSpellerRule; import org.languagetool.tools.StringTools; diff --git a/languagetool-dev/src/main/java/org/languagetool/dev/MissingGermanWords.java b/languagetool-dev/src/main/java/org/languagetool/dev/MissingGermanWords.java index e083d90c3a8e..7baf20edb6d9 100644 --- a/languagetool-dev/src/main/java/org/languagetool/dev/MissingGermanWords.java +++ b/languagetool-dev/src/main/java/org/languagetool/dev/MissingGermanWords.java @@ -1,8 +1,8 @@ package org.languagetool.dev; import org.languagetool.JLanguageTool; -import org.languagetool.language.AmericanEnglish; -import org.languagetool.language.GermanyGerman; +import org.languagetool.language.en.AmericanEnglish; +import org.languagetool.language.de.GermanyGerman; import org.languagetool.rules.de.GermanSpellerRule; import org.languagetool.rules.en.MorfologikAmericanSpellerRule; import org.languagetool.tagging.de.GermanTagger; diff --git a/languagetool-dev/src/main/java/org/languagetool/dev/RuleOverview.java b/languagetool-dev/src/main/java/org/languagetool/dev/RuleOverview.java index 684f42a38783..d71b37a8dbd5 100644 --- a/languagetool-dev/src/main/java/org/languagetool/dev/RuleOverview.java +++ b/languagetool-dev/src/main/java/org/languagetool/dev/RuleOverview.java @@ -21,7 +21,7 @@ import org.apache.commons.lang3.StringUtils; import org.languagetool.*; import org.languagetool.broker.ResourceDataBroker; -import org.languagetool.language.AmericanEnglish; +import org.languagetool.language.en.AmericanEnglish; import org.languagetool.language.Contributor; import org.languagetool.rules.ConfusionSetLoader; import org.languagetool.rules.Rule; diff --git a/languagetool-dev/src/main/java/org/languagetool/dev/archive/GermanTaggerEnhancer.java b/languagetool-dev/src/main/java/org/languagetool/dev/archive/GermanTaggerEnhancer.java index 707642941d21..f658bb3fd523 100644 --- a/languagetool-dev/src/main/java/org/languagetool/dev/archive/GermanTaggerEnhancer.java +++ b/languagetool-dev/src/main/java/org/languagetool/dev/archive/GermanTaggerEnhancer.java @@ -24,7 +24,7 @@ import org.languagetool.AnalyzedTokenReadings; import org.languagetool.JLanguageTool; -import org.languagetool.language.GermanyGerman; +import org.languagetool.language.de.GermanyGerman; import org.languagetool.tagging.Tagger; import org.languagetool.tools.StringTools; diff --git a/languagetool-dev/src/main/java/org/languagetool/dev/archive/SimpleRuleCounter.java b/languagetool-dev/src/main/java/org/languagetool/dev/archive/SimpleRuleCounter.java index 0e59d1190e32..feb54969f80f 100644 --- a/languagetool-dev/src/main/java/org/languagetool/dev/archive/SimpleRuleCounter.java +++ b/languagetool-dev/src/main/java/org/languagetool/dev/archive/SimpleRuleCounter.java @@ -21,7 +21,7 @@ import org.languagetool.JLanguageTool; import org.languagetool.Language; import org.languagetool.Languages; -//import org.languagetool.language.English; +//import org.languagetool.language.en.English; import org.languagetool.rules.Rule; import org.languagetool.rules.patterns.PatternRule; import org.languagetool.rules.patterns.PatternToken; diff --git a/languagetool-dev/src/main/java/org/languagetool/dev/bigdata/ConfusionRuleEvaluator.java b/languagetool-dev/src/main/java/org/languagetool/dev/bigdata/ConfusionRuleEvaluator.java index aa8842814276..5a18d237c26f 100644 --- a/languagetool-dev/src/main/java/org/languagetool/dev/bigdata/ConfusionRuleEvaluator.java +++ b/languagetool-dev/src/main/java/org/languagetool/dev/bigdata/ConfusionRuleEvaluator.java @@ -24,7 +24,7 @@ import org.languagetool.chunking.Chunker; import org.languagetool.dev.dumpcheck.*; import org.languagetool.dev.eval.FMeasure; -import org.languagetool.language.English; +import org.languagetool.language.en.English; import org.languagetool.languagemodel.LanguageModel; import org.languagetool.languagemodel.LuceneLanguageModel; import org.languagetool.rules.*; diff --git a/languagetool-dev/src/main/java/org/languagetool/dev/bigdata/GermanReflexiveVerbGuesser.java b/languagetool-dev/src/main/java/org/languagetool/dev/bigdata/GermanReflexiveVerbGuesser.java index 5856fd8da86d..459e3f4293cf 100644 --- a/languagetool-dev/src/main/java/org/languagetool/dev/bigdata/GermanReflexiveVerbGuesser.java +++ b/languagetool-dev/src/main/java/org/languagetool/dev/bigdata/GermanReflexiveVerbGuesser.java @@ -19,7 +19,7 @@ package org.languagetool.dev.bigdata; import org.languagetool.AnalyzedToken; -import org.languagetool.language.GermanyGerman; +import org.languagetool.language.de.GermanyGerman; import org.languagetool.languagemodel.LuceneLanguageModel; import org.languagetool.synthesis.Synthesizer; diff --git a/languagetool-dev/src/main/java/org/languagetool/dev/bigdata/NGramUrlGenerator.java b/languagetool-dev/src/main/java/org/languagetool/dev/bigdata/NGramUrlGenerator.java index bd4395fa1ca2..22f4fea4b028 100644 --- a/languagetool-dev/src/main/java/org/languagetool/dev/bigdata/NGramUrlGenerator.java +++ b/languagetool-dev/src/main/java/org/languagetool/dev/bigdata/NGramUrlGenerator.java @@ -19,7 +19,7 @@ package org.languagetool.dev.bigdata; import org.languagetool.JLanguageTool; -import org.languagetool.language.AmericanEnglish; +import org.languagetool.language.en.AmericanEnglish; import org.languagetool.rules.ConfusionPair; import org.languagetool.rules.ConfusionSetLoader; diff --git a/languagetool-dev/src/main/java/org/languagetool/dev/bigdata/NeededNGramCounter.java b/languagetool-dev/src/main/java/org/languagetool/dev/bigdata/NeededNGramCounter.java index d5caea350778..1cad20c0e42d 100644 --- a/languagetool-dev/src/main/java/org/languagetool/dev/bigdata/NeededNGramCounter.java +++ b/languagetool-dev/src/main/java/org/languagetool/dev/bigdata/NeededNGramCounter.java @@ -24,7 +24,7 @@ import org.languagetool.JLanguageTool; import org.languagetool.Language; import org.languagetool.Languages; -import org.languagetool.language.AmericanEnglish; +import org.languagetool.language.en.AmericanEnglish; import org.languagetool.rules.ConfusionSetLoader; import java.io.File; diff --git a/languagetool-dev/src/main/java/org/languagetool/dev/eval/CheckBNC.java b/languagetool-dev/src/main/java/org/languagetool/dev/eval/CheckBNC.java index c6099110ab46..e80dea2c6867 100644 --- a/languagetool-dev/src/main/java/org/languagetool/dev/eval/CheckBNC.java +++ b/languagetool-dev/src/main/java/org/languagetool/dev/eval/CheckBNC.java @@ -26,7 +26,7 @@ import org.languagetool.JLanguageTool; import org.languagetool.commandline.CommandLineTools; -import org.languagetool.language.English; +import org.languagetool.language.en.English; import org.languagetool.tokenizers.Tokenizer; import org.languagetool.tools.StringTools; diff --git a/languagetool-dev/src/main/java/org/languagetool/dev/eval/LanguageToolEvaluator.java b/languagetool-dev/src/main/java/org/languagetool/dev/eval/LanguageToolEvaluator.java index ef6077a3a3d6..ba12768150c7 100644 --- a/languagetool-dev/src/main/java/org/languagetool/dev/eval/LanguageToolEvaluator.java +++ b/languagetool-dev/src/main/java/org/languagetool/dev/eval/LanguageToolEvaluator.java @@ -19,8 +19,8 @@ package org.languagetool.dev.eval; import org.languagetool.JLanguageTool; -import org.languagetool.language.BritishEnglish; -import org.languagetool.language.English; +import org.languagetool.language.en.BritishEnglish; +import org.languagetool.language.en.English; import org.languagetool.languagemodel.LanguageModel; import org.languagetool.languagemodel.LuceneLanguageModel; import org.languagetool.markup.AnnotatedText; diff --git a/languagetool-dev/src/main/java/org/languagetool/dev/eval/RealWordFalseAlarmEvaluator.java b/languagetool-dev/src/main/java/org/languagetool/dev/eval/RealWordFalseAlarmEvaluator.java index 647856f29bde..ea4c7dec82c9 100644 --- a/languagetool-dev/src/main/java/org/languagetool/dev/eval/RealWordFalseAlarmEvaluator.java +++ b/languagetool-dev/src/main/java/org/languagetool/dev/eval/RealWordFalseAlarmEvaluator.java @@ -21,9 +21,8 @@ import org.apache.commons.io.IOUtils; import org.languagetool.JLanguageTool; import org.languagetool.Language; -import org.languagetool.language.AmericanEnglish; -import org.languagetool.language.BritishEnglish; -import org.languagetool.language.English; +import org.languagetool.language.en.AmericanEnglish; +import org.languagetool.language.en.BritishEnglish; import org.languagetool.languagemodel.LanguageModel; import org.languagetool.languagemodel.LuceneLanguageModel; import org.languagetool.rules.*; diff --git a/languagetool-dev/src/main/java/org/languagetool/dev/eval/SimpleCorpusEvaluator.java b/languagetool-dev/src/main/java/org/languagetool/dev/eval/SimpleCorpusEvaluator.java index 532410809d00..07c9c5ddc675 100644 --- a/languagetool-dev/src/main/java/org/languagetool/dev/eval/SimpleCorpusEvaluator.java +++ b/languagetool-dev/src/main/java/org/languagetool/dev/eval/SimpleCorpusEvaluator.java @@ -24,7 +24,7 @@ import org.languagetool.dev.errorcorpus.ErrorCorpus; import org.languagetool.dev.errorcorpus.ErrorSentence; import org.languagetool.dev.errorcorpus.SimpleCorpus; -import org.languagetool.language.English; +import org.languagetool.language.en.English; import org.languagetool.languagemodel.LanguageModel; import org.languagetool.languagemodel.LuceneLanguageModel; import org.languagetool.languagemodel.LuceneSingleIndexLanguageModel; diff --git a/languagetool-dev/src/test/java/org/languagetool/dev/bigdata/CommonCrawlToNgramTest.java b/languagetool-dev/src/test/java/org/languagetool/dev/bigdata/CommonCrawlToNgramTest.java index 6aef47ad0aee..ed39be16aa92 100644 --- a/languagetool-dev/src/test/java/org/languagetool/dev/bigdata/CommonCrawlToNgramTest.java +++ b/languagetool-dev/src/test/java/org/languagetool/dev/bigdata/CommonCrawlToNgramTest.java @@ -24,7 +24,7 @@ import org.apache.commons.io.FileUtils; import org.junit.Ignore; import org.junit.Test; -import org.languagetool.language.GermanyGerman; +import org.languagetool.language.de.GermanyGerman; public class CommonCrawlToNgramTest { diff --git a/languagetool-dev/src/test/java/org/languagetool/dev/bigdata/ContextBuilderTest.java b/languagetool-dev/src/test/java/org/languagetool/dev/bigdata/ContextBuilderTest.java index 70a7cc12432c..1a4fd8877256 100644 --- a/languagetool-dev/src/test/java/org/languagetool/dev/bigdata/ContextBuilderTest.java +++ b/languagetool-dev/src/test/java/org/languagetool/dev/bigdata/ContextBuilderTest.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.languagetool.AnalyzedSentence; import org.languagetool.JLanguageTool; -import org.languagetool.language.English; +import org.languagetool.language.en.English; import java.io.IOException; import java.util.List; diff --git a/languagetool-language-modules/ar/pom.xml b/languagetool-language-modules/ar/pom.xml index 7e8d3a2d35e2..f5ae1f822d19 100644 --- a/languagetool-language-modules/ar/pom.xml +++ b/languagetool-language-modules/ar/pom.xml @@ -93,6 +93,17 @@ org.apache.maven.plugins maven-surefire-plugin + + org.apache.maven.plugins + maven-jar-plugin + + + + org.languagetool.language.ar + + + + diff --git a/languagetool-language-modules/ar/src/main/java/org/languagetool/language/Arabic.java b/languagetool-language-modules/ar/src/main/java/org/languagetool/language/ar/Arabic.java similarity index 96% rename from languagetool-language-modules/ar/src/main/java/org/languagetool/language/Arabic.java rename to languagetool-language-modules/ar/src/main/java/org/languagetool/language/ar/Arabic.java index d7587d2c305d..6db43b4a3fd7 100644 --- a/languagetool-language-modules/ar/src/main/java/org/languagetool/language/Arabic.java +++ b/languagetool-language-modules/ar/src/main/java/org/languagetool/language/ar/Arabic.java @@ -16,13 +16,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language; +package org.languagetool.language.ar; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.languagetool.Language; import org.languagetool.LanguageMaintainedState; import org.languagetool.UserConfig; +import org.languagetool.language.Contributor; import org.languagetool.languagemodel.LanguageModel; import org.languagetool.rules.*; import org.languagetool.rules.ar.*; @@ -96,8 +97,8 @@ public Synthesizer createDefaultSynthesizer() { @Override public Contributor[] getMaintainers() { return new Contributor[]{ - new Contributor("Taha Zerrouki"), - new Contributor("Sohaib Afifi") + new Contributor("Taha Zerrouki", null), + new Contributor("Sohaib Afifi", null) }; } diff --git a/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicDarjaRule.java b/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicDarjaRule.java index cd6a53431dd7..afa77dac2313 100644 --- a/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicDarjaRule.java +++ b/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicDarjaRule.java @@ -19,7 +19,7 @@ */ package org.languagetool.rules.ar; -import org.languagetool.language.Arabic; +import org.languagetool.language.ar.Arabic; import org.languagetool.rules.AbstractSimpleReplaceRule2; import org.languagetool.rules.Categories; import org.languagetool.rules.Example; diff --git a/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicDiacriticsRule.java b/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicDiacriticsRule.java index ab050f54ba07..0ae82c131d20 100644 --- a/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicDiacriticsRule.java +++ b/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicDiacriticsRule.java @@ -19,7 +19,7 @@ */ package org.languagetool.rules.ar; -import org.languagetool.language.Arabic; +import org.languagetool.language.ar.Arabic; import org.languagetool.rules.AbstractSimpleReplaceRule2; import org.languagetool.rules.Categories; import org.languagetool.rules.Example; diff --git a/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicHomophonesRule.java b/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicHomophonesRule.java index a3dc61ecbf3b..9fc0bcf3f95c 100644 --- a/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicHomophonesRule.java +++ b/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicHomophonesRule.java @@ -19,7 +19,7 @@ */ package org.languagetool.rules.ar; -import org.languagetool.language.Arabic; +import org.languagetool.language.ar.Arabic; import org.languagetool.rules.AbstractSimpleReplaceRule2; import org.languagetool.rules.Categories; import org.languagetool.rules.Example; diff --git a/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicHunspellSpellerRule.java b/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicHunspellSpellerRule.java index fa1aee6bfebe..a4e2ef908981 100644 --- a/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicHunspellSpellerRule.java +++ b/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicHunspellSpellerRule.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; import org.languagetool.UserConfig; -import org.languagetool.language.Arabic; +import org.languagetool.language.ar.Arabic; import org.languagetool.rules.spelling.hunspell.HunspellRule; import org.languagetool.tools.ArabicStringTools; diff --git a/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicInflectedOneWordReplaceRule.java b/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicInflectedOneWordReplaceRule.java index 3c0f810135d3..039c366979f0 100644 --- a/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicInflectedOneWordReplaceRule.java +++ b/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicInflectedOneWordReplaceRule.java @@ -22,7 +22,7 @@ import org.languagetool.AnalyzedSentence; import org.languagetool.AnalyzedToken; import org.languagetool.AnalyzedTokenReadings; -import org.languagetool.language.Arabic; +import org.languagetool.language.ar.Arabic; import org.languagetool.rules.*; import org.languagetool.synthesis.ar.ArabicSynthesizer; import org.languagetool.tagging.ar.ArabicTagger; diff --git a/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicRedundancyRule.java b/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicRedundancyRule.java index 12bbb4674c3f..d33f280fb140 100644 --- a/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicRedundancyRule.java +++ b/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicRedundancyRule.java @@ -19,7 +19,7 @@ */ package org.languagetool.rules.ar; -import org.languagetool.language.Arabic; +import org.languagetool.language.ar.Arabic; import org.languagetool.rules.AbstractSimpleReplaceRule2; import org.languagetool.rules.Categories; import org.languagetool.rules.Example; diff --git a/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicSimpleReplaceRule.java b/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicSimpleReplaceRule.java index f1c268669d9e..a5000c729e1c 100644 --- a/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicSimpleReplaceRule.java +++ b/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicSimpleReplaceRule.java @@ -19,7 +19,7 @@ */ package org.languagetool.rules.ar; -import org.languagetool.language.Arabic; +import org.languagetool.language.ar.Arabic; import org.languagetool.rules.AbstractSimpleReplaceRule2; import org.languagetool.rules.Categories; import org.languagetool.rules.Example; diff --git a/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicTransVerbRule.java b/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicTransVerbRule.java index a72595956922..16645993d00c 100644 --- a/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicTransVerbRule.java +++ b/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicTransVerbRule.java @@ -22,7 +22,7 @@ import org.languagetool.AnalyzedSentence; import org.languagetool.AnalyzedToken; import org.languagetool.AnalyzedTokenReadings; -import org.languagetool.language.Arabic; +import org.languagetool.language.ar.Arabic; import org.languagetool.rules.*; import org.languagetool.synthesis.ar.ArabicSynthesizer; import org.languagetool.tagging.ar.ArabicTagManager; diff --git a/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicWordRepeatRule.java b/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicWordRepeatRule.java index e94fac1d1ec5..c5c458d52cec 100644 --- a/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicWordRepeatRule.java +++ b/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicWordRepeatRule.java @@ -19,7 +19,7 @@ package org.languagetool.rules.ar; import org.languagetool.AnalyzedTokenReadings; -import org.languagetool.language.Arabic; +import org.languagetool.language.ar.Arabic; import org.languagetool.rules.Example; import org.languagetool.rules.WordRepeatRule; diff --git a/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicWordinessRule.java b/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicWordinessRule.java index 9f45ecb4659d..dc1548ac5500 100644 --- a/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicWordinessRule.java +++ b/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/ArabicWordinessRule.java @@ -19,7 +19,7 @@ */ package org.languagetool.rules.ar; -import org.languagetool.language.Arabic; +import org.languagetool.language.ar.Arabic; import org.languagetool.rules.AbstractSimpleReplaceRule2; import org.languagetool.rules.Categories; import org.languagetool.rules.Example; diff --git a/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/filters/ArabicAdvancedSynthesizerFilter.java b/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/filters/ArabicAdvancedSynthesizerFilter.java index 6cd9e9713a27..06f30cc5c0d0 100644 --- a/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/filters/ArabicAdvancedSynthesizerFilter.java +++ b/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/filters/ArabicAdvancedSynthesizerFilter.java @@ -20,7 +20,7 @@ package org.languagetool.rules.ar.filters; -import org.languagetool.language.Arabic; +import org.languagetool.language.ar.Arabic; import org.languagetool.rules.AbstractAdvancedSynthesizerFilter; import org.languagetool.synthesis.Synthesizer; import org.languagetool.synthesis.ar.ArabicSynthesizer; diff --git a/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/filters/ArabicMasdarToVerbFilter.java b/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/filters/ArabicMasdarToVerbFilter.java index 2dd73530552b..fe354605b825 100644 --- a/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/filters/ArabicMasdarToVerbFilter.java +++ b/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/filters/ArabicMasdarToVerbFilter.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.Nullable; import org.languagetool.AnalyzedToken; import org.languagetool.AnalyzedTokenReadings; -import org.languagetool.language.Arabic; +import org.languagetool.language.ar.Arabic; import org.languagetool.rules.RuleMatch; import org.languagetool.rules.SimpleReplaceDataLoader; import org.languagetool.rules.patterns.RuleFilter; diff --git a/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/filters/ArabicNumberPhraseFilter.java b/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/filters/ArabicNumberPhraseFilter.java index 69754747a8d6..efc28a155a71 100644 --- a/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/filters/ArabicNumberPhraseFilter.java +++ b/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/filters/ArabicNumberPhraseFilter.java @@ -21,12 +21,11 @@ import org.jetbrains.annotations.Nullable; import org.languagetool.AnalyzedToken; import org.languagetool.AnalyzedTokenReadings; -import org.languagetool.language.Arabic; +import org.languagetool.language.ar.Arabic; import org.languagetool.rules.RuleMatch; import org.languagetool.rules.patterns.RuleFilter; import org.languagetool.synthesis.ar.ArabicSynthesizer; import org.languagetool.tagging.ar.ArabicTagManager; -import org.languagetool.tagging.ar.ArabicTagger; import org.languagetool.tools.ArabicNumbersWords; import java.util.ArrayList; diff --git a/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/filters/ArabicVerbToMafoulMutlaqFilter.java b/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/filters/ArabicVerbToMafoulMutlaqFilter.java index e3cfcbbc82b4..cfbde580b908 100644 --- a/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/filters/ArabicVerbToMafoulMutlaqFilter.java +++ b/languagetool-language-modules/ar/src/main/java/org/languagetool/rules/ar/filters/ArabicVerbToMafoulMutlaqFilter.java @@ -20,7 +20,7 @@ import org.jetbrains.annotations.Nullable; import org.languagetool.AnalyzedTokenReadings; -import org.languagetool.language.Arabic; +import org.languagetool.language.ar.Arabic; import org.languagetool.rules.RuleMatch; import org.languagetool.rules.SimpleReplaceDataLoader; import org.languagetool.rules.patterns.RuleFilter; diff --git a/languagetool-language-modules/ar/src/main/java/org/languagetool/tagging/ar/ArabicHybridDisambiguator.java b/languagetool-language-modules/ar/src/main/java/org/languagetool/tagging/ar/ArabicHybridDisambiguator.java index c4c7e8210d3a..55a2a22bdba3 100644 --- a/languagetool-language-modules/ar/src/main/java/org/languagetool/tagging/ar/ArabicHybridDisambiguator.java +++ b/languagetool-language-modules/ar/src/main/java/org/languagetool/tagging/ar/ArabicHybridDisambiguator.java @@ -19,7 +19,7 @@ package org.languagetool.tagging.ar; import org.languagetool.AnalyzedSentence; -import org.languagetool.language.Arabic; +import org.languagetool.language.ar.Arabic; import org.languagetool.tagging.disambiguation.AbstractDisambiguator; import org.languagetool.tagging.disambiguation.Disambiguator; import org.languagetool.tagging.disambiguation.MultiWordChunker; diff --git a/languagetool-language-modules/ar/src/main/resources/META-INF/org/languagetool/language-module.properties b/languagetool-language-modules/ar/src/main/resources/META-INF/org/languagetool/language-module.properties index 5d095e68e6d9..dd921d1a82d3 100644 --- a/languagetool-language-modules/ar/src/main/resources/META-INF/org/languagetool/language-module.properties +++ b/languagetool-language-modules/ar/src/main/resources/META-INF/org/languagetool/language-module.properties @@ -1 +1 @@ -languageClasses=org.languagetool.language.Arabic +languageClasses=org.languagetool.language.ar.Arabic diff --git a/languagetool-language-modules/ar/src/test/java/org/languagetool/rules/ar/ArabicDiacriticsCheckRuleTest.java b/languagetool-language-modules/ar/src/test/java/org/languagetool/rules/ar/ArabicDiacriticsCheckRuleTest.java index 7a4640b486fc..8327edd8da89 100644 --- a/languagetool-language-modules/ar/src/test/java/org/languagetool/rules/ar/ArabicDiacriticsCheckRuleTest.java +++ b/languagetool-language-modules/ar/src/test/java/org/languagetool/rules/ar/ArabicDiacriticsCheckRuleTest.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Arabic; +import org.languagetool.language.ar.Arabic; import java.io.IOException; diff --git a/languagetool-language-modules/ar/src/test/java/org/languagetool/rules/ar/ArabicHomophonesCheckRuleTest.java b/languagetool-language-modules/ar/src/test/java/org/languagetool/rules/ar/ArabicHomophonesCheckRuleTest.java index 344267c34050..6c08227af701 100644 --- a/languagetool-language-modules/ar/src/test/java/org/languagetool/rules/ar/ArabicHomophonesCheckRuleTest.java +++ b/languagetool-language-modules/ar/src/test/java/org/languagetool/rules/ar/ArabicHomophonesCheckRuleTest.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Arabic; +import org.languagetool.language.ar.Arabic; import java.io.IOException; diff --git a/languagetool-language-modules/ar/src/test/java/org/languagetool/rules/ar/ArabicSRXSentenceTokenizerTest.java b/languagetool-language-modules/ar/src/test/java/org/languagetool/rules/ar/ArabicSRXSentenceTokenizerTest.java index f366e69b526b..3cfeee143e4c 100644 --- a/languagetool-language-modules/ar/src/test/java/org/languagetool/rules/ar/ArabicSRXSentenceTokenizerTest.java +++ b/languagetool-language-modules/ar/src/test/java/org/languagetool/rules/ar/ArabicSRXSentenceTokenizerTest.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.languagetool.TestTools; -import org.languagetool.language.Arabic; +import org.languagetool.language.ar.Arabic; import org.languagetool.tokenizers.SRXSentenceTokenizer; public class ArabicSRXSentenceTokenizerTest { diff --git a/languagetool-language-modules/ar/src/test/java/org/languagetool/rules/ar/ArabicTaggerTest.java b/languagetool-language-modules/ar/src/test/java/org/languagetool/rules/ar/ArabicTaggerTest.java index 653a1e499d59..693bfcce6a5d 100644 --- a/languagetool-language-modules/ar/src/test/java/org/languagetool/rules/ar/ArabicTaggerTest.java +++ b/languagetool-language-modules/ar/src/test/java/org/languagetool/rules/ar/ArabicTaggerTest.java @@ -22,7 +22,7 @@ import org.junit.Before; import org.junit.Test; import org.languagetool.TestTools; -import org.languagetool.language.Arabic; +import org.languagetool.language.ar.Arabic; import org.languagetool.tagging.ar.ArabicTagger; import org.languagetool.tokenizers.WordTokenizer; diff --git a/languagetool-language-modules/ast/pom.xml b/languagetool-language-modules/ast/pom.xml index 3aed85bf4033..ed1c281bdd7e 100644 --- a/languagetool-language-modules/ast/pom.xml +++ b/languagetool-language-modules/ast/pom.xml @@ -67,6 +67,17 @@ org.apache.maven.plugins maven-surefire-plugin + + org.apache.maven.plugins + maven-jar-plugin + + + + org.languagetool.language.ast + + + + diff --git a/languagetool-language-modules/ast/src/main/java/org/languagetool/language/Asturian.java b/languagetool-language-modules/ast/src/main/java/org/languagetool/language/ast/Asturian.java similarity index 96% rename from languagetool-language-modules/ast/src/main/java/org/languagetool/language/Asturian.java rename to languagetool-language-modules/ast/src/main/java/org/languagetool/language/ast/Asturian.java index 9c0474e82932..a947d76254fd 100644 --- a/languagetool-language-modules/ast/src/main/java/org/languagetool/language/Asturian.java +++ b/languagetool-language-modules/ast/src/main/java/org/languagetool/language/ast/Asturian.java @@ -16,12 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language; +package org.languagetool.language.ast; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.languagetool.Language; import org.languagetool.UserConfig; +import org.languagetool.language.Contributor; import org.languagetool.language.rules.ast.MorfologikAsturianSpellerRule; import org.languagetool.rules.*; import org.languagetool.rules.spelling.SpellingCheckRule; @@ -56,7 +57,7 @@ public String[] getCountries() { @Override public Contributor[] getMaintainers() { - return new Contributor[] { new Contributor("Xesús González Rato") }; + return new Contributor[] { new Contributor("Xesús González Rato", null) }; } @Override diff --git a/languagetool-language-modules/ast/src/main/resources/META-INF/org/languagetool/language-module.properties b/languagetool-language-modules/ast/src/main/resources/META-INF/org/languagetool/language-module.properties index 2d824bc98d42..c42dc216181c 100644 --- a/languagetool-language-modules/ast/src/main/resources/META-INF/org/languagetool/language-module.properties +++ b/languagetool-language-modules/ast/src/main/resources/META-INF/org/languagetool/language-module.properties @@ -1 +1 @@ -languageClasses=org.languagetool.language.Asturian +languageClasses=org.languagetool.language.ast.Asturian diff --git a/languagetool-language-modules/ast/src/test/java/org/languagetool/AsturianConcurrencyTest.java b/languagetool-language-modules/ast/src/test/java/org/languagetool/AsturianConcurrencyTest.java index 8473d18ee708..702766521c93 100644 --- a/languagetool-language-modules/ast/src/test/java/org/languagetool/AsturianConcurrencyTest.java +++ b/languagetool-language-modules/ast/src/test/java/org/languagetool/AsturianConcurrencyTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.languagetool.language.AbstractLanguageConcurrencyTest; -import org.languagetool.language.Asturian; +import org.languagetool.language.ast.Asturian; public class AsturianConcurrencyTest extends AbstractLanguageConcurrencyTest { @Override diff --git a/languagetool-language-modules/ast/src/test/java/org/languagetool/language/rules/ast/MorfologikAsturianSpellerRuleTest.java b/languagetool-language-modules/ast/src/test/java/org/languagetool/language/rules/ast/MorfologikAsturianSpellerRuleTest.java index 9e4f0d66905a..cf7bc33a2b4b 100644 --- a/languagetool-language-modules/ast/src/test/java/org/languagetool/language/rules/ast/MorfologikAsturianSpellerRuleTest.java +++ b/languagetool-language-modules/ast/src/test/java/org/languagetool/language/rules/ast/MorfologikAsturianSpellerRuleTest.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Asturian; +import org.languagetool.language.ast.Asturian; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/ast/src/test/java/org/languagetool/rules/ast/AsturianTest.java b/languagetool-language-modules/ast/src/test/java/org/languagetool/rules/ast/AsturianTest.java index d07c0e879d4a..6256fe90e98c 100644 --- a/languagetool-language-modules/ast/src/test/java/org/languagetool/rules/ast/AsturianTest.java +++ b/languagetool-language-modules/ast/src/test/java/org/languagetool/rules/ast/AsturianTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.languagetool.LanguageSpecificTest; -import org.languagetool.language.Asturian; +import org.languagetool.language.ast.Asturian; import java.io.IOException; import java.util.Arrays; diff --git a/languagetool-language-modules/ast/src/test/java/org/languagetool/tokenizers/ast/AsturianSRXSentenceTokenizerTest.java b/languagetool-language-modules/ast/src/test/java/org/languagetool/tokenizers/ast/AsturianSRXSentenceTokenizerTest.java index 6ca1a211023f..588dc90fc896 100644 --- a/languagetool-language-modules/ast/src/test/java/org/languagetool/tokenizers/ast/AsturianSRXSentenceTokenizerTest.java +++ b/languagetool-language-modules/ast/src/test/java/org/languagetool/tokenizers/ast/AsturianSRXSentenceTokenizerTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.languagetool.TestTools; -import org.languagetool.language.Asturian; +import org.languagetool.language.ast.Asturian; import org.languagetool.tokenizers.SRXSentenceTokenizer; public class AsturianSRXSentenceTokenizerTest { diff --git a/languagetool-language-modules/be/pom.xml b/languagetool-language-modules/be/pom.xml index fcd7fb3e97ee..bf504a3ad291 100644 --- a/languagetool-language-modules/be/pom.xml +++ b/languagetool-language-modules/be/pom.xml @@ -72,6 +72,17 @@ org.apache.maven.plugins maven-surefire-plugin + + org.apache.maven.plugins + maven-jar-plugin + + + + org.languagetool.language.be + + + + diff --git a/languagetool-language-modules/be/src/main/java/org/languagetool/language/Belarusian.java b/languagetool-language-modules/be/src/main/java/org/languagetool/language/be/Belarusian.java similarity index 97% rename from languagetool-language-modules/be/src/main/java/org/languagetool/language/Belarusian.java rename to languagetool-language-modules/be/src/main/java/org/languagetool/language/be/Belarusian.java index f23346c8bec5..fd549cff8e2b 100644 --- a/languagetool-language-modules/be/src/main/java/org/languagetool/language/Belarusian.java +++ b/languagetool-language-modules/be/src/main/java/org/languagetool/language/be/Belarusian.java @@ -16,11 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language; +package org.languagetool.language.be; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.languagetool.*; +import org.languagetool.language.Contributor; import org.languagetool.languagemodel.LanguageModel; import org.languagetool.Language; import org.languagetool.UserConfig; @@ -88,7 +89,7 @@ public Tokenizer createDefaultWordTokenizer() { @Override public Contributor[] getMaintainers() { - return new Contributor[] { new Contributor("Alex Buloichik") }; + return new Contributor[] { new Contributor("Alex Buloichik", null) }; } /** @since 5.1 */ diff --git a/languagetool-language-modules/be/src/main/java/org/languagetool/rules/be/SimpleReplaceRule.java b/languagetool-language-modules/be/src/main/java/org/languagetool/rules/be/SimpleReplaceRule.java index ca74b4b64191..6ee96dd2ba20 100644 --- a/languagetool-language-modules/be/src/main/java/org/languagetool/rules/be/SimpleReplaceRule.java +++ b/languagetool-language-modules/be/src/main/java/org/languagetool/rules/be/SimpleReplaceRule.java @@ -27,7 +27,7 @@ import java.util.Locale; import java.util.ResourceBundle; -import org.languagetool.language.Belarusian; +import org.languagetool.language.be.Belarusian; import org.languagetool.rules.ITSIssueType; import org.languagetool.rules.Category; import org.languagetool.rules.CategoryId; diff --git a/languagetool-language-modules/be/src/main/resources/META-INF/org/languagetool/language-module.properties b/languagetool-language-modules/be/src/main/resources/META-INF/org/languagetool/language-module.properties index b95b974b63d0..10dd4a27ded7 100644 --- a/languagetool-language-modules/be/src/main/resources/META-INF/org/languagetool/language-module.properties +++ b/languagetool-language-modules/be/src/main/resources/META-INF/org/languagetool/language-module.properties @@ -1 +1 @@ -languageClasses=org.languagetool.language.Belarusian +languageClasses=org.languagetool.language.be.Belarusian diff --git a/languagetool-language-modules/be/src/test/java/org/languagetool/BelarusianConcurrencyTest.java b/languagetool-language-modules/be/src/test/java/org/languagetool/BelarusianConcurrencyTest.java index c62371c630fe..e14ba1690deb 100644 --- a/languagetool-language-modules/be/src/test/java/org/languagetool/BelarusianConcurrencyTest.java +++ b/languagetool-language-modules/be/src/test/java/org/languagetool/BelarusianConcurrencyTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.languagetool.language.AbstractLanguageConcurrencyTest; -import org.languagetool.language.Belarusian; +import org.languagetool.language.be.Belarusian; public class BelarusianConcurrencyTest extends AbstractLanguageConcurrencyTest { diff --git a/languagetool-language-modules/be/src/test/java/org/languagetool/rules/be/BelarusianMorfologikRuleTest.java b/languagetool-language-modules/be/src/test/java/org/languagetool/rules/be/BelarusianMorfologikRuleTest.java index a4c3ab44fe02..c5f73dbd8532 100644 --- a/languagetool-language-modules/be/src/test/java/org/languagetool/rules/be/BelarusianMorfologikRuleTest.java +++ b/languagetool-language-modules/be/src/test/java/org/languagetool/rules/be/BelarusianMorfologikRuleTest.java @@ -27,7 +27,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Belarusian; +import org.languagetool.language.be.Belarusian; import org.languagetool.rules.RuleMatch; public class BelarusianMorfologikRuleTest { diff --git a/languagetool-language-modules/be/src/test/java/org/languagetool/rules/be/BelarusianTest.java b/languagetool-language-modules/be/src/test/java/org/languagetool/rules/be/BelarusianTest.java index da4696b7f1d9..0d44de2ee2e3 100644 --- a/languagetool-language-modules/be/src/test/java/org/languagetool/rules/be/BelarusianTest.java +++ b/languagetool-language-modules/be/src/test/java/org/languagetool/rules/be/BelarusianTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.languagetool.LanguageSpecificTest; -import org.languagetool.language.Belarusian; +import org.languagetool.language.be.Belarusian; import java.io.IOException; import java.util.Arrays; diff --git a/languagetool-language-modules/be/src/test/java/org/languagetool/rules/be/SimpleReplaceRuleTest.java b/languagetool-language-modules/be/src/test/java/org/languagetool/rules/be/SimpleReplaceRuleTest.java index 9ec4d3c5010b..fdd1f8c0ce22 100644 --- a/languagetool-language-modules/be/src/test/java/org/languagetool/rules/be/SimpleReplaceRuleTest.java +++ b/languagetool-language-modules/be/src/test/java/org/languagetool/rules/be/SimpleReplaceRuleTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Belarusian; +import org.languagetool.language.be.Belarusian; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/br/pom.xml b/languagetool-language-modules/br/pom.xml index 71e4a66554e7..f4e88869b6e7 100644 --- a/languagetool-language-modules/br/pom.xml +++ b/languagetool-language-modules/br/pom.xml @@ -73,6 +73,17 @@ org.apache.maven.plugins maven-surefire-plugin + + org.apache.maven.plugins + maven-jar-plugin + + + + org.languagetool.language.be + + + + diff --git a/languagetool-language-modules/br/src/main/java/org/languagetool/language/Breton.java b/languagetool-language-modules/br/src/main/java/org/languagetool/language/br/Breton.java similarity index 95% rename from languagetool-language-modules/br/src/main/java/org/languagetool/language/Breton.java rename to languagetool-language-modules/br/src/main/java/org/languagetool/language/br/Breton.java index 1f02a5e89a96..c50831bd1a91 100644 --- a/languagetool-language-modules/br/src/main/java/org/languagetool/language/Breton.java +++ b/languagetool-language-modules/br/src/main/java/org/languagetool/language/br/Breton.java @@ -17,11 +17,13 @@ * USA */ -package org.languagetool.language; +package org.languagetool.language.br; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.languagetool.*; +import org.languagetool.language.Contributor; +import org.languagetool.language.Contributors; import org.languagetool.rules.*; import org.languagetool.rules.br.MorfologikBretonSpellerRule; import org.languagetool.rules.br.TopoReplaceRule; @@ -80,7 +82,7 @@ public Disambiguator createDefaultDisambiguator() { @Override public Contributor[] getMaintainers() { return new Contributor[] { - Contributors.DOMINIQUE_PELLE, new Contributor("Fulup Jakez") + Contributors.DOMINIQUE_PELLE, new Contributor("Fulup Jakezm", null) }; } diff --git a/languagetool-language-modules/br/src/main/java/org/languagetool/rules/br/TopoReplaceRule.java b/languagetool-language-modules/br/src/main/java/org/languagetool/rules/br/TopoReplaceRule.java index 3030656eb36d..8e2188c41cef 100644 --- a/languagetool-language-modules/br/src/main/java/org/languagetool/rules/br/TopoReplaceRule.java +++ b/languagetool-language-modules/br/src/main/java/org/languagetool/rules/br/TopoReplaceRule.java @@ -21,7 +21,7 @@ import org.languagetool.AnalyzedSentence; import org.languagetool.AnalyzedTokenReadings; import org.languagetool.JLanguageTool; -import org.languagetool.language.Breton; +import org.languagetool.language.br.Breton; import org.languagetool.rules.*; import org.languagetool.tokenizers.Tokenizer; import org.languagetool.tools.StringTools; diff --git a/languagetool-language-modules/br/src/main/resources/META-INF/org/languagetool/language-module.properties b/languagetool-language-modules/br/src/main/resources/META-INF/org/languagetool/language-module.properties index ccffcaadbdd5..fbef9cd15324 100644 --- a/languagetool-language-modules/br/src/main/resources/META-INF/org/languagetool/language-module.properties +++ b/languagetool-language-modules/br/src/main/resources/META-INF/org/languagetool/language-module.properties @@ -1 +1 @@ -languageClasses=org.languagetool.language.Breton +languageClasses=org.languagetool.language.br.Breton diff --git a/languagetool-language-modules/br/src/test/java/org/languagetool/BretonConcurrencyTest.java b/languagetool-language-modules/br/src/test/java/org/languagetool/BretonConcurrencyTest.java index 836692c16ebb..04a88895bf23 100644 --- a/languagetool-language-modules/br/src/test/java/org/languagetool/BretonConcurrencyTest.java +++ b/languagetool-language-modules/br/src/test/java/org/languagetool/BretonConcurrencyTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.languagetool.language.AbstractLanguageConcurrencyTest; -import org.languagetool.language.Breton; +import org.languagetool.language.br.Breton; public class BretonConcurrencyTest extends AbstractLanguageConcurrencyTest { @Override diff --git a/languagetool-language-modules/br/src/test/java/org/languagetool/rules/br/BretonTest.java b/languagetool-language-modules/br/src/test/java/org/languagetool/rules/br/BretonTest.java index 76483442478b..786e44e56078 100644 --- a/languagetool-language-modules/br/src/test/java/org/languagetool/rules/br/BretonTest.java +++ b/languagetool-language-modules/br/src/test/java/org/languagetool/rules/br/BretonTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.languagetool.LanguageSpecificTest; -import org.languagetool.language.Breton; +import org.languagetool.language.br.Breton; import java.io.IOException; import java.util.Arrays; diff --git a/languagetool-language-modules/br/src/test/java/org/languagetool/rules/br/MorfologikBretonSpellerRuleTest.java b/languagetool-language-modules/br/src/test/java/org/languagetool/rules/br/MorfologikBretonSpellerRuleTest.java index 10e32e50ed5f..039030d0fda4 100644 --- a/languagetool-language-modules/br/src/test/java/org/languagetool/rules/br/MorfologikBretonSpellerRuleTest.java +++ b/languagetool-language-modules/br/src/test/java/org/languagetool/rules/br/MorfologikBretonSpellerRuleTest.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Breton; +import org.languagetool.language.br.Breton; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/br/src/test/java/org/languagetool/rules/br/TopoReplaceRuleTest.java b/languagetool-language-modules/br/src/test/java/org/languagetool/rules/br/TopoReplaceRuleTest.java index eefad52c6894..e5b6bbe3212a 100644 --- a/languagetool-language-modules/br/src/test/java/org/languagetool/rules/br/TopoReplaceRuleTest.java +++ b/languagetool-language-modules/br/src/test/java/org/languagetool/rules/br/TopoReplaceRuleTest.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Breton; +import org.languagetool.language.br.Breton; import java.io.IOException; diff --git a/languagetool-language-modules/ca/pom.xml b/languagetool-language-modules/ca/pom.xml index 3d7c5ea9fd68..24b05724fd3d 100644 --- a/languagetool-language-modules/ca/pom.xml +++ b/languagetool-language-modules/ca/pom.xml @@ -77,6 +77,17 @@ org.apache.maven.plugins maven-surefire-plugin + + org.apache.maven.plugins + maven-jar-plugin + + + + org.languagetool.language.ca + + + + diff --git a/languagetool-language-modules/ca/src/main/java/org/languagetool/language/BalearicCatalan.java b/languagetool-language-modules/ca/src/main/java/org/languagetool/language/ca/BalearicCatalan.java similarity index 97% rename from languagetool-language-modules/ca/src/main/java/org/languagetool/language/BalearicCatalan.java rename to languagetool-language-modules/ca/src/main/java/org/languagetool/language/ca/BalearicCatalan.java index 390ee84613d3..9a739964c776 100644 --- a/languagetool-language-modules/ca/src/main/java/org/languagetool/language/BalearicCatalan.java +++ b/languagetool-language-modules/ca/src/main/java/org/languagetool/language/ca/BalearicCatalan.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language; +package org.languagetool.language.ca; import java.util.Arrays; import java.util.Collections; diff --git a/languagetool-language-modules/ca/src/main/java/org/languagetool/language/Catalan.java b/languagetool-language-modules/ca/src/main/java/org/languagetool/language/ca/Catalan.java similarity index 98% rename from languagetool-language-modules/ca/src/main/java/org/languagetool/language/Catalan.java rename to languagetool-language-modules/ca/src/main/java/org/languagetool/language/ca/Catalan.java index 94e1d56a0224..5a4678e58cef 100644 --- a/languagetool-language-modules/ca/src/main/java/org/languagetool/language/Catalan.java +++ b/languagetool-language-modules/ca/src/main/java/org/languagetool/language/ca/Catalan.java @@ -16,11 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language; +package org.languagetool.language.ca; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.languagetool.*; +import org.languagetool.language.Contributor; import org.languagetool.rules.*; import org.languagetool.rules.ca.*; import org.languagetool.rules.spelling.SpellingCheckRule; @@ -70,7 +71,7 @@ public Language getDefaultLanguageVariant() { @Override public Contributor[] getMaintainers() { - return new Contributor[] { new Contributor("Ricard Roca"), new Contributor("Jaume Ortolà") }; + return new Contributor[] { new Contributor("Ricard Roca", null), new Contributor("Jaume Ortolà", null) }; } @Override diff --git a/languagetool-language-modules/ca/src/main/java/org/languagetool/language/ValencianCatalan.java b/languagetool-language-modules/ca/src/main/java/org/languagetool/language/ca/ValencianCatalan.java similarity index 98% rename from languagetool-language-modules/ca/src/main/java/org/languagetool/language/ValencianCatalan.java rename to languagetool-language-modules/ca/src/main/java/org/languagetool/language/ca/ValencianCatalan.java index 6bfe25252302..0ddf51124b24 100644 --- a/languagetool-language-modules/ca/src/main/java/org/languagetool/language/ValencianCatalan.java +++ b/languagetool-language-modules/ca/src/main/java/org/languagetool/language/ca/ValencianCatalan.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language; +package org.languagetool.language.ca; import java.util.Arrays; import java.util.Collections; diff --git a/languagetool-language-modules/ca/src/main/java/org/languagetool/rules/ca/CatalanMultitokenSpeller.java b/languagetool-language-modules/ca/src/main/java/org/languagetool/rules/ca/CatalanMultitokenSpeller.java index 6a014d043a13..63c9a8d16812 100644 --- a/languagetool-language-modules/ca/src/main/java/org/languagetool/rules/ca/CatalanMultitokenSpeller.java +++ b/languagetool-language-modules/ca/src/main/java/org/languagetool/rules/ca/CatalanMultitokenSpeller.java @@ -31,5 +31,4 @@ protected CatalanMultitokenSpeller() { super(Languages.getLanguageForShortCode("ca-ES"), Arrays.asList("/ca/multiwords.txt", "/spelling_global.txt", "/ca/hyphenated_words.txt")); } - } diff --git a/languagetool-language-modules/ca/src/main/java/org/languagetool/rules/ca/CatalanNumberInWordFilter.java b/languagetool-language-modules/ca/src/main/java/org/languagetool/rules/ca/CatalanNumberInWordFilter.java index 7b4d9b7a8617..1a1b3df538a9 100644 --- a/languagetool-language-modules/ca/src/main/java/org/languagetool/rules/ca/CatalanNumberInWordFilter.java +++ b/languagetool-language-modules/ca/src/main/java/org/languagetool/rules/ca/CatalanNumberInWordFilter.java @@ -19,7 +19,7 @@ package org.languagetool.rules.ca; import org.languagetool.JLanguageTool; -import org.languagetool.language.Catalan; +import org.languagetool.language.ca.Catalan; import org.languagetool.rules.AbstractNumberInWordFilter; import java.io.IOException; diff --git a/languagetool-language-modules/ca/src/main/java/org/languagetool/rules/ca/CatalanNumberSpellerFilter.java b/languagetool-language-modules/ca/src/main/java/org/languagetool/rules/ca/CatalanNumberSpellerFilter.java index b11e1e72e455..26979fba3982 100644 --- a/languagetool-language-modules/ca/src/main/java/org/languagetool/rules/ca/CatalanNumberSpellerFilter.java +++ b/languagetool-language-modules/ca/src/main/java/org/languagetool/rules/ca/CatalanNumberSpellerFilter.java @@ -4,7 +4,7 @@ import org.languagetool.AnalyzedTokenReadings; import org.languagetool.Language; -import org.languagetool.language.Catalan; +import org.languagetool.language.ca.Catalan; import org.languagetool.rules.RuleMatch; import org.languagetool.rules.patterns.RuleFilter; import org.languagetool.synthesis.ca.CatalanSynthesizer; diff --git a/languagetool-language-modules/ca/src/main/java/org/languagetool/rules/ca/CatalanRepeatedWordsRule.java b/languagetool-language-modules/ca/src/main/java/org/languagetool/rules/ca/CatalanRepeatedWordsRule.java index dff834dd46d6..40a857a64857 100644 --- a/languagetool-language-modules/ca/src/main/java/org/languagetool/rules/ca/CatalanRepeatedWordsRule.java +++ b/languagetool-language-modules/ca/src/main/java/org/languagetool/rules/ca/CatalanRepeatedWordsRule.java @@ -20,7 +20,7 @@ import org.languagetool.AnalyzedTokenReadings; import org.languagetool.Tag; -import org.languagetool.language.Catalan; +import org.languagetool.language.ca.Catalan; import org.languagetool.rules.AbstractRepeatedWordsRule; import org.languagetool.rules.SynonymsData; import org.languagetool.rules.patterns.PatternToken; diff --git a/languagetool-language-modules/ca/src/main/java/org/languagetool/rules/ca/CatalanSuppressMisspelledSuggestionsFilter.java b/languagetool-language-modules/ca/src/main/java/org/languagetool/rules/ca/CatalanSuppressMisspelledSuggestionsFilter.java index 5a7b749e218c..2298311db2f9 100644 --- a/languagetool-language-modules/ca/src/main/java/org/languagetool/rules/ca/CatalanSuppressMisspelledSuggestionsFilter.java +++ b/languagetool-language-modules/ca/src/main/java/org/languagetool/rules/ca/CatalanSuppressMisspelledSuggestionsFilter.java @@ -21,7 +21,7 @@ import java.io.IOException; -import org.languagetool.language.ValencianCatalan; +import org.languagetool.language.ca.ValencianCatalan; import org.languagetool.rules.AbstractSuppressMisspelledSuggestionsFilter; public class CatalanSuppressMisspelledSuggestionsFilter extends AbstractSuppressMisspelledSuggestionsFilter { diff --git a/languagetool-language-modules/ca/src/main/java/org/languagetool/rules/ca/SimpleReplaceAdverbsMent.java b/languagetool-language-modules/ca/src/main/java/org/languagetool/rules/ca/SimpleReplaceAdverbsMent.java index fdeb47eb416e..948bc064d6ba 100644 --- a/languagetool-language-modules/ca/src/main/java/org/languagetool/rules/ca/SimpleReplaceAdverbsMent.java +++ b/languagetool-language-modules/ca/src/main/java/org/languagetool/rules/ca/SimpleReplaceAdverbsMent.java @@ -19,7 +19,7 @@ package org.languagetool.rules.ca; import org.languagetool.Tag; -import org.languagetool.language.Catalan; +import org.languagetool.language.ca.Catalan; import org.languagetool.rules.AbstractSimpleReplaceRule; import org.languagetool.rules.Category; import org.languagetool.rules.CategoryId; diff --git a/languagetool-language-modules/ca/src/main/java/org/languagetool/rules/ca/SimpleReplaceAnglicism.java b/languagetool-language-modules/ca/src/main/java/org/languagetool/rules/ca/SimpleReplaceAnglicism.java index 035bab790b55..d865b30c3458 100644 --- a/languagetool-language-modules/ca/src/main/java/org/languagetool/rules/ca/SimpleReplaceAnglicism.java +++ b/languagetool-language-modules/ca/src/main/java/org/languagetool/rules/ca/SimpleReplaceAnglicism.java @@ -19,7 +19,7 @@ package org.languagetool.rules.ca; import org.languagetool.AnalyzedTokenReadings; -import org.languagetool.language.Catalan; +import org.languagetool.language.ca.Catalan; import org.languagetool.rules.AbstractSimpleReplaceRule2; import org.languagetool.rules.Categories; import org.languagetool.rules.ITSIssueType; diff --git a/languagetool-language-modules/ca/src/main/java/org/languagetool/rules/ca/SimpleReplaceDiacriticsIEC.java b/languagetool-language-modules/ca/src/main/java/org/languagetool/rules/ca/SimpleReplaceDiacriticsIEC.java index fd46357a8459..48fca273b027 100644 --- a/languagetool-language-modules/ca/src/main/java/org/languagetool/rules/ca/SimpleReplaceDiacriticsIEC.java +++ b/languagetool-language-modules/ca/src/main/java/org/languagetool/rules/ca/SimpleReplaceDiacriticsIEC.java @@ -20,7 +20,6 @@ import org.languagetool.AnalyzedTokenReadings; import org.languagetool.Language; -import org.languagetool.language.Catalan; import org.languagetool.rules.AbstractSimpleReplaceRule; import org.languagetool.rules.Category; import org.languagetool.rules.CategoryId; diff --git a/languagetool-language-modules/ca/src/main/java/org/languagetool/rules/ca/SimpleReplaceMultiwordsRule.java b/languagetool-language-modules/ca/src/main/java/org/languagetool/rules/ca/SimpleReplaceMultiwordsRule.java index ef0d248bfe6c..8d8afa0cfe13 100644 --- a/languagetool-language-modules/ca/src/main/java/org/languagetool/rules/ca/SimpleReplaceMultiwordsRule.java +++ b/languagetool-language-modules/ca/src/main/java/org/languagetool/rules/ca/SimpleReplaceMultiwordsRule.java @@ -18,13 +18,12 @@ */ package org.languagetool.rules.ca; -import org.languagetool.language.Catalan; +import org.languagetool.language.ca.Catalan; import org.languagetool.rules.AbstractSimpleReplaceRule2; import org.languagetool.rules.Categories; import org.languagetool.rules.ITSIssueType; import java.io.IOException; -import java.net.URL; import java.util.Arrays; import java.util.List; import java.util.Locale; diff --git a/languagetool-language-modules/ca/src/main/java/org/languagetool/tagging/ca/CatalanTagger.java b/languagetool-language-modules/ca/src/main/java/org/languagetool/tagging/ca/CatalanTagger.java index 4901bba8a0c3..b73823bb5cee 100644 --- a/languagetool-language-modules/ca/src/main/java/org/languagetool/tagging/ca/CatalanTagger.java +++ b/languagetool-language-modules/ca/src/main/java/org/languagetool/tagging/ca/CatalanTagger.java @@ -22,8 +22,8 @@ import morfologik.stemming.IStemmer; import org.jetbrains.annotations.Nullable; import org.languagetool.*; -import org.languagetool.language.Catalan; -import org.languagetool.language.ValencianCatalan; +import org.languagetool.language.ca.Catalan; +import org.languagetool.language.ca.ValencianCatalan; import org.languagetool.tagging.BaseTagger; import org.languagetool.tools.StringTools; diff --git a/languagetool-language-modules/ca/src/main/java/org/languagetool/tagging/disambiguation/ca/CatalanHybridDisambiguator.java b/languagetool-language-modules/ca/src/main/java/org/languagetool/tagging/disambiguation/ca/CatalanHybridDisambiguator.java index 3dc9abef2a3b..bd21a6efb0b4 100644 --- a/languagetool-language-modules/ca/src/main/java/org/languagetool/tagging/disambiguation/ca/CatalanHybridDisambiguator.java +++ b/languagetool-language-modules/ca/src/main/java/org/languagetool/tagging/disambiguation/ca/CatalanHybridDisambiguator.java @@ -26,7 +26,7 @@ import org.jetbrains.annotations.Nullable; import org.languagetool.*; -import org.languagetool.language.Catalan; + import org.languagetool.tagging.disambiguation.AbstractDisambiguator; import org.languagetool.tagging.disambiguation.Disambiguator; import org.languagetool.tagging.disambiguation.MultiWordChunker; diff --git a/languagetool-language-modules/ca/src/main/resources/META-INF/org/languagetool/language-module.properties b/languagetool-language-modules/ca/src/main/resources/META-INF/org/languagetool/language-module.properties index 235279090123..271193eca9c3 100644 --- a/languagetool-language-modules/ca/src/main/resources/META-INF/org/languagetool/language-module.properties +++ b/languagetool-language-modules/ca/src/main/resources/META-INF/org/languagetool/language-module.properties @@ -1 +1 @@ -languageClasses=org.languagetool.language.Catalan,org.languagetool.language.ValencianCatalan,org.languagetool.language.BalearicCatalan +languageClasses=org.languagetool.language.ca.Catalan,org.languagetool.language.ca.ValencianCatalan,org.languagetool.language.ca.BalearicCatalan diff --git a/languagetool-language-modules/ca/src/test/java/org/languagetool/CatalanConcurrencyTest.java b/languagetool-language-modules/ca/src/test/java/org/languagetool/CatalanConcurrencyTest.java index 0149ca1ad63b..df0d1ccf6fad 100644 --- a/languagetool-language-modules/ca/src/test/java/org/languagetool/CatalanConcurrencyTest.java +++ b/languagetool-language-modules/ca/src/test/java/org/languagetool/CatalanConcurrencyTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.languagetool.language.AbstractLanguageConcurrencyTest; -import org.languagetool.language.Catalan; +import org.languagetool.language.ca.Catalan; public class CatalanConcurrencyTest extends AbstractLanguageConcurrencyTest { @Override diff --git a/languagetool-language-modules/ca/src/test/java/org/languagetool/JLanguageToolTest.java b/languagetool-language-modules/ca/src/test/java/org/languagetool/JLanguageToolTest.java index 88b8aabc8fd0..5be7158f6065 100644 --- a/languagetool-language-modules/ca/src/test/java/org/languagetool/JLanguageToolTest.java +++ b/languagetool-language-modules/ca/src/test/java/org/languagetool/JLanguageToolTest.java @@ -19,9 +19,9 @@ package org.languagetool; import org.junit.Test; -import org.languagetool.language.Catalan; -import org.languagetool.language.ValencianCatalan; -import org.languagetool.language.BalearicCatalan; +import org.languagetool.language.ca.Catalan; +import org.languagetool.language.ca.ValencianCatalan; +import org.languagetool.language.ca.BalearicCatalan; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/ca/src/test/java/org/languagetool/ValencianCatalanConcurrencyTest.java b/languagetool-language-modules/ca/src/test/java/org/languagetool/ValencianCatalanConcurrencyTest.java index 3c4425a9efe1..29f6d45db98f 100644 --- a/languagetool-language-modules/ca/src/test/java/org/languagetool/ValencianCatalanConcurrencyTest.java +++ b/languagetool-language-modules/ca/src/test/java/org/languagetool/ValencianCatalanConcurrencyTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.languagetool.language.AbstractLanguageConcurrencyTest; -import org.languagetool.language.ValencianCatalan; +import org.languagetool.language.ca.ValencianCatalan; public class ValencianCatalanConcurrencyTest extends AbstractLanguageConcurrencyTest { @Override diff --git a/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/CatalanTest.java b/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/CatalanTest.java index 7b8a802d6a6b..5068025f2db6 100644 --- a/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/CatalanTest.java +++ b/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/CatalanTest.java @@ -22,7 +22,7 @@ import org.languagetool.JLanguageTool; import org.languagetool.Language; import org.languagetool.LanguageSpecificTest; -import org.languagetool.language.Catalan; +import org.languagetool.language.ca.Catalan; import org.languagetool.rules.RuleMatch; import static org.junit.Assert.assertEquals; diff --git a/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/CatalanUnpairedBracketsRuleTest.java b/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/CatalanUnpairedBracketsRuleTest.java index 172bdfc46c7c..cd732406e3b1 100644 --- a/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/CatalanUnpairedBracketsRuleTest.java +++ b/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/CatalanUnpairedBracketsRuleTest.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Catalan; +import org.languagetool.language.ca.Catalan; import org.languagetool.rules.RuleMatch; import org.languagetool.rules.TextLevelRule; diff --git a/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/CatalanWordRepeatRuleTest.java b/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/CatalanWordRepeatRuleTest.java index defcf1c20e2d..530b899bd546 100644 --- a/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/CatalanWordRepeatRuleTest.java +++ b/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/CatalanWordRepeatRuleTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Catalan; +import org.languagetool.language.ca.Catalan; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/CatalanWrongWordInContextRuleTest.java b/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/CatalanWrongWordInContextRuleTest.java index 66e0b0b0b305..da424f497e32 100644 --- a/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/CatalanWrongWordInContextRuleTest.java +++ b/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/CatalanWrongWordInContextRuleTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; -import org.languagetool.language.Catalan; +import org.languagetool.language.ca.Catalan; import java.io.IOException; diff --git a/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/CheckCaseRuleTest.java b/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/CheckCaseRuleTest.java index 5f0b633ec911..0d9a2b23ae24 100644 --- a/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/CheckCaseRuleTest.java +++ b/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/CheckCaseRuleTest.java @@ -26,7 +26,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Catalan; +import org.languagetool.language.ca.Catalan; import org.languagetool.rules.RuleMatch; public class CheckCaseRuleTest { diff --git a/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/MorfologikCatalanSpellerRuleTest.java b/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/MorfologikCatalanSpellerRuleTest.java index 7030509ec3cc..f0067e4de02e 100644 --- a/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/MorfologikCatalanSpellerRuleTest.java +++ b/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/MorfologikCatalanSpellerRuleTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.languagetool.*; -import org.languagetool.language.Catalan; +import org.languagetool.language.ca.Catalan; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/PronomFebleDuplicateRuleTest.java b/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/PronomFebleDuplicateRuleTest.java index 55238681c825..94b04afa6b25 100644 --- a/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/PronomFebleDuplicateRuleTest.java +++ b/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/PronomFebleDuplicateRuleTest.java @@ -26,7 +26,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Catalan; +import org.languagetool.language.ca.Catalan; import org.languagetool.rules.RuleMatch; public class PronomFebleDuplicateRuleTest { diff --git a/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/ReplaceOperationNamesRuleTest.java b/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/ReplaceOperationNamesRuleTest.java index 493b078e217c..0d9c490c5100 100644 --- a/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/ReplaceOperationNamesRuleTest.java +++ b/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/ReplaceOperationNamesRuleTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Catalan; +import org.languagetool.language.ca.Catalan; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/SimpleReplaceBalearicRuleTest.java b/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/SimpleReplaceBalearicRuleTest.java index 5587a5984c7c..5abc4013c675 100644 --- a/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/SimpleReplaceBalearicRuleTest.java +++ b/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/SimpleReplaceBalearicRuleTest.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Catalan; +import org.languagetool.language.ca.Catalan; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/SimpleReplaceDNVRuleTest.java b/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/SimpleReplaceDNVRuleTest.java index b14ff3c4094b..8b01e09e3dfb 100644 --- a/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/SimpleReplaceDNVRuleTest.java +++ b/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/SimpleReplaceDNVRuleTest.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.ValencianCatalan; +import org.languagetool.language.ca.ValencianCatalan; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/SimpleReplaceDNVSecondaryRuleTest.java b/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/SimpleReplaceDNVSecondaryRuleTest.java index 6b3cede96b2b..eea3ade6682c 100644 --- a/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/SimpleReplaceDNVSecondaryRuleTest.java +++ b/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/SimpleReplaceDNVSecondaryRuleTest.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.ValencianCatalan; +import org.languagetool.language.ca.ValencianCatalan; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/SimpleReplaceRuleTest.java b/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/SimpleReplaceRuleTest.java index 59fe8fc05113..8b8eaf13f9d9 100644 --- a/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/SimpleReplaceRuleTest.java +++ b/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/SimpleReplaceRuleTest.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Catalan; +import org.languagetool.language.ca.Catalan; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/SimpleReplaceVerbsRuleTest.java b/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/SimpleReplaceVerbsRuleTest.java index b18dca441d6a..7652cb3dd6e6 100644 --- a/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/SimpleReplaceVerbsRuleTest.java +++ b/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/SimpleReplaceVerbsRuleTest.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Catalan; +import org.languagetool.language.ca.Catalan; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/ca/src/test/java/org/languagetool/synthesis/ca/CatalanSynthesizerTest.java b/languagetool-language-modules/ca/src/test/java/org/languagetool/synthesis/ca/CatalanSynthesizerTest.java index a7e020c2b718..05e4724aec25 100644 --- a/languagetool-language-modules/ca/src/test/java/org/languagetool/synthesis/ca/CatalanSynthesizerTest.java +++ b/languagetool-language-modules/ca/src/test/java/org/languagetool/synthesis/ca/CatalanSynthesizerTest.java @@ -21,8 +21,6 @@ import org.junit.Test; import org.languagetool.AnalyzedToken; -import org.languagetool.Language; -import org.languagetool.language.ValencianCatalan; import java.io.IOException; import java.util.Arrays; diff --git a/languagetool-language-modules/ca/src/test/java/org/languagetool/tagging/ca/CatalanTaggerTest.java b/languagetool-language-modules/ca/src/test/java/org/languagetool/tagging/ca/CatalanTaggerTest.java index 1968f9fd7a1f..d97f2100d25d 100644 --- a/languagetool-language-modules/ca/src/test/java/org/languagetool/tagging/ca/CatalanTaggerTest.java +++ b/languagetool-language-modules/ca/src/test/java/org/languagetool/tagging/ca/CatalanTaggerTest.java @@ -21,7 +21,7 @@ import org.junit.Before; import org.junit.Test; import org.languagetool.TestTools; -import org.languagetool.language.Catalan; +import org.languagetool.language.ca.Catalan; import org.languagetool.tokenizers.WordTokenizer; import org.languagetool.tokenizers.ca.CatalanWordTokenizer; diff --git a/languagetool-language-modules/ca/src/test/java/org/languagetool/tagging/disambiguation/CatalanDisambiguationRuleTest.java b/languagetool-language-modules/ca/src/test/java/org/languagetool/tagging/disambiguation/CatalanDisambiguationRuleTest.java index 89d005c4e5a3..a82ac52a6cd7 100644 --- a/languagetool-language-modules/ca/src/test/java/org/languagetool/tagging/disambiguation/CatalanDisambiguationRuleTest.java +++ b/languagetool-language-modules/ca/src/test/java/org/languagetool/tagging/disambiguation/CatalanDisambiguationRuleTest.java @@ -23,7 +23,7 @@ import org.junit.Before; import org.junit.Test; import org.languagetool.TestTools; -import org.languagetool.language.Catalan; +import org.languagetool.language.ca.Catalan; import org.languagetool.tagging.ca.CatalanTagger; import org.languagetool.tagging.disambiguation.ca.CatalanHybridDisambiguator; import org.languagetool.tokenizers.SRXSentenceTokenizer; diff --git a/languagetool-language-modules/ca/src/test/java/org/languagetool/tokenizers/ca/CatalanSentenceTokenizerTest.java b/languagetool-language-modules/ca/src/test/java/org/languagetool/tokenizers/ca/CatalanSentenceTokenizerTest.java index 6d18958c654a..6e463d411fc4 100644 --- a/languagetool-language-modules/ca/src/test/java/org/languagetool/tokenizers/ca/CatalanSentenceTokenizerTest.java +++ b/languagetool-language-modules/ca/src/test/java/org/languagetool/tokenizers/ca/CatalanSentenceTokenizerTest.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.languagetool.TestTools; -import org.languagetool.language.Catalan; +import org.languagetool.language.ca.Catalan; import org.languagetool.tokenizers.SRXSentenceTokenizer; import org.languagetool.tokenizers.SentenceTokenizer; diff --git a/languagetool-language-modules/da/pom.xml b/languagetool-language-modules/da/pom.xml index b1ecc2f673ee..06bc18571ba8 100644 --- a/languagetool-language-modules/da/pom.xml +++ b/languagetool-language-modules/da/pom.xml @@ -67,6 +67,17 @@ org.apache.maven.plugins maven-surefire-plugin + + org.apache.maven.plugins + maven-jar-plugin + + + + org.languagetool.language.da + + + + diff --git a/languagetool-language-modules/da/src/main/java/org/languagetool/language/Danish.java b/languagetool-language-modules/da/src/main/java/org/languagetool/language/da/Danish.java similarity index 94% rename from languagetool-language-modules/da/src/main/java/org/languagetool/language/Danish.java rename to languagetool-language-modules/da/src/main/java/org/languagetool/language/da/Danish.java index 370ed9546754..a8869b32ea1e 100644 --- a/languagetool-language-modules/da/src/main/java/org/languagetool/language/Danish.java +++ b/languagetool-language-modules/da/src/main/java/org/languagetool/language/da/Danish.java @@ -16,12 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language; +package org.languagetool.language.da; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.languagetool.Language; import org.languagetool.UserConfig; +import org.languagetool.language.Contributor; import org.languagetool.rules.*; import org.languagetool.rules.spelling.SpellingCheckRule; import org.languagetool.rules.spelling.hunspell.HunspellRule; @@ -74,7 +75,7 @@ public Disambiguator createDefaultDisambiguator() { @Override public Contributor[] getMaintainers() { - return new Contributor[] {new Contributor("Esben Aaberg"), new Contributor("Henrik Bendt") }; + return new Contributor[] {new Contributor("Esben Aaberg", null), new Contributor("Henrik Bendt", null) }; } @Override diff --git a/languagetool-language-modules/da/src/main/resources/META-INF/org/languagetool/language-module.properties b/languagetool-language-modules/da/src/main/resources/META-INF/org/languagetool/language-module.properties index 725a3955b667..827eccdc9561 100644 --- a/languagetool-language-modules/da/src/main/resources/META-INF/org/languagetool/language-module.properties +++ b/languagetool-language-modules/da/src/main/resources/META-INF/org/languagetool/language-module.properties @@ -1 +1 @@ -languageClasses=org.languagetool.language.Danish +languageClasses=org.languagetool.language.da.Danish diff --git a/languagetool-language-modules/da/src/test/java/org/languagetool/DanishConcurrencyTest.java b/languagetool-language-modules/da/src/test/java/org/languagetool/DanishConcurrencyTest.java index ba7a8b01a927..ad0b59386bcd 100644 --- a/languagetool-language-modules/da/src/test/java/org/languagetool/DanishConcurrencyTest.java +++ b/languagetool-language-modules/da/src/test/java/org/languagetool/DanishConcurrencyTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.languagetool.language.AbstractLanguageConcurrencyTest; -import org.languagetool.language.Danish; +import org.languagetool.language.da.Danish; public class DanishConcurrencyTest extends AbstractLanguageConcurrencyTest { @Override diff --git a/languagetool-language-modules/da/src/test/java/org/languagetool/rules/da/DanishTest.java b/languagetool-language-modules/da/src/test/java/org/languagetool/rules/da/DanishTest.java index 2213437c685a..f152335f5976 100644 --- a/languagetool-language-modules/da/src/test/java/org/languagetool/rules/da/DanishTest.java +++ b/languagetool-language-modules/da/src/test/java/org/languagetool/rules/da/DanishTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.languagetool.LanguageSpecificTest; -import org.languagetool.language.Danish; +import org.languagetool.language.da.Danish; import java.io.IOException; import java.util.Arrays; diff --git a/languagetool-language-modules/da/src/test/java/org/languagetool/tokenizers/da/DanishSRXSentenceTokenizerTest.java b/languagetool-language-modules/da/src/test/java/org/languagetool/tokenizers/da/DanishSRXSentenceTokenizerTest.java index 4a51de6a32f9..06e65c2d560f 100644 --- a/languagetool-language-modules/da/src/test/java/org/languagetool/tokenizers/da/DanishSRXSentenceTokenizerTest.java +++ b/languagetool-language-modules/da/src/test/java/org/languagetool/tokenizers/da/DanishSRXSentenceTokenizerTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.languagetool.TestTools; -import org.languagetool.language.Danish; +import org.languagetool.language.da.Danish; import org.languagetool.tokenizers.SRXSentenceTokenizer; /** diff --git a/languagetool-language-modules/de-DE-x-simple-language/pom.xml b/languagetool-language-modules/de-DE-x-simple-language/pom.xml index dd22fc5a204b..f89af52ec20e 100644 --- a/languagetool-language-modules/de-DE-x-simple-language/pom.xml +++ b/languagetool-language-modules/de-DE-x-simple-language/pom.xml @@ -65,6 +65,17 @@ org.apache.maven.plugins maven-surefire-plugin + + org.apache.maven.plugins + maven-jar-plugin + + + + org.languagetool.language.de_simple + + + + diff --git a/languagetool-language-modules/de-DE-x-simple-language/src/main/java/org/languagetool/language/SimpleGerman.java b/languagetool-language-modules/de-DE-x-simple-language/src/main/java/org/languagetool/language/de_simple/SimpleGerman.java similarity index 95% rename from languagetool-language-modules/de-DE-x-simple-language/src/main/java/org/languagetool/language/SimpleGerman.java rename to languagetool-language-modules/de-DE-x-simple-language/src/main/java/org/languagetool/language/de_simple/SimpleGerman.java index 238b2985d114..8d5049ce7b97 100644 --- a/languagetool-language-modules/de-DE-x-simple-language/src/main/java/org/languagetool/language/SimpleGerman.java +++ b/languagetool-language-modules/de-DE-x-simple-language/src/main/java/org/languagetool/language/de_simple/SimpleGerman.java @@ -16,13 +16,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language; +package org.languagetool.language.de_simple; import org.jetbrains.annotations.Nullable; import org.languagetool.GlobalConfig; import org.languagetool.Language; import org.languagetool.UserConfig; import org.languagetool.JLanguageTool; +import org.languagetool.language.Contributor; +import org.languagetool.language.de.GermanyGerman; import org.languagetool.languagemodel.LanguageModel; import org.languagetool.rules.Rule; import org.languagetool.rules.de.LongSentenceRule; @@ -60,7 +62,7 @@ public String getShortCode() { @Override public Contributor[] getMaintainers() { return new Contributor[] { - new Contributor("Annika Nietzio") + new Contributor("Annika Nietzio", null) }; } diff --git a/languagetool-language-modules/de-DE-x-simple-language/src/main/resources/META-INF/org/languagetool/language-module.properties b/languagetool-language-modules/de-DE-x-simple-language/src/main/resources/META-INF/org/languagetool/language-module.properties index d332f53d783f..cfe86c240271 100644 --- a/languagetool-language-modules/de-DE-x-simple-language/src/main/resources/META-INF/org/languagetool/language-module.properties +++ b/languagetool-language-modules/de-DE-x-simple-language/src/main/resources/META-INF/org/languagetool/language-module.properties @@ -1 +1 @@ -languageClasses=org.languagetool.language.SimpleGerman +languageClasses=org.languagetool.language.de_simple.SimpleGerman diff --git a/languagetool-language-modules/de-DE-x-simple-language/src/test/java/org/languagetool/SimpleGermanConcurrencyTest.java b/languagetool-language-modules/de-DE-x-simple-language/src/test/java/org/languagetool/SimpleGermanConcurrencyTest.java index 9ec0e6c2e197..951dacd7f4aa 100644 --- a/languagetool-language-modules/de-DE-x-simple-language/src/test/java/org/languagetool/SimpleGermanConcurrencyTest.java +++ b/languagetool-language-modules/de-DE-x-simple-language/src/test/java/org/languagetool/SimpleGermanConcurrencyTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.languagetool.language.AbstractLanguageConcurrencyTest; -import org.languagetool.language.SimpleGerman; +import org.languagetool.language.de_simple.SimpleGerman; public class SimpleGermanConcurrencyTest extends AbstractLanguageConcurrencyTest { @Override diff --git a/languagetool-language-modules/de-DE-x-simple-language/src/test/java/org/languagetool/rules/de/SimpleGermanPatternRuleTest.java b/languagetool-language-modules/de-DE-x-simple-language/src/test/java/org/languagetool/rules/de/SimpleGermanPatternRuleTest.java index 2e76aecac690..0d3662ec7bc6 100644 --- a/languagetool-language-modules/de-DE-x-simple-language/src/test/java/org/languagetool/rules/de/SimpleGermanPatternRuleTest.java +++ b/languagetool-language-modules/de-DE-x-simple-language/src/test/java/org/languagetool/rules/de/SimpleGermanPatternRuleTest.java @@ -21,7 +21,7 @@ import java.io.IOException; import org.junit.Test; -import org.languagetool.language.SimpleGerman; +import org.languagetool.language.de_simple.SimpleGerman; import org.languagetool.rules.patterns.PatternRuleTest; public class SimpleGermanPatternRuleTest extends PatternRuleTest { diff --git a/languagetool-language-modules/de-DE-x-simple-language/src/test/java/org/languagetool/rules/de/SimpleGermanTest.java b/languagetool-language-modules/de-DE-x-simple-language/src/test/java/org/languagetool/rules/de/SimpleGermanTest.java index b9786d6d2fd4..bf78a295e585 100644 --- a/languagetool-language-modules/de-DE-x-simple-language/src/test/java/org/languagetool/rules/de/SimpleGermanTest.java +++ b/languagetool-language-modules/de-DE-x-simple-language/src/test/java/org/languagetool/rules/de/SimpleGermanTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.languagetool.LanguageSpecificTest; -import org.languagetool.language.SimpleGerman; +import org.languagetool.language.de_simple.SimpleGerman; import java.io.IOException; import java.util.Arrays; diff --git a/languagetool-language-modules/de/pom.xml b/languagetool-language-modules/de/pom.xml index 0ced0d651586..8cb63e03c57b 100644 --- a/languagetool-language-modules/de/pom.xml +++ b/languagetool-language-modules/de/pom.xml @@ -105,6 +105,17 @@ org.apache.maven.plugins maven-surefire-plugin + + org.apache.maven.plugins + maven-jar-plugin + + + + org.languagetool.language.de + + + + diff --git a/languagetool-language-modules/de/src/main/java/org/languagetool/chunking/GermanChunker.java b/languagetool-language-modules/de/src/main/java/org/languagetool/chunking/de/GermanChunker.java similarity index 98% rename from languagetool-language-modules/de/src/main/java/org/languagetool/chunking/GermanChunker.java rename to languagetool-language-modules/de/src/main/java/org/languagetool/chunking/de/GermanChunker.java index a5a0ec28cc59..8dc07de760c4 100644 --- a/languagetool-language-modules/de/src/main/java/org/languagetool/chunking/GermanChunker.java +++ b/languagetool-language-modules/de/src/main/java/org/languagetool/chunking/de/GermanChunker.java @@ -16,18 +16,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.chunking; +package org.languagetool.chunking.de; import edu.washington.cs.knowitall.regex.Match; import edu.washington.cs.knowitall.regex.RegularExpression; import org.languagetool.AnalyzedTokenReadings; +import org.languagetool.chunking.ChunkTag; +import org.languagetool.chunking.ChunkTaggedToken; +import org.languagetool.chunking.Chunker; +import org.languagetool.chunking.TokenExpressionFactory; import org.languagetool.rules.patterns.StringMatcher; import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static org.languagetool.chunking.GermanChunker.PhraseType.*; +import static org.languagetool.chunking.de.GermanChunker.PhraseType.*; /** * A rule-based German chunker for noun phrases. Please note that this chunker @@ -336,7 +340,7 @@ public void addChunkTags(List tokenReadings) { assignChunksToReadings(chunkTaggedTokens); } - List getBasicChunks(List tokenReadings) { + public List getBasicChunks(List tokenReadings) { return getBasicChunks(tokenReadings, allForms(tokenReadings)); } diff --git a/languagetool-language-modules/de/src/main/java/org/languagetool/language/AustrianGerman.java b/languagetool-language-modules/de/src/main/java/org/languagetool/language/de/AustrianGerman.java similarity index 98% rename from languagetool-language-modules/de/src/main/java/org/languagetool/language/AustrianGerman.java rename to languagetool-language-modules/de/src/main/java/org/languagetool/language/de/AustrianGerman.java index d741f58c8f6b..f0beb99df56a 100644 --- a/languagetool-language-modules/de/src/main/java/org/languagetool/language/AustrianGerman.java +++ b/languagetool-language-modules/de/src/main/java/org/languagetool/language/de/AustrianGerman.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language; +package org.languagetool.language.de; import org.jetbrains.annotations.Nullable; import org.languagetool.GlobalConfig; diff --git a/languagetool-language-modules/de/src/main/java/org/languagetool/language/German.java b/languagetool-language-modules/de/src/main/java/org/languagetool/language/de/German.java similarity index 99% rename from languagetool-language-modules/de/src/main/java/org/languagetool/language/German.java rename to languagetool-language-modules/de/src/main/java/org/languagetool/language/de/German.java index f34e95270e04..639e8878ab01 100644 --- a/languagetool-language-modules/de/src/main/java/org/languagetool/language/German.java +++ b/languagetool-language-modules/de/src/main/java/org/languagetool/language/de/German.java @@ -16,13 +16,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language; +package org.languagetool.language.de; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.languagetool.*; import org.languagetool.chunking.Chunker; -import org.languagetool.chunking.GermanChunker; +import org.languagetool.chunking.de.GermanChunker; +import org.languagetool.language.Contributor; +import org.languagetool.language.Contributors; import org.languagetool.languagemodel.LanguageModel; import org.languagetool.rules.*; import org.languagetool.rules.de.LongSentenceRule; @@ -30,7 +32,7 @@ import org.languagetool.rules.de.*; import org.languagetool.rules.spelling.SpellingCheckRule; import org.languagetool.rules.spelling.multitoken.MultitokenSpeller; -import org.languagetool.synthesis.GermanSynthesizer; +import org.languagetool.synthesis.de.GermanSynthesizer; import org.languagetool.synthesis.Synthesizer; import org.languagetool.tagging.Tagger; import org.languagetool.tagging.de.GermanTagger; @@ -521,7 +523,7 @@ public LanguageMaintainedState getMaintainedState() { id2prio.put("DOPPELUNG_GLEICHES_VERB", -55); // prefer comma rules id2prio.put("FEHLENDES_NOMEN", -60); // lower prio than most rules id2prio.put("REPETITIONS_STYLE", -60); - id2prio.put("GERMAN_WORD_REPEAT_BEGINNING_RULE", -61); + id2prio.put("GERMAN_WORD_REPEAT_BEGINNING_RULE", -61); // Category ids - make sure style issues don't hide overlapping "real" errors: id2prio.put("TYPOGRAPHY", -14); id2prio.put("COLLOQUIALISMS", -15); @@ -534,7 +536,7 @@ public LanguageMaintainedState getMaintainedState() { public Map getPriorityMap() { return id2prio; } - + @Override protected int getPriorityForId(String id) { Integer prio = id2prio.get(id); diff --git a/languagetool-language-modules/de/src/main/java/org/languagetool/language/GermanyGerman.java b/languagetool-language-modules/de/src/main/java/org/languagetool/language/de/GermanyGerman.java similarity index 98% rename from languagetool-language-modules/de/src/main/java/org/languagetool/language/GermanyGerman.java rename to languagetool-language-modules/de/src/main/java/org/languagetool/language/de/GermanyGerman.java index 3c2d0620ee96..24bb9fb30e1f 100644 --- a/languagetool-language-modules/de/src/main/java/org/languagetool/language/GermanyGerman.java +++ b/languagetool-language-modules/de/src/main/java/org/languagetool/language/de/GermanyGerman.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language; +package org.languagetool.language.de; import org.jetbrains.annotations.Nullable; import org.languagetool.GlobalConfig; diff --git a/languagetool-language-modules/de/src/main/java/org/languagetool/language/NonSwissGerman.java b/languagetool-language-modules/de/src/main/java/org/languagetool/language/de/NonSwissGerman.java similarity index 98% rename from languagetool-language-modules/de/src/main/java/org/languagetool/language/NonSwissGerman.java rename to languagetool-language-modules/de/src/main/java/org/languagetool/language/de/NonSwissGerman.java index 347702aef78e..2922711af322 100644 --- a/languagetool-language-modules/de/src/main/java/org/languagetool/language/NonSwissGerman.java +++ b/languagetool-language-modules/de/src/main/java/org/languagetool/language/de/NonSwissGerman.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language; +package org.languagetool.language.de; import org.languagetool.Language; import org.languagetool.UserConfig; diff --git a/languagetool-language-modules/de/src/main/java/org/languagetool/language/SwissGerman.java b/languagetool-language-modules/de/src/main/java/org/languagetool/language/de/SwissGerman.java similarity index 99% rename from languagetool-language-modules/de/src/main/java/org/languagetool/language/SwissGerman.java rename to languagetool-language-modules/de/src/main/java/org/languagetool/language/de/SwissGerman.java index fb85b7c727f3..8d1bec8b1ee2 100644 --- a/languagetool-language-modules/de/src/main/java/org/languagetool/language/SwissGerman.java +++ b/languagetool-language-modules/de/src/main/java/org/languagetool/language/de/SwissGerman.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language; +package org.languagetool.language.de; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/AdaptSuggestionFilter.java b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/AdaptSuggestionFilter.java index bdf019c92e48..c586f41dbb0f 100644 --- a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/AdaptSuggestionFilter.java +++ b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/AdaptSuggestionFilter.java @@ -22,11 +22,11 @@ import org.languagetool.AnalyzedToken; import org.languagetool.AnalyzedTokenReadings; import org.languagetool.JLanguageTool; -import org.languagetool.language.German; +import org.languagetool.language.de.German; import org.languagetool.rules.RuleMatch; import org.languagetool.rules.SuggestionFilter; import org.languagetool.rules.patterns.RuleFilter; -import org.languagetool.synthesis.GermanSynthesizer; +import org.languagetool.synthesis.de.GermanSynthesizer; import org.languagetool.tagging.de.GermanTagger; import org.languagetool.tools.StringTools; diff --git a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/AdvancedSynthesizerFilter.java b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/AdvancedSynthesizerFilter.java index 005f632208e5..6e16ade22f29 100644 --- a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/AdvancedSynthesizerFilter.java +++ b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/AdvancedSynthesizerFilter.java @@ -21,7 +21,7 @@ import org.languagetool.rules.AbstractAdvancedSynthesizerFilter; -import org.languagetool.synthesis.GermanSynthesizer; +import org.languagetool.synthesis.de.GermanSynthesizer; import org.languagetool.synthesis.Synthesizer; /* diff --git a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/AgreementRule.java b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/AgreementRule.java index 3e24a54d4493..9a97b6553be8 100644 --- a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/AgreementRule.java +++ b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/AgreementRule.java @@ -25,7 +25,7 @@ import org.languagetool.AnalyzedToken; import org.languagetool.AnalyzedTokenReadings; import org.languagetool.JLanguageTool; -import org.languagetool.language.German; +import org.languagetool.language.de.German; import org.languagetool.rules.Categories; import org.languagetool.rules.Example; import org.languagetool.rules.Rule; diff --git a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/AgreementRule2.java b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/AgreementRule2.java index 0b53039ff1b9..39fc24604556 100644 --- a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/AgreementRule2.java +++ b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/AgreementRule2.java @@ -31,7 +31,7 @@ import org.languagetool.rules.RuleMatch; import org.languagetool.rules.patterns.PatternToken; import org.languagetool.rules.patterns.PatternTokenBuilder; -import org.languagetool.synthesis.GermanSynthesizer; +import org.languagetool.synthesis.de.GermanSynthesizer; import org.languagetool.tagging.disambiguation.rules.DisambiguationPatternRule; import java.io.IOException; diff --git a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/AustrianGermanSpellerRule.java b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/AustrianGermanSpellerRule.java index cb2e3174d990..add72d0715bd 100644 --- a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/AustrianGermanSpellerRule.java +++ b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/AustrianGermanSpellerRule.java @@ -19,7 +19,7 @@ package org.languagetool.rules.de; import org.languagetool.UserConfig; -import org.languagetool.language.German; +import org.languagetool.language.de.German; import org.languagetool.languagemodel.LanguageModel; import org.languagetool.rules.spelling.CachingWordListLoader; diff --git a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/CaseRule.java b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/CaseRule.java index 5db1611036e4..b44a0fac09fd 100644 --- a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/CaseRule.java +++ b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/CaseRule.java @@ -24,7 +24,7 @@ import org.languagetool.AnalyzedToken; import org.languagetool.AnalyzedTokenReadings; import org.languagetool.JLanguageTool; -import org.languagetool.language.German; +import org.languagetool.language.de.German; import org.languagetool.rules.Categories; import org.languagetool.rules.Example; import org.languagetool.rules.Rule; diff --git a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/GermanCompoundRule.java b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/GermanCompoundRule.java index 234d66bcfa7f..228b0fc247e2 100644 --- a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/GermanCompoundRule.java +++ b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/GermanCompoundRule.java @@ -21,7 +21,7 @@ import org.languagetool.Language; import org.languagetool.Languages; import org.languagetool.UserConfig; -import org.languagetool.language.GermanyGerman; +import org.languagetool.language.de.GermanyGerman; import org.languagetool.rules.AbstractCompoundRule; import org.languagetool.rules.Categories; import org.languagetool.rules.CompoundRuleData; diff --git a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/GermanNumberInWordFilter.java b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/GermanNumberInWordFilter.java index f1405eaf7e5b..9026440a3049 100644 --- a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/GermanNumberInWordFilter.java +++ b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/GermanNumberInWordFilter.java @@ -18,7 +18,7 @@ */ package org.languagetool.rules.de; -import org.languagetool.language.GermanyGerman; +import org.languagetool.language.de.GermanyGerman; import org.languagetool.rules.AbstractNumberInWordFilter; import java.io.IOException; diff --git a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/GermanRepeatedWordsRule.java b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/GermanRepeatedWordsRule.java index d1fe4c343cc9..f614c5c92024 100644 --- a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/GermanRepeatedWordsRule.java +++ b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/GermanRepeatedWordsRule.java @@ -19,10 +19,10 @@ package org.languagetool.rules.de; import org.languagetool.AnalyzedTokenReadings; -import org.languagetool.language.GermanyGerman; +import org.languagetool.language.de.GermanyGerman; import org.languagetool.rules.AbstractRepeatedWordsRule; import org.languagetool.rules.SynonymsData; -import org.languagetool.synthesis.GermanSynthesizer; +import org.languagetool.synthesis.de.GermanSynthesizer; import org.languagetool.synthesis.Synthesizer; import java.util.Map; diff --git a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/GermanSpellerRule.java b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/GermanSpellerRule.java index 1f51bed3a704..bebb24821005 100644 --- a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/GermanSpellerRule.java +++ b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/GermanSpellerRule.java @@ -25,7 +25,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.languagetool.*; -import org.languagetool.language.German; +import org.languagetool.language.de.German; import org.languagetool.languagemodel.LanguageModel; import org.languagetool.rules.Example; import org.languagetool.rules.RuleMatch; diff --git a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/GermanSuppressMisspelledSuggestionsFilter.java b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/GermanSuppressMisspelledSuggestionsFilter.java index 47adb5442e7f..27b5ee9dd5f3 100644 --- a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/GermanSuppressMisspelledSuggestionsFilter.java +++ b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/GermanSuppressMisspelledSuggestionsFilter.java @@ -19,7 +19,7 @@ */ package org.languagetool.rules.de; -import org.languagetool.language.GermanyGerman; +import org.languagetool.language.de.GermanyGerman; import org.languagetool.rules.AbstractSuppressMisspelledSuggestionsFilter; import java.io.IOException; diff --git a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/LineExpander.java b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/LineExpander.java index e18057dee7ae..56f24e624884 100644 --- a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/LineExpander.java +++ b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/LineExpander.java @@ -22,7 +22,7 @@ import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import org.jetbrains.annotations.NotNull; -import org.languagetool.synthesis.GermanSynthesizer; +import org.languagetool.synthesis.de.GermanSynthesizer; import org.languagetool.tools.StringTools; import java.io.IOException; diff --git a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/MissingCommaRelativeClauseRule.java b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/MissingCommaRelativeClauseRule.java index 20ac585863b0..e8179fd39c59 100644 --- a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/MissingCommaRelativeClauseRule.java +++ b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/MissingCommaRelativeClauseRule.java @@ -21,7 +21,7 @@ import org.apache.commons.lang3.StringUtils; import org.languagetool.AnalyzedSentence; import org.languagetool.AnalyzedTokenReadings; -import org.languagetool.language.GermanyGerman; +import org.languagetool.language.de.GermanyGerman; import org.languagetool.rules.Category; import org.languagetool.rules.Category.Location; import org.languagetool.rules.CategoryId; diff --git a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/MissingVerbRule.java b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/MissingVerbRule.java index adc33d75a858..0424adaf4d88 100644 --- a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/MissingVerbRule.java +++ b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/MissingVerbRule.java @@ -22,7 +22,7 @@ import org.languagetool.AnalyzedSentence; import org.languagetool.AnalyzedTokenReadings; import org.languagetool.Language; -import org.languagetool.language.German; +import org.languagetool.language.de.German; import org.languagetool.rules.*; import org.languagetool.rules.patterns.PatternToken; import org.languagetool.rules.patterns.PatternRule; diff --git a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/PotentialCompoundFilter.java b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/PotentialCompoundFilter.java index f80fe922886a..663e48c7bd5e 100644 --- a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/PotentialCompoundFilter.java +++ b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/PotentialCompoundFilter.java @@ -21,7 +21,7 @@ import org.languagetool.AnalyzedSentence; import org.languagetool.AnalyzedToken; import org.languagetool.AnalyzedTokenReadings; -import org.languagetool.language.GermanyGerman; +import org.languagetool.language.de.GermanyGerman; import org.languagetool.rules.RuleMatch; import org.languagetool.rules.patterns.RuleFilter; import org.languagetool.tools.StringTools; diff --git a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/ProhibitedCompoundRule.java b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/ProhibitedCompoundRule.java index d79a4ce89ddd..46990bea02f4 100644 --- a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/ProhibitedCompoundRule.java +++ b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/ProhibitedCompoundRule.java @@ -26,7 +26,7 @@ import org.jetbrains.annotations.Nullable; import org.languagetool.*; import org.languagetool.broker.ResourceDataBroker; -import org.languagetool.language.GermanyGerman; +import org.languagetool.language.de.GermanyGerman; import org.languagetool.languagemodel.BaseLanguageModel; import org.languagetool.languagemodel.LanguageModel; import org.languagetool.rules.*; diff --git a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/RemoveUnknownCompoundsFilter.java b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/RemoveUnknownCompoundsFilter.java index bfff8b167f0a..54fa5b923a16 100644 --- a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/RemoveUnknownCompoundsFilter.java +++ b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/RemoveUnknownCompoundsFilter.java @@ -20,7 +20,7 @@ import org.jetbrains.annotations.Nullable; import org.languagetool.AnalyzedTokenReadings; -import org.languagetool.language.GermanyGerman; +import org.languagetool.language.de.GermanyGerman; import org.languagetool.rules.RuleMatch; import org.languagetool.rules.patterns.RuleFilter; diff --git a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/SpellingData.java b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/SpellingData.java index 2498921f1662..5f90331b1068 100644 --- a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/SpellingData.java +++ b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/SpellingData.java @@ -20,7 +20,7 @@ import com.hankcs.algorithm.AhoCorasickDoubleArrayTrie; import org.languagetool.JLanguageTool; -import org.languagetool.synthesis.GermanSynthesizer; +import org.languagetool.synthesis.de.GermanSynthesizer; import java.io.IOException; import java.util.HashMap; diff --git a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/SubjectVerbAgreementRule.java b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/SubjectVerbAgreementRule.java index dd2c8a80ad4f..42b5386483e6 100644 --- a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/SubjectVerbAgreementRule.java +++ b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/SubjectVerbAgreementRule.java @@ -25,7 +25,7 @@ import org.languagetool.AnalyzedTokenReadings; import org.languagetool.JLanguageTool; import org.languagetool.chunking.ChunkTag; -import org.languagetool.language.German; +import org.languagetool.language.de.German; import org.languagetool.rules.*; import org.languagetool.rules.patterns.PatternToken; import org.languagetool.rules.patterns.PatternTokenBuilder; diff --git a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/SwissGermanSpellerRule.java b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/SwissGermanSpellerRule.java index 28c2a9d4c5cd..4c2c96505ad0 100644 --- a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/SwissGermanSpellerRule.java +++ b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/SwissGermanSpellerRule.java @@ -19,7 +19,7 @@ package org.languagetool.rules.de; import org.languagetool.UserConfig; -import org.languagetool.language.German; +import org.languagetool.language.de.German; import org.languagetool.languagemodel.LanguageModel; import org.languagetool.rules.spelling.CachingWordListLoader; diff --git a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/ValidWordFilter.java b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/ValidWordFilter.java index 37afa6aa4e07..841ca8939578 100644 --- a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/ValidWordFilter.java +++ b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/ValidWordFilter.java @@ -20,7 +20,7 @@ import org.jetbrains.annotations.Nullable; import org.languagetool.AnalyzedTokenReadings; -import org.languagetool.language.GermanyGerman; +import org.languagetool.language.de.GermanyGerman; import org.languagetool.rules.RuleMatch; import org.languagetool.rules.patterns.RuleFilter; diff --git a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/VerbAgreementRule.java b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/VerbAgreementRule.java index 057efc0c093a..190b37c18d6f 100644 --- a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/VerbAgreementRule.java +++ b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/VerbAgreementRule.java @@ -23,7 +23,7 @@ import org.languagetool.AnalyzedSentence; import org.languagetool.AnalyzedToken; import org.languagetool.AnalyzedTokenReadings; -import org.languagetool.language.German; +import org.languagetool.language.de.German; import org.languagetool.rules.Categories; import org.languagetool.rules.Example; import org.languagetool.rules.RuleMatch; diff --git a/languagetool-language-modules/de/src/main/java/org/languagetool/synthesis/GermanSynthesizer.java b/languagetool-language-modules/de/src/main/java/org/languagetool/synthesis/de/GermanSynthesizer.java similarity index 98% rename from languagetool-language-modules/de/src/main/java/org/languagetool/synthesis/GermanSynthesizer.java rename to languagetool-language-modules/de/src/main/java/org/languagetool/synthesis/de/GermanSynthesizer.java index 81e6108db7e2..a01c54efab2f 100644 --- a/languagetool-language-modules/de/src/main/java/org/languagetool/synthesis/GermanSynthesizer.java +++ b/languagetool-language-modules/de/src/main/java/org/languagetool/synthesis/de/GermanSynthesizer.java @@ -16,12 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.synthesis; +package org.languagetool.synthesis.de; import org.jetbrains.annotations.NotNull; import org.languagetool.AnalyzedToken; import org.languagetool.Language; import org.languagetool.Languages; +import org.languagetool.synthesis.BaseSynthesizer; import org.languagetool.tokenizers.de.GermanCompoundTokenizer; import org.languagetool.tools.StringTools; diff --git a/languagetool-language-modules/de/src/main/java/org/languagetool/tagging/de/GermanTagger.java b/languagetool-language-modules/de/src/main/java/org/languagetool/tagging/de/GermanTagger.java index 0f17617eb96f..d0d8d1a1a589 100644 --- a/languagetool-language-modules/de/src/main/java/org/languagetool/tagging/de/GermanTagger.java +++ b/languagetool-language-modules/de/src/main/java/org/languagetool/tagging/de/GermanTagger.java @@ -26,7 +26,7 @@ import org.languagetool.AnalyzedToken; import org.languagetool.AnalyzedTokenReadings; import org.languagetool.rules.spelling.CachingWordListLoader; -import org.languagetool.synthesis.GermanSynthesizer; +import org.languagetool.synthesis.de.GermanSynthesizer; import org.languagetool.tagging.BaseTagger; import org.languagetool.tagging.CombiningTagger; import org.languagetool.tagging.ManualTagger; diff --git a/languagetool-language-modules/de/src/main/resources/META-INF/org/languagetool/language-module.properties b/languagetool-language-modules/de/src/main/resources/META-INF/org/languagetool/language-module.properties index aa73a9b3f390..18844aa25ee2 100644 --- a/languagetool-language-modules/de/src/main/resources/META-INF/org/languagetool/language-module.properties +++ b/languagetool-language-modules/de/src/main/resources/META-INF/org/languagetool/language-module.properties @@ -1 +1 @@ -languageClasses=org.languagetool.language.German,org.languagetool.language.GermanyGerman,org.languagetool.language.AustrianGerman,org.languagetool.language.SwissGerman +languageClasses=org.languagetool.language.de.German,org.languagetool.language.de.GermanyGerman,org.languagetool.language.de.AustrianGerman,org.languagetool.language.de.SwissGerman diff --git a/languagetool-language-modules/de/src/test/java/org/languagetool/AustrianGermanConcurrencyTest.java b/languagetool-language-modules/de/src/test/java/org/languagetool/AustrianGermanConcurrencyTest.java index e7c3585a8128..02952990546a 100644 --- a/languagetool-language-modules/de/src/test/java/org/languagetool/AustrianGermanConcurrencyTest.java +++ b/languagetool-language-modules/de/src/test/java/org/languagetool/AustrianGermanConcurrencyTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.languagetool.language.AbstractLanguageConcurrencyTest; -import org.languagetool.language.AustrianGerman; +import org.languagetool.language.de.AustrianGerman; public class AustrianGermanConcurrencyTest extends AbstractLanguageConcurrencyTest { @Override diff --git a/languagetool-language-modules/de/src/test/java/org/languagetool/GermanyGermanConcurrencyTest.java b/languagetool-language-modules/de/src/test/java/org/languagetool/GermanyGermanConcurrencyTest.java index 592989450704..d83425d5ff80 100644 --- a/languagetool-language-modules/de/src/test/java/org/languagetool/GermanyGermanConcurrencyTest.java +++ b/languagetool-language-modules/de/src/test/java/org/languagetool/GermanyGermanConcurrencyTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.languagetool.language.AbstractLanguageConcurrencyTest; -import org.languagetool.language.GermanyGerman; +import org.languagetool.language.de.GermanyGerman; public class GermanyGermanConcurrencyTest extends AbstractLanguageConcurrencyTest { @Override diff --git a/languagetool-language-modules/de/src/test/java/org/languagetool/JLanguageToolTest.java b/languagetool-language-modules/de/src/test/java/org/languagetool/JLanguageToolTest.java index 0fec120cfdb9..cecf9d7e8a1b 100644 --- a/languagetool-language-modules/de/src/test/java/org/languagetool/JLanguageToolTest.java +++ b/languagetool-language-modules/de/src/test/java/org/languagetool/JLanguageToolTest.java @@ -24,7 +24,7 @@ import java.util.List; import org.junit.Test; -import org.languagetool.language.GermanyGerman; +import org.languagetool.language.de.GermanyGerman; import org.languagetool.markup.AnnotatedTextBuilder; import org.languagetool.rules.RuleMatch; diff --git a/languagetool-language-modules/de/src/test/java/org/languagetool/SwissGermanConcurrencyTest.java b/languagetool-language-modules/de/src/test/java/org/languagetool/SwissGermanConcurrencyTest.java index 4935032bc1e5..5567cde2c8c8 100644 --- a/languagetool-language-modules/de/src/test/java/org/languagetool/SwissGermanConcurrencyTest.java +++ b/languagetool-language-modules/de/src/test/java/org/languagetool/SwissGermanConcurrencyTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.languagetool.language.AbstractLanguageConcurrencyTest; -import org.languagetool.language.SwissGerman; +import org.languagetool.language.de.SwissGerman; public class SwissGermanConcurrencyTest extends AbstractLanguageConcurrencyTest { @Override diff --git a/languagetool-language-modules/de/src/test/java/org/languagetool/chunking/GermanChunkerTest.java b/languagetool-language-modules/de/src/test/java/org/languagetool/chunking/GermanChunkerTest.java index ef931994dff8..74c57821d3ab 100644 --- a/languagetool-language-modules/de/src/test/java/org/languagetool/chunking/GermanChunkerTest.java +++ b/languagetool-language-modules/de/src/test/java/org/languagetool/chunking/GermanChunkerTest.java @@ -29,6 +29,7 @@ import org.languagetool.AnalyzedTokenReadings; import org.languagetool.JLanguageTool; import org.languagetool.Languages; +import org.languagetool.chunking.de.GermanChunker; public class GermanChunkerTest { diff --git a/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/AgreementRule2Test.java b/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/AgreementRule2Test.java index 615a5dd6dd00..f8373d999df9 100644 --- a/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/AgreementRule2Test.java +++ b/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/AgreementRule2Test.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.GermanyGerman; +import org.languagetool.language.de.GermanyGerman; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/AgreementRuleTest.java b/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/AgreementRuleTest.java index 15147013e834..59f52f8bb117 100644 --- a/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/AgreementRuleTest.java +++ b/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/AgreementRuleTest.java @@ -21,7 +21,7 @@ import org.junit.Before; import org.junit.Test; import org.languagetool.*; -import org.languagetool.language.GermanyGerman; +import org.languagetool.language.de.GermanyGerman; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/AustrianGermanSpellerRuleTest.java b/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/AustrianGermanSpellerRuleTest.java index 916078ef3d34..19a2ad19961a 100644 --- a/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/AustrianGermanSpellerRuleTest.java +++ b/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/AustrianGermanSpellerRuleTest.java @@ -25,7 +25,7 @@ import org.languagetool.JLanguageTool; import org.languagetool.Languages; import org.languagetool.TestTools; -import org.languagetool.language.AustrianGerman; +import org.languagetool.language.de.AustrianGerman; public class AustrianGermanSpellerRuleTest { diff --git a/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/CaseRuleTest.java b/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/CaseRuleTest.java index 8a88a555565c..e5574e9a65a3 100644 --- a/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/CaseRuleTest.java +++ b/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/CaseRuleTest.java @@ -24,7 +24,7 @@ import org.languagetool.JLanguageTool; import org.languagetool.Languages; import org.languagetool.TestTools; -import org.languagetool.language.German; +import org.languagetool.language.de.German; import java.io.IOException; diff --git a/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/GermanFillerWordsRuleTest.java b/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/GermanFillerWordsRuleTest.java index c1932d39c1e4..5fe90dc7c723 100644 --- a/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/GermanFillerWordsRuleTest.java +++ b/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/GermanFillerWordsRuleTest.java @@ -26,7 +26,6 @@ import org.junit.Test; import org.languagetool.*; -import org.languagetool.language.GermanyGerman; import org.languagetool.rules.Rule; /** diff --git a/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/GermanSpellerRuleTest.java b/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/GermanSpellerRuleTest.java index 4d8396ce8ceb..2dc4096a5184 100644 --- a/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/GermanSpellerRuleTest.java +++ b/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/GermanSpellerRuleTest.java @@ -28,10 +28,10 @@ import org.languagetool.JLanguageTool; import org.languagetool.Languages; import org.languagetool.TestTools; -import org.languagetool.language.AustrianGerman; -import org.languagetool.language.German; -import org.languagetool.language.GermanyGerman; -import org.languagetool.language.SwissGerman; +import org.languagetool.language.de.AustrianGerman; +import org.languagetool.language.de.German; +import org.languagetool.language.de.GermanyGerman; +import org.languagetool.language.de.SwissGerman; import org.languagetool.rules.RuleMatch; import org.languagetool.rules.spelling.CachingWordListLoader; import org.languagetool.rules.spelling.hunspell.HunspellRule; diff --git a/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/MissingVerbRuleTest.java b/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/MissingVerbRuleTest.java index 68cb4cf57cfb..9d34010de7b6 100644 --- a/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/MissingVerbRuleTest.java +++ b/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/MissingVerbRuleTest.java @@ -26,7 +26,7 @@ import org.languagetool.JLanguageTool; import org.languagetool.Languages; import org.languagetool.TestTools; -import org.languagetool.language.GermanyGerman; +import org.languagetool.language.de.GermanyGerman; public class MissingVerbRuleTest { diff --git a/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/MorfologikGermanyGermanSpellerRuleTest.java b/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/MorfologikGermanyGermanSpellerRuleTest.java index c5792649b6e8..a13dd9adc935 100644 --- a/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/MorfologikGermanyGermanSpellerRuleTest.java +++ b/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/MorfologikGermanyGermanSpellerRuleTest.java @@ -25,7 +25,6 @@ import java.io.IOException; import java.net.URL; import java.nio.charset.CharacterCodingException; -import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -34,7 +33,6 @@ import org.languagetool.JLanguageTool; import org.languagetool.Languages; import org.languagetool.TestTools; -import org.languagetool.language.German; import org.languagetool.rules.RuleMatch; import morfologik.speller.Speller; diff --git a/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/SubjectVerbAgreementRuleTest.java b/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/SubjectVerbAgreementRuleTest.java index 0b14d2d37934..1cb0bba45910 100644 --- a/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/SubjectVerbAgreementRuleTest.java +++ b/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/SubjectVerbAgreementRuleTest.java @@ -29,8 +29,8 @@ import org.junit.BeforeClass; import org.junit.Test; import org.languagetool.*; -import org.languagetool.chunking.GermanChunker; -import org.languagetool.language.German; +import org.languagetool.chunking.de.GermanChunker; +import org.languagetool.language.de.German; import org.languagetool.rules.RuleMatch; public class SubjectVerbAgreementRuleTest { diff --git a/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/SuggestionRegressionTest.java b/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/SuggestionRegressionTest.java index e872fea9fd04..ebf6d3563249 100644 --- a/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/SuggestionRegressionTest.java +++ b/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/SuggestionRegressionTest.java @@ -23,7 +23,7 @@ import org.languagetool.JLanguageTool; import org.languagetool.Languages; import org.languagetool.TestTools; -import org.languagetool.language.GermanyGerman; +import org.languagetool.language.de.GermanyGerman; import org.languagetool.rules.RuleMatch; import java.io.FileWriter; diff --git a/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/SwissGermanSpellerRuleTest.java b/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/SwissGermanSpellerRuleTest.java index 6af57e3fe43f..e068f905cdc8 100644 --- a/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/SwissGermanSpellerRuleTest.java +++ b/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/SwissGermanSpellerRuleTest.java @@ -22,7 +22,7 @@ import org.languagetool.JLanguageTool; import org.languagetool.Languages; import org.languagetool.TestTools; -import org.languagetool.language.SwissGerman; +import org.languagetool.language.de.SwissGerman; import org.languagetool.rules.RuleMatch; import static org.hamcrest.CoreMatchers.is; diff --git a/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/VerbAgreementRuleTest.java b/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/VerbAgreementRuleTest.java index 7e122934dd89..b43212e1ec81 100644 --- a/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/VerbAgreementRuleTest.java +++ b/languagetool-language-modules/de/src/test/java/org/languagetool/rules/de/VerbAgreementRuleTest.java @@ -23,7 +23,7 @@ import org.languagetool.JLanguageTool; import org.languagetool.Languages; import org.languagetool.TestTools; -import org.languagetool.language.German; +import org.languagetool.language.de.German; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/de/src/test/java/org/languagetool/rules/spelling/hunspell/HunspellRuleTest.java b/languagetool-language-modules/de/src/test/java/org/languagetool/rules/spelling/hunspell/HunspellRuleTest.java index 3d4734e6ed4d..b0d98277a723 100644 --- a/languagetool-language-modules/de/src/test/java/org/languagetool/rules/spelling/hunspell/HunspellRuleTest.java +++ b/languagetool-language-modules/de/src/test/java/org/languagetool/rules/spelling/hunspell/HunspellRuleTest.java @@ -24,7 +24,7 @@ import org.languagetool.Language; import org.languagetool.Languages; import org.languagetool.TestTools; -import org.languagetool.language.German; +import org.languagetool.language.de.German; import org.languagetool.rules.RuleMatch; import org.languagetool.rules.SuggestedReplacement; import org.languagetool.rules.de.GermanSpellerRule; diff --git a/languagetool-language-modules/de/src/test/java/org/languagetool/synthesis/GermanSynthesizerTest.java b/languagetool-language-modules/de/src/test/java/org/languagetool/synthesis/GermanSynthesizerTest.java index bd2fd1336e6b..a091a29c8e86 100644 --- a/languagetool-language-modules/de/src/test/java/org/languagetool/synthesis/GermanSynthesizerTest.java +++ b/languagetool-language-modules/de/src/test/java/org/languagetool/synthesis/GermanSynthesizerTest.java @@ -21,6 +21,7 @@ import org.junit.Ignore; import org.junit.Test; import org.languagetool.AnalyzedToken; +import org.languagetool.synthesis.de.GermanSynthesizer; import java.io.IOException; import java.util.Arrays; diff --git a/languagetool-language-modules/de/src/test/java/org/languagetool/tagging/de/GermanDisambiguationTest.java b/languagetool-language-modules/de/src/test/java/org/languagetool/tagging/de/GermanDisambiguationTest.java index af455cca43b0..32b824cf5a7c 100644 --- a/languagetool-language-modules/de/src/test/java/org/languagetool/tagging/de/GermanDisambiguationTest.java +++ b/languagetool-language-modules/de/src/test/java/org/languagetool/tagging/de/GermanDisambiguationTest.java @@ -28,7 +28,7 @@ import org.languagetool.AnalyzedSentence; import org.languagetool.JLanguageTool; import org.languagetool.Language; -import org.languagetool.language.GermanyGerman; +import org.languagetool.language.de.GermanyGerman; public class GermanDisambiguationTest { diff --git a/languagetool-language-modules/el/pom.xml b/languagetool-language-modules/el/pom.xml index 07a068793c91..72b2e3c277c3 100644 --- a/languagetool-language-modules/el/pom.xml +++ b/languagetool-language-modules/el/pom.xml @@ -90,10 +90,21 @@ - + + + org.apache.maven.plugins + maven-jar-plugin + + + + org.languagetool.language.el + + + + diff --git a/languagetool-language-modules/el/src/main/java/org/languagetool/language/Greek.java b/languagetool-language-modules/el/src/main/java/org/languagetool/language/el/Greek.java similarity index 97% rename from languagetool-language-modules/el/src/main/java/org/languagetool/language/Greek.java rename to languagetool-language-modules/el/src/main/java/org/languagetool/language/el/Greek.java index 2f84c833e3ea..4a55ba84da7c 100644 --- a/languagetool-language-modules/el/src/main/java/org/languagetool/language/Greek.java +++ b/languagetool-language-modules/el/src/main/java/org/languagetool/language/el/Greek.java @@ -16,11 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language; +package org.languagetool.language.el; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.languagetool.*; +import org.languagetool.language.Contributor; import org.languagetool.rules.*; import org.languagetool.rules.el.GreekRedundancyRule; import org.languagetool.rules.el.GreekWordRepeatBeginningRule; @@ -65,7 +66,7 @@ public String[] getCountries() { @Override public Contributor[] getMaintainers() { return new Contributor[]{ - new Contributor("Panagiotis Minos") + new Contributor("Panagiotis Minos", null) }; } diff --git a/languagetool-language-modules/el/src/main/resources/META-INF/org/languagetool/language-module.properties b/languagetool-language-modules/el/src/main/resources/META-INF/org/languagetool/language-module.properties index f1a788c840b2..15973cffdc6b 100644 --- a/languagetool-language-modules/el/src/main/resources/META-INF/org/languagetool/language-module.properties +++ b/languagetool-language-modules/el/src/main/resources/META-INF/org/languagetool/language-module.properties @@ -1 +1 @@ -languageClasses=org.languagetool.language.Greek +languageClasses=org.languagetool.language.el.Greek diff --git a/languagetool-language-modules/el/src/test/java/org/languagetool/GreekConcurrencyTest.java b/languagetool-language-modules/el/src/test/java/org/languagetool/GreekConcurrencyTest.java index ead9e5abefd9..ffca59bb781e 100644 --- a/languagetool-language-modules/el/src/test/java/org/languagetool/GreekConcurrencyTest.java +++ b/languagetool-language-modules/el/src/test/java/org/languagetool/GreekConcurrencyTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.languagetool.language.AbstractLanguageConcurrencyTest; -import org.languagetool.language.Greek; +import org.languagetool.language.el.Greek; public class GreekConcurrencyTest extends AbstractLanguageConcurrencyTest { @Override diff --git a/languagetool-language-modules/el/src/test/java/org/languagetool/rules/el/GreekRedundancyRuleTest.java b/languagetool-language-modules/el/src/test/java/org/languagetool/rules/el/GreekRedundancyRuleTest.java index f2d49e77bfaf..8f541f945244 100644 --- a/languagetool-language-modules/el/src/test/java/org/languagetool/rules/el/GreekRedundancyRuleTest.java +++ b/languagetool-language-modules/el/src/test/java/org/languagetool/rules/el/GreekRedundancyRuleTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Greek; +import org.languagetool.language.el.Greek; import org.languagetool.rules.RuleMatch; import java.io.IOException; import static org.junit.Assert.assertEquals; diff --git a/languagetool-language-modules/el/src/test/java/org/languagetool/rules/el/GreekTest.java b/languagetool-language-modules/el/src/test/java/org/languagetool/rules/el/GreekTest.java index 4102b18f214c..02b11bdb5436 100644 --- a/languagetool-language-modules/el/src/test/java/org/languagetool/rules/el/GreekTest.java +++ b/languagetool-language-modules/el/src/test/java/org/languagetool/rules/el/GreekTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.languagetool.LanguageSpecificTest; -import org.languagetool.language.Greek; +import org.languagetool.language.el.Greek; import java.io.IOException; import java.util.Arrays; diff --git a/languagetool-language-modules/el/src/test/java/org/languagetool/rules/el/NumeralStressRuleTest.java b/languagetool-language-modules/el/src/test/java/org/languagetool/rules/el/NumeralStressRuleTest.java index e468fbcab75d..c51679d19e68 100644 --- a/languagetool-language-modules/el/src/test/java/org/languagetool/rules/el/NumeralStressRuleTest.java +++ b/languagetool-language-modules/el/src/test/java/org/languagetool/rules/el/NumeralStressRuleTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Greek; +import org.languagetool.language.el.Greek; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/el/src/test/java/org/languagetool/rules/el/ReplaceHomonymsRuleTest.java b/languagetool-language-modules/el/src/test/java/org/languagetool/rules/el/ReplaceHomonymsRuleTest.java index 5432e818629a..d015caf46d61 100644 --- a/languagetool-language-modules/el/src/test/java/org/languagetool/rules/el/ReplaceHomonymsRuleTest.java +++ b/languagetool-language-modules/el/src/test/java/org/languagetool/rules/el/ReplaceHomonymsRuleTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Greek; +import org.languagetool.language.el.Greek; import org.languagetool.rules.RuleMatch; import java.io.IOException; import static org.junit.Assert.assertEquals; diff --git a/languagetool-language-modules/en/pom.xml b/languagetool-language-modules/en/pom.xml index dc2e120e389a..d0a4514e578f 100644 --- a/languagetool-language-modules/en/pom.xml +++ b/languagetool-language-modules/en/pom.xml @@ -95,6 +95,17 @@ org.apache.maven.plugins maven-surefire-plugin + + org.apache.maven.plugins + maven-jar-plugin + + + + org.languagetool.language.en + + + + diff --git a/languagetool-language-modules/en/src/main/java/org/languagetool/chunking/EnglishChunkFilter.java b/languagetool-language-modules/en/src/main/java/org/languagetool/chunking/en/EnglishChunkFilter.java similarity index 94% rename from languagetool-language-modules/en/src/main/java/org/languagetool/chunking/EnglishChunkFilter.java rename to languagetool-language-modules/en/src/main/java/org/languagetool/chunking/en/EnglishChunkFilter.java index 70c2e26716cb..617d61b51420 100644 --- a/languagetool-language-modules/en/src/main/java/org/languagetool/chunking/EnglishChunkFilter.java +++ b/languagetool-language-modules/en/src/main/java/org/languagetool/chunking/en/EnglishChunkFilter.java @@ -16,9 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.chunking; +package org.languagetool.chunking.en; import org.languagetool.AnalyzedToken; +import org.languagetool.chunking.ChunkTag; +import org.languagetool.chunking.ChunkTaggedToken; import java.util.ArrayList; import java.util.List; @@ -28,14 +30,14 @@ * or plural noun phrases. We add this information here. * @since 2.3 */ -class EnglishChunkFilter { +public class EnglishChunkFilter { private static final ChunkTag BEGIN_NOUN_PHRASE_TAG = new ChunkTag("B-NP"); private static final ChunkTag IN_NOUN_PHRASE_TAG = new ChunkTag("I-NP"); enum ChunkType { SINGULAR, PLURAL } - List filter(List tokens) { + public List filter(List tokens) { List result = new ArrayList<>(); String newChunkTag = null; int i = 0; diff --git a/languagetool-language-modules/en/src/main/java/org/languagetool/chunking/EnglishChunker.java b/languagetool-language-modules/en/src/main/java/org/languagetool/chunking/en/EnglishChunker.java similarity index 97% rename from languagetool-language-modules/en/src/main/java/org/languagetool/chunking/EnglishChunker.java rename to languagetool-language-modules/en/src/main/java/org/languagetool/chunking/en/EnglishChunker.java index 5433c75cd578..da1cd138a039 100644 --- a/languagetool-language-modules/en/src/main/java/org/languagetool/chunking/EnglishChunker.java +++ b/languagetool-language-modules/en/src/main/java/org/languagetool/chunking/en/EnglishChunker.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.chunking; +package org.languagetool.chunking.en; import opennlp.tools.chunker.ChunkerME; import opennlp.tools.chunker.ChunkerModel; @@ -27,6 +27,9 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.languagetool.AnalyzedTokenReadings; +import org.languagetool.chunking.ChunkTag; +import org.languagetool.chunking.ChunkTaggedToken; +import org.languagetool.chunking.Chunker; import org.languagetool.tools.Tools; import java.io.IOException; @@ -110,7 +113,7 @@ private List cleanZeroWidthWhitespaces(String[] tokens) { } // non-private for test cases - String[] tokenize(String sentence) { + public String[] tokenize(String sentence) { TokenizerME tokenizer = new TokenizerME(tokenModel); String cleanString = sentence.replace('’', '\''); // this is the type of apostrophe that OpenNLP expects return tokenizer.tokenize(cleanString); diff --git a/languagetool-language-modules/en/src/main/java/org/languagetool/language/AmericanEnglish.java b/languagetool-language-modules/en/src/main/java/org/languagetool/language/en/AmericanEnglish.java similarity index 98% rename from languagetool-language-modules/en/src/main/java/org/languagetool/language/AmericanEnglish.java rename to languagetool-language-modules/en/src/main/java/org/languagetool/language/en/AmericanEnglish.java index 1c608e9f4657..1cf681e6e3b8 100644 --- a/languagetool-language-modules/en/src/main/java/org/languagetool/language/AmericanEnglish.java +++ b/languagetool-language-modules/en/src/main/java/org/languagetool/language/en/AmericanEnglish.java @@ -17,7 +17,7 @@ * USA */ -package org.languagetool.language; +package org.languagetool.language.en; import org.jetbrains.annotations.Nullable; import org.languagetool.GlobalConfig; diff --git a/languagetool-language-modules/en/src/main/java/org/languagetool/language/AustralianEnglish.java b/languagetool-language-modules/en/src/main/java/org/languagetool/language/en/AustralianEnglish.java similarity index 98% rename from languagetool-language-modules/en/src/main/java/org/languagetool/language/AustralianEnglish.java rename to languagetool-language-modules/en/src/main/java/org/languagetool/language/en/AustralianEnglish.java index 733bc0323ed5..6b0972fc89fc 100644 --- a/languagetool-language-modules/en/src/main/java/org/languagetool/language/AustralianEnglish.java +++ b/languagetool-language-modules/en/src/main/java/org/languagetool/language/en/AustralianEnglish.java @@ -17,7 +17,7 @@ * USA */ -package org.languagetool.language; +package org.languagetool.language.en; import java.io.IOException; import java.util.ArrayList; diff --git a/languagetool-language-modules/en/src/main/java/org/languagetool/language/BritishEnglish.java b/languagetool-language-modules/en/src/main/java/org/languagetool/language/en/BritishEnglish.java similarity index 98% rename from languagetool-language-modules/en/src/main/java/org/languagetool/language/BritishEnglish.java rename to languagetool-language-modules/en/src/main/java/org/languagetool/language/en/BritishEnglish.java index 776f8ce1b9fe..2761031b98a9 100644 --- a/languagetool-language-modules/en/src/main/java/org/languagetool/language/BritishEnglish.java +++ b/languagetool-language-modules/en/src/main/java/org/languagetool/language/en/BritishEnglish.java @@ -17,7 +17,7 @@ * USA */ -package org.languagetool.language; +package org.languagetool.language.en; import java.io.IOException; import java.util.ArrayList; diff --git a/languagetool-language-modules/en/src/main/java/org/languagetool/language/CanadianEnglish.java b/languagetool-language-modules/en/src/main/java/org/languagetool/language/en/CanadianEnglish.java similarity index 98% rename from languagetool-language-modules/en/src/main/java/org/languagetool/language/CanadianEnglish.java rename to languagetool-language-modules/en/src/main/java/org/languagetool/language/en/CanadianEnglish.java index f6650c35a428..7a57940c2d82 100644 --- a/languagetool-language-modules/en/src/main/java/org/languagetool/language/CanadianEnglish.java +++ b/languagetool-language-modules/en/src/main/java/org/languagetool/language/en/CanadianEnglish.java @@ -17,7 +17,7 @@ * USA */ -package org.languagetool.language; +package org.languagetool.language.en; import java.io.IOException; import java.util.ArrayList; diff --git a/languagetool-language-modules/en/src/main/java/org/languagetool/language/English.java b/languagetool-language-modules/en/src/main/java/org/languagetool/language/en/English.java similarity index 99% rename from languagetool-language-modules/en/src/main/java/org/languagetool/language/English.java rename to languagetool-language-modules/en/src/main/java/org/languagetool/language/en/English.java index 33674a3c11df..d1a43f9b9d09 100644 --- a/languagetool-language-modules/en/src/main/java/org/languagetool/language/English.java +++ b/languagetool-language-modules/en/src/main/java/org/languagetool/language/en/English.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language; +package org.languagetool.language.en; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; @@ -25,7 +25,9 @@ import org.jetbrains.annotations.Nullable; import org.languagetool.*; import org.languagetool.chunking.Chunker; -import org.languagetool.chunking.EnglishChunker; +import org.languagetool.chunking.en.EnglishChunker; +import org.languagetool.language.Contributor; +import org.languagetool.language.Contributors; import org.languagetool.languagemodel.LanguageModel; import org.languagetool.rules.*; import org.languagetool.rules.en.*; @@ -154,7 +156,7 @@ public synchronized LanguageModel getLanguageModel(File indexDir) throws IOExcep @Override public Contributor[] getMaintainers() { - return new Contributor[] { new Contributor("Mike Unwalla"), Contributors.MARCIN_MILKOWSKI, Contributors.DANIEL_NABER }; + return new Contributor[] { new Contributor("Mike Unwalla", null), Contributors.MARCIN_MILKOWSKI, Contributors.DANIEL_NABER }; } @Override diff --git a/languagetool-language-modules/en/src/main/java/org/languagetool/language/NewZealandEnglish.java b/languagetool-language-modules/en/src/main/java/org/languagetool/language/en/NewZealandEnglish.java similarity index 98% rename from languagetool-language-modules/en/src/main/java/org/languagetool/language/NewZealandEnglish.java rename to languagetool-language-modules/en/src/main/java/org/languagetool/language/en/NewZealandEnglish.java index 1325d5da2177..57eb39e4ab29 100644 --- a/languagetool-language-modules/en/src/main/java/org/languagetool/language/NewZealandEnglish.java +++ b/languagetool-language-modules/en/src/main/java/org/languagetool/language/en/NewZealandEnglish.java @@ -17,7 +17,7 @@ * USA */ -package org.languagetool.language; +package org.languagetool.language.en; import java.io.IOException; import java.util.ArrayList; diff --git a/languagetool-language-modules/en/src/main/java/org/languagetool/language/SouthAfricanEnglish.java b/languagetool-language-modules/en/src/main/java/org/languagetool/language/en/SouthAfricanEnglish.java similarity index 98% rename from languagetool-language-modules/en/src/main/java/org/languagetool/language/SouthAfricanEnglish.java rename to languagetool-language-modules/en/src/main/java/org/languagetool/language/en/SouthAfricanEnglish.java index 1b52c6c86656..f6d0c8443014 100644 --- a/languagetool-language-modules/en/src/main/java/org/languagetool/language/SouthAfricanEnglish.java +++ b/languagetool-language-modules/en/src/main/java/org/languagetool/language/en/SouthAfricanEnglish.java @@ -17,7 +17,7 @@ * USA */ -package org.languagetool.language; +package org.languagetool.language.en; import java.io.IOException; import java.util.ArrayList; diff --git a/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/AmericanReplaceRule.java b/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/AmericanReplaceRule.java index 1af1188a9193..d47f8069c3bc 100644 --- a/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/AmericanReplaceRule.java +++ b/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/AmericanReplaceRule.java @@ -18,7 +18,7 @@ */ package org.languagetool.rules.en; -import org.languagetool.language.AmericanEnglish; +import org.languagetool.language.en.AmericanEnglish; import org.languagetool.rules.AbstractSimpleReplaceRule2; import org.languagetool.rules.Categories; import org.languagetool.rules.Example; diff --git a/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/BritishReplaceRule.java b/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/BritishReplaceRule.java index 207611119d04..8e492a12ce86 100644 --- a/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/BritishReplaceRule.java +++ b/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/BritishReplaceRule.java @@ -18,7 +18,7 @@ */ package org.languagetool.rules.en; -import org.languagetool.language.BritishEnglish; +import org.languagetool.language.en.BritishEnglish; import org.languagetool.rules.AbstractSimpleReplaceRule2; import org.languagetool.rules.Categories; import org.languagetool.rules.Example; diff --git a/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/EnglishDiacriticsRule.java b/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/EnglishDiacriticsRule.java index 00cb3308d2d8..af29cae09bf1 100644 --- a/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/EnglishDiacriticsRule.java +++ b/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/EnglishDiacriticsRule.java @@ -18,7 +18,7 @@ */ package org.languagetool.rules.en; -import org.languagetool.language.English; +import org.languagetool.language.en.English; import org.languagetool.rules.AbstractSimpleReplaceRule2; import org.languagetool.rules.Categories; import org.languagetool.rules.Example; diff --git a/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/EnglishNumberInWordFilter.java b/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/EnglishNumberInWordFilter.java index 2ee18a3821bf..2623fa39426e 100644 --- a/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/EnglishNumberInWordFilter.java +++ b/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/EnglishNumberInWordFilter.java @@ -19,7 +19,7 @@ package org.languagetool.rules.en; import org.languagetool.JLanguageTool; -import org.languagetool.language.AmericanEnglish; +import org.languagetool.language.en.AmericanEnglish; import org.languagetool.rules.AbstractNumberInWordFilter; import java.io.IOException; diff --git a/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/EnglishPartialPosTagFilter.java b/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/EnglishPartialPosTagFilter.java index 5ae160ea9ec5..f6bc2aac9b56 100644 --- a/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/EnglishPartialPosTagFilter.java +++ b/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/EnglishPartialPosTagFilter.java @@ -20,7 +20,7 @@ import org.languagetool.AnalyzedSentence; import org.languagetool.AnalyzedTokenReadings; -import org.languagetool.language.English; +import org.languagetool.language.en.English; import org.languagetool.rules.PartialPosTagFilter; import org.languagetool.tagging.Tagger; import org.languagetool.tagging.disambiguation.Disambiguator; diff --git a/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/EnglishPlainEnglishRule.java b/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/EnglishPlainEnglishRule.java index 24fcc8b6c466..8b40832974aa 100644 --- a/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/EnglishPlainEnglishRule.java +++ b/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/EnglishPlainEnglishRule.java @@ -18,7 +18,7 @@ */ package org.languagetool.rules.en; -import org.languagetool.language.English; +import org.languagetool.language.en.English; import org.languagetool.rules.AbstractSimpleReplaceRule2; import org.languagetool.rules.Categories; import org.languagetool.rules.Example; diff --git a/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/EnglishRedundancyRule.java b/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/EnglishRedundancyRule.java index 97dfee8a6b1e..34226acedc9c 100644 --- a/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/EnglishRedundancyRule.java +++ b/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/EnglishRedundancyRule.java @@ -18,7 +18,7 @@ */ package org.languagetool.rules.en; -import org.languagetool.language.English; +import org.languagetool.language.en.English; import org.languagetool.rules.AbstractSimpleReplaceRule2; import org.languagetool.rules.Categories; import org.languagetool.rules.Example; diff --git a/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/EnglishRepeatedWordsRule.java b/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/EnglishRepeatedWordsRule.java index f81f7297367b..954717565dee 100644 --- a/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/EnglishRepeatedWordsRule.java +++ b/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/EnglishRepeatedWordsRule.java @@ -20,7 +20,7 @@ import org.languagetool.AnalyzedTokenReadings; import org.languagetool.Tag; -import org.languagetool.language.AmericanEnglish; +import org.languagetool.language.en.AmericanEnglish; import org.languagetool.rules.AbstractRepeatedWordsRule; import org.languagetool.rules.SynonymsData; import org.languagetool.rules.patterns.PatternToken; diff --git a/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/EnglishSuppressMisspelledSuggestionsFilter.java b/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/EnglishSuppressMisspelledSuggestionsFilter.java index 4143ee84dc00..7510fa97483f 100644 --- a/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/EnglishSuppressMisspelledSuggestionsFilter.java +++ b/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/EnglishSuppressMisspelledSuggestionsFilter.java @@ -20,7 +20,7 @@ package org.languagetool.rules.en; import java.io.IOException; -import org.languagetool.language.AmericanEnglish; +import org.languagetool.language.en.AmericanEnglish; import org.languagetool.rules.AbstractSuppressMisspelledSuggestionsFilter; public class EnglishSuppressMisspelledSuggestionsFilter extends AbstractSuppressMisspelledSuggestionsFilter { diff --git a/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/NewZealandReplaceRule.java b/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/NewZealandReplaceRule.java index cf7e6e525e1c..783b691ae8e6 100644 --- a/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/NewZealandReplaceRule.java +++ b/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/NewZealandReplaceRule.java @@ -18,7 +18,7 @@ */ package org.languagetool.rules.en; -import org.languagetool.language.NewZealandEnglish; +import org.languagetool.language.en.NewZealandEnglish; import org.languagetool.rules.AbstractSimpleReplaceRule2; import org.languagetool.rules.Categories; import org.languagetool.rules.Example; diff --git a/languagetool-language-modules/en/src/main/java/org/languagetool/tagging/en/EnglishHybridDisambiguator.java b/languagetool-language-modules/en/src/main/java/org/languagetool/tagging/en/EnglishHybridDisambiguator.java index 83defe413ede..b70d619ab6c2 100644 --- a/languagetool-language-modules/en/src/main/java/org/languagetool/tagging/en/EnglishHybridDisambiguator.java +++ b/languagetool-language-modules/en/src/main/java/org/languagetool/tagging/en/EnglishHybridDisambiguator.java @@ -25,7 +25,6 @@ import org.languagetool.AnalyzedTokenReadings; import org.languagetool.JLanguageTool; import org.languagetool.Language; -import org.languagetool.language.English; import org.languagetool.tagging.disambiguation.AbstractDisambiguator; import org.languagetool.tagging.disambiguation.Disambiguator; import org.languagetool.tagging.disambiguation.MultiWordChunker; diff --git a/languagetool-language-modules/en/src/main/resources/META-INF/org/languagetool/language-module.properties b/languagetool-language-modules/en/src/main/resources/META-INF/org/languagetool/language-module.properties index 02bdbc147ab0..226f03b469b9 100644 --- a/languagetool-language-modules/en/src/main/resources/META-INF/org/languagetool/language-module.properties +++ b/languagetool-language-modules/en/src/main/resources/META-INF/org/languagetool/language-module.properties @@ -1 +1 @@ -languageClasses=org.languagetool.language.English,org.languagetool.language.AmericanEnglish,org.languagetool.language.BritishEnglish,org.languagetool.language.AustralianEnglish,org.languagetool.language.CanadianEnglish,org.languagetool.language.NewZealandEnglish,org.languagetool.language.SouthAfricanEnglish +languageClasses=org.languagetool.language.en.English,org.languagetool.language.en.AmericanEnglish,org.languagetool.language.en.BritishEnglish,org.languagetool.language.en.AustralianEnglish,org.languagetool.language.en.CanadianEnglish,org.languagetool.language.en.NewZealandEnglish,org.languagetool.language.en.SouthAfricanEnglish diff --git a/languagetool-language-modules/en/src/test/java/org/languagetool/AmericanEnglishConcurrencyTest.java b/languagetool-language-modules/en/src/test/java/org/languagetool/AmericanEnglishConcurrencyTest.java index 30d00e157cee..a0b3a2715868 100644 --- a/languagetool-language-modules/en/src/test/java/org/languagetool/AmericanEnglishConcurrencyTest.java +++ b/languagetool-language-modules/en/src/test/java/org/languagetool/AmericanEnglishConcurrencyTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.languagetool.language.AbstractLanguageConcurrencyTest; -import org.languagetool.language.AmericanEnglish; +import org.languagetool.language.en.AmericanEnglish; public class AmericanEnglishConcurrencyTest extends AbstractLanguageConcurrencyTest { @Override diff --git a/languagetool-language-modules/en/src/test/java/org/languagetool/AustralianEnglishConcurrencyTest.java b/languagetool-language-modules/en/src/test/java/org/languagetool/AustralianEnglishConcurrencyTest.java index 7a0e01eb0eaa..92992272be19 100644 --- a/languagetool-language-modules/en/src/test/java/org/languagetool/AustralianEnglishConcurrencyTest.java +++ b/languagetool-language-modules/en/src/test/java/org/languagetool/AustralianEnglishConcurrencyTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.languagetool.language.AbstractLanguageConcurrencyTest; -import org.languagetool.language.AustralianEnglish; +import org.languagetool.language.en.AustralianEnglish; public class AustralianEnglishConcurrencyTest extends AbstractLanguageConcurrencyTest { @Override diff --git a/languagetool-language-modules/en/src/test/java/org/languagetool/BritishEnglishConcurrencyTest.java b/languagetool-language-modules/en/src/test/java/org/languagetool/BritishEnglishConcurrencyTest.java index 7312e560c484..be2e5d6a3147 100644 --- a/languagetool-language-modules/en/src/test/java/org/languagetool/BritishEnglishConcurrencyTest.java +++ b/languagetool-language-modules/en/src/test/java/org/languagetool/BritishEnglishConcurrencyTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.languagetool.language.AbstractLanguageConcurrencyTest; -import org.languagetool.language.BritishEnglish; +import org.languagetool.language.en.BritishEnglish; public class BritishEnglishConcurrencyTest extends AbstractLanguageConcurrencyTest { @Override diff --git a/languagetool-language-modules/en/src/test/java/org/languagetool/CanadianEnglishConcurrencyTest.java b/languagetool-language-modules/en/src/test/java/org/languagetool/CanadianEnglishConcurrencyTest.java index b1e628991556..c3edb52a4645 100644 --- a/languagetool-language-modules/en/src/test/java/org/languagetool/CanadianEnglishConcurrencyTest.java +++ b/languagetool-language-modules/en/src/test/java/org/languagetool/CanadianEnglishConcurrencyTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.languagetool.language.AbstractLanguageConcurrencyTest; -import org.languagetool.language.CanadianEnglish; +import org.languagetool.language.en.CanadianEnglish; public class CanadianEnglishConcurrencyTest extends AbstractLanguageConcurrencyTest { @Override diff --git a/languagetool-language-modules/en/src/test/java/org/languagetool/JLanguageToolTest.java b/languagetool-language-modules/en/src/test/java/org/languagetool/JLanguageToolTest.java index 2dd507391275..9826e971d0a9 100644 --- a/languagetool-language-modules/en/src/test/java/org/languagetool/JLanguageToolTest.java +++ b/languagetool-language-modules/en/src/test/java/org/languagetool/JLanguageToolTest.java @@ -21,13 +21,9 @@ import org.junit.Ignore; import org.junit.Test; import org.languagetool.JLanguageTool.ParagraphHandling; -import org.languagetool.language.AmericanEnglish; -import org.languagetool.language.BritishEnglish; -import org.languagetool.language.English; -import org.languagetool.language.CanadianEnglish; -import org.languagetool.language.NewZealandEnglish; -import org.languagetool.language.SouthAfricanEnglish; -import org.languagetool.language.AustralianEnglish; +import org.languagetool.language.en.AmericanEnglish; +import org.languagetool.language.en.BritishEnglish; +import org.languagetool.language.en.English; import org.languagetool.markup.AnnotatedText; import org.languagetool.markup.AnnotatedTextBuilder; import org.languagetool.rules.*; diff --git a/languagetool-language-modules/en/src/test/java/org/languagetool/NewZealandEnglishConcurrencyTest.java b/languagetool-language-modules/en/src/test/java/org/languagetool/NewZealandEnglishConcurrencyTest.java index d2d6512fd2f0..d5d6ce764ee1 100644 --- a/languagetool-language-modules/en/src/test/java/org/languagetool/NewZealandEnglishConcurrencyTest.java +++ b/languagetool-language-modules/en/src/test/java/org/languagetool/NewZealandEnglishConcurrencyTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.languagetool.language.AbstractLanguageConcurrencyTest; -import org.languagetool.language.NewZealandEnglish; +import org.languagetool.language.en.NewZealandEnglish; public class NewZealandEnglishConcurrencyTest extends AbstractLanguageConcurrencyTest { @Override diff --git a/languagetool-language-modules/en/src/test/java/org/languagetool/SouthAfricanEnglishConcurrencyTest.java b/languagetool-language-modules/en/src/test/java/org/languagetool/SouthAfricanEnglishConcurrencyTest.java index d5d669e384e5..05b5abac24f1 100644 --- a/languagetool-language-modules/en/src/test/java/org/languagetool/SouthAfricanEnglishConcurrencyTest.java +++ b/languagetool-language-modules/en/src/test/java/org/languagetool/SouthAfricanEnglishConcurrencyTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.languagetool.language.AbstractLanguageConcurrencyTest; -import org.languagetool.language.SouthAfricanEnglish; +import org.languagetool.language.en.SouthAfricanEnglish; public class SouthAfricanEnglishConcurrencyTest extends AbstractLanguageConcurrencyTest { @Override diff --git a/languagetool-language-modules/en/src/test/java/org/languagetool/SpellIgnoreTest.java b/languagetool-language-modules/en/src/test/java/org/languagetool/SpellIgnoreTest.java index 9938eed5e0d7..c283628c1f0c 100644 --- a/languagetool-language-modules/en/src/test/java/org/languagetool/SpellIgnoreTest.java +++ b/languagetool-language-modules/en/src/test/java/org/languagetool/SpellIgnoreTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.junit.Test; -import org.languagetool.language.AmericanEnglish; +import org.languagetool.language.en.AmericanEnglish; import org.languagetool.rules.Rule; import org.languagetool.rules.spelling.SpellingCheckRule; diff --git a/languagetool-language-modules/en/src/test/java/org/languagetool/chunking/EnglishChunkFilterTest.java b/languagetool-language-modules/en/src/test/java/org/languagetool/chunking/EnglishChunkFilterTest.java index 47163e93a755..a26657bbd340 100644 --- a/languagetool-language-modules/en/src/test/java/org/languagetool/chunking/EnglishChunkFilterTest.java +++ b/languagetool-language-modules/en/src/test/java/org/languagetool/chunking/EnglishChunkFilterTest.java @@ -23,6 +23,7 @@ import org.junit.Test; import org.languagetool.AnalyzedToken; import org.languagetool.AnalyzedTokenReadings; +import org.languagetool.chunking.en.EnglishChunkFilter; import java.io.IOException; import java.util.ArrayList; diff --git a/languagetool-language-modules/en/src/test/java/org/languagetool/chunking/EnglishChunkerTest.java b/languagetool-language-modules/en/src/test/java/org/languagetool/chunking/EnglishChunkerTest.java index 5b107c822ab4..5f74a3629563 100644 --- a/languagetool-language-modules/en/src/test/java/org/languagetool/chunking/EnglishChunkerTest.java +++ b/languagetool-language-modules/en/src/test/java/org/languagetool/chunking/EnglishChunkerTest.java @@ -25,7 +25,8 @@ import org.languagetool.AnalyzedToken; import org.languagetool.AnalyzedTokenReadings; import org.languagetool.JLanguageTool; -import org.languagetool.language.English; +import org.languagetool.chunking.en.EnglishChunker; +import org.languagetool.language.en.English; import java.io.IOException; import java.util.ArrayList; diff --git a/languagetool-language-modules/en/src/test/java/org/languagetool/rules/en/EnglishPatternRuleTest.java b/languagetool-language-modules/en/src/test/java/org/languagetool/rules/en/EnglishPatternRuleTest.java index 3e78af3810de..4e3a4a767850 100644 --- a/languagetool-language-modules/en/src/test/java/org/languagetool/rules/en/EnglishPatternRuleTest.java +++ b/languagetool-language-modules/en/src/test/java/org/languagetool/rules/en/EnglishPatternRuleTest.java @@ -23,7 +23,7 @@ import org.languagetool.Language; import org.languagetool.Languages; import org.languagetool.UserConfig; -import org.languagetool.language.AmericanEnglish; +import org.languagetool.language.en.AmericanEnglish; import org.languagetool.rules.Rule; import org.languagetool.rules.patterns.PatternRuleTest; diff --git a/languagetool-language-modules/en/src/test/java/org/languagetool/rules/en/EnglishRemoteRuleSuppressMisspelledTest.java b/languagetool-language-modules/en/src/test/java/org/languagetool/rules/en/EnglishRemoteRuleSuppressMisspelledTest.java index 6e36b32a410b..7c224ecb1e55 100644 --- a/languagetool-language-modules/en/src/test/java/org/languagetool/rules/en/EnglishRemoteRuleSuppressMisspelledTest.java +++ b/languagetool-language-modules/en/src/test/java/org/languagetool/rules/en/EnglishRemoteRuleSuppressMisspelledTest.java @@ -25,7 +25,7 @@ import org.languagetool.AnalyzedSentence; import org.languagetool.JLanguageTool; import org.languagetool.Language; -import org.languagetool.language.AmericanEnglish; +import org.languagetool.language.en.AmericanEnglish; import org.languagetool.rules.RemoteRule; import org.languagetool.rules.RemoteRuleConfig; import org.languagetool.rules.RemoteRuleResult; diff --git a/languagetool-language-modules/en/src/test/java/org/languagetool/rules/en/EnglishTest.java b/languagetool-language-modules/en/src/test/java/org/languagetool/rules/en/EnglishTest.java index f05aa47f622c..4bb565491882 100644 --- a/languagetool-language-modules/en/src/test/java/org/languagetool/rules/en/EnglishTest.java +++ b/languagetool-language-modules/en/src/test/java/org/languagetool/rules/en/EnglishTest.java @@ -23,7 +23,7 @@ import org.languagetool.Language; import org.languagetool.LanguageSpecificTest; import org.languagetool.Languages; -import org.languagetool.language.English; +import org.languagetool.language.en.English; import org.languagetool.rules.Rule; import org.languagetool.rules.RuleMatch; import org.languagetool.rules.patterns.AbstractPatternRule; diff --git a/languagetool-language-modules/en/src/test/java/org/languagetool/rules/en/MorfologikAmericanSpellerRuleTest.java b/languagetool-language-modules/en/src/test/java/org/languagetool/rules/en/MorfologikAmericanSpellerRuleTest.java index f4d2ba27afdf..18cfa9666e33 100644 --- a/languagetool-language-modules/en/src/test/java/org/languagetool/rules/en/MorfologikAmericanSpellerRuleTest.java +++ b/languagetool-language-modules/en/src/test/java/org/languagetool/rules/en/MorfologikAmericanSpellerRuleTest.java @@ -22,7 +22,7 @@ import org.junit.Ignore; import org.junit.Test; import org.languagetool.*; -import org.languagetool.language.CanadianEnglish; +import org.languagetool.language.en.CanadianEnglish; import org.languagetool.languagemodel.LanguageModel; import org.languagetool.rules.Rule; import org.languagetool.rules.RuleMatch; diff --git a/languagetool-language-modules/en/src/test/java/org/languagetool/rules/en/MorfologikAustralianSpellerRuleTest.java b/languagetool-language-modules/en/src/test/java/org/languagetool/rules/en/MorfologikAustralianSpellerRuleTest.java index 5be471ed9d93..e4fa5b61fec5 100644 --- a/languagetool-language-modules/en/src/test/java/org/languagetool/rules/en/MorfologikAustralianSpellerRuleTest.java +++ b/languagetool-language-modules/en/src/test/java/org/languagetool/rules/en/MorfologikAustralianSpellerRuleTest.java @@ -30,7 +30,7 @@ import org.languagetool.JLanguageTool; import org.languagetool.Language; import org.languagetool.TestTools; -import org.languagetool.language.AustralianEnglish; +import org.languagetool.language.en.AustralianEnglish; import org.languagetool.rules.Rule; import org.languagetool.rules.RuleMatch; diff --git a/languagetool-language-modules/en/src/test/java/org/languagetool/rules/en/MorfologikCanadianSpellerRuleTest.java b/languagetool-language-modules/en/src/test/java/org/languagetool/rules/en/MorfologikCanadianSpellerRuleTest.java index 6978c9fdd795..1808965ad9c2 100644 --- a/languagetool-language-modules/en/src/test/java/org/languagetool/rules/en/MorfologikCanadianSpellerRuleTest.java +++ b/languagetool-language-modules/en/src/test/java/org/languagetool/rules/en/MorfologikCanadianSpellerRuleTest.java @@ -30,7 +30,7 @@ import org.languagetool.JLanguageTool; import org.languagetool.Language; import org.languagetool.TestTools; -import org.languagetool.language.CanadianEnglish; +import org.languagetool.language.en.CanadianEnglish; import org.languagetool.rules.Rule; import org.languagetool.rules.RuleMatch; diff --git a/languagetool-language-modules/en/src/test/java/org/languagetool/rules/en/MorfologikNewZealandSpellerRuleTest.java b/languagetool-language-modules/en/src/test/java/org/languagetool/rules/en/MorfologikNewZealandSpellerRuleTest.java index f260a53ebc14..4aaf20610ab1 100644 --- a/languagetool-language-modules/en/src/test/java/org/languagetool/rules/en/MorfologikNewZealandSpellerRuleTest.java +++ b/languagetool-language-modules/en/src/test/java/org/languagetool/rules/en/MorfologikNewZealandSpellerRuleTest.java @@ -27,7 +27,7 @@ import org.languagetool.JLanguageTool; import org.languagetool.Language; import org.languagetool.TestTools; -import org.languagetool.language.NewZealandEnglish; +import org.languagetool.language.en.NewZealandEnglish; import org.languagetool.rules.Rule; import org.languagetool.rules.RuleMatch; diff --git a/languagetool-language-modules/en/src/test/java/org/languagetool/rules/en/MorfologikSouthAfricanSpellerRuleTest.java b/languagetool-language-modules/en/src/test/java/org/languagetool/rules/en/MorfologikSouthAfricanSpellerRuleTest.java index c8d9dfc378f5..21c4cadb4481 100644 --- a/languagetool-language-modules/en/src/test/java/org/languagetool/rules/en/MorfologikSouthAfricanSpellerRuleTest.java +++ b/languagetool-language-modules/en/src/test/java/org/languagetool/rules/en/MorfologikSouthAfricanSpellerRuleTest.java @@ -30,7 +30,7 @@ import org.languagetool.JLanguageTool; import org.languagetool.Language; import org.languagetool.TestTools; -import org.languagetool.language.SouthAfricanEnglish; +import org.languagetool.language.en.SouthAfricanEnglish; import org.languagetool.rules.Rule; import org.languagetool.rules.RuleMatch; diff --git a/languagetool-language-modules/en/src/test/java/org/languagetool/rules/en/NewZealandReplaceRuleTest.java b/languagetool-language-modules/en/src/test/java/org/languagetool/rules/en/NewZealandReplaceRuleTest.java index 27a7dac0f507..dc32cfa83e4b 100644 --- a/languagetool-language-modules/en/src/test/java/org/languagetool/rules/en/NewZealandReplaceRuleTest.java +++ b/languagetool-language-modules/en/src/test/java/org/languagetool/rules/en/NewZealandReplaceRuleTest.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.NewZealandEnglish; +import org.languagetool.language.en.NewZealandEnglish; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/en/src/test/java/org/languagetool/tagging/disambiguation/rules/en/EnglishDisambiguationRuleTest.java b/languagetool-language-modules/en/src/test/java/org/languagetool/tagging/disambiguation/rules/en/EnglishDisambiguationRuleTest.java index f6d98d1ab49c..bb9d21d4b7a3 100644 --- a/languagetool-language-modules/en/src/test/java/org/languagetool/tagging/disambiguation/rules/en/EnglishDisambiguationRuleTest.java +++ b/languagetool-language-modules/en/src/test/java/org/languagetool/tagging/disambiguation/rules/en/EnglishDisambiguationRuleTest.java @@ -24,7 +24,7 @@ import org.junit.Test; import org.languagetool.Language; import org.languagetool.TestTools; -import org.languagetool.language.English; +import org.languagetool.language.en.English; import org.languagetool.tagging.disambiguation.rules.XmlRuleDisambiguator; import org.languagetool.tagging.disambiguation.xx.DemoDisambiguator; import org.languagetool.tagging.en.EnglishHybridDisambiguator; diff --git a/languagetool-language-modules/en/src/test/java/org/languagetool/tagging/en/EnglishTaggerTest.java b/languagetool-language-modules/en/src/test/java/org/languagetool/tagging/en/EnglishTaggerTest.java index 97e3b57c37ad..031a61e72c1b 100644 --- a/languagetool-language-modules/en/src/test/java/org/languagetool/tagging/en/EnglishTaggerTest.java +++ b/languagetool-language-modules/en/src/test/java/org/languagetool/tagging/en/EnglishTaggerTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.languagetool.AnalyzedTokenReadings; import org.languagetool.TestTools; -import org.languagetool.language.English; +import org.languagetool.language.en.English; import org.languagetool.tokenizers.en.EnglishWordTokenizer; import java.io.IOException; diff --git a/languagetool-language-modules/en/src/test/java/org/languagetool/tokenizers/EnglishSRXSentenceTokenizerTest.java b/languagetool-language-modules/en/src/test/java/org/languagetool/tokenizers/EnglishSRXSentenceTokenizerTest.java index aaa15bc5e3bf..6273a79c0d48 100644 --- a/languagetool-language-modules/en/src/test/java/org/languagetool/tokenizers/EnglishSRXSentenceTokenizerTest.java +++ b/languagetool-language-modules/en/src/test/java/org/languagetool/tokenizers/EnglishSRXSentenceTokenizerTest.java @@ -21,7 +21,7 @@ import org.junit.Before; import org.junit.Test; import org.languagetool.TestTools; -import org.languagetool.language.English; +import org.languagetool.language.en.English; public class EnglishSRXSentenceTokenizerTest { diff --git a/languagetool-language-modules/en/src/test/java/org/languagetool/tools/ToolsTest.java b/languagetool-language-modules/en/src/test/java/org/languagetool/tools/ToolsTest.java index d88ee9f13df1..8c9372ad4e0d 100644 --- a/languagetool-language-modules/en/src/test/java/org/languagetool/tools/ToolsTest.java +++ b/languagetool-language-modules/en/src/test/java/org/languagetool/tools/ToolsTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; -import org.languagetool.language.English; +import org.languagetool.language.en.English; import org.xml.sax.SAXException; import javax.xml.parsers.ParserConfigurationException; diff --git a/languagetool-language-modules/eo/pom.xml b/languagetool-language-modules/eo/pom.xml index 087ba2797554..6551c8f9a38d 100644 --- a/languagetool-language-modules/eo/pom.xml +++ b/languagetool-language-modules/eo/pom.xml @@ -73,6 +73,17 @@ org.apache.maven.plugins maven-surefire-plugin + + org.apache.maven.plugins + maven-jar-plugin + + + + org.languagetool.language.eo + + + + diff --git a/languagetool-language-modules/eo/src/main/java/org/languagetool/language/Esperanto.java b/languagetool-language-modules/eo/src/main/java/org/languagetool/language/eo/Esperanto.java similarity index 96% rename from languagetool-language-modules/eo/src/main/java/org/languagetool/language/Esperanto.java rename to languagetool-language-modules/eo/src/main/java/org/languagetool/language/eo/Esperanto.java index 27efb9339202..2319dfccfa50 100644 --- a/languagetool-language-modules/eo/src/main/java/org/languagetool/language/Esperanto.java +++ b/languagetool-language-modules/eo/src/main/java/org/languagetool/language/eo/Esperanto.java @@ -16,11 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language; +package org.languagetool.language.eo; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.languagetool.*; +import org.languagetool.language.Contributor; +import org.languagetool.language.Contributors; import org.languagetool.rules.*; import org.languagetool.rules.spelling.SpellingCheckRule; import org.languagetool.rules.spelling.hunspell.HunspellRule; diff --git a/languagetool-language-modules/eo/src/main/resources/META-INF/org/languagetool/language-module.properties b/languagetool-language-modules/eo/src/main/resources/META-INF/org/languagetool/language-module.properties index b13d2beafb0e..4f6c49b06acb 100644 --- a/languagetool-language-modules/eo/src/main/resources/META-INF/org/languagetool/language-module.properties +++ b/languagetool-language-modules/eo/src/main/resources/META-INF/org/languagetool/language-module.properties @@ -1 +1 @@ -languageClasses=org.languagetool.language.Esperanto +languageClasses=org.languagetool.language.eo.Esperanto diff --git a/languagetool-language-modules/eo/src/test/java/org/languagetool/EsperantoConcurrencyTest.java b/languagetool-language-modules/eo/src/test/java/org/languagetool/EsperantoConcurrencyTest.java index fe57724371ba..68e21791231f 100644 --- a/languagetool-language-modules/eo/src/test/java/org/languagetool/EsperantoConcurrencyTest.java +++ b/languagetool-language-modules/eo/src/test/java/org/languagetool/EsperantoConcurrencyTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.languagetool.language.AbstractLanguageConcurrencyTest; -import org.languagetool.language.Esperanto; +import org.languagetool.language.eo.Esperanto; public class EsperantoConcurrencyTest extends AbstractLanguageConcurrencyTest { @Override diff --git a/languagetool-language-modules/eo/src/test/java/org/languagetool/EsperantoTest.java b/languagetool-language-modules/eo/src/test/java/org/languagetool/EsperantoTest.java index 42cc7322f8aa..079f76066359 100644 --- a/languagetool-language-modules/eo/src/test/java/org/languagetool/EsperantoTest.java +++ b/languagetool-language-modules/eo/src/test/java/org/languagetool/EsperantoTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.junit.Test; -import org.languagetool.language.Esperanto; +import org.languagetool.language.eo.Esperanto; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/eo/src/test/java/org/languagetool/rules/eo/EsperantoTest.java b/languagetool-language-modules/eo/src/test/java/org/languagetool/rules/eo/EsperantoTest.java index 2a587ab89dc6..e2b42c8b809b 100644 --- a/languagetool-language-modules/eo/src/test/java/org/languagetool/rules/eo/EsperantoTest.java +++ b/languagetool-language-modules/eo/src/test/java/org/languagetool/rules/eo/EsperantoTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.languagetool.LanguageSpecificTest; -import org.languagetool.language.Esperanto; +import org.languagetool.language.eo.Esperanto; import java.io.IOException; import java.util.Arrays; diff --git a/languagetool-language-modules/es/pom.xml b/languagetool-language-modules/es/pom.xml index aee616ca100b..4222a6b84623 100644 --- a/languagetool-language-modules/es/pom.xml +++ b/languagetool-language-modules/es/pom.xml @@ -78,6 +78,17 @@ org.apache.maven.plugins maven-surefire-plugin + + org.apache.maven.plugins + maven-jar-plugin + + + + org.languagetool.language.es + + + + diff --git a/languagetool-language-modules/es/src/main/java/org/languagetool/language/Spanish.java b/languagetool-language-modules/es/src/main/java/org/languagetool/language/es/Spanish.java similarity index 98% rename from languagetool-language-modules/es/src/main/java/org/languagetool/language/Spanish.java rename to languagetool-language-modules/es/src/main/java/org/languagetool/language/es/Spanish.java index 09f875d24e4f..59a86b83820a 100644 --- a/languagetool-language-modules/es/src/main/java/org/languagetool/language/Spanish.java +++ b/languagetool-language-modules/es/src/main/java/org/languagetool/language/es/Spanish.java @@ -16,11 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language; +package org.languagetool.language.es; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.languagetool.*; +import org.languagetool.language.Contributor; import org.languagetool.languagemodel.LanguageModel; import org.languagetool.rules.*; import org.languagetool.rules.es.*; @@ -99,7 +100,7 @@ public SentenceTokenizer createDefaultSentenceTokenizer() { @Override public Contributor[] getMaintainers() { return new Contributor[] { - new Contributor("Jaume Ortolà") + new Contributor("Jaume Ortolà", null) }; } diff --git a/languagetool-language-modules/es/src/main/java/org/languagetool/language/SpanishVoseo.java b/languagetool-language-modules/es/src/main/java/org/languagetool/language/es/SpanishVoseo.java similarity index 92% rename from languagetool-language-modules/es/src/main/java/org/languagetool/language/SpanishVoseo.java rename to languagetool-language-modules/es/src/main/java/org/languagetool/language/es/SpanishVoseo.java index 4f90848a2e73..9ea45dbc077e 100644 --- a/languagetool-language-modules/es/src/main/java/org/languagetool/language/SpanishVoseo.java +++ b/languagetool-language-modules/es/src/main/java/org/languagetool/language/es/SpanishVoseo.java @@ -1,4 +1,4 @@ -package org.languagetool.language; +package org.languagetool.language.es; import java.util.Arrays; import java.util.Collections; diff --git a/languagetool-language-modules/es/src/main/java/org/languagetool/rules/es/SpanishNumberInWordFilter.java b/languagetool-language-modules/es/src/main/java/org/languagetool/rules/es/SpanishNumberInWordFilter.java index 8f871289e5dd..31e94ec27161 100644 --- a/languagetool-language-modules/es/src/main/java/org/languagetool/rules/es/SpanishNumberInWordFilter.java +++ b/languagetool-language-modules/es/src/main/java/org/languagetool/rules/es/SpanishNumberInWordFilter.java @@ -19,7 +19,7 @@ package org.languagetool.rules.es; import org.languagetool.JLanguageTool; -import org.languagetool.language.Spanish; +import org.languagetool.language.es.Spanish; import org.languagetool.rules.AbstractNumberInWordFilter; import java.io.IOException; diff --git a/languagetool-language-modules/es/src/main/java/org/languagetool/rules/es/SpanishRepeatedWordsRule.java b/languagetool-language-modules/es/src/main/java/org/languagetool/rules/es/SpanishRepeatedWordsRule.java index 5a663a5fac2a..ff6f95d81e9d 100644 --- a/languagetool-language-modules/es/src/main/java/org/languagetool/rules/es/SpanishRepeatedWordsRule.java +++ b/languagetool-language-modules/es/src/main/java/org/languagetool/rules/es/SpanishRepeatedWordsRule.java @@ -20,7 +20,7 @@ import org.languagetool.AnalyzedTokenReadings; import org.languagetool.Tag; -import org.languagetool.language.Spanish; +import org.languagetool.language.es.Spanish; import org.languagetool.rules.AbstractRepeatedWordsRule; import org.languagetool.rules.SynonymsData; import org.languagetool.rules.patterns.PatternToken; diff --git a/languagetool-language-modules/es/src/main/java/org/languagetool/rules/es/SpanishSuppressMisspelledSuggestionsFilter.java b/languagetool-language-modules/es/src/main/java/org/languagetool/rules/es/SpanishSuppressMisspelledSuggestionsFilter.java index 311ad7447445..bff8317b5187 100644 --- a/languagetool-language-modules/es/src/main/java/org/languagetool/rules/es/SpanishSuppressMisspelledSuggestionsFilter.java +++ b/languagetool-language-modules/es/src/main/java/org/languagetool/rules/es/SpanishSuppressMisspelledSuggestionsFilter.java @@ -20,7 +20,7 @@ package org.languagetool.rules.es; import java.io.IOException; -import org.languagetool.language.Spanish; +import org.languagetool.language.es.Spanish; import org.languagetool.rules.AbstractSuppressMisspelledSuggestionsFilter; public class SpanishSuppressMisspelledSuggestionsFilter extends AbstractSuppressMisspelledSuggestionsFilter { diff --git a/languagetool-language-modules/es/src/main/java/org/languagetool/rules/es/SpanishWikipediaRule.java b/languagetool-language-modules/es/src/main/java/org/languagetool/rules/es/SpanishWikipediaRule.java index 272234b372f1..16c26e9d5b6f 100644 --- a/languagetool-language-modules/es/src/main/java/org/languagetool/rules/es/SpanishWikipediaRule.java +++ b/languagetool-language-modules/es/src/main/java/org/languagetool/rules/es/SpanishWikipediaRule.java @@ -18,7 +18,7 @@ */ package org.languagetool.rules.es; -import org.languagetool.language.Spanish; +import org.languagetool.language.es.Spanish; import org.languagetool.rules.AbstractSimpleReplaceRule2; import org.languagetool.rules.Categories; import org.languagetool.rules.Example; diff --git a/languagetool-language-modules/es/src/main/resources/META-INF/org/languagetool/language-module.properties b/languagetool-language-modules/es/src/main/resources/META-INF/org/languagetool/language-module.properties index 220ee46400e3..940b050c524e 100644 --- a/languagetool-language-modules/es/src/main/resources/META-INF/org/languagetool/language-module.properties +++ b/languagetool-language-modules/es/src/main/resources/META-INF/org/languagetool/language-module.properties @@ -1 +1 @@ -languageClasses=org.languagetool.language.Spanish,org.languagetool.language.SpanishVoseo +languageClasses=org.languagetool.language.es.Spanish,org.languagetool.language.es.SpanishVoseo diff --git a/languagetool-language-modules/es/src/test/java/org/languagetool/JLanguageToolTest.java b/languagetool-language-modules/es/src/test/java/org/languagetool/JLanguageToolTest.java index 2cd112114901..9e76c69194d1 100644 --- a/languagetool-language-modules/es/src/test/java/org/languagetool/JLanguageToolTest.java +++ b/languagetool-language-modules/es/src/test/java/org/languagetool/JLanguageToolTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.junit.Test; -import org.languagetool.language.Spanish; +import org.languagetool.language.es.Spanish; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/es/src/test/java/org/languagetool/SpanishConcurrencyTest.java b/languagetool-language-modules/es/src/test/java/org/languagetool/SpanishConcurrencyTest.java index f7eb9d65fa6f..a215d09513fa 100644 --- a/languagetool-language-modules/es/src/test/java/org/languagetool/SpanishConcurrencyTest.java +++ b/languagetool-language-modules/es/src/test/java/org/languagetool/SpanishConcurrencyTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.languagetool.language.AbstractLanguageConcurrencyTest; -import org.languagetool.language.Spanish; +import org.languagetool.language.es.Spanish; public class SpanishConcurrencyTest extends AbstractLanguageConcurrencyTest { @Override diff --git a/languagetool-language-modules/es/src/test/java/org/languagetool/rules/es/MorfologikSpanishSpellerRuleTest.java b/languagetool-language-modules/es/src/test/java/org/languagetool/rules/es/MorfologikSpanishSpellerRuleTest.java index b904c01f6dbc..f0c15941409c 100644 --- a/languagetool-language-modules/es/src/test/java/org/languagetool/rules/es/MorfologikSpanishSpellerRuleTest.java +++ b/languagetool-language-modules/es/src/test/java/org/languagetool/rules/es/MorfologikSpanishSpellerRuleTest.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Spanish; +import org.languagetool.language.es.Spanish; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/es/src/test/java/org/languagetool/rules/es/QuestionMarkRuleTest.java b/languagetool-language-modules/es/src/test/java/org/languagetool/rules/es/QuestionMarkRuleTest.java index 3c899cfcd364..c744ff461bac 100644 --- a/languagetool-language-modules/es/src/test/java/org/languagetool/rules/es/QuestionMarkRuleTest.java +++ b/languagetool-language-modules/es/src/test/java/org/languagetool/rules/es/QuestionMarkRuleTest.java @@ -21,7 +21,7 @@ import org.junit.Before; import org.junit.Test; import org.languagetool.JLanguageTool; -import org.languagetool.language.Spanish; +import org.languagetool.language.es.Spanish; import org.languagetool.rules.Rule; import org.languagetool.rules.RuleMatch; diff --git a/languagetool-language-modules/es/src/test/java/org/languagetool/rules/es/SimpleReplaceRuleTest.java b/languagetool-language-modules/es/src/test/java/org/languagetool/rules/es/SimpleReplaceRuleTest.java index b11d4b77f424..2db9fc89aada 100644 --- a/languagetool-language-modules/es/src/test/java/org/languagetool/rules/es/SimpleReplaceRuleTest.java +++ b/languagetool-language-modules/es/src/test/java/org/languagetool/rules/es/SimpleReplaceRuleTest.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Spanish; +import org.languagetool.language.es.Spanish; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/es/src/test/java/org/languagetool/rules/es/SimpleReplaceVerbsRuleTest.java b/languagetool-language-modules/es/src/test/java/org/languagetool/rules/es/SimpleReplaceVerbsRuleTest.java index 9734abe42506..e2d6278a9b59 100644 --- a/languagetool-language-modules/es/src/test/java/org/languagetool/rules/es/SimpleReplaceVerbsRuleTest.java +++ b/languagetool-language-modules/es/src/test/java/org/languagetool/rules/es/SimpleReplaceVerbsRuleTest.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Spanish; +import org.languagetool.language.es.Spanish; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/es/src/test/java/org/languagetool/rules/es/SpanishTest.java b/languagetool-language-modules/es/src/test/java/org/languagetool/rules/es/SpanishTest.java index fdfc8e85f4d1..1558b5f6fc69 100644 --- a/languagetool-language-modules/es/src/test/java/org/languagetool/rules/es/SpanishTest.java +++ b/languagetool-language-modules/es/src/test/java/org/languagetool/rules/es/SpanishTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.languagetool.LanguageSpecificTest; -import org.languagetool.language.Spanish; +import org.languagetool.language.es.Spanish; import java.io.IOException; import java.util.Arrays; diff --git a/languagetool-language-modules/es/src/test/java/org/languagetool/rules/es/SpanishUnpairedBracketsRuleTest.java b/languagetool-language-modules/es/src/test/java/org/languagetool/rules/es/SpanishUnpairedBracketsRuleTest.java index 1ba790024e35..f89986348996 100644 --- a/languagetool-language-modules/es/src/test/java/org/languagetool/rules/es/SpanishUnpairedBracketsRuleTest.java +++ b/languagetool-language-modules/es/src/test/java/org/languagetool/rules/es/SpanishUnpairedBracketsRuleTest.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Spanish; +import org.languagetool.language.es.Spanish; import org.languagetool.markup.AnnotatedText; import org.languagetool.markup.AnnotatedTextBuilder; import org.languagetool.rules.RuleMatch; diff --git a/languagetool-language-modules/es/src/test/java/org/languagetool/rules/es/SpanishWikipediaRuleTest.java b/languagetool-language-modules/es/src/test/java/org/languagetool/rules/es/SpanishWikipediaRuleTest.java index 5fd8c62ab6da..d3fce67a3590 100644 --- a/languagetool-language-modules/es/src/test/java/org/languagetool/rules/es/SpanishWikipediaRuleTest.java +++ b/languagetool-language-modules/es/src/test/java/org/languagetool/rules/es/SpanishWikipediaRuleTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Spanish; +import org.languagetool.language.es.Spanish; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/es/src/test/java/org/languagetool/rules/es/SpanishWordRepeatRuleTest.java b/languagetool-language-modules/es/src/test/java/org/languagetool/rules/es/SpanishWordRepeatRuleTest.java index a0ba3ece722e..7fdfdec2366f 100644 --- a/languagetool-language-modules/es/src/test/java/org/languagetool/rules/es/SpanishWordRepeatRuleTest.java +++ b/languagetool-language-modules/es/src/test/java/org/languagetool/rules/es/SpanishWordRepeatRuleTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Spanish; +import org.languagetool.language.es.Spanish; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/es/src/test/java/org/languagetool/rules/es/SpanishWrongWordInContextRuleTest.java b/languagetool-language-modules/es/src/test/java/org/languagetool/rules/es/SpanishWrongWordInContextRuleTest.java index 3259929d5247..81acda9ba3e4 100644 --- a/languagetool-language-modules/es/src/test/java/org/languagetool/rules/es/SpanishWrongWordInContextRuleTest.java +++ b/languagetool-language-modules/es/src/test/java/org/languagetool/rules/es/SpanishWrongWordInContextRuleTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; -import org.languagetool.language.Spanish; +import org.languagetool.language.es.Spanish; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/es/src/test/java/org/languagetool/tagging/es/SpanishTaggerTest.java b/languagetool-language-modules/es/src/test/java/org/languagetool/tagging/es/SpanishTaggerTest.java index 92f2bde09401..e3dda570ae7d 100644 --- a/languagetool-language-modules/es/src/test/java/org/languagetool/tagging/es/SpanishTaggerTest.java +++ b/languagetool-language-modules/es/src/test/java/org/languagetool/tagging/es/SpanishTaggerTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.languagetool.Languages; import org.languagetool.TestTools; -import org.languagetool.language.Spanish; +import org.languagetool.language.es.Spanish; import org.languagetool.tagging.disambiguation.es.SpanishHybridDisambiguator; import org.languagetool.tokenizers.SRXSentenceTokenizer; import org.languagetool.tokenizers.SentenceTokenizer; diff --git a/languagetool-language-modules/es/src/test/java/org/languagetool/tokenizers/es/SpanishSentenceTokenizerTest.java b/languagetool-language-modules/es/src/test/java/org/languagetool/tokenizers/es/SpanishSentenceTokenizerTest.java index fa542df55382..aaf805692cc7 100644 --- a/languagetool-language-modules/es/src/test/java/org/languagetool/tokenizers/es/SpanishSentenceTokenizerTest.java +++ b/languagetool-language-modules/es/src/test/java/org/languagetool/tokenizers/es/SpanishSentenceTokenizerTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.languagetool.TestTools; -import org.languagetool.language.Spanish; +import org.languagetool.language.es.Spanish; import org.languagetool.tokenizers.SRXSentenceTokenizer; import org.languagetool.tokenizers.SentenceTokenizer; diff --git a/languagetool-language-modules/fa/pom.xml b/languagetool-language-modules/fa/pom.xml index 05d2527bc26f..6243e3561c20 100644 --- a/languagetool-language-modules/fa/pom.xml +++ b/languagetool-language-modules/fa/pom.xml @@ -52,6 +52,17 @@ org.apache.maven.plugins maven-surefire-plugin + + org.apache.maven.plugins + maven-jar-plugin + + + + org.languagetool.language.fa + + + + diff --git a/languagetool-language-modules/fa/src/main/java/org/languagetool/language/Persian.java b/languagetool-language-modules/fa/src/main/java/org/languagetool/language/fa/Persian.java similarity index 89% rename from languagetool-language-modules/fa/src/main/java/org/languagetool/language/Persian.java rename to languagetool-language-modules/fa/src/main/java/org/languagetool/language/fa/Persian.java index 916a4e10da2d..a20a4e5e27fb 100644 --- a/languagetool-language-modules/fa/src/main/java/org/languagetool/language/Persian.java +++ b/languagetool-language-modules/fa/src/main/java/org/languagetool/language/fa/Persian.java @@ -16,13 +16,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language; +package org.languagetool.language.fa; import org.languagetool.Language; import org.languagetool.UserConfig; +import org.languagetool.language.Contributor; import org.languagetool.rules.*; import org.languagetool.rules.fa.*; import org.languagetool.tokenizers.*; +import org.languagetool.tokenizers.fa.PersianWordTokenizer; import java.io.IOException; import java.util.*; @@ -61,9 +63,9 @@ public Tokenizer createDefaultWordTokenizer() { @Override public Contributor[] getMaintainers() { return new Contributor[] { - new Contributor("Reza1615"), - new Contributor("Alireza Eskandarpour Shoferi"), - new Contributor("Ebrahim Byagowi") + new Contributor("Reza1615", null), + new Contributor("Alireza Eskandarpour Shoferi", null), + new Contributor("Ebrahim Byagowi", null) }; } diff --git a/languagetool-language-modules/fa/src/main/java/org/languagetool/tokenizers/PersianWordTokenizer.java b/languagetool-language-modules/fa/src/main/java/org/languagetool/tokenizers/fa/PersianWordTokenizer.java similarity index 92% rename from languagetool-language-modules/fa/src/main/java/org/languagetool/tokenizers/PersianWordTokenizer.java rename to languagetool-language-modules/fa/src/main/java/org/languagetool/tokenizers/fa/PersianWordTokenizer.java index 11838e507894..40bd750dd8cd 100644 --- a/languagetool-language-modules/fa/src/main/java/org/languagetool/tokenizers/PersianWordTokenizer.java +++ b/languagetool-language-modules/fa/src/main/java/org/languagetool/tokenizers/fa/PersianWordTokenizer.java @@ -16,7 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.tokenizers; +package org.languagetool.tokenizers.fa; + +import org.languagetool.tokenizers.WordTokenizer; /** * @since 2.7 diff --git a/languagetool-language-modules/fa/src/main/resources/META-INF/org/languagetool/language-module.properties b/languagetool-language-modules/fa/src/main/resources/META-INF/org/languagetool/language-module.properties index 81ece5332e0c..e13e72fa08b0 100644 --- a/languagetool-language-modules/fa/src/main/resources/META-INF/org/languagetool/language-module.properties +++ b/languagetool-language-modules/fa/src/main/resources/META-INF/org/languagetool/language-module.properties @@ -1 +1 @@ -languageClasses=org.languagetool.language.Persian +languageClasses=org.languagetool.language.fa.Persian diff --git a/languagetool-language-modules/fa/src/test/java/org/languagetool/rules/fa/PersianTest.java b/languagetool-language-modules/fa/src/test/java/org/languagetool/rules/fa/PersianTest.java index c0d3e0eef18c..b82756067004 100644 --- a/languagetool-language-modules/fa/src/test/java/org/languagetool/rules/fa/PersianTest.java +++ b/languagetool-language-modules/fa/src/test/java/org/languagetool/rules/fa/PersianTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.languagetool.LanguageSpecificTest; -import org.languagetool.language.Persian; +import org.languagetool.language.fa.Persian; import java.io.IOException; diff --git a/languagetool-language-modules/fa/src/test/java/org/languagetool/rules/fa/WordCoherencyRuleTest.java b/languagetool-language-modules/fa/src/test/java/org/languagetool/rules/fa/WordCoherencyRuleTest.java index 055b4c4dc7ef..eb477cae4a34 100644 --- a/languagetool-language-modules/fa/src/test/java/org/languagetool/rules/fa/WordCoherencyRuleTest.java +++ b/languagetool-language-modules/fa/src/test/java/org/languagetool/rules/fa/WordCoherencyRuleTest.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Persian; +import org.languagetool.language.fa.Persian; import org.languagetool.rules.TextLevelRule; import org.languagetool.rules.patterns.PatternRuleTest; diff --git a/languagetool-language-modules/fa/src/test/java/org/languagetool/tokenizers/PersianSRXSentenceTokenizerTest.java b/languagetool-language-modules/fa/src/test/java/org/languagetool/tokenizers/PersianSRXSentenceTokenizerTest.java index ce0e9abf0207..0ac29d7f3885 100644 --- a/languagetool-language-modules/fa/src/test/java/org/languagetool/tokenizers/PersianSRXSentenceTokenizerTest.java +++ b/languagetool-language-modules/fa/src/test/java/org/languagetool/tokenizers/PersianSRXSentenceTokenizerTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.languagetool.TestTools; -import org.languagetool.language.Persian; +import org.languagetool.language.fa.Persian; public class PersianSRXSentenceTokenizerTest { diff --git a/languagetool-language-modules/fr/pom.xml b/languagetool-language-modules/fr/pom.xml index e7b48d71a805..fb3f60e3347a 100644 --- a/languagetool-language-modules/fr/pom.xml +++ b/languagetool-language-modules/fr/pom.xml @@ -77,6 +77,17 @@ org.apache.maven.plugins maven-surefire-plugin - + + org.apache.maven.plugins + maven-jar-plugin + + + + org.languagetool.language.fr + + + + + diff --git a/languagetool-language-modules/fr/src/main/java/org/languagetool/language/BelgianFrench.java b/languagetool-language-modules/fr/src/main/java/org/languagetool/language/fr/BelgianFrench.java similarity index 97% rename from languagetool-language-modules/fr/src/main/java/org/languagetool/language/BelgianFrench.java rename to languagetool-language-modules/fr/src/main/java/org/languagetool/language/fr/BelgianFrench.java index 7865f5e9daa4..e0164d154347 100644 --- a/languagetool-language-modules/fr/src/main/java/org/languagetool/language/BelgianFrench.java +++ b/languagetool-language-modules/fr/src/main/java/org/languagetool/language/fr/BelgianFrench.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language; +package org.languagetool.language.fr; import java.util.Arrays; import java.util.Collections; diff --git a/languagetool-language-modules/fr/src/main/java/org/languagetool/language/CanadianFrench.java b/languagetool-language-modules/fr/src/main/java/org/languagetool/language/fr/CanadianFrench.java similarity index 95% rename from languagetool-language-modules/fr/src/main/java/org/languagetool/language/CanadianFrench.java rename to languagetool-language-modules/fr/src/main/java/org/languagetool/language/fr/CanadianFrench.java index a01e308dea70..26c00a17fef3 100644 --- a/languagetool-language-modules/fr/src/main/java/org/languagetool/language/CanadianFrench.java +++ b/languagetool-language-modules/fr/src/main/java/org/languagetool/language/fr/CanadianFrench.java @@ -16,9 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language; +package org.languagetool.language.fr; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/languagetool-language-modules/fr/src/main/java/org/languagetool/language/French.java b/languagetool-language-modules/fr/src/main/java/org/languagetool/language/fr/French.java similarity index 99% rename from languagetool-language-modules/fr/src/main/java/org/languagetool/language/French.java rename to languagetool-language-modules/fr/src/main/java/org/languagetool/language/fr/French.java index 52a64b67e088..ac1fab3784b5 100644 --- a/languagetool-language-modules/fr/src/main/java/org/languagetool/language/French.java +++ b/languagetool-language-modules/fr/src/main/java/org/languagetool/language/fr/French.java @@ -16,17 +16,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language; +package org.languagetool.language.fr; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.languagetool.*; +import org.languagetool.language.Contributor; +import org.languagetool.language.Contributors; import org.languagetool.languagemodel.LanguageModel; import org.languagetool.rules.*; import org.languagetool.rules.fr.*; import org.languagetool.rules.spelling.SpellingCheckRule; +import org.languagetool.synthesis.fr.FrenchSynthesizer; import org.languagetool.rules.spelling.multitoken.MultitokenSpeller; -import org.languagetool.synthesis.FrenchSynthesizer; import org.languagetool.synthesis.Synthesizer; import org.languagetool.tagging.Tagger; import org.languagetool.tagging.disambiguation.Disambiguator; diff --git a/languagetool-language-modules/fr/src/main/java/org/languagetool/language/SwissFrench.java b/languagetool-language-modules/fr/src/main/java/org/languagetool/language/fr/SwissFrench.java similarity index 95% rename from languagetool-language-modules/fr/src/main/java/org/languagetool/language/SwissFrench.java rename to languagetool-language-modules/fr/src/main/java/org/languagetool/language/fr/SwissFrench.java index 24156dd1e246..77b8ba032c36 100644 --- a/languagetool-language-modules/fr/src/main/java/org/languagetool/language/SwissFrench.java +++ b/languagetool-language-modules/fr/src/main/java/org/languagetool/language/fr/SwissFrench.java @@ -16,9 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language; +package org.languagetool.language.fr; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/languagetool-language-modules/fr/src/main/java/org/languagetool/rules/fr/AdvancedSynthesizerFilter.java b/languagetool-language-modules/fr/src/main/java/org/languagetool/rules/fr/AdvancedSynthesizerFilter.java index ccdc44241f66..f35b41ecb56a 100644 --- a/languagetool-language-modules/fr/src/main/java/org/languagetool/rules/fr/AdvancedSynthesizerFilter.java +++ b/languagetool-language-modules/fr/src/main/java/org/languagetool/rules/fr/AdvancedSynthesizerFilter.java @@ -21,7 +21,7 @@ import org.languagetool.rules.AbstractAdvancedSynthesizerFilter; -import org.languagetool.synthesis.FrenchSynthesizer; +import org.languagetool.synthesis.fr.FrenchSynthesizer; import org.languagetool.synthesis.Synthesizer; /* diff --git a/languagetool-language-modules/fr/src/main/java/org/languagetool/rules/fr/FindSuggestionsFilter.java b/languagetool-language-modules/fr/src/main/java/org/languagetool/rules/fr/FindSuggestionsFilter.java index 01344691a556..9a916e5de2d5 100644 --- a/languagetool-language-modules/fr/src/main/java/org/languagetool/rules/fr/FindSuggestionsFilter.java +++ b/languagetool-language-modules/fr/src/main/java/org/languagetool/rules/fr/FindSuggestionsFilter.java @@ -22,10 +22,10 @@ import org.languagetool.AnalyzedToken; import org.languagetool.AnalyzedTokenReadings; import org.languagetool.JLanguageTool; -import org.languagetool.language.French; +import org.languagetool.language.fr.French; import org.languagetool.rules.AbstractFindSuggestionsFilter; import org.languagetool.rules.RuleMatch; -import org.languagetool.synthesis.FrenchSynthesizer; +import org.languagetool.synthesis.fr.FrenchSynthesizer; import org.languagetool.synthesis.Synthesizer; import org.languagetool.tagging.Tagger; import org.languagetool.tagging.fr.FrenchTagger; diff --git a/languagetool-language-modules/fr/src/main/java/org/languagetool/rules/fr/FrenchNumberInWordFilter.java b/languagetool-language-modules/fr/src/main/java/org/languagetool/rules/fr/FrenchNumberInWordFilter.java index 62085e2a6954..a56f27c47d22 100644 --- a/languagetool-language-modules/fr/src/main/java/org/languagetool/rules/fr/FrenchNumberInWordFilter.java +++ b/languagetool-language-modules/fr/src/main/java/org/languagetool/rules/fr/FrenchNumberInWordFilter.java @@ -19,7 +19,7 @@ package org.languagetool.rules.fr; import org.languagetool.JLanguageTool; -import org.languagetool.language.French; +import org.languagetool.language.fr.French; import org.languagetool.rules.AbstractNumberInWordFilter; import java.io.IOException; diff --git a/languagetool-language-modules/fr/src/main/java/org/languagetool/rules/fr/FrenchPartialPosTagFilter.java b/languagetool-language-modules/fr/src/main/java/org/languagetool/rules/fr/FrenchPartialPosTagFilter.java index 9718813b30bf..83058270e6dd 100644 --- a/languagetool-language-modules/fr/src/main/java/org/languagetool/rules/fr/FrenchPartialPosTagFilter.java +++ b/languagetool-language-modules/fr/src/main/java/org/languagetool/rules/fr/FrenchPartialPosTagFilter.java @@ -20,7 +20,7 @@ import org.languagetool.AnalyzedSentence; import org.languagetool.AnalyzedTokenReadings; -import org.languagetool.language.French; +import org.languagetool.language.fr.French; import org.languagetool.rules.PartialPosTagFilter; import org.languagetool.tagging.Tagger; import org.languagetool.tagging.disambiguation.Disambiguator; diff --git a/languagetool-language-modules/fr/src/main/java/org/languagetool/rules/fr/FrenchRepeatedWordsRule.java b/languagetool-language-modules/fr/src/main/java/org/languagetool/rules/fr/FrenchRepeatedWordsRule.java index c515d9a91fc1..c9b3889450b9 100644 --- a/languagetool-language-modules/fr/src/main/java/org/languagetool/rules/fr/FrenchRepeatedWordsRule.java +++ b/languagetool-language-modules/fr/src/main/java/org/languagetool/rules/fr/FrenchRepeatedWordsRule.java @@ -19,10 +19,10 @@ package org.languagetool.rules.fr; import org.languagetool.AnalyzedTokenReadings; -import org.languagetool.language.French; +import org.languagetool.language.fr.French; import org.languagetool.rules.AbstractRepeatedWordsRule; import org.languagetool.rules.SynonymsData; -import org.languagetool.synthesis.FrenchSynthesizer; +import org.languagetool.synthesis.fr.FrenchSynthesizer; import org.languagetool.synthesis.Synthesizer; import java.util.Map; diff --git a/languagetool-language-modules/fr/src/main/java/org/languagetool/rules/fr/FrenchSuppressMisspelledSuggestionsFilter.java b/languagetool-language-modules/fr/src/main/java/org/languagetool/rules/fr/FrenchSuppressMisspelledSuggestionsFilter.java index d1830fe1c02b..b2a0b7ccaecd 100644 --- a/languagetool-language-modules/fr/src/main/java/org/languagetool/rules/fr/FrenchSuppressMisspelledSuggestionsFilter.java +++ b/languagetool-language-modules/fr/src/main/java/org/languagetool/rules/fr/FrenchSuppressMisspelledSuggestionsFilter.java @@ -20,7 +20,7 @@ package org.languagetool.rules.fr; import java.io.IOException; -import org.languagetool.language.French; +import org.languagetool.language.fr.French; import org.languagetool.rules.AbstractSuppressMisspelledSuggestionsFilter; public class FrenchSuppressMisspelledSuggestionsFilter extends AbstractSuppressMisspelledSuggestionsFilter { diff --git a/languagetool-language-modules/fr/src/main/java/org/languagetool/rules/fr/InterrogativeVerbFilter.java b/languagetool-language-modules/fr/src/main/java/org/languagetool/rules/fr/InterrogativeVerbFilter.java index 7177688950c5..a6e37e5994cd 100644 --- a/languagetool-language-modules/fr/src/main/java/org/languagetool/rules/fr/InterrogativeVerbFilter.java +++ b/languagetool-language-modules/fr/src/main/java/org/languagetool/rules/fr/InterrogativeVerbFilter.java @@ -22,10 +22,10 @@ import org.languagetool.AnalyzedToken; import org.languagetool.AnalyzedTokenReadings; import org.languagetool.JLanguageTool; -import org.languagetool.language.French; +import org.languagetool.language.fr.French; import org.languagetool.rules.RuleMatch; import org.languagetool.rules.patterns.RuleFilter; -import org.languagetool.synthesis.FrenchSynthesizer; +import org.languagetool.synthesis.fr.FrenchSynthesizer; import org.languagetool.tagging.fr.FrenchTagger; import org.languagetool.tools.StringTools; diff --git a/languagetool-language-modules/fr/src/main/java/org/languagetool/rules/fr/PostponedAdjectiveConcordanceFilter.java b/languagetool-language-modules/fr/src/main/java/org/languagetool/rules/fr/PostponedAdjectiveConcordanceFilter.java index 4615dfb25cdc..6001fd50aeee 100644 --- a/languagetool-language-modules/fr/src/main/java/org/languagetool/rules/fr/PostponedAdjectiveConcordanceFilter.java +++ b/languagetool-language-modules/fr/src/main/java/org/languagetool/rules/fr/PostponedAdjectiveConcordanceFilter.java @@ -22,7 +22,7 @@ import org.languagetool.AnalyzedTokenReadings; import org.languagetool.rules.RuleMatch; import org.languagetool.rules.patterns.RuleFilter; -import org.languagetool.synthesis.FrenchSynthesizer; +import org.languagetool.synthesis.fr.FrenchSynthesizer; import java.io.IOException; import java.util.ArrayList; diff --git a/languagetool-language-modules/fr/src/main/java/org/languagetool/rules/fr/WordWithDeterminerFilter.java b/languagetool-language-modules/fr/src/main/java/org/languagetool/rules/fr/WordWithDeterminerFilter.java index d23c66f44990..054c6130c0f0 100644 --- a/languagetool-language-modules/fr/src/main/java/org/languagetool/rules/fr/WordWithDeterminerFilter.java +++ b/languagetool-language-modules/fr/src/main/java/org/languagetool/rules/fr/WordWithDeterminerFilter.java @@ -22,7 +22,7 @@ import org.languagetool.rules.Rule; import org.languagetool.rules.RuleMatch; import org.languagetool.rules.patterns.RuleFilter; -import org.languagetool.synthesis.FrenchSynthesizer; +import org.languagetool.synthesis.fr.FrenchSynthesizer; import org.languagetool.tools.StringTools; import java.io.IOException; diff --git a/languagetool-language-modules/fr/src/main/java/org/languagetool/synthesis/FrenchSynthesizer.java b/languagetool-language-modules/fr/src/main/java/org/languagetool/synthesis/fr/FrenchSynthesizer.java similarity index 95% rename from languagetool-language-modules/fr/src/main/java/org/languagetool/synthesis/FrenchSynthesizer.java rename to languagetool-language-modules/fr/src/main/java/org/languagetool/synthesis/fr/FrenchSynthesizer.java index ed233a23683c..fd8eb0af5bb1 100644 --- a/languagetool-language-modules/fr/src/main/java/org/languagetool/synthesis/FrenchSynthesizer.java +++ b/languagetool-language-modules/fr/src/main/java/org/languagetool/synthesis/fr/FrenchSynthesizer.java @@ -16,9 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.synthesis; +package org.languagetool.synthesis.fr; import org.languagetool.Language; +import org.languagetool.synthesis.BaseSynthesizer; import java.util.Arrays; import java.util.List; diff --git a/languagetool-language-modules/fr/src/main/java/org/languagetool/tagging/disambiguation/fr/FrenchHybridDisambiguator.java b/languagetool-language-modules/fr/src/main/java/org/languagetool/tagging/disambiguation/fr/FrenchHybridDisambiguator.java index 8d06cb2edb4f..aa1fd279d708 100644 --- a/languagetool-language-modules/fr/src/main/java/org/languagetool/tagging/disambiguation/fr/FrenchHybridDisambiguator.java +++ b/languagetool-language-modules/fr/src/main/java/org/languagetool/tagging/disambiguation/fr/FrenchHybridDisambiguator.java @@ -20,8 +20,9 @@ package org.languagetool.tagging.disambiguation.fr; import org.jetbrains.annotations.Nullable; -import org.languagetool.*; -import org.languagetool.language.French; +import org.languagetool.AnalyzedSentence; +import org.languagetool.JLanguageTool; +import org.languagetool.language.fr.French; import org.languagetool.tagging.disambiguation.AbstractDisambiguator; import org.languagetool.tagging.disambiguation.Disambiguator; import org.languagetool.tagging.disambiguation.MultiWordChunker; @@ -60,6 +61,4 @@ public AnalyzedSentence disambiguate(AnalyzedSentence input) throws IOException public AnalyzedSentence disambiguate(AnalyzedSentence input, @Nullable JLanguageTool.CheckCancelledCallback checkCanceled) throws IOException { return disambiguator.disambiguate(chunker.disambiguate(input, checkCanceled), checkCanceled); } - - } diff --git a/languagetool-language-modules/fr/src/main/resources/META-INF/org/languagetool/language-module.properties b/languagetool-language-modules/fr/src/main/resources/META-INF/org/languagetool/language-module.properties index 50d6fcf1c997..6b18b0fb6185 100644 --- a/languagetool-language-modules/fr/src/main/resources/META-INF/org/languagetool/language-module.properties +++ b/languagetool-language-modules/fr/src/main/resources/META-INF/org/languagetool/language-module.properties @@ -1 +1 @@ -languageClasses=org.languagetool.language.French,org.languagetool.language.CanadianFrench,org.languagetool.language.SwissFrench,org.languagetool.language.BelgianFrench +languageClasses=org.languagetool.language.fr.French,org.languagetool.language.fr.CanadianFrench,org.languagetool.language.fr.SwissFrench,org.languagetool.language.fr.BelgianFrench diff --git a/languagetool-language-modules/fr/src/test/java/org/languagetool/FrenchConcurrencyTest.java b/languagetool-language-modules/fr/src/test/java/org/languagetool/FrenchConcurrencyTest.java index f1f729634efc..f2250dc88fda 100644 --- a/languagetool-language-modules/fr/src/test/java/org/languagetool/FrenchConcurrencyTest.java +++ b/languagetool-language-modules/fr/src/test/java/org/languagetool/FrenchConcurrencyTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.languagetool.language.AbstractLanguageConcurrencyTest; -import org.languagetool.language.French; +import org.languagetool.language.fr.French; public class FrenchConcurrencyTest extends AbstractLanguageConcurrencyTest { diff --git a/languagetool-language-modules/fr/src/test/java/org/languagetool/JLanguageToolTest.java b/languagetool-language-modules/fr/src/test/java/org/languagetool/JLanguageToolTest.java index d6cd103cdafe..de0277321b96 100644 --- a/languagetool-language-modules/fr/src/test/java/org/languagetool/JLanguageToolTest.java +++ b/languagetool-language-modules/fr/src/test/java/org/languagetool/JLanguageToolTest.java @@ -22,7 +22,7 @@ import org.languagetool.JLanguageTool.Level; import org.languagetool.JLanguageTool.Mode; import org.languagetool.JLanguageTool.ParagraphHandling; -import org.languagetool.language.French; +import org.languagetool.language.fr.French; import org.languagetool.markup.AnnotatedText; import org.languagetool.markup.AnnotatedTextBuilder; import org.languagetool.rules.RuleMatch; diff --git a/languagetool-language-modules/fr/src/test/java/org/languagetool/language/FrenchTest.java b/languagetool-language-modules/fr/src/test/java/org/languagetool/language/FrenchTest.java index 3b3c87f306ec..bb948507ba0f 100644 --- a/languagetool-language-modules/fr/src/test/java/org/languagetool/language/FrenchTest.java +++ b/languagetool-language-modules/fr/src/test/java/org/languagetool/language/FrenchTest.java @@ -26,6 +26,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.Language; +import org.languagetool.language.fr.French; import org.languagetool.rules.RuleMatch; import org.languagetool.tokenizers.SentenceTokenizer; diff --git a/languagetool-language-modules/fr/src/test/java/org/languagetool/rules/fr/AnnotatedTextTest.java b/languagetool-language-modules/fr/src/test/java/org/languagetool/rules/fr/AnnotatedTextTest.java index 0f9b88fd0de1..dd96ca5c7bf6 100644 --- a/languagetool-language-modules/fr/src/test/java/org/languagetool/rules/fr/AnnotatedTextTest.java +++ b/languagetool-language-modules/fr/src/test/java/org/languagetool/rules/fr/AnnotatedTextTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; -import org.languagetool.language.French; +import org.languagetool.language.fr.French; import org.languagetool.markup.AnnotatedTextBuilder; import org.languagetool.rules.RuleMatch; diff --git a/languagetool-language-modules/fr/src/test/java/org/languagetool/rules/fr/FrenchTest.java b/languagetool-language-modules/fr/src/test/java/org/languagetool/rules/fr/FrenchTest.java index 62e5dd59d103..918edd42228a 100644 --- a/languagetool-language-modules/fr/src/test/java/org/languagetool/rules/fr/FrenchTest.java +++ b/languagetool-language-modules/fr/src/test/java/org/languagetool/rules/fr/FrenchTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.languagetool.LanguageSpecificTest; -import org.languagetool.language.French; +import org.languagetool.language.fr.French; import java.io.IOException; import java.util.Arrays; diff --git a/languagetool-language-modules/fr/src/test/java/org/languagetool/rules/fr/GenericUnpairedBracketsRuleTest.java b/languagetool-language-modules/fr/src/test/java/org/languagetool/rules/fr/GenericUnpairedBracketsRuleTest.java index 5189cf2e976d..2fac0508e5e9 100644 --- a/languagetool-language-modules/fr/src/test/java/org/languagetool/rules/fr/GenericUnpairedBracketsRuleTest.java +++ b/languagetool-language-modules/fr/src/test/java/org/languagetool/rules/fr/GenericUnpairedBracketsRuleTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; -import org.languagetool.language.French; +import org.languagetool.language.fr.French; import org.languagetool.rules.GenericUnpairedBracketsRule; import org.languagetool.rules.RuleMatch; diff --git a/languagetool-language-modules/fr/src/test/java/org/languagetool/rules/fr/MorfologikFrenchSpellerRuleTest.java b/languagetool-language-modules/fr/src/test/java/org/languagetool/rules/fr/MorfologikFrenchSpellerRuleTest.java index 23cb91d4510c..d7b3e010a7bc 100644 --- a/languagetool-language-modules/fr/src/test/java/org/languagetool/rules/fr/MorfologikFrenchSpellerRuleTest.java +++ b/languagetool-language-modules/fr/src/test/java/org/languagetool/rules/fr/MorfologikFrenchSpellerRuleTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.French; +import org.languagetool.language.fr.French; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/fr/src/test/java/org/languagetool/rules/fr/QuestionWhitespaceRuleTest.java b/languagetool-language-modules/fr/src/test/java/org/languagetool/rules/fr/QuestionWhitespaceRuleTest.java index ab30d6be58e2..c830b7406b35 100644 --- a/languagetool-language-modules/fr/src/test/java/org/languagetool/rules/fr/QuestionWhitespaceRuleTest.java +++ b/languagetool-language-modules/fr/src/test/java/org/languagetool/rules/fr/QuestionWhitespaceRuleTest.java @@ -26,7 +26,7 @@ import org.languagetool.JLanguageTool; import org.languagetool.Language; import org.languagetool.TestTools; -import org.languagetool.language.French; +import org.languagetool.language.fr.French; import org.languagetool.rules.RuleMatch; import static org.hamcrest.core.Is.is; diff --git a/languagetool-language-modules/fr/src/test/java/org/languagetool/rules/fr/QuestionWhitespaceStrictRuleTest.java b/languagetool-language-modules/fr/src/test/java/org/languagetool/rules/fr/QuestionWhitespaceStrictRuleTest.java index ff554744f046..64a618350afb 100644 --- a/languagetool-language-modules/fr/src/test/java/org/languagetool/rules/fr/QuestionWhitespaceStrictRuleTest.java +++ b/languagetool-language-modules/fr/src/test/java/org/languagetool/rules/fr/QuestionWhitespaceStrictRuleTest.java @@ -22,7 +22,7 @@ import org.languagetool.JLanguageTool; import org.languagetool.Language; import org.languagetool.TestTools; -import org.languagetool.language.French; +import org.languagetool.language.fr.French; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/fr/src/test/java/org/languagetool/rules/fr/SimpleReplaceRuleTest.java b/languagetool-language-modules/fr/src/test/java/org/languagetool/rules/fr/SimpleReplaceRuleTest.java index 2ebdea55d651..36bcf91f354f 100644 --- a/languagetool-language-modules/fr/src/test/java/org/languagetool/rules/fr/SimpleReplaceRuleTest.java +++ b/languagetool-language-modules/fr/src/test/java/org/languagetool/rules/fr/SimpleReplaceRuleTest.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.French; +import org.languagetool.language.fr.French; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/fr/src/test/java/org/languagetool/rules/spelling/hunspell/TestFrenchDisambiguator.java b/languagetool-language-modules/fr/src/test/java/org/languagetool/rules/spelling/hunspell/TestFrenchDisambiguator.java index b9f87c91210e..3400b1676646 100644 --- a/languagetool-language-modules/fr/src/test/java/org/languagetool/rules/spelling/hunspell/TestFrenchDisambiguator.java +++ b/languagetool-language-modules/fr/src/test/java/org/languagetool/rules/spelling/hunspell/TestFrenchDisambiguator.java @@ -23,7 +23,7 @@ import java.util.List; import org.languagetool.AnalyzedSentence; -import org.languagetool.language.French; +import org.languagetool.language.fr.French; import org.languagetool.tagging.disambiguation.AbstractDisambiguator; import org.languagetool.tagging.disambiguation.rules.DisambiguationPatternRule; import org.languagetool.tagging.disambiguation.rules.DisambiguationRuleLoader; diff --git a/languagetool-language-modules/fr/src/test/java/org/languagetool/synthesis/fr/FrenchSynthesizerTest.java b/languagetool-language-modules/fr/src/test/java/org/languagetool/synthesis/fr/FrenchSynthesizerTest.java index adc84b8bb9b9..7cf1640c3648 100644 --- a/languagetool-language-modules/fr/src/test/java/org/languagetool/synthesis/fr/FrenchSynthesizerTest.java +++ b/languagetool-language-modules/fr/src/test/java/org/languagetool/synthesis/fr/FrenchSynthesizerTest.java @@ -20,7 +20,6 @@ import org.junit.Test; import org.languagetool.AnalyzedToken; -import org.languagetool.synthesis.FrenchSynthesizer; import java.io.IOException; import java.util.Arrays; diff --git a/languagetool-language-modules/fr/src/test/java/org/languagetool/tagging/disambiguation/rules/fr/FrenchRuleDisambiguatorTest.java b/languagetool-language-modules/fr/src/test/java/org/languagetool/tagging/disambiguation/rules/fr/FrenchRuleDisambiguatorTest.java index f60b5881c45e..818fadab4dbd 100644 --- a/languagetool-language-modules/fr/src/test/java/org/languagetool/tagging/disambiguation/rules/fr/FrenchRuleDisambiguatorTest.java +++ b/languagetool-language-modules/fr/src/test/java/org/languagetool/tagging/disambiguation/rules/fr/FrenchRuleDisambiguatorTest.java @@ -22,9 +22,8 @@ import org.junit.Before; import org.junit.Test; import org.languagetool.TestTools; -import org.languagetool.language.French; +import org.languagetool.language.fr.French; import org.languagetool.tagging.disambiguation.fr.FrenchHybridDisambiguator; -import org.languagetool.tagging.disambiguation.rules.XmlRuleDisambiguator; import org.languagetool.tagging.disambiguation.xx.DemoDisambiguator; import org.languagetool.tagging.fr.FrenchTagger; import org.languagetool.tokenizers.SRXSentenceTokenizer; diff --git a/languagetool-language-modules/fr/src/test/java/org/languagetool/tagging/fr/FrenchTaggerTest.java b/languagetool-language-modules/fr/src/test/java/org/languagetool/tagging/fr/FrenchTaggerTest.java index 75d44cd23411..95cf26969c56 100644 --- a/languagetool-language-modules/fr/src/test/java/org/languagetool/tagging/fr/FrenchTaggerTest.java +++ b/languagetool-language-modules/fr/src/test/java/org/languagetool/tagging/fr/FrenchTaggerTest.java @@ -21,7 +21,7 @@ import org.junit.Before; import org.junit.Test; import org.languagetool.TestTools; -import org.languagetool.language.French; +import org.languagetool.language.fr.French; import org.languagetool.tokenizers.WordTokenizer; import org.languagetool.tokenizers.fr.FrenchWordTokenizer; diff --git a/languagetool-language-modules/fr/src/test/java/org/languagetool/tokenizers/fr/FrenchSentenceTokenizerTest.java b/languagetool-language-modules/fr/src/test/java/org/languagetool/tokenizers/fr/FrenchSentenceTokenizerTest.java index 5e968498e4b5..b0558cff7684 100644 --- a/languagetool-language-modules/fr/src/test/java/org/languagetool/tokenizers/fr/FrenchSentenceTokenizerTest.java +++ b/languagetool-language-modules/fr/src/test/java/org/languagetool/tokenizers/fr/FrenchSentenceTokenizerTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.languagetool.TestTools; -import org.languagetool.language.French; +import org.languagetool.language.fr.French; import org.languagetool.tokenizers.SRXSentenceTokenizer; import org.languagetool.tokenizers.SentenceTokenizer; diff --git a/languagetool-language-modules/ga/pom.xml b/languagetool-language-modules/ga/pom.xml index abd310d556b6..996928b95b8d 100644 --- a/languagetool-language-modules/ga/pom.xml +++ b/languagetool-language-modules/ga/pom.xml @@ -87,6 +87,17 @@ org.apache.maven.plugins maven-surefire-plugin - + + org.apache.maven.plugins + maven-jar-plugin + + + + org.languagetool.language.ga + + + + + diff --git a/languagetool-language-modules/ga/src/main/java/org/languagetool/language/Irish.java b/languagetool-language-modules/ga/src/main/java/org/languagetool/language/ga/Irish.java similarity index 94% rename from languagetool-language-modules/ga/src/main/java/org/languagetool/language/Irish.java rename to languagetool-language-modules/ga/src/main/java/org/languagetool/language/ga/Irish.java index 4b17fc1836c6..b2d5470680ea 100644 --- a/languagetool-language-modules/ga/src/main/java/org/languagetool/language/Irish.java +++ b/languagetool-language-modules/ga/src/main/java/org/languagetool/language/ga/Irish.java @@ -16,11 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language; +package org.languagetool.language.ga; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.languagetool.*; +import org.languagetool.language.Contributor; import org.languagetool.languagemodel.LanguageModel; import org.languagetool.rules.*; import org.languagetool.rules.ga.*; @@ -69,10 +70,10 @@ public Language getDefaultLanguageVariant() { @Override public Contributor[] getMaintainers() { return new Contributor[] { - new Contributor("Jim O'Regan"), - new Contributor("Emily Barnes"), - new Contributor("Mícheál J. Ó Meachair"), - new Contributor("Seanán Ó Coistín") + new Contributor("Jim O'Regan", null), + new Contributor("Emily Barnes", null), + new Contributor("Mícheál J. Ó Meachair", null), + new Contributor("Seanán Ó Coistín", null) }; } diff --git a/languagetool-language-modules/ga/src/main/java/org/languagetool/rules/ga/IrishPartialPosTagFilter.java b/languagetool-language-modules/ga/src/main/java/org/languagetool/rules/ga/IrishPartialPosTagFilter.java index 0290c9bee026..09f0bb3a414a 100644 --- a/languagetool-language-modules/ga/src/main/java/org/languagetool/rules/ga/IrishPartialPosTagFilter.java +++ b/languagetool-language-modules/ga/src/main/java/org/languagetool/rules/ga/IrishPartialPosTagFilter.java @@ -20,7 +20,7 @@ import org.languagetool.AnalyzedSentence; import org.languagetool.AnalyzedTokenReadings; -import org.languagetool.language.Irish; +import org.languagetool.language.ga.Irish; import org.languagetool.rules.PartialPosTagFilter; import org.languagetool.tagging.Tagger; import org.languagetool.tagging.disambiguation.Disambiguator; diff --git a/languagetool-language-modules/ga/src/main/java/org/languagetool/rules/ga/NoDisambiguationIrishPartialPosTagFilter.java b/languagetool-language-modules/ga/src/main/java/org/languagetool/rules/ga/NoDisambiguationIrishPartialPosTagFilter.java index 66424a11f53d..e8c38f32a31a 100644 --- a/languagetool-language-modules/ga/src/main/java/org/languagetool/rules/ga/NoDisambiguationIrishPartialPosTagFilter.java +++ b/languagetool-language-modules/ga/src/main/java/org/languagetool/rules/ga/NoDisambiguationIrishPartialPosTagFilter.java @@ -19,7 +19,7 @@ package org.languagetool.rules.ga; import org.languagetool.AnalyzedTokenReadings; -import org.languagetool.language.Irish; +import org.languagetool.language.ga.Irish; import org.languagetool.rules.PartialPosTagFilter; import org.languagetool.tagging.Tagger; diff --git a/languagetool-language-modules/ga/src/main/java/org/languagetool/tagging/disambiguation/ga/IrishHybridDisambiguator.java b/languagetool-language-modules/ga/src/main/java/org/languagetool/tagging/disambiguation/ga/IrishHybridDisambiguator.java index 3bf373c9cf62..d0f7bb412fb0 100644 --- a/languagetool-language-modules/ga/src/main/java/org/languagetool/tagging/disambiguation/ga/IrishHybridDisambiguator.java +++ b/languagetool-language-modules/ga/src/main/java/org/languagetool/tagging/disambiguation/ga/IrishHybridDisambiguator.java @@ -22,7 +22,7 @@ import java.io.IOException; import org.languagetool.AnalyzedSentence; -import org.languagetool.language.Irish; +import org.languagetool.language.ga.Irish; import org.languagetool.tagging.disambiguation.AbstractDisambiguator; import org.languagetool.tagging.disambiguation.Disambiguator; import org.languagetool.tagging.disambiguation.MultiWordChunker; diff --git a/languagetool-language-modules/ga/src/main/resources/META-INF/org/languagetool/language-module.properties b/languagetool-language-modules/ga/src/main/resources/META-INF/org/languagetool/language-module.properties index da4e2b34f11e..78bad1d9c228 100644 --- a/languagetool-language-modules/ga/src/main/resources/META-INF/org/languagetool/language-module.properties +++ b/languagetool-language-modules/ga/src/main/resources/META-INF/org/languagetool/language-module.properties @@ -1 +1 @@ -languageClasses=org.languagetool.language.Irish +languageClasses=org.languagetool.language.ga.Irish diff --git a/languagetool-language-modules/ga/src/test/java/org/languagetool/rules/ga/DhaNoBeirtRuleTest.java b/languagetool-language-modules/ga/src/test/java/org/languagetool/rules/ga/DhaNoBeirtRuleTest.java index a8cc75edf389..54928cae03df 100644 --- a/languagetool-language-modules/ga/src/test/java/org/languagetool/rules/ga/DhaNoBeirtRuleTest.java +++ b/languagetool-language-modules/ga/src/test/java/org/languagetool/rules/ga/DhaNoBeirtRuleTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Irish; +import org.languagetool.language.ga.Irish; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/ga/src/test/java/org/languagetool/rules/ga/MorfologikIrishSpellerRuleTest.java b/languagetool-language-modules/ga/src/test/java/org/languagetool/rules/ga/MorfologikIrishSpellerRuleTest.java index 0baeed9d9a69..e1d089514c28 100644 --- a/languagetool-language-modules/ga/src/test/java/org/languagetool/rules/ga/MorfologikIrishSpellerRuleTest.java +++ b/languagetool-language-modules/ga/src/test/java/org/languagetool/rules/ga/MorfologikIrishSpellerRuleTest.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Irish; +import org.languagetool.language.ga.Irish; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/ga/src/test/java/org/languagetool/tagging/disambiguation/rules/ga/IrishDisambiguationRuleTest.java b/languagetool-language-modules/ga/src/test/java/org/languagetool/tagging/disambiguation/rules/ga/IrishDisambiguationRuleTest.java index e4373f3a4b2d..b8b3f23b071d 100644 --- a/languagetool-language-modules/ga/src/test/java/org/languagetool/tagging/disambiguation/rules/ga/IrishDisambiguationRuleTest.java +++ b/languagetool-language-modules/ga/src/test/java/org/languagetool/tagging/disambiguation/rules/ga/IrishDisambiguationRuleTest.java @@ -23,7 +23,7 @@ import org.junit.Before; import org.junit.Test; import org.languagetool.TestTools; -import org.languagetool.language.Irish; +import org.languagetool.language.ga.Irish; import org.languagetool.tagging.disambiguation.rules.XmlRuleDisambiguator; import org.languagetool.tagging.disambiguation.rules.DisambiguationRuleTest; import org.languagetool.tagging.ga.IrishTagger; diff --git a/languagetool-language-modules/ga/src/test/java/org/languagetool/tagging/ga/IrishTaggerTest.java b/languagetool-language-modules/ga/src/test/java/org/languagetool/tagging/ga/IrishTaggerTest.java index 4ac3c1785c20..b7e388059a36 100644 --- a/languagetool-language-modules/ga/src/test/java/org/languagetool/tagging/ga/IrishTaggerTest.java +++ b/languagetool-language-modules/ga/src/test/java/org/languagetool/tagging/ga/IrishTaggerTest.java @@ -20,7 +20,7 @@ import junit.framework.TestCase; import org.languagetool.TestTools; -import org.languagetool.language.Irish; +import org.languagetool.language.ga.Irish; import org.languagetool.tokenizers.WordTokenizer; import java.io.IOException; diff --git a/languagetool-language-modules/gl/pom.xml b/languagetool-language-modules/gl/pom.xml index 435ccd294f12..d5c2f96638da 100644 --- a/languagetool-language-modules/gl/pom.xml +++ b/languagetool-language-modules/gl/pom.xml @@ -73,6 +73,17 @@ org.apache.maven.plugins maven-surefire-plugin + + org.apache.maven.plugins + maven-jar-plugin + + + + org.languagetool.language.gl + + + + diff --git a/languagetool-language-modules/gl/src/main/java/org/languagetool/language/Galician.java b/languagetool-language-modules/gl/src/main/java/org/languagetool/language/gl/Galician.java similarity index 98% rename from languagetool-language-modules/gl/src/main/java/org/languagetool/language/Galician.java rename to languagetool-language-modules/gl/src/main/java/org/languagetool/language/gl/Galician.java index b208abbf9ce7..d93c284d806a 100644 --- a/languagetool-language-modules/gl/src/main/java/org/languagetool/language/Galician.java +++ b/languagetool-language-modules/gl/src/main/java/org/languagetool/language/gl/Galician.java @@ -16,11 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language; +package org.languagetool.language.gl; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.languagetool.*; +import org.languagetool.language.Contributor; import org.languagetool.rules.*; import org.languagetool.rules.gl.*; import org.languagetool.rules.spelling.SpellingCheckRule; @@ -89,7 +90,7 @@ public LanguageMaintainedState getMaintainedState() { @Override public Contributor[] getMaintainers() { return new Contributor[] { - new Contributor("Susana Sotelo Docío"), + new Contributor("Susana Sotelo Docío", null), new Contributor("Tiago F. Santos (4.0-4.7)", "https://github.com/TiagoSantos81") }; } diff --git a/languagetool-language-modules/gl/src/main/java/org/languagetool/rules/gl/GalicianBarbarismsRule.java b/languagetool-language-modules/gl/src/main/java/org/languagetool/rules/gl/GalicianBarbarismsRule.java index 433033f0230f..0fa359d368e5 100644 --- a/languagetool-language-modules/gl/src/main/java/org/languagetool/rules/gl/GalicianBarbarismsRule.java +++ b/languagetool-language-modules/gl/src/main/java/org/languagetool/rules/gl/GalicianBarbarismsRule.java @@ -18,7 +18,7 @@ */ package org.languagetool.rules.gl; -import org.languagetool.language.Galician; +import org.languagetool.language.gl.Galician; import org.languagetool.rules.AbstractSimpleReplaceRule2; import org.languagetool.rules.Categories; import org.languagetool.rules.Example; diff --git a/languagetool-language-modules/gl/src/main/java/org/languagetool/rules/gl/GalicianRedundancyRule.java b/languagetool-language-modules/gl/src/main/java/org/languagetool/rules/gl/GalicianRedundancyRule.java index 86b7c0a1f3ab..b96621731b9a 100644 --- a/languagetool-language-modules/gl/src/main/java/org/languagetool/rules/gl/GalicianRedundancyRule.java +++ b/languagetool-language-modules/gl/src/main/java/org/languagetool/rules/gl/GalicianRedundancyRule.java @@ -18,7 +18,7 @@ */ package org.languagetool.rules.gl; -import org.languagetool.language.Galician; +import org.languagetool.language.gl.Galician; import org.languagetool.rules.AbstractSimpleReplaceRule2; import org.languagetool.rules.Categories; import org.languagetool.rules.Example; diff --git a/languagetool-language-modules/gl/src/main/java/org/languagetool/rules/gl/GalicianWikipediaRule.java b/languagetool-language-modules/gl/src/main/java/org/languagetool/rules/gl/GalicianWikipediaRule.java index 7a96a16867b8..b85c230aadb5 100644 --- a/languagetool-language-modules/gl/src/main/java/org/languagetool/rules/gl/GalicianWikipediaRule.java +++ b/languagetool-language-modules/gl/src/main/java/org/languagetool/rules/gl/GalicianWikipediaRule.java @@ -18,7 +18,7 @@ */ package org.languagetool.rules.gl; -import org.languagetool.language.Galician; +import org.languagetool.language.gl.Galician; import org.languagetool.rules.AbstractSimpleReplaceRule2; import org.languagetool.rules.Categories; import org.languagetool.rules.Example; diff --git a/languagetool-language-modules/gl/src/main/java/org/languagetool/rules/gl/GalicianWordinessRule.java b/languagetool-language-modules/gl/src/main/java/org/languagetool/rules/gl/GalicianWordinessRule.java index 8a9069ed6e47..f26de3f3f194 100644 --- a/languagetool-language-modules/gl/src/main/java/org/languagetool/rules/gl/GalicianWordinessRule.java +++ b/languagetool-language-modules/gl/src/main/java/org/languagetool/rules/gl/GalicianWordinessRule.java @@ -18,7 +18,7 @@ */ package org.languagetool.rules.gl; -import org.languagetool.language.Galician; +import org.languagetool.language.gl.Galician; import org.languagetool.rules.AbstractSimpleReplaceRule2; import org.languagetool.rules.Categories; import org.languagetool.rules.Example; diff --git a/languagetool-language-modules/gl/src/main/java/org/languagetool/tagging/disambiguation/gl/GalicianHybridDisambiguator.java b/languagetool-language-modules/gl/src/main/java/org/languagetool/tagging/disambiguation/gl/GalicianHybridDisambiguator.java index 444a57987901..5f39e814a421 100644 --- a/languagetool-language-modules/gl/src/main/java/org/languagetool/tagging/disambiguation/gl/GalicianHybridDisambiguator.java +++ b/languagetool-language-modules/gl/src/main/java/org/languagetool/tagging/disambiguation/gl/GalicianHybridDisambiguator.java @@ -22,7 +22,7 @@ import java.io.IOException; import org.languagetool.AnalyzedSentence; -import org.languagetool.language.Galician; +import org.languagetool.language.gl.Galician; import org.languagetool.tagging.disambiguation.AbstractDisambiguator; import org.languagetool.tagging.disambiguation.Disambiguator; import org.languagetool.tagging.disambiguation.MultiWordChunker; diff --git a/languagetool-language-modules/gl/src/main/resources/META-INF/org/languagetool/language-module.properties b/languagetool-language-modules/gl/src/main/resources/META-INF/org/languagetool/language-module.properties index 2717edf4db49..dbd8a6ad50cd 100644 --- a/languagetool-language-modules/gl/src/main/resources/META-INF/org/languagetool/language-module.properties +++ b/languagetool-language-modules/gl/src/main/resources/META-INF/org/languagetool/language-module.properties @@ -1 +1 @@ -languageClasses=org.languagetool.language.Galician +languageClasses=org.languagetool.language.gl.Galician diff --git a/languagetool-language-modules/gl/src/test/java/org/languagetool/GalicianConcurrencyTest.java b/languagetool-language-modules/gl/src/test/java/org/languagetool/GalicianConcurrencyTest.java index 0e36293e9454..a36506d4d063 100644 --- a/languagetool-language-modules/gl/src/test/java/org/languagetool/GalicianConcurrencyTest.java +++ b/languagetool-language-modules/gl/src/test/java/org/languagetool/GalicianConcurrencyTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.languagetool.language.AbstractLanguageConcurrencyTest; -import org.languagetool.language.Galician; +import org.languagetool.language.gl.Galician; public class GalicianConcurrencyTest extends AbstractLanguageConcurrencyTest { diff --git a/languagetool-language-modules/gl/src/test/java/org/languagetool/rules/gl/GalicianTest.java b/languagetool-language-modules/gl/src/test/java/org/languagetool/rules/gl/GalicianTest.java index a16ef138e21d..b65f5a193fb3 100644 --- a/languagetool-language-modules/gl/src/test/java/org/languagetool/rules/gl/GalicianTest.java +++ b/languagetool-language-modules/gl/src/test/java/org/languagetool/rules/gl/GalicianTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.languagetool.LanguageSpecificTest; -import org.languagetool.language.Galician; +import org.languagetool.language.gl.Galician; import java.io.IOException; import java.util.Arrays; diff --git a/languagetool-language-modules/is/pom.xml b/languagetool-language-modules/is/pom.xml index 3038cb942709..7de8834816b0 100644 --- a/languagetool-language-modules/is/pom.xml +++ b/languagetool-language-modules/is/pom.xml @@ -67,6 +67,17 @@ org.apache.maven.plugins maven-surefire-plugin + + org.apache.maven.plugins + maven-jar-plugin + + + + org.languagetool.language.is + + + + diff --git a/languagetool-language-modules/is/src/main/java/org/languagetool/language/Icelandic.java b/languagetool-language-modules/is/src/main/java/org/languagetool/language/is/Icelandic.java similarity index 96% rename from languagetool-language-modules/is/src/main/java/org/languagetool/language/Icelandic.java rename to languagetool-language-modules/is/src/main/java/org/languagetool/language/is/Icelandic.java index 5a10b55170fc..fd35d7e48001 100644 --- a/languagetool-language-modules/is/src/main/java/org/languagetool/language/Icelandic.java +++ b/languagetool-language-modules/is/src/main/java/org/languagetool/language/is/Icelandic.java @@ -17,11 +17,12 @@ * USA */ -package org.languagetool.language; +package org.languagetool.language.is; import org.jetbrains.annotations.NotNull; import org.languagetool.Language; import org.languagetool.UserConfig; +import org.languagetool.language.Contributor; import org.languagetool.rules.*; import org.languagetool.rules.spelling.hunspell.HunspellNoSuggestionRule; import org.languagetool.tagging.Tagger; @@ -55,7 +56,7 @@ public String[] getCountries() { @Override public Contributor[] getMaintainers() { - return new Contributor[] {new Contributor("Anton Karl Ingason")}; + return new Contributor[] {new Contributor("Anton Karl Ingason", null)}; } @NotNull diff --git a/languagetool-language-modules/is/src/main/resources/META-INF/org/languagetool/language-module.properties b/languagetool-language-modules/is/src/main/resources/META-INF/org/languagetool/language-module.properties index c55bfd306923..97f6f2a37b86 100644 --- a/languagetool-language-modules/is/src/main/resources/META-INF/org/languagetool/language-module.properties +++ b/languagetool-language-modules/is/src/main/resources/META-INF/org/languagetool/language-module.properties @@ -1 +1 @@ -languageClasses=org.languagetool.language.Icelandic +languageClasses=org.languagetool.language.is.Icelandic diff --git a/languagetool-language-modules/is/src/test/java/org/languagetool/IcelandicConcurrencyTest.java b/languagetool-language-modules/is/src/test/java/org/languagetool/IcelandicConcurrencyTest.java index c9ed7de16b94..8e6da6296712 100644 --- a/languagetool-language-modules/is/src/test/java/org/languagetool/IcelandicConcurrencyTest.java +++ b/languagetool-language-modules/is/src/test/java/org/languagetool/IcelandicConcurrencyTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.languagetool.language.AbstractLanguageConcurrencyTest; -import org.languagetool.language.Icelandic; +import org.languagetool.language.is.Icelandic; public class IcelandicConcurrencyTest extends AbstractLanguageConcurrencyTest { @Override diff --git a/languagetool-language-modules/it/pom.xml b/languagetool-language-modules/it/pom.xml index eb6350fe5108..328e52f9452c 100644 --- a/languagetool-language-modules/it/pom.xml +++ b/languagetool-language-modules/it/pom.xml @@ -73,6 +73,17 @@ org.apache.maven.plugins maven-surefire-plugin + + org.apache.maven.plugins + maven-jar-plugin + + + + org.languagetool.language.it + + + + diff --git a/languagetool-language-modules/it/src/main/java/org/languagetool/language/Italian.java b/languagetool-language-modules/it/src/main/java/org/languagetool/language/it/Italian.java similarity index 96% rename from languagetool-language-modules/it/src/main/java/org/languagetool/language/Italian.java rename to languagetool-language-modules/it/src/main/java/org/languagetool/language/it/Italian.java index 29b4124ca3d1..2567d3a089ef 100644 --- a/languagetool-language-modules/it/src/main/java/org/languagetool/language/Italian.java +++ b/languagetool-language-modules/it/src/main/java/org/languagetool/language/it/Italian.java @@ -16,11 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language; +package org.languagetool.language.it; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.languagetool.*; +import org.languagetool.language.Contributor; import org.languagetool.languagemodel.LanguageModel; import org.languagetool.rules.*; import org.languagetool.rules.it.*; @@ -70,7 +71,7 @@ public SentenceTokenizer createDefaultSentenceTokenizer() { @Override public Contributor[] getMaintainers() { - Contributor contributor = new Contributor("Paolo Bianchini"); + Contributor contributor = new Contributor("Paolo Bianchini", null); return new Contributor[] { contributor }; } diff --git a/languagetool-language-modules/it/src/main/java/org/languagetool/tagging/disambiguation/rules/it/ItalianRuleDisambiguator.java b/languagetool-language-modules/it/src/main/java/org/languagetool/tagging/disambiguation/rules/it/ItalianRuleDisambiguator.java index 912da49c0e49..c371388f59bb 100644 --- a/languagetool-language-modules/it/src/main/java/org/languagetool/tagging/disambiguation/rules/it/ItalianRuleDisambiguator.java +++ b/languagetool-language-modules/it/src/main/java/org/languagetool/tagging/disambiguation/rules/it/ItalianRuleDisambiguator.java @@ -21,7 +21,7 @@ import java.io.IOException; import org.languagetool.AnalyzedSentence; -import org.languagetool.language.Italian; +import org.languagetool.language.it.Italian; import org.languagetool.tagging.disambiguation.AbstractDisambiguator; import org.languagetool.tagging.disambiguation.Disambiguator; import org.languagetool.tagging.disambiguation.rules.XmlRuleDisambiguator; diff --git a/languagetool-language-modules/it/src/main/resources/META-INF/org/languagetool/language-module.properties b/languagetool-language-modules/it/src/main/resources/META-INF/org/languagetool/language-module.properties index b91103704108..7a131aa1ca29 100644 --- a/languagetool-language-modules/it/src/main/resources/META-INF/org/languagetool/language-module.properties +++ b/languagetool-language-modules/it/src/main/resources/META-INF/org/languagetool/language-module.properties @@ -1 +1 @@ -languageClasses=org.languagetool.language.Italian +languageClasses=org.languagetool.language.it.Italian diff --git a/languagetool-language-modules/it/src/test/java/org/languagetool/ItalianConcurrencyTest.java b/languagetool-language-modules/it/src/test/java/org/languagetool/ItalianConcurrencyTest.java index 0184900f3767..e7e06558c207 100644 --- a/languagetool-language-modules/it/src/test/java/org/languagetool/ItalianConcurrencyTest.java +++ b/languagetool-language-modules/it/src/test/java/org/languagetool/ItalianConcurrencyTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.languagetool.language.AbstractLanguageConcurrencyTest; -import org.languagetool.language.Italian; +import org.languagetool.language.it.Italian; public class ItalianConcurrencyTest extends AbstractLanguageConcurrencyTest { @Override diff --git a/languagetool-language-modules/it/src/test/java/org/languagetool/rules/it/ItalianTest.java b/languagetool-language-modules/it/src/test/java/org/languagetool/rules/it/ItalianTest.java index 1fb648f0921f..6f71990983fa 100644 --- a/languagetool-language-modules/it/src/test/java/org/languagetool/rules/it/ItalianTest.java +++ b/languagetool-language-modules/it/src/test/java/org/languagetool/rules/it/ItalianTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.languagetool.LanguageSpecificTest; -import org.languagetool.language.Italian; +import org.languagetool.language.it.Italian; import java.io.IOException; import java.util.Arrays; diff --git a/languagetool-language-modules/it/src/test/java/org/languagetool/rules/it/ItalianWordRepeatRuleTest.java b/languagetool-language-modules/it/src/test/java/org/languagetool/rules/it/ItalianWordRepeatRuleTest.java index 55d0b8861e81..a4d2f7be6821 100644 --- a/languagetool-language-modules/it/src/test/java/org/languagetool/rules/it/ItalianWordRepeatRuleTest.java +++ b/languagetool-language-modules/it/src/test/java/org/languagetool/rules/it/ItalianWordRepeatRuleTest.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Italian; +import org.languagetool.language.it.Italian; import java.io.IOException; diff --git a/languagetool-language-modules/it/src/test/java/org/languagetool/rules/it/MorfologikItalianSpellerRuleTest.java b/languagetool-language-modules/it/src/test/java/org/languagetool/rules/it/MorfologikItalianSpellerRuleTest.java index ed4ef7ba2253..7f06f1b2630b 100644 --- a/languagetool-language-modules/it/src/test/java/org/languagetool/rules/it/MorfologikItalianSpellerRuleTest.java +++ b/languagetool-language-modules/it/src/test/java/org/languagetool/rules/it/MorfologikItalianSpellerRuleTest.java @@ -24,7 +24,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Italian; +import org.languagetool.language.it.Italian; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/it/src/test/java/org/languagetool/tagging/it/ItalianTaggerTest.java b/languagetool-language-modules/it/src/test/java/org/languagetool/tagging/it/ItalianTaggerTest.java index 556079f1ee7d..13e1c6247164 100644 --- a/languagetool-language-modules/it/src/test/java/org/languagetool/tagging/it/ItalianTaggerTest.java +++ b/languagetool-language-modules/it/src/test/java/org/languagetool/tagging/it/ItalianTaggerTest.java @@ -21,7 +21,7 @@ import org.junit.Before; import org.junit.Test; import org.languagetool.TestTools; -import org.languagetool.language.Italian; +import org.languagetool.language.it.Italian; import org.languagetool.tokenizers.WordTokenizer; import java.io.IOException; diff --git a/languagetool-language-modules/it/src/test/java/org/languagetool/tokenizers/it/ItalianSRXSentenceTokenizerTest.java b/languagetool-language-modules/it/src/test/java/org/languagetool/tokenizers/it/ItalianSRXSentenceTokenizerTest.java index f0c33e1cc7d9..0e97f9aca789 100644 --- a/languagetool-language-modules/it/src/test/java/org/languagetool/tokenizers/it/ItalianSRXSentenceTokenizerTest.java +++ b/languagetool-language-modules/it/src/test/java/org/languagetool/tokenizers/it/ItalianSRXSentenceTokenizerTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.languagetool.TestTools; -import org.languagetool.language.Italian; +import org.languagetool.language.it.Italian; import org.languagetool.tokenizers.SRXSentenceTokenizer; public class ItalianSRXSentenceTokenizerTest { diff --git a/languagetool-language-modules/ja/pom.xml b/languagetool-language-modules/ja/pom.xml index 12dfea7942b2..a9aaf428c22c 100644 --- a/languagetool-language-modules/ja/pom.xml +++ b/languagetool-language-modules/ja/pom.xml @@ -76,6 +76,17 @@ org.apache.maven.plugins maven-surefire-plugin + + org.apache.maven.plugins + maven-jar-plugin + + + + org.languagetool.language.ja + + + + diff --git a/languagetool-language-modules/ja/src/main/java/org/languagetool/language/Japanese.java b/languagetool-language-modules/ja/src/main/java/org/languagetool/language/ja/Japanese.java similarity index 94% rename from languagetool-language-modules/ja/src/main/java/org/languagetool/language/Japanese.java rename to languagetool-language-modules/ja/src/main/java/org/languagetool/language/ja/Japanese.java index 31566bdbfea1..9787799c3054 100644 --- a/languagetool-language-modules/ja/src/main/java/org/languagetool/language/Japanese.java +++ b/languagetool-language-modules/ja/src/main/java/org/languagetool/language/ja/Japanese.java @@ -1,84 +1,85 @@ -/* LanguageTool, a natural language style checker - * Copyright (C) 2005 Daniel Naber (http://www.danielnaber.de) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 - * USA - */ -package org.languagetool.language; - -import org.jetbrains.annotations.NotNull; -import org.languagetool.Language; -import org.languagetool.UserConfig; -import org.languagetool.rules.*; -import org.languagetool.tagging.Tagger; -import org.languagetool.tagging.ja.JapaneseTagger; -import org.languagetool.tokenizers.*; -import org.languagetool.tokenizers.ja.JapaneseWordTokenizer; - -import java.util.*; - -public class Japanese extends Language { - - @Override - public String getShortCode() { - return "ja"; - } - - @Override - public String getName() { - return "Japanese"; - } - - @Override - public String[] getCountries() { - return new String[] { "JP" }; - } - - @Override - public String getCommonWordsPath() { - // TODO: provide common words file - return null; - } - - @Override - public Contributor[] getMaintainers() { - return new Contributor[] { new Contributor("Takahiro Shinkai")}; - } - - @Override - public List getRelevantRules(ResourceBundle messages, UserConfig userConfig, Language motherTongue, List altLanguages) { - return Arrays.asList( - new DoublePunctuationRule(messages), - new MultipleWhitespaceRule(messages, this) - ); - } - - @NotNull - @Override - public Tagger createDefaultTagger() { - return new JapaneseTagger(); - } - - @Override - public Tokenizer createDefaultWordTokenizer() { - return new JapaneseWordTokenizer(); - } - - @Override - public SentenceTokenizer createDefaultSentenceTokenizer() { - return new SRXSentenceTokenizer(this); - } - -} +/* LanguageTool, a natural language style checker + * Copyright (C) 2005 Daniel Naber (http://www.danielnaber.de) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language.ja; + +import org.jetbrains.annotations.NotNull; +import org.languagetool.Language; +import org.languagetool.UserConfig; +import org.languagetool.language.Contributor; +import org.languagetool.rules.*; +import org.languagetool.tagging.Tagger; +import org.languagetool.tagging.ja.JapaneseTagger; +import org.languagetool.tokenizers.*; +import org.languagetool.tokenizers.ja.JapaneseWordTokenizer; + +import java.util.*; + +public class Japanese extends Language { + + @Override + public String getShortCode() { + return "ja"; + } + + @Override + public String getName() { + return "Japanese"; + } + + @Override + public String[] getCountries() { + return new String[] { "JP" }; + } + + @Override + public String getCommonWordsPath() { + // TODO: provide common words file + return null; + } + + @Override + public Contributor[] getMaintainers() { + return new Contributor[] { new Contributor("Takahiro Shinkai", null)}; + } + + @Override + public List getRelevantRules(ResourceBundle messages, UserConfig userConfig, Language motherTongue, List altLanguages) { + return Arrays.asList( + new DoublePunctuationRule(messages), + new MultipleWhitespaceRule(messages, this) + ); + } + + @NotNull + @Override + public Tagger createDefaultTagger() { + return new JapaneseTagger(); + } + + @Override + public Tokenizer createDefaultWordTokenizer() { + return new JapaneseWordTokenizer(); + } + + @Override + public SentenceTokenizer createDefaultSentenceTokenizer() { + return new SRXSentenceTokenizer(this); + } + +} diff --git a/languagetool-language-modules/ja/src/main/resources/META-INF/org/languagetool/language-module.properties b/languagetool-language-modules/ja/src/main/resources/META-INF/org/languagetool/language-module.properties index 4beb394d65ed..146bfcc48e85 100644 --- a/languagetool-language-modules/ja/src/main/resources/META-INF/org/languagetool/language-module.properties +++ b/languagetool-language-modules/ja/src/main/resources/META-INF/org/languagetool/language-module.properties @@ -1 +1 @@ -languageClasses=org.languagetool.language.Japanese +languageClasses=org.languagetool.language.ja.Japanese diff --git a/languagetool-language-modules/ja/src/test/java/org/languagetool/JLanguageToolTest.java b/languagetool-language-modules/ja/src/test/java/org/languagetool/JLanguageToolTest.java index 36174b6bb633..e905f08b4ae3 100644 --- a/languagetool-language-modules/ja/src/test/java/org/languagetool/JLanguageToolTest.java +++ b/languagetool-language-modules/ja/src/test/java/org/languagetool/JLanguageToolTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.junit.Test; -import org.languagetool.language.Japanese; +import org.languagetool.language.ja.Japanese; import java.io.IOException; diff --git a/languagetool-language-modules/ja/src/test/java/org/languagetool/JapaneseConcurrencyTest.java b/languagetool-language-modules/ja/src/test/java/org/languagetool/JapaneseConcurrencyTest.java index 40d7ebdf335b..53efe32bb95f 100644 --- a/languagetool-language-modules/ja/src/test/java/org/languagetool/JapaneseConcurrencyTest.java +++ b/languagetool-language-modules/ja/src/test/java/org/languagetool/JapaneseConcurrencyTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.languagetool.language.AbstractLanguageConcurrencyTest; -import org.languagetool.language.Japanese; +import org.languagetool.language.ja.Japanese; public class JapaneseConcurrencyTest extends AbstractLanguageConcurrencyTest { @Override diff --git a/languagetool-language-modules/ja/src/test/java/org/languagetool/rules/ja/JapaneseTest.java b/languagetool-language-modules/ja/src/test/java/org/languagetool/rules/ja/JapaneseTest.java index 8fb587f5a538..95b5fb42e0c9 100644 --- a/languagetool-language-modules/ja/src/test/java/org/languagetool/rules/ja/JapaneseTest.java +++ b/languagetool-language-modules/ja/src/test/java/org/languagetool/rules/ja/JapaneseTest.java @@ -20,10 +20,9 @@ import org.junit.Test; import org.languagetool.LanguageSpecificTest; -import org.languagetool.language.Japanese; +import org.languagetool.language.ja.Japanese; import java.io.IOException; -import java.util.Arrays; public class JapaneseTest extends LanguageSpecificTest { diff --git a/languagetool-language-modules/ja/src/test/java/org/languagetool/tokenizers/ja/JapaneseSRXSentenceTokenizerTest.java b/languagetool-language-modules/ja/src/test/java/org/languagetool/tokenizers/ja/JapaneseSRXSentenceTokenizerTest.java index 14f928ba2bc1..25f52a71dd8b 100644 --- a/languagetool-language-modules/ja/src/test/java/org/languagetool/tokenizers/ja/JapaneseSRXSentenceTokenizerTest.java +++ b/languagetool-language-modules/ja/src/test/java/org/languagetool/tokenizers/ja/JapaneseSRXSentenceTokenizerTest.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.languagetool.TestTools; -import org.languagetool.language.Japanese; +import org.languagetool.language.ja.Japanese; import org.languagetool.tokenizers.SRXSentenceTokenizer; public class JapaneseSRXSentenceTokenizerTest { diff --git a/languagetool-language-modules/km/pom.xml b/languagetool-language-modules/km/pom.xml index e73337287143..f80ccd3651cf 100644 --- a/languagetool-language-modules/km/pom.xml +++ b/languagetool-language-modules/km/pom.xml @@ -67,6 +67,17 @@ org.apache.maven.plugins maven-surefire-plugin + + org.apache.maven.plugins + maven-jar-plugin + + + + org.languagetool.language.km + + + + diff --git a/languagetool-language-modules/km/src/main/java/org/languagetool/language/Khmer.java b/languagetool-language-modules/km/src/main/java/org/languagetool/language/km/Khmer.java similarity index 93% rename from languagetool-language-modules/km/src/main/java/org/languagetool/language/Khmer.java rename to languagetool-language-modules/km/src/main/java/org/languagetool/language/km/Khmer.java index c3e48f74e8e3..d61f91277fc5 100644 --- a/languagetool-language-modules/km/src/main/java/org/languagetool/language/Khmer.java +++ b/languagetool-language-modules/km/src/main/java/org/languagetool/language/km/Khmer.java @@ -1,105 +1,106 @@ -/* LanguageTool, a natural language style checker - * Copyright (C) 2007 Daniel Naber (http://www.danielnaber.de) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 - * USA - */ -package org.languagetool.language; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import org.languagetool.Language; -import org.languagetool.UserConfig; -import org.languagetool.rules.Rule; -import org.languagetool.rules.km.*; -import org.languagetool.rules.spelling.SpellingCheckRule; -import org.languagetool.rules.spelling.hunspell.HunspellRule; -import org.languagetool.tagging.Tagger; -import org.languagetool.tagging.disambiguation.Disambiguator; -import org.languagetool.tagging.disambiguation.rules.XmlRuleDisambiguator; -import org.languagetool.tagging.km.KhmerTagger; -import org.languagetool.tokenizers.*; -import org.languagetool.tokenizers.km.KhmerWordTokenizer; - -import java.io.IOException; -import java.util.*; - -public class Khmer extends Language { - - @Override - public String getName() { - return "Khmer"; - } - - @Override - public String getShortCode() { - return "km"; - } - - @Override - public String[] getCountries() { - return new String[]{"KH"}; - } - - @Override - public String getCommonWordsPath() { - // TODO: provide common words file - return null; - } - - @NotNull - @Override - public Tagger createDefaultTagger() { - return new KhmerTagger(); - } - - @Override - public SentenceTokenizer createDefaultSentenceTokenizer() { - return new SRXSentenceTokenizer(this); - } - - @Override - public Tokenizer createDefaultWordTokenizer() { - return new KhmerWordTokenizer(); - } - - @Override - public Disambiguator createDefaultDisambiguator() { - return new XmlRuleDisambiguator(this); - } - - @Override - public Contributor[] getMaintainers() { - return new Contributor[] {new Contributor("Nathan Wells")}; - } - - @Override - public List getRelevantRules(ResourceBundle messages, UserConfig userConfig, Language motherTongue, List altLanguages) throws IOException { - return Arrays.asList( - new KhmerHunspellRule(messages, userConfig), - // specific to Khmer: - new KhmerSimpleReplaceRule(messages), - new KhmerWordRepeatRule(messages, this), - new KhmerUnpairedBracketsRule(messages, this), - new KhmerSpaceBeforeRule(messages, this) - ); - } - - @Nullable - @Override - protected SpellingCheckRule createDefaultSpellingRule(ResourceBundle messages) throws IOException { - return new KhmerHunspellRule(messages, null); - } -} +/* LanguageTool, a natural language style checker + * Copyright (C) 2007 Daniel Naber (http://www.danielnaber.de) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language.km; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; +import org.languagetool.Language; +import org.languagetool.UserConfig; +import org.languagetool.language.Contributor; +import org.languagetool.rules.Rule; +import org.languagetool.rules.km.*; +import org.languagetool.rules.spelling.SpellingCheckRule; +import org.languagetool.rules.spelling.hunspell.HunspellRule; +import org.languagetool.tagging.Tagger; +import org.languagetool.tagging.disambiguation.Disambiguator; +import org.languagetool.tagging.disambiguation.rules.XmlRuleDisambiguator; +import org.languagetool.tagging.km.KhmerTagger; +import org.languagetool.tokenizers.*; +import org.languagetool.tokenizers.km.KhmerWordTokenizer; + +import java.io.IOException; +import java.util.*; + +public class Khmer extends Language { + + @Override + public String getName() { + return "Khmer"; + } + + @Override + public String getShortCode() { + return "km"; + } + + @Override + public String[] getCountries() { + return new String[]{"KH"}; + } + + @Override + public String getCommonWordsPath() { + // TODO: provide common words file + return null; + } + + @NotNull + @Override + public Tagger createDefaultTagger() { + return new KhmerTagger(); + } + + @Override + public SentenceTokenizer createDefaultSentenceTokenizer() { + return new SRXSentenceTokenizer(this); + } + + @Override + public Tokenizer createDefaultWordTokenizer() { + return new KhmerWordTokenizer(); + } + + @Override + public Disambiguator createDefaultDisambiguator() { + return new XmlRuleDisambiguator(this); + } + + @Override + public Contributor[] getMaintainers() { + return new Contributor[] {new Contributor("Nathan Wells", null)}; + } + + @Override + public List getRelevantRules(ResourceBundle messages, UserConfig userConfig, Language motherTongue, List altLanguages) throws IOException { + return Arrays.asList( + new KhmerHunspellRule(messages, userConfig), + // specific to Khmer: + new KhmerSimpleReplaceRule(messages), + new KhmerWordRepeatRule(messages, this), + new KhmerUnpairedBracketsRule(messages, this), + new KhmerSpaceBeforeRule(messages, this) + ); + } + + @Nullable + @Override + protected SpellingCheckRule createDefaultSpellingRule(ResourceBundle messages) throws IOException { + return new KhmerHunspellRule(messages, null); + } +} diff --git a/languagetool-language-modules/km/src/main/java/org/languagetool/rules/km/KhmerHunspellRule.java b/languagetool-language-modules/km/src/main/java/org/languagetool/rules/km/KhmerHunspellRule.java index f27ccd7c48cf..1cfe3cbe9b74 100644 --- a/languagetool-language-modules/km/src/main/java/org/languagetool/rules/km/KhmerHunspellRule.java +++ b/languagetool-language-modules/km/src/main/java/org/languagetool/rules/km/KhmerHunspellRule.java @@ -20,7 +20,7 @@ package org.languagetool.rules.km; import org.languagetool.UserConfig; -import org.languagetool.language.Khmer; +import org.languagetool.language.km.Khmer; import org.languagetool.rules.spelling.hunspell.HunspellRule; import java.util.ResourceBundle; diff --git a/languagetool-language-modules/km/src/main/java/org/languagetool/rules/km/KhmerSimpleReplaceRule.java b/languagetool-language-modules/km/src/main/java/org/languagetool/rules/km/KhmerSimpleReplaceRule.java index f13a450782ba..2473d9b6474b 100644 --- a/languagetool-language-modules/km/src/main/java/org/languagetool/rules/km/KhmerSimpleReplaceRule.java +++ b/languagetool-language-modules/km/src/main/java/org/languagetool/rules/km/KhmerSimpleReplaceRule.java @@ -18,7 +18,7 @@ */ package org.languagetool.rules.km; -import org.languagetool.language.Khmer; +import org.languagetool.language.km.Khmer; import org.languagetool.rules.AbstractSimpleReplaceRule2; import org.languagetool.rules.Categories; diff --git a/languagetool-language-modules/km/src/main/resources/META-INF/org/languagetool/language-module.properties b/languagetool-language-modules/km/src/main/resources/META-INF/org/languagetool/language-module.properties index 36259df5b3f8..884e5dd08a77 100644 --- a/languagetool-language-modules/km/src/main/resources/META-INF/org/languagetool/language-module.properties +++ b/languagetool-language-modules/km/src/main/resources/META-INF/org/languagetool/language-module.properties @@ -1 +1 @@ -languageClasses=org.languagetool.language.Khmer +languageClasses=org.languagetool.language.km.Khmer diff --git a/languagetool-language-modules/km/src/test/java/org/languagetool/KhmerConcurrencyTest.java b/languagetool-language-modules/km/src/test/java/org/languagetool/KhmerConcurrencyTest.java index dfaa572ec2c1..21ae8cd56fc7 100644 --- a/languagetool-language-modules/km/src/test/java/org/languagetool/KhmerConcurrencyTest.java +++ b/languagetool-language-modules/km/src/test/java/org/languagetool/KhmerConcurrencyTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.languagetool.language.AbstractLanguageConcurrencyTest; -import org.languagetool.language.Khmer; +import org.languagetool.language.km.Khmer; public class KhmerConcurrencyTest extends AbstractLanguageConcurrencyTest { @Override diff --git a/languagetool-language-modules/km/src/test/java/org/languagetool/rules/km/KhmerSpaceBeforeRuleTest.java b/languagetool-language-modules/km/src/test/java/org/languagetool/rules/km/KhmerSpaceBeforeRuleTest.java index d30194fbb510..c68a22e380f7 100644 --- a/languagetool-language-modules/km/src/test/java/org/languagetool/rules/km/KhmerSpaceBeforeRuleTest.java +++ b/languagetool-language-modules/km/src/test/java/org/languagetool/rules/km/KhmerSpaceBeforeRuleTest.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Khmer; +import org.languagetool.language.km.Khmer; import java.io.IOException; diff --git a/languagetool-language-modules/km/src/test/java/org/languagetool/rules/km/KhmerTest.java b/languagetool-language-modules/km/src/test/java/org/languagetool/rules/km/KhmerTest.java index 7af9edae3c6f..47b750f3b661 100644 --- a/languagetool-language-modules/km/src/test/java/org/languagetool/rules/km/KhmerTest.java +++ b/languagetool-language-modules/km/src/test/java/org/languagetool/rules/km/KhmerTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.languagetool.LanguageSpecificTest; -import org.languagetool.language.Khmer; +import org.languagetool.language.km.Khmer; import java.io.IOException; import java.util.Arrays; diff --git a/languagetool-language-modules/km/src/test/java/org/languagetool/rules/km/KhmerWordRepeatRuleTest.java b/languagetool-language-modules/km/src/test/java/org/languagetool/rules/km/KhmerWordRepeatRuleTest.java index 198681021853..dda1ce2b30c6 100644 --- a/languagetool-language-modules/km/src/test/java/org/languagetool/rules/km/KhmerWordRepeatRuleTest.java +++ b/languagetool-language-modules/km/src/test/java/org/languagetool/rules/km/KhmerWordRepeatRuleTest.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Khmer; +import org.languagetool.language.km.Khmer; import java.io.IOException; diff --git a/languagetool-language-modules/language-java8compat/pom.xml b/languagetool-language-modules/language-java8compat/pom.xml new file mode 100644 index 000000000000..fb2beb4840e5 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/pom.xml @@ -0,0 +1,296 @@ + + 4.0.0 + + + org.languagetool + languagetool-parent + ${revision} + ../../pom.xml + + + language-java8compat + https://www.languagetool.org + Java8 compatibility module for LanguageTool(no JPMS) + + + + + + GNU Lesser General Public License + http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt + repo + The license refers to the source code, resources may be under different licenses + + + + jar + + + + Hiroshi Miura + + Maintainer + + + + + + + + src/main/resources + + + + + maven-compiler-plugin + + + maven-surefire-plugin + + + + + + + org.languagetool + languagetool-core + ${revision} + + + + + org.languagetool + languagetool-core + ${revision} + test-jar + test + + + + + org.languagetool + language-ar + ${revision} + test + + + org.languagetool + language-be + ${revision} + test + + + org.languagetool + language-br + ${revision} + test + + + org.languagetool + language-ca + ${revision} + test + + + org.languagetool + language-da + ${revision} + test + + + org.languagetool + language-de + ${revision} + test + + + org.languagetool + language-de-DE-x-simple-language + ${revision} + test + + + org.languagetool + language-el + ${revision} + test + + + org.languagetool + language-en + ${revision} + test + + + org.languagetool + language-es + ${revision} + test + + + org.languagetool + language-eo + ${revision} + test + + + org.languagetool + language-fa + ${revision} + test + + + org.languagetool + language-fr + ${revision} + test + + + org.languagetool + language-ga + ${revision} + test + + + org.languagetool + language-gl + ${revision} + test + + + org.languagetool + language-is + ${revision} + test + + + org.languagetool + language-it + ${revision} + test + + + org.languagetool + language-ja + ${revision} + test + + + org.languagetool + language-km + ${revision} + test + + + org.languagetool + language-lt + ${revision} + test + + + org.languagetool + language-ml + ${revision} + test + + + org.languagetool + language-nl + ${revision} + test + + + org.languagetool + language-pl + ${revision} + test + + + org.languagetool + language-pt + ${revision} + test + + + org.languagetool + language-ro + ${revision} + test + + + org.languagetool + language-ru + ${revision} + test + + + org.languagetool + language-sk + ${revision} + test + + + org.languagetool + language-sl + ${revision} + test + + + org.languagetool + language-sv + ${revision} + test + + + org.languagetool + language-ta + ${revision} + test + + + org.languagetool + language-tl + ${revision} + test + + + org.languagetool + language-uk + ${revision} + test + + + org.languagetool + language-zh + ${revision} + test + + + junit + junit + ${junit.version} + test + + + ch.qos.logback + logback-classic + ${ch.qos.logback.version} + + + org.slf4j + slf4j-api + + + test + + + + + diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/AbstractLanguageProxy.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/AbstractLanguageProxy.java new file mode 100644 index 000000000000..c4913e229fcf --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/AbstractLanguageProxy.java @@ -0,0 +1,438 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; +import org.languagetool.*; +import org.languagetool.chunking.Chunker; +import org.languagetool.language.Contributor; +import org.languagetool.languagemodel.LanguageModel; +import org.languagetool.markup.AnnotatedText; +import org.languagetool.rules.RemoteRuleConfig; +import org.languagetool.rules.Rule; +import org.languagetool.rules.RuleMatch; +import org.languagetool.rules.patterns.AbstractPatternRule; +import org.languagetool.rules.patterns.Unifier; +import org.languagetool.rules.patterns.UnifierConfiguration; +import org.languagetool.rules.spelling.SpellingCheckRule; +import org.languagetool.synthesis.Synthesizer; +import org.languagetool.tagging.Tagger; +import org.languagetool.tagging.disambiguation.Disambiguator; +import org.languagetool.tokenizers.SentenceTokenizer; +import org.languagetool.tokenizers.Tokenizer; + +import java.io.File; +import java.io.IOException; +import java.lang.reflect.InvocationTargetException; +import java.util.*; +import java.util.function.Function; +import java.util.regex.Pattern; + +/** + * @author Hiroshi Miura + */ +public abstract class AbstractLanguageProxy extends Language implements AutoCloseable { + private final Language impl; + + /** + * Abstract base class for backward comaptible + * org.langaugetool.langauge.(LANGUAGE) classes. + * It depends on classes `org.languagetool.language.(ln).(LANGUAGE) + * class extends org.languagetool.compat.LanguageCompat class. + * @param className Language full qualified class name. + */ + protected AbstractLanguageProxy(String className) { + try { + Class clazz = Class.forName(className); + impl = (Language) clazz.getDeclaredConstructor().newInstance(); + } catch (ClassNotFoundException | InvocationTargetException | InstantiationException | IllegalAccessException | + NoSuchMethodException e) { + throw new RuntimeException(e.getMessage()); + } + } + + public AbstractLanguageProxy() { + this(""); + } + + @Override + public String getShortCode() { + return impl.getShortCode(); + } + + @Override + public String getName() { + return impl.getName(); + } + + @Override + public String[] getCountries() { + return impl.getCountries(); + } + + @Nullable + @Override + public Contributor[] getMaintainers() { + return impl.getMaintainers(); + } + + @Override + public List getRelevantRules(ResourceBundle messages, UserConfig userConfig, Language motherTongue, List altLanguages) throws IOException { + return impl.getRelevantRules(messages, userConfig, motherTongue, altLanguages); + } + + @Override + public String getCommonWordsPath() { + return impl.getCommonWordsPath(); + } + + @Override + public String getVariant() { + return impl.getVariant(); + } + + @Override + public List getDefaultEnabledRulesForVariant() { + return impl.getDefaultEnabledRulesForVariant(); + } + + @Override + public List getDefaultDisabledRulesForVariant() { + return impl.getDefaultDisabledRulesForVariant(); + } + + @Override + public synchronized LanguageModel getLanguageModel(File indexDir) throws IOException { + return impl.getLanguageModel(indexDir); + } + + @Override + public List getRelevantLanguageModelRules(ResourceBundle messages, @Nullable LanguageModel languageModel, + UserConfig userConfig) throws IOException { + return impl.getRelevantLanguageModelRules(messages, languageModel, userConfig); + } + + @Override + public List getRelevantLanguageModelCapableRules(ResourceBundle messages, @Nullable LanguageModel lm, + GlobalConfig globalConfig, UserConfig userConfig, + Language motherTongue, List altLanguages) + throws IOException { + return impl.getRelevantLanguageModelCapableRules(messages, lm, globalConfig, userConfig, motherTongue, + altLanguages); + } + + @Override + public List getRelevantRemoteRules(ResourceBundle messageBundle, List configs, + GlobalConfig globalConfig, UserConfig userConfig, Language motherTongue, + List altLanguages, boolean inputLogging) throws IOException { + return impl.getRelevantRemoteRules(messageBundle, configs, globalConfig, userConfig, motherTongue, altLanguages, + inputLogging); + } + +/* + @Override + public Function getRemoteEnhancedRules( + ResourceBundle messageBundle, List configs, UserConfig userConfig, + Language motherTongue, List altLanguages, boolean inputLogging) throws IOException { + return impl.getRemoteEnhancedRules(messageBundle, configs, userConfig,motherTongue, altLanguages, inputLogging); + } +*/ + + @Override + public List getRelevantRulesGlobalConfig(ResourceBundle messages, GlobalConfig globalConfig, UserConfig userConfig, Language motherTongue, List altLanguages) throws IOException { + return impl.getRelevantRulesGlobalConfig(messages, globalConfig, userConfig, motherTongue, altLanguages); + } + + @Nullable + @Override + public SpellingCheckRule getDefaultSpellingRule() { + return impl.getDefaultSpellingRule(); + } + + @Override + public Locale getLocale() { + return impl.getLocale(); + } + + @Override + public Locale getLocaleWithCountryAndVariant() { + return impl.getLocaleWithCountryAndVariant(); + } + + @Override + public List getRuleFileNames() { + return impl.getRuleFileNames(); + } + + @NotNull + @Override + public Language getDefaultLanguageVariant() { + return impl.getDefaultLanguageVariant(); + } + + @Override + public Disambiguator createDefaultDisambiguator() { + return impl.createDefaultDisambiguator(); + } + + @Override + public void setDisambiguator(Disambiguator disambiguator) { + impl.setDisambiguator(disambiguator); + } + + @NotNull + @Override + public Tagger createDefaultTagger() { + return impl.createDefaultTagger(); + } + + @NotNull + @Override + public synchronized Tagger getTagger() { + return impl.getTagger(); + } + + @Override + public void setTagger(Tagger tagger) { + impl.setTagger(tagger); + } + + @Override + public SentenceTokenizer createDefaultSentenceTokenizer() { + return impl.createDefaultSentenceTokenizer(); + } + + @Override + public synchronized SentenceTokenizer getSentenceTokenizer() { + return impl.getSentenceTokenizer(); + } + + @Override + public void setSentenceTokenizer(SentenceTokenizer tokenizer) { + impl.setSentenceTokenizer(tokenizer); + } + + @Override + public Tokenizer createDefaultWordTokenizer() { + return impl.createDefaultWordTokenizer(); + } + + @Override + public synchronized Tokenizer getWordTokenizer() { + return impl.getWordTokenizer(); + } + + @Override + public void setWordTokenizer(Tokenizer tokenizer) { + impl.setWordTokenizer(tokenizer); + } + + @Nullable + @Override + public Chunker createDefaultChunker() { + return impl.createDefaultChunker(); + } + + @Override + public synchronized Chunker getChunker() { + return impl.getChunker(); + } + + @Override + public void setChunker(Chunker chunker) { + impl.setChunker(chunker); + } + + @Override + public Chunker createDefaultPostDisambiguationChunker() { + return impl.createDefaultPostDisambiguationChunker(); + } + + @Nullable + @Override + public synchronized Chunker getPostDisambiguationChunker() { + return impl.getPostDisambiguationChunker(); + } + + @Override + public void setPostDisambiguationChunker(Chunker chunker) { + impl.setPostDisambiguationChunker(chunker); + } + + @Override + public JLanguageTool createDefaultJLanguageTool() { + return impl.createDefaultJLanguageTool(); + } + + @Nullable + @Override + public Synthesizer createDefaultSynthesizer() { + return impl.createDefaultSynthesizer(); + } + + @Nullable + @Override + public synchronized Synthesizer getSynthesizer() { + return impl.getSynthesizer(); + } + + @Override + public void setSynthesizer(Synthesizer synthesizer) { + impl.setSynthesizer(synthesizer); + } + + @Override + public Unifier getUnifier() { + return impl.getUnifier(); + } + + @Override + public Unifier getDisambiguationUnifier() { + return impl.getDisambiguationUnifier(); + } + + @Override + public UnifierConfiguration getUnifierConfiguration() { + return impl.getUnifierConfiguration(); + } + + @Override + public UnifierConfiguration getDisambiguationUnifierConfiguration() { + return impl.getDisambiguationUnifierConfiguration(); + } + + @Override + public boolean isVariant() { + return impl.isVariant(); + } + + @Override + public boolean isExternal() { + return impl.isExternal(); + } + + public boolean equalsConsiderVariantsIfSpecified(Language otherLanguage) { + return impl.equalsConsiderVariantsIfSpecified(otherLanguage); + } + + @Override + public Pattern getIgnoredCharactersRegex() { + return impl.getIgnoredCharactersRegex(); + } + + @Override + public LanguageMaintainedState getMaintainedState() { + return impl.getMaintainedState(); + } + + @Override + public boolean isHiddenFromGui() { + return impl.isHiddenFromGui(); + } + + @Override + public int getRulePriority(Rule rule) { + return impl.getRulePriority(rule); + } + + @Override + public boolean isSpellcheckOnlyLanguage() { + return impl.isSpellcheckOnlyLanguage(); + } + + @Override + public boolean hasNGramFalseFriendRule(Language motherTongue) { + return impl.hasNGramFalseFriendRule(motherTongue); + } + + @Override + public String getOpeningDoubleQuote() { + return impl.getOpeningDoubleQuote(); + } + + @Override + public String getClosingDoubleQuote() { + return impl.getClosingDoubleQuote(); + } + + @Override + public String getOpeningSingleQuote() { + return impl.getOpeningSingleQuote(); + } + + @Override + public String getClosingSingleQuote() { + return impl.getClosingSingleQuote(); + } + + @Override + public boolean isAdvancedTypographyEnabled() { + return impl.isAdvancedTypographyEnabled(); + } + + @Override + public List adaptSuggestions(List ruleMatches, Set enabledRules) { + return impl.adaptSuggestions(ruleMatches, enabledRules); + } + + // XXX + + @Override + public void close() throws Exception { + if (impl instanceof AutoCloseable) { + ((AutoCloseable) impl).close(); + } + } + + @Override + public Function getRemoteEnhancedRules(ResourceBundle messageBundle, List configs, UserConfig userConfig, Language motherTongue, List altLanguages, boolean inputLogging) throws IOException { + return impl.getRemoteEnhancedRules(messageBundle, configs, userConfig, motherTongue, altLanguages, inputLogging); + } + + @Override + public String toAdvancedTypography(String input) { + return impl.toAdvancedTypography(input); + } + + @Override + public boolean hasMinMatchesRules() { + return impl.hasMinMatchesRules(); + } + + @Override + public String adaptSuggestion(String s) { + return impl.adaptSuggestion(s); + } + + @Override + public String getConsistencyRulePrefix() { + return impl.getConsistencyRulePrefix(); + } + + @Override + public RuleMatch adjustMatch(RuleMatch rm, List features) { + return impl.adjustMatch(rm, features); + } + + @Override + public List mergeSuggestions(List ruleMatches, AnnotatedText text, Set enabledRules) { + return impl.mergeSuggestions(ruleMatches, text, enabledRules); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/AmericanEnglish.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/AmericanEnglish.java new file mode 100644 index 000000000000..ff240973ac2e --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/AmericanEnglish.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class AmericanEnglish extends AbstractLanguageProxy { + public AmericanEnglish() { + super("org.languagetool.language.en.AmericanEnglish"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/AngolaPortuguese.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/AngolaPortuguese.java new file mode 100644 index 000000000000..62b19e7529c8 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/AngolaPortuguese.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class AngolaPortuguese extends AbstractLanguageProxy { + public AngolaPortuguese() { + super("org.languagetool.language.pt.AngolaPortuguese"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Arabic.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Arabic.java new file mode 100644 index 000000000000..d1c3b9d00839 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Arabic.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class Arabic extends AbstractLanguageProxy { + public Arabic() { + super("org.languagetool.language.ar.Arabic"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Asturian.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Asturian.java new file mode 100644 index 000000000000..b3158fb6c4c0 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Asturian.java @@ -0,0 +1,26 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +@Deprecated +public class Asturian extends AbstractLanguageProxy { + public Asturian() { + super("org.languagetool.language.ast.Asturian"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/AustralianEnglish.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/AustralianEnglish.java new file mode 100644 index 000000000000..d709ce80b635 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/AustralianEnglish.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class AustralianEnglish extends AbstractLanguageProxy { + public AustralianEnglish() { + super("org.languagetool.language.en.AustralianEnglish"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/AustrianGerman.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/AustrianGerman.java new file mode 100644 index 000000000000..46276cfc3a6e --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/AustrianGerman.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class AustrianGerman extends AbstractLanguageProxy { + public AustrianGerman() { + super("org.languagetool.language.de.AustrianGerman"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/BalearicCatalan.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/BalearicCatalan.java new file mode 100644 index 000000000000..abca3225d303 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/BalearicCatalan.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class BalearicCatalan extends AbstractLanguageProxy { + public BalearicCatalan() { + super("org.languagetool.language.ca.BalearicCatalan"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/BelgianDutch.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/BelgianDutch.java new file mode 100644 index 000000000000..449b231f09f3 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/BelgianDutch.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class BelgianDutch extends AbstractLanguageProxy { + public BelgianDutch() { + super("org.languagetool.language.nl.BelgianDutch"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/BelgianFrench.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/BelgianFrench.java new file mode 100644 index 000000000000..b0646fee44c3 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/BelgianFrench.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class BelgianFrench extends AbstractLanguageProxy { + public BelgianFrench() { + super("org.languagetool.language.fr.BelgianFrench"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/BrazilianPortuguese.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/BrazilianPortuguese.java new file mode 100644 index 000000000000..6f6bff4d2b66 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/BrazilianPortuguese.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class BrazilianPortuguese extends AbstractLanguageProxy { + public BrazilianPortuguese() { + super("org.languagetool.language.pt.BrazilianPortuguese"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Breton.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Breton.java new file mode 100644 index 000000000000..486bd4c6daa8 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Breton.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class Breton extends AbstractLanguageProxy { + public Breton() { + super("org.languagetool.language.br.Breton"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/BritishEnglish.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/BritishEnglish.java new file mode 100644 index 000000000000..fc67cfab5b93 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/BritishEnglish.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class BritishEnglish extends AbstractLanguageProxy { + public BritishEnglish() { + super("org.languagetool.language.en.BritishEnglish"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/CanadianEnglish.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/CanadianEnglish.java new file mode 100644 index 000000000000..75b1163b09d1 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/CanadianEnglish.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class CanadianEnglish extends AbstractLanguageProxy { + public CanadianEnglish() { + super("org.languagetool.language.en.CanadianEnglish"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/CanadianFrench.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/CanadianFrench.java new file mode 100644 index 000000000000..d9e8ef3993f2 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/CanadianFrench.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class CanadianFrench extends AbstractLanguageProxy { + public CanadianFrench() { + super("org.languagetool.language.fr.CanadianFrench"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Catalan.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Catalan.java new file mode 100644 index 000000000000..9288c9787e78 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Catalan.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class Catalan extends AbstractLanguageProxy { + public Catalan() { + super("org.languagetool.language.ca.Catalan"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Chinese.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Chinese.java new file mode 100644 index 000000000000..9ef9df41eacd --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Chinese.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class Chinese extends AbstractLanguageProxy { + public Chinese() { + super("org.languagetool.language.zh.Chinese"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Danish.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Danish.java new file mode 100644 index 000000000000..705a34803f6a --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Danish.java @@ -0,0 +1,26 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +@Deprecated +public class Danish extends AbstractLanguageProxy { + public Danish() { + super("org.languagetool.language.da.Danish"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Dutch.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Dutch.java new file mode 100644 index 000000000000..1c5fda1792d3 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Dutch.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class Dutch extends AbstractLanguageProxy { + public Dutch() { + super("org.languagetool.language.nl.Dutch"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/English.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/English.java new file mode 100644 index 000000000000..2ca84d101f78 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/English.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class English extends AbstractLanguageProxy { + public English() { + super("org.languagetool.language.en.English"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Esperanto.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Esperanto.java new file mode 100644 index 000000000000..da18088b8314 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Esperanto.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class Esperanto extends AbstractLanguageProxy { + public Esperanto() { + super("org.languagetool.language.eo.Esperanto"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/French.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/French.java new file mode 100644 index 000000000000..ba7ec3f76edb --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/French.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class French extends AbstractLanguageProxy { + public French() { + super("org.languagetool.language.fr.French"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Galician.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Galician.java new file mode 100644 index 000000000000..c1fa2e8a9419 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Galician.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class Galician extends AbstractLanguageProxy { + public Galician() { + super("org.languagetool.language.gl.Galician"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/GermanyGerman.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/GermanyGerman.java new file mode 100644 index 000000000000..835065d14958 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/GermanyGerman.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class GermanyGerman extends AbstractLanguageProxy { + public GermanyGerman() { + super("org.languagetool.language.de.GermanyGerman"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Greek.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Greek.java new file mode 100644 index 000000000000..fb64f343db0f --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Greek.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class Greek extends AbstractLanguageProxy { + public Greek() { + super("org.languagetool.language.el.Greek"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Icelandic.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Icelandic.java new file mode 100644 index 000000000000..57e690399a98 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Icelandic.java @@ -0,0 +1,26 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +@Deprecated +public class Icelandic extends AbstractLanguageProxy { + public Icelandic() { + super("org.languagetool.language.is.Icelandic"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Irish.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Irish.java new file mode 100644 index 000000000000..ecd967693ec8 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Irish.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class Irish extends AbstractLanguageProxy { + public Irish() { + super("org.languagetool.language.ga.Irish"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Italian.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Italian.java new file mode 100644 index 000000000000..df11bd12ff59 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Italian.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class Italian extends AbstractLanguageProxy { + public Italian() { + super("org.languagetool.language.it.Italian"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Japanese.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Japanese.java new file mode 100644 index 000000000000..d934e977ac80 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Japanese.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class Japanese extends AbstractLanguageProxy { + public Japanese() { + super("org.languagetool.language.ja.Japanese"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Khmer.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Khmer.java new file mode 100644 index 000000000000..2aa2416992dc --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Khmer.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class Khmer extends AbstractLanguageProxy { + public Khmer() { + super("org.languagetool.language.km.Khmer"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Lithuanian.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Lithuanian.java new file mode 100644 index 000000000000..dd2fff3ad629 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Lithuanian.java @@ -0,0 +1,26 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +@Deprecated +public class Lithuanian extends AbstractLanguageProxy { + public Lithuanian() { + super("org.languagetool.language.lt.Lithuanian"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Malayalam.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Malayalam.java new file mode 100644 index 000000000000..82157d120cb9 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Malayalam.java @@ -0,0 +1,26 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +@Deprecated +public class Malayalam extends AbstractLanguageProxy { + public Malayalam() { + super("org.languagetool.language.ml.Malayalam"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/MozambiquePortuguese.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/MozambiquePortuguese.java new file mode 100644 index 000000000000..a7a0d0a7da7f --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/MozambiquePortuguese.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class MozambiquePortuguese extends AbstractLanguageProxy { + public MozambiquePortuguese() { + super("org.languagetool.language.pt.MozambiquePortuguese"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/NewZealandEnglish.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/NewZealandEnglish.java new file mode 100644 index 000000000000..41db4004a0f4 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/NewZealandEnglish.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class NewZealandEnglish extends AbstractLanguageProxy { + public NewZealandEnglish() { + super("org.languagetool.language.en.NewZealandEnglish"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/NonSwissGerman.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/NonSwissGerman.java new file mode 100644 index 000000000000..2190985415bc --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/NonSwissGerman.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class NonSwissGerman extends AbstractLanguageProxy { + public NonSwissGerman() { + super("org.languagetool.language.de.NonSwissGerman"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Persian.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Persian.java new file mode 100644 index 000000000000..69b5f7b55030 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Persian.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class Persian extends AbstractLanguageProxy { + public Persian() { + super("org.languagetool.language.fa.Persian"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Polish.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Polish.java new file mode 100644 index 000000000000..942acd51a136 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Polish.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class Polish extends AbstractLanguageProxy { + public Polish() { + super("org.languagetool.language.pl.Polish"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/PortugalPortuguese.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/PortugalPortuguese.java new file mode 100644 index 000000000000..92f5c5e0e253 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/PortugalPortuguese.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class PortugalPortuguese extends AbstractLanguageProxy { + public PortugalPortuguese() { + super("org.languagetool.language.pt.PortugalPortuguese"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Portuguese.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Portuguese.java new file mode 100644 index 000000000000..c39c40315b7f --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Portuguese.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class Portuguese extends AbstractLanguageProxy { + public Portuguese() { + super("org.languagetool.language.pt.Portuguese"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Romanian.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Romanian.java new file mode 100644 index 000000000000..ce504627e7ea --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Romanian.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class Romanian extends AbstractLanguageProxy { + public Romanian() { + super("org.languagetool.language.ro.Romanian"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Russian.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Russian.java new file mode 100644 index 000000000000..531cb42360f3 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Russian.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class Russian extends AbstractLanguageProxy { + public Russian() { + super("org.languagetool.language.ru.Russian"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/SimpleGerman.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/SimpleGerman.java new file mode 100644 index 000000000000..777730664810 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/SimpleGerman.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class SimpleGerman extends AbstractLanguageProxy { + public SimpleGerman() { + super("org.languagetool.language.de_simple.SimpleGerman"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Slovak.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Slovak.java new file mode 100644 index 000000000000..cd2bf4e0d1a8 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Slovak.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class Slovak extends AbstractLanguageProxy { + public Slovak() { + super("org.languagetool.language.sk.Slovak"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Slovenian.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Slovenian.java new file mode 100644 index 000000000000..2b6e429ff826 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Slovenian.java @@ -0,0 +1,26 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +@Deprecated +public class Slovenian extends AbstractLanguageProxy { + public Slovenian() { + super("org.languagetool.language.sl.Slovenian"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/SouthAfricanEnglish.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/SouthAfricanEnglish.java new file mode 100644 index 000000000000..af6b1b7f3578 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/SouthAfricanEnglish.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class SouthAfricanEnglish extends AbstractLanguageProxy { + public SouthAfricanEnglish() { + super("org.languagetool.language.en.SouthAfricanEnglish"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Spanish.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Spanish.java new file mode 100644 index 000000000000..4a6ac6c6f251 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Spanish.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class Spanish extends AbstractLanguageProxy { + public Spanish() { + super("org.languagetool.language.es.Spanish"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/SpanishVoseo.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/SpanishVoseo.java new file mode 100644 index 000000000000..653890db673f --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/SpanishVoseo.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class SpanishVoseo extends AbstractLanguageProxy { + public SpanishVoseo() { + super("org.languagetool.language.es.SpanishVoseo"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Swedish.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Swedish.java new file mode 100644 index 000000000000..8007542026f7 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Swedish.java @@ -0,0 +1,26 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +@Deprecated +public class Swedish extends AbstractLanguageProxy { + public Swedish() { + super("org.languagetool.language.sv.Swedish"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/SwissFrench.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/SwissFrench.java new file mode 100644 index 000000000000..fb3c9fe99201 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/SwissFrench.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class SwissFrench extends AbstractLanguageProxy { + public SwissFrench() { + super("org.languagetool.language.fr.SwissFrench"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/SwissGerman.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/SwissGerman.java new file mode 100644 index 000000000000..268c2bc7cf60 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/SwissGerman.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class SwissGerman extends AbstractLanguageProxy { + public SwissGerman() { + super("org.languagetool.language.de.SwissGerman"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Tagalog.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Tagalog.java new file mode 100644 index 000000000000..02f324ae1165 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Tagalog.java @@ -0,0 +1,26 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +@Deprecated +public class Tagalog extends AbstractLanguageProxy { + public Tagalog() { + super("org.languagetool.language.tl.Tagalog"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Tamil.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Tamil.java new file mode 100644 index 000000000000..450a78332da5 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Tamil.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class Tamil extends AbstractLanguageProxy { + public Tamil() { + super("org.languagetool.language.ta.Tamil"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Ukrainian.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Ukrainian.java new file mode 100644 index 000000000000..3e6dad1bf1d8 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Ukrainian.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class Ukrainian extends AbstractLanguageProxy { + public Ukrainian() { + super("org.languagetool.language.uk.Ukrainian"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Ukrainian1992.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Ukrainian1992.java new file mode 100644 index 000000000000..f668fb395e9e --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/Ukrainian1992.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class Ukrainian1992 extends AbstractLanguageProxy { + public Ukrainian1992() { + super("org.languagetool.language.uk.Ukrainian1992"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/ValencianCatalan.java b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/ValencianCatalan.java new file mode 100644 index 000000000000..1a253ccebdcd --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/main/java/org/languagetool/language/ValencianCatalan.java @@ -0,0 +1,25 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2023 Hiroshi Miura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +public class ValencianCatalan extends AbstractLanguageProxy { + public ValencianCatalan() { + super("org.languagetool.language.ca.ValencianCatalan"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/BretonTest.java b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/BretonTest.java new file mode 100644 index 000000000000..f564d59f38d5 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/BretonTest.java @@ -0,0 +1,39 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2019 Daniel Naber (http://www.danielnaber.de) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +import org.junit.Test; +import org.languagetool.LanguageSpecificTest; + +import java.io.IOException; +import java.util.Arrays; + +public class BretonTest extends LanguageSpecificTest { + + @Test + public void testLanguage() throws IOException { + // NOTE: this text needs to be kept in sync with config.ts -> DEMO_TEXTS: + String s = "Lakait amañ ho testenn vrezhonek da vezañ gwiriet. Pe implijit an frazenn-mañ gant meur a fazioù yezhadurel enni."; + Breton lang = new Breton(); + testDemoText(lang, s, + Arrays.asList("AR", "LIES") + ); + runTests(lang, "br"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/CatalanTest.java b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/CatalanTest.java new file mode 100644 index 000000000000..f30bcf83fb85 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/CatalanTest.java @@ -0,0 +1,111 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2005 Daniel Naber (http://www.danielnaber.de) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +import org.junit.Test; +import org.languagetool.JLanguageTool; +import org.languagetool.Language; +import org.languagetool.rules.RuleMatch; + +import java.io.IOException; +import java.util.List; + +import static org.junit.Assert.assertEquals; + +public class CatalanTest { + + @Test + public void testCleanOverlappingErrors() throws IOException { + Language lang = new Catalan(); + JLanguageTool tool = new JLanguageTool(lang); + List matches = tool.check("prosper"); + assertEquals(1, matches.size()); + assertEquals("CA_SIMPLE_REPLACE_BALEARIC_PROSPER", matches.get(0).getRule().getId()); + + matches = tool.check("Potser siga el millor"); + assertEquals(1, matches.size()); + assertEquals("POTSER_SIGUI", matches.get(0).getRule().getId()); + + //ChunkTags + + assertEquals("[ Ho[ho/PP3NN000] deu[deure/VMIP3S00,GV] haver[haver/VAN00000,haver/_GV_,haver/_perfet,GV] tornat[tornar/VMP00SM0,GV] a[a/SPS00,GV] fer[fer/VMN00000,fer/complement,GV].[./_PUNCT,

]]", + tool.analyzeText("Ho deu haver tornat a fer.").toString()); + + + assertEquals("[ Ho[ho/PP3NN000] he[haver/VAIP1S00,haver/_obligacio,GV] de[de/SPS00,GV] continuar[continuar/VMN00000,continuar/_GV_,GV] fent[fer/VMG00000,fent/_GV_,GV] així[així/RG].[./_PUNCT,

]]", + tool.analyzeText("Ho he de continuar fent així.").toString()); + + } + + @Test + public void testValecianVariant() throws IOException { + Language lang = new ValencianCatalan(); + JLanguageTool tool = new JLanguageTool(lang); + List matches = tool.check("Cal usar mètodes d'anàlisi adequats."); + assertEquals(0, matches.size()); + } + + @Test + public void testBalearicVariant() throws IOException { + Language lang = new BalearicCatalan(); + JLanguageTool tool = new JLanguageTool(lang); + List matches = tool.check("Cal usar mètodes d'anàlisi adequats."); + assertEquals(0, matches.size()); + } + + @Test + public void testAdvancedTypography() throws IOException { + Language lang = new Catalan(); + assertEquals(lang.toAdvancedTypography("És l'\"hora\"!"), "És l’«hora»!"); + assertEquals(lang.toAdvancedTypography("És l''hora'!"), "És l’‘hora’!"); + assertEquals(lang.toAdvancedTypography("És l'«hora»!"), "És l’«hora»!"); + assertEquals(lang.toAdvancedTypography("És l''hora'."), "És l’‘hora’."); + assertEquals(lang.toAdvancedTypography("Cal evitar el \"'lo' neutre\"."), "Cal evitar el «‘lo’ neutre»."); + assertEquals(lang.toAdvancedTypography("És \"molt 'important'\"."), "És «molt ‘important’»."); + assertEquals(lang.toAdvancedTypography("Si és del v. 'haver'."), "Si és del v.\u00a0‘haver’."); + assertEquals(lang.toAdvancedTypography("Amb el so de 's'."), "Amb el so de ‘s’."); + + assertEquals(lang.adaptSuggestion("L'IEC"), "L'IEC"); + assertEquals(lang.adaptSuggestion("te estimava"), "t'estimava"); + assertEquals(lang.adaptSuggestion("el Albert"), "l'Albert"); + assertEquals(lang.adaptSuggestion("l'Albert"), "l'Albert"); + assertEquals(lang.adaptSuggestion("l'«Albert»"), "l'«Albert»"); + assertEquals(lang.adaptSuggestion("l’«Albert»"), "l’«Albert»"); + assertEquals(lang.adaptSuggestion("l'\"Albert\""), "l'\"Albert\""); + assertEquals(lang.adaptSuggestion("m'tancava"), "em tancava"); + assertEquals(lang.adaptSuggestion("s'tancava"), "es tancava"); + assertEquals(lang.adaptSuggestion("l'R+D"), "l'R+D"); + assertEquals(lang.adaptSuggestion("l'FBI"), "l'FBI"); + + } + + @Test + public void testAdaptSuggestions() throws IOException { + JLanguageTool tool = new JLanguageTool(new Catalan()); + List matches = tool.check( + "Els valencians hem sigut valencians des que Jaume I creà el regne de València i poc a poc es conformà una nova identitat política (que en l'edat mitjana, per exemple, no entrava en contradicció amb la consciència clara que teníem un origen i una llengua comuns amb els catalans)."); + assertEquals(matches.get(0).getSuggestedReplacements().toString(), "[a poc a poc]"); + + matches = tool.check("A nivell d'ensenyament superior."); + assertEquals(matches.get(0).getSuggestedReplacements().toString(), + "[En l'àmbit d', A escala d', A , En , Pel que fa a , Quant a ]"); + + } + +} diff --git a/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/ChineseTest.java b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/ChineseTest.java new file mode 100644 index 000000000000..acb1edcbc445 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/ChineseTest.java @@ -0,0 +1,39 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2019 Daniel Naber (http://www.danielnaber.de) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +import org.junit.Test; +import org.languagetool.LanguageSpecificTest; + +import java.io.IOException; +import java.util.Arrays; + +public class ChineseTest extends LanguageSpecificTest { + + @Test + public void testLanguage() throws IOException { + // NOTE: this text needs to be kept in sync with config.ts -> DEMO_TEXTS: + String s = "将文本粘贴在此，或者检测以下文本：我和她去看了二部电影。"; + Chinese lang = new Chinese(); + testDemoText(lang, s, + Arrays.asList("wa5") + ); + runTests(lang, "zh"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/DanishTest.java b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/DanishTest.java new file mode 100644 index 000000000000..ede1e3dc3d20 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/DanishTest.java @@ -0,0 +1,39 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2019 Daniel Naber (http://www.danielnaber.de) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +import org.junit.Test; +import org.languagetool.LanguageSpecificTest; + +import java.io.IOException; +import java.util.Arrays; + +public class DanishTest extends LanguageSpecificTest { + + @Test + public void testLanguage() throws IOException { + // NOTE: this text needs to be kept in sync with config.ts -> DEMO_TEXTS: + String s = "Indsæt din egen tekst her , eller brug denne tekst for at se nogle af de fejl LanguageTool fanger. vær opmærksom på at den langtfra er er perfect, men skal være en hjælp til at få standartfejl frem i lyset."; + Danish lang = new Danish(); + testDemoText(lang, s, + Arrays.asList("COMMA_PARENTHESIS_WHITESPACE", "UPPERCASE_SENTENCE_START", "Ordgentagelse", "HUNSPELL_RULE", "standart_standard") + ); + runTests(lang, "da"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/DutchTest.java b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/DutchTest.java new file mode 100644 index 000000000000..2545b12e5635 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/DutchTest.java @@ -0,0 +1,54 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2005 Daniel Naber (http://www.danielnaber.de) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +import org.junit.Test; +import org.languagetool.JLanguageTool; +import org.languagetool.Language; + +import java.io.IOException; + +import static org.junit.Assert.assertEquals; + +public class DutchTest { + + @Test + public void testDutch() throws IOException { + final JLanguageTool tool = new JLanguageTool(new Dutch()); + /* this is in the way, since I am using rules to experiment with possible disambiguation pattern, to check if they are good enough + assertEquals(0, tool.check("Een test, die geen fouten mag geven.").size()); + */ + //assertEquals(1, tool.check("Dit is fout.!").size()); + //test uppercasing rule: + /* + matches = tool.check("De Afdeling Beheer kan het"); + assertEquals(1, matches.size()); + assertEquals("Als Afdeling geen deel uitmaakt van de naam, dan is juist:afdeling", matches.get(0).getMessage()); + */ + // Dutch rule has no effect with English error but they are spelling mistakes: + assertEquals(1, tool.check("Hier staat een spelvout voor testdoeleinden.").size()); + } + + @Test + public void testAdvancedTypography() throws IOException { + Language lang = new Dutch(); + assertEquals(lang.toAdvancedTypography("\"Fatima zei 'Hallo' tegen me.\""), "“Fatima zei ‘Hallo’ tegen me.”"); + assertEquals(lang.toAdvancedTypography("Bedoelt u wellicht \"vivo's\"?"), "Bedoelt u wellicht “vivo’s”?"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/EnglishTest.java b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/EnglishTest.java new file mode 100644 index 000000000000..65b33cc3c5af --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/EnglishTest.java @@ -0,0 +1,336 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2005 Daniel Naber (http://www.danielnaber.de) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +import org.junit.Ignore; +import org.junit.Test; +import org.languagetool.*; +import org.languagetool.JLanguageTool.ParagraphHandling; +import org.languagetool.markup.AnnotatedText; +import org.languagetool.markup.AnnotatedTextBuilder; +import org.languagetool.rules.*; +import org.languagetool.rules.patterns.PatternRule; +import org.languagetool.rules.patterns.PatternToken; +import org.languagetool.rules.spelling.SpellingCheckRule; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import static org.hamcrest.core.Is.is; +import static org.junit.Assert.*; + +public class EnglishTest { + + @Ignore("not a test, but used on https://dev.languagetool.org/java-api") + @Test + public void demoCodeForHomepage() throws IOException { + JLanguageTool lt = new JLanguageTool(new BritishEnglish()); + // comment in to use statistical ngram data: + //lt.activateLanguageModelRules(new File("/data/google-ngram-data")); + List matches = lt.check("A sentence with a error in the Hitchhiker's Guide tot he Galaxy"); + for (RuleMatch match : matches) { + System.out.println("Potential error at characters " + + match.getFromPos() + "-" + match.getToPos() + ": " + + match.getMessage()); + System.out.println("Suggested correction(s): " + + match.getSuggestedReplacements()); + } + } + + @Ignore("not a test, but used on https://dev.languagetool.org/java-spell-checker") + @Test + public void spellCheckerDemoCodeForHomepage() throws IOException { + JLanguageTool lt = new JLanguageTool(new BritishEnglish()); + for (Rule rule : lt.getAllRules()) { + if (!rule.isDictionaryBasedSpellingRule()) { + lt.disableRule(rule.getId()); + } + } + List matches = lt.check("A speling error"); + for (RuleMatch match : matches) { + System.out.println("Potential typo at characters " + + match.getFromPos() + "-" + match.getToPos() + ": " + + match.getMessage()); + System.out.println("Suggested correction(s): " + + match.getSuggestedReplacements()); + } + } + + @Ignore("not a test, but used on https://dev.languagetool.org/java-spell-checker") + @Test + public void spellCheckerDemoCodeForHomepageWithAddedWords() throws IOException { + JLanguageTool lt = new JLanguageTool(new BritishEnglish()); + for (Rule rule : lt.getAllRules()) { + if (rule instanceof SpellingCheckRule) { + ((SpellingCheckRule) rule).addIgnoreTokens(Arrays.asList("myspecialword", "anotherspecialword")); + } + } + List matches = lt.check("These are myspecialword and anotherspecialword"); + System.out.println(matches.size() + " matches"); // => "0 matches" + } + + @Test + public void testEnglish() throws IOException { + //more error-free sentences to deal with possible regressions + if (System.getProperty("disableHardcodedTests") == null) { + JLanguageTool lt = new JLanguageTool(new English()); + assertNoError("A test that should not give errors.", lt); + assertNoError("As long as you have hope, a chance remains.", lt); + assertNoError("A rolling stone gathers no moss.", lt); + assertNoError("Hard work causes fitness.", lt); + assertNoError("Gershwin overlays the slow blues theme from section B in the final “Grandioso.”", lt); + assertNoError("Making ingroup membership more noticeable increases cooperativeness.", lt); + assertNoError("Dog mushing is more of a sport than a true means of transportation.", lt); + assertNoError("No one trusts him any more.", lt); + assertNoError("A member of the United Nations since 1992, Azerbaijan was elected to membership in the newly established Human Rights Council by the United Nations General Assembly on May 9, 2006 (the term of office began on June 19, 2006).", lt); + assertNoError("Anatomy and geometry are fused in one, and each does something to the other.", lt); + assertNoError("Certain frogs that lay eggs underground have unpigmented eggs.", lt); + assertNoError("It's a kind of agreement in which each party gives something to the other, Jack said.", lt); + assertNoError("Later, you shall know it better.", lt); + assertNoError("And the few must win what the many lose, for the opposite arrangement would not support markets as we know them at all, and is, in fact, unimaginable.", lt); + assertNoError("He explained his errand, but without bothering much to make it plausible, for he felt something well up in him which was the reason he had fled the army.", lt); + assertNoError("I think it's better, and it's not a big deal.", lt); + + // with hidden characters, separated with annotated text + assertNoError("This\u202D\u202C \u202D\u202Cis\u202D\u202C \u202D\u202Ca\u202D\u202C " + + "\u202D\u202Ctest\u202D\u202C \u202D\u202Csentence,\u202D\u202C \u202D\u202Cwith" + + "\u202D\u202C \u202D\u202Cstrange\u202D\u202C \u202D\u202Chidden\u202D\u202C \u202D\u202Ccharacters.", lt); + + assertOneError("A test test that should give errors.", lt); + assertOneError("I can give you more a detailed description.", lt); + assertTrue(lt.getAllRules().size() > 1000); + assertNoError("The sea ice is highly variable — frozen solid during cold, calm weather and broke...", lt); + assertTrue(lt.getAllRules().size() > 3); + assertOneError("I can give you more a detailed description.", lt); + lt.disableRule("MORE_A_JJ"); + assertNoError("I can give you more a detailed description.", lt); + assertOneError("I've go to go.", lt); + lt.disableCategory(Categories.TYPOS.getId()); + if (Premium.isPremiumVersion()) { + assertOneError("I've go to go.", lt); + } else { + assertNoError("I've go to go.", lt); + } + + // Passive voice: repetitions + // the first match is at a long distance + assertNoError( + "The territory of Metropolitan France was settled by Celtic tribes known as Gauls. France reached its political and military zenith in the early 19th century under Napoleon Bonaparte, subjugating much of continental Europe and establishing the First French Empire. The French Revolutionary and Napoleonic Wars shaped the course of European and world history. The collapse of the empire initiated a period of relative decline, in which France endured a tumultuous succession of governments until the founding of the French Third Republic during the Franco-Prussian War in 1870. Subsequent decades saw a period of optimism, cultural and scientific flourishing, as well as economic prosperity known as the Belle Époque. France was one of the major participants of World War I, from which it emerged victorious at great human and economic cost. It was among the Allied powers of World War II, but was soon occupied by the Axis in 1940. France was plunged into a series of dynastic conflicts involving England. The second half of the 16th century was dominated by religious civil wars. The short-lived Fourth Republic was established and later dissolved during the Algerian War. The current Fifth Republic was formed in 1958 by Charles de Gaulle.", + lt); + // 4 previous matches within 80 tokens + assertOneError( + "The territory of Metropolitan France was settled by Celtic tribes known as Gauls. France was plunged into a series of dynastic conflicts involving England. The second half of the 16th century was dominated by religious civil wars. The short-lived Fourth Republic was established and later dissolved during the Algerian War. The current Fifth Republic was formed in 1958 by Charles de Gaulle. ", + lt); + } + } + + private void assertNoError(String input, JLanguageTool lt) throws IOException { + List matches = lt.check(input); + assertEquals("Did not expect an error in test sentence: '" + input + "', but got: " + matches, 0, matches.size()); + } + + private void assertOneError(String input, JLanguageTool lt) throws IOException { + List matches = lt.check(input); + assertEquals("Did expect 1 error in test sentence: '" + input + "', but got: " + matches, 1, matches.size()); + } + + @Test + public void testPositionsWithEnglish() throws IOException { + JLanguageTool tool = new JLanguageTool(new AmericanEnglish()); + List matches = tool.check("A sentence with no period\n" + + "A sentence. A typoh."); + assertEquals(1, matches.size()); + RuleMatch match = matches.get(0); + assertEquals(1, match.getLine()); + assertEquals(15, match.getColumn()); + } + + @Test + public void testPositionsWithEnglishTwoLineBreaks() throws IOException { + JLanguageTool tool = new JLanguageTool(new AmericanEnglish()); + List matches = tool.check("This sentence.\n\n" + + "A sentence. A typoh."); + assertEquals(1, matches.size()); + RuleMatch match = matches.get(0); + assertEquals(2, match.getLine()); + // It was 14. It should actually be 15, as in testPositionsWithEnglish(). + // Fixed thanks to a change in the sentence split. + if (Premium.isPremiumVersion()) { + // TODO: there should be no difference here + assertEquals(14, match.getColumn()); + } else { + assertEquals(15, match.getColumn()); + } + } + + @Test + public void testAnalyzedSentence() throws IOException { + JLanguageTool tool = new JLanguageTool(new English()); + //test soft-hyphen ignoring: + assertEquals(" This[this/DT,B-NP-singular|E-NP-singular] " + + "is[be/VBZ,B-VP] a[a/DT,B-NP-singular] " + + "test­ed[tested/JJ,I-NP-singular] " + + "sentence[sentence/NN,E-NP-singular].[./.,./PCT,O]", + tool.getAnalyzedSentence("This is a test\u00aded sentence.").toString()); + //test paragraph ends adding + assertEquals("

", tool.getAnalyzedSentence("\n").toString()); + + //test vertical tab as white space + String sentence = "I'm a cool test\u000Bwith a line"; + AnalyzedSentence aSentence = tool.getAnalyzedSentence(sentence); + assertEquals(aSentence.getTokens()[9].isWhitespace(), true); + assertEquals(aSentence.getTokens()[10].isWhitespaceBefore(), true); + } + + @Test + public void testParagraphRules() throws IOException { + JLanguageTool tool = new JLanguageTool(new English()); + + //run normally + List matches1 = tool.check("(This is an quote.\n It ends in the second sentence."); + assertEquals(2, matches1.size()); + + //run in a sentence-only mode + List matches2 = tool.check("(This is an quote.\n It ends in the second sentence.", false, ParagraphHandling.ONLYNONPARA); + assertEquals(1, matches2.size()); + assertEquals("EN_A_VS_AN", matches2.get(0).getRule().getId()); + + //run in a paragraph mode - single sentence + List matches3 = tool.check("(This is an quote.\n It ends in the second sentence.", false, ParagraphHandling.ONLYPARA); + assertEquals(1, matches3.size()); + assertEquals("EN_UNPAIRED_BRACKETS", matches3.get(0).getRule().getId()); + + //run in a paragraph mode - many sentences + List matches4 = tool.check("(This is an quote.\n It ends in the second sentence.", true, ParagraphHandling.ONLYPARA); + assertEquals(1, matches4.size()); + assertEquals("EN_UNPAIRED_BRACKETS", matches4.get(0).getRule().getId()); + } + + @Test + public void testWhitespace() throws IOException { + JLanguageTool tool = new JLanguageTool(new English()); + AnalyzedSentence raw = tool.getRawAnalyzedSentence("Let's do a \"test\", do you understand?"); + AnalyzedSentence cooked = tool.getAnalyzedSentence("Let's do a \"test\", do you understand?"); + //test if there was a change + assertFalse(raw.equals(cooked)); + //see if nothing has been deleted + assertEquals(raw.getTokens().length, cooked.getTokens().length); + int i = 0; + for (AnalyzedTokenReadings atr : raw.getTokens()) { + assertEquals(atr.isWhitespaceBefore(), + cooked.getTokens()[i].isWhitespaceBefore()); + i++; + } + } + + @Test + public void testOverlapFilter() throws IOException { + Category category = new Category(new CategoryId("TEST_ID"), "test category"); + List elements1 = Arrays.asList(new PatternToken("one", true, false, false)); + PatternRule rule1 = new PatternRule("id1", new English(), elements1, "desc1", "msg1", "shortMsg1"); + rule1.setSubId("1"); + rule1.setCategory(category); + + List elements2 = Arrays.asList(new PatternToken("one", true, false, false), new PatternToken("two", true, false, false)); + PatternRule rule2 = new PatternRule("id1", new English(), elements2, "desc2", "msg2", "shortMsg2"); + rule2.setSubId("2"); + rule2.setCategory(category); + + JLanguageTool tool = new JLanguageTool(new English()); + tool.addRule(rule1); + tool.addRule(rule2); + + List ruleMatches1 = tool.check("And one two three."); + assertEquals("one overlapping rule must be filtered out", 1, ruleMatches1.size()); + assertEquals("msg1", ruleMatches1.get(0).getMessage()); + + String sentence = "And one two three."; + AnalyzedSentence analyzedSentence = tool.getAnalyzedSentence(sentence); + List bothRules = new ArrayList<>(Arrays.asList(rule1, rule2)); + List ruleMatches2 = tool.checkAnalyzedSentence(ParagraphHandling.NORMAL, bothRules, analyzedSentence, true); + assertEquals("one overlapping rule must be filtered out", 1, ruleMatches2.size()); + assertEquals("msg1", ruleMatches2.get(0).getMessage()); + } + + @Test + public void testTextLevelRuleWithGlobalData() throws IOException { + JLanguageTool tool = new JLanguageTool(new English()); + tool.addRule(new MyTextLevelRule()); + AnnotatedText text1 = new AnnotatedTextBuilder().addGlobalMetaData(AnnotatedText.MetaDataKey.EmailToAddress, "Foo Bar ").build(); + assertThat(tool.check(text1).size(), is(1)); + AnnotatedText text2 = new AnnotatedTextBuilder().addGlobalMetaData(AnnotatedText.MetaDataKey.EmailToAddress, "blah blah ").build(); + assertThat(tool.check(text2).size(), is(0)); + } + + class MyTextLevelRule extends TextLevelRule { + @Override + public RuleMatch[] match(List sentences, AnnotatedText text) throws IOException { + if (text.getGlobalMetaData(AnnotatedText.MetaDataKey.EmailToAddress, "").contains("Foo Bar")) { + return new RuleMatch[]{new RuleMatch(this, null, 0, 1, "test message")}; + } + return new RuleMatch[0]; + } + @Override + public RuleMatch[] match(List sentences) throws IOException { + throw new RuntimeException("not implemented"); + } + @Override + public String getId() { + return "MyTextLevelRule"; + } + @Override + public String getDescription() { + return "Test rule"; + } + @Override + public int minToCheckParagraph() { + return -1; + } + } + + @Test + public void testAdvancedTypography() { + Language lang = new AmericanEnglish(); + assertEquals(lang.toAdvancedTypography("The genitive ('s) may be missing."), "The genitive (’s) may be missing."); + assertEquals(lang.toAdvancedTypography("The word 'Language‘s' is not standard English"), "The word ‘Language‘s’ is not standard English"); + assertEquals(lang.toAdvancedTypography("Did you mean Language's (straight apostrophe) or Language’s (curly apostrophe)?"), "Did you mean “Language's” (straight apostrophe) or “Language’s” (curly apostrophe)?"); + assertEquals(lang.toAdvancedTypography("Did you mean Language’s (curly apostrophe) or Language's (straight apostrophe)?"), "Did you mean “Language’s” (curly apostrophe) or “Language's” (straight apostrophe)?"); + assertEquals(lang.toAdvancedTypography("Did you mean |?"), "Did you mean “|?”"); + } + + @Test + public void testAdaptSuggestions() throws IOException { + JLanguageTool tool = new JLanguageTool(new AmericanEnglish()); + List matches = tool.check("Whatever their needs, we doesn't never disappoint them."); + assertEquals("[n't, never]", matches.get(0).getSuggestedReplacements().toString()); + } + + @Test + public void testEnglishVariants() throws IOException { + String sentence = "This is a test."; + String sentence2 = "This is an test."; + for (String langCode : new String[] { "en-US", "en-AU", "en-GB", "en-CA", "en-ZA", "en-NZ" }) { + JLanguageTool lt = new JLanguageTool(Languages.getLanguageForShortCode(langCode)); + assertEquals(0, lt.check(sentence).size()); + assertEquals(1, lt.check(sentence2).size()); + } + } +} diff --git a/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/EsperantoTest.java b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/EsperantoTest.java new file mode 100644 index 000000000000..54dd2c8a1f88 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/EsperantoTest.java @@ -0,0 +1,46 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2013 Daniel Naber (http://www.danielnaber.de) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +import org.junit.Test; +import org.languagetool.JLanguageTool; +import org.languagetool.LanguageSpecificTest; +import org.languagetool.language.Esperanto; +import org.languagetool.rules.RuleMatch; + +import java.io.IOException; +import java.util.List; + +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertThat; + +public class EsperantoTest extends LanguageSpecificTest { + + @Test + public void testLanguage() throws IOException { + Esperanto language = new Esperanto(); + runTests(language, "eo"); + JLanguageTool languageTool = new JLanguageTool(language); + String input = "La Mondaj Ludoj de 2013 estis plur-sporta evento..."; + List ruleMatches = languageTool.check(input); + assertThat(ruleMatches.size(), is(1)); + assertThat(ruleMatches.get(0).getRule().getId(), is("HUNSPELL_RULE")); + } + +} diff --git a/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/FrenchTest.java b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/FrenchTest.java new file mode 100644 index 000000000000..e357b285ade7 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/FrenchTest.java @@ -0,0 +1,75 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2019 Daniel Naber (http://www.danielnaber.de) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +import org.junit.Test; +import org.languagetool.JLanguageTool; +import org.languagetool.Language; +import org.languagetool.rules.RuleMatch; +import org.languagetool.tokenizers.SentenceTokenizer; + +import java.io.IOException; +import java.util.List; + +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; + +public class FrenchTest { + + @Test + public void testSentenceTokenizer() { + Language lang = new French(); + SentenceTokenizer tokenizer = lang.getSentenceTokenizer(); + assertThat(tokenizer.tokenize("Arrête de le cajoler... ça ne donnera rien.").size(), is(1)); + assertThat(tokenizer.tokenize("Arrête de le cajoler… ça ne donnera rien.").size(), is(1)); + assertThat(tokenizer.tokenize("Il est possible de le contacter par tous les moyens (courrier, téléphone, mail...) à condition de vous présenter.").size(), is(1)); + } + + @Test + public void testAdvancedTypography() { + Language lang = new French(); + assertEquals(lang.toAdvancedTypography("\"C'est\""), "«\u00a0C’est\u00a0»"); + assertEquals(lang.toAdvancedTypography("\"C'est\" "), "«\u00a0C’est\u00a0» "); + assertEquals(lang.toAdvancedTypography("'C'est'"), "‘C’est’"); + assertEquals(lang.toAdvancedTypography("Vouliez-vous dire 'C'est'?"), "Vouliez-vous dire ‘C’est’\u202f?"); + assertEquals(lang.toAdvancedTypography("Vouliez-vous dire \"C'est\"?"), "Vouliez-vous dire «\u00a0C’est\u00a0»\u202f?"); + assertEquals(lang.toAdvancedTypography("Vouliez-vous dire C'est?"), "Vouliez-vous dire «\u00a0C’est\u00a0»\u202f?"); + assertEquals(lang.toAdvancedTypography("Confusion possible : \"a\" est une conjugaison du verbe avoir. Vouliez-vous dire « à »?"), + "Confusion possible\u00a0: «\u00a0a\u00a0» est une conjugaison du verbe avoir. Vouliez-vous dire «\u00a0à\u00a0»\u202f?"); + assertEquals(lang.toAdvancedTypography("C'est l'\"homme\"."), "C’est l’« homme »."); + assertEquals(lang.toAdvancedTypography("Vouliez-vous dire 50\u00a0$?"), "Vouliez-vous dire «\u00a050\u00a0$\u00a0»\u202f?"); + } + + @Test + public void testRules() throws IOException { + Language lang = new French(); + JLanguageTool lt = new JLanguageTool(lang); + + // In some (unclear) circumstances, matches in these sentences and rules are not detected by tests on XML examples #6300 + + // FRENCH_WORD_REPEAT_RULE[2] + List matches = lt.check("Fête des mères et remise de l'insigne \" Morts pour la France \"."); + assertEquals(0, matches.size()); + // ACCORD_V_QUESTION2[1] + List matches2 = lt.check("D'autre part, je ne soutiens pas du tout le système actuel en france mais je sais qu'au train où l'on va que notre prochaine étape sera celle de la Grèce ou de l'Argentine."); + assertEquals(1, matches2.size()); + } + +} diff --git a/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/GalicianTest.java b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/GalicianTest.java new file mode 100644 index 000000000000..dcbd89b6cc1d --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/GalicianTest.java @@ -0,0 +1,39 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2019 Daniel Naber (http://www.danielnaber.de) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +import org.junit.Test; +import org.languagetool.LanguageSpecificTest; + +import java.io.IOException; +import java.util.Arrays; + +public class GalicianTest extends LanguageSpecificTest { + + @Test + public void testLanguage() throws IOException { + // NOTE: this text needs to be kept in sync with config.ts -> DEMO_TEXTS: + String s = "Esta vai a ser unha mostra de de exemplo para amosar o funcionamento de LanguageTool."; + Galician lang = new Galician(); + testDemoText(lang, s, + Arrays.asList("IR_A_INF", "WORD_REPETITION", "WHITESPACE_RULE") + ); + runTests(lang, "ga"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/GermanTest.java b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/GermanTest.java new file mode 100644 index 000000000000..208082632a43 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/GermanTest.java @@ -0,0 +1,75 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2005 Daniel Naber (http://www.danielnaber.de) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +import org.junit.Test; +import org.languagetool.JLanguageTool; +import org.languagetool.Premium; +import org.languagetool.rules.RuleMatch; + +import java.io.IOException; +import java.util.List; + +import static org.junit.Assert.assertEquals; + +public class GermanTest { + + @Test + public void testGermanyGerman() throws IOException { + JLanguageTool lt = new JLanguageTool(new GermanyGerman()); + assertEquals(0, lt.check("Ein Test, der keine Fehler geben sollte.").size()); + assertEquals(1, lt.check("Ein Test Test, der Fehler geben sollte.").size()); + lt.setListUnknownWords(true); + // German rule has no effect with English error, but they are spelling mistakes: + if (Premium.isPremiumVersion()) { + assertEquals(7, lt.check("I can give you more a detailed description").size()); + } else { + assertEquals(6, lt.check("I can give you more a detailed description").size()); + } + //test unknown words listing + assertEquals("[I, can, description, detailed, give, more, you]", lt.getUnknownWords().toString()); + } + + @Test + public void testPositionsWithGerman() throws IOException { + JLanguageTool lt = new JLanguageTool(new GermanyGerman()); + List matches = lt.check("Stundenkilometer"); + assertEquals(1, matches.size()); + RuleMatch match = matches.get(0); + assertEquals(0, match.getLine()); + assertEquals(1, match.getColumn()); + } + + @Test + public void testGermanVariants() throws IOException { + String sentence = "Ein Test, der keine Fehler geben sollte."; + String sentence2 = "Ein Test Test, der Fehler geben sollte."; + JLanguageTool lt = new JLanguageTool(new GermanyGerman()); + assertEquals(0, lt.check(sentence).size()); + assertEquals(1, lt.check(sentence2).size()); + + lt = new JLanguageTool(new SwissGerman()); + assertEquals(0, lt.check(sentence).size()); + assertEquals(1, lt.check(sentence2).size()); + + lt = new JLanguageTool(new AustrianGerman()); + assertEquals(0, lt.check(sentence).size()); + assertEquals(1, lt.check(sentence2).size()); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/GreekTest.java b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/GreekTest.java new file mode 100644 index 000000000000..5b43d22d65a1 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/GreekTest.java @@ -0,0 +1,39 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2019 Daniel Naber (http://www.danielnaber.de) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +import org.junit.Test; +import org.languagetool.LanguageSpecificTest; + +import java.io.IOException; +import java.util.Arrays; + +public class GreekTest extends LanguageSpecificTest { + + @Test + public void testLanguage() throws IOException { + // NOTE: this text needs to be kept in sync with config.ts -> DEMO_TEXTS: + String s = "Επικολλήστε το κείμενο σας εδώ και κάντε κλικ στο κουμπί ελέγχου. Κάντε κλικ στις χρωματιστές φράσεις για λεπτομέρειες σχετικά με πιθανά σφάλματα. Για παράδειγμα σε αυτή τη πρόταση υπάρχουν εσκεμμένα λάθη για να να δείτε πώς λειτουργει το LanguageTool.."; + Greek lang = new Greek(); + testDemoText(lang, s, + Arrays.asList("GREEK_PUNC_2", "GREEK_ART_FEM_MISSING_N", "WORD_REPEAT_RULE", "MORFOLOGIK_RULE_EL_GR", "DOUBLE_PUNCTUATION") + ); + runTests(lang, "el", "ισότπς"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/IcelandicTest.java b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/IcelandicTest.java new file mode 100644 index 000000000000..4cd3477f6273 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/IcelandicTest.java @@ -0,0 +1,35 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2013 Daniel Naber (http://www.danielnaber.de) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +import org.junit.Test; +import org.languagetool.Language; +import org.languagetool.LanguageSpecificTest; + +import java.io.IOException; + +public class IcelandicTest extends LanguageSpecificTest { + + @Test + public void testRules() throws IOException { + Language lang = new Icelandic(); + runTests(lang, "is"); + } + +} diff --git a/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/IrishTest.java b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/IrishTest.java new file mode 100644 index 000000000000..0886923a9001 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/IrishTest.java @@ -0,0 +1,43 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2019 Daniel Naber (http://www.danielnaber.de) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +import org.junit.Test; +import org.languagetool.JLanguageTool; +import org.languagetool.Language; +import org.languagetool.rules.RuleMatch; + +import java.io.IOException; +import java.util.List; + +import static org.junit.Assert.assertEquals; + +public class IrishTest { + + @Test + public void testRules() throws IOException { + Language lang = new Irish(); + JLanguageTool lt = new JLanguageTool(lang); + List matches = lt.check("Seo abairt bheag."); + assertEquals(0, matches.size()); + matches = lt.check("Tá dhá dheartháireacha agam."); + assertEquals(1, matches.size()); + } + +} diff --git a/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/ItalianTest.java b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/ItalianTest.java new file mode 100644 index 000000000000..4dd40c8ceb4f --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/ItalianTest.java @@ -0,0 +1,40 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2019 Daniel Naber (http://www.danielnaber.de) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +import org.junit.Test; +import org.languagetool.LanguageSpecificTest; +import org.languagetool.language.it.Italian; + +import java.io.IOException; +import java.util.Arrays; + +public class ItalianTest extends LanguageSpecificTest { + + @Test + public void testLanguage() throws IOException { + // NOTE: this text needs to be kept in sync with config.ts -> DEMO_TEXTS: + String s = "Inserite qui il vostro testo... Oppure controlate direttamente questo ed avrete un assaggio di quali errori possono essere identificati con LanguageTool."; + Italian lang = new Italian(); + testDemoText(lang, s, + Arrays.asList("MORFOLOGIK_RULE_IT_IT", "ST_03_001") + ); + runTests(lang, "it"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/JapaneselTest.java b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/JapaneselTest.java new file mode 100644 index 000000000000..b3e3d4701db6 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/JapaneselTest.java @@ -0,0 +1,37 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2005 Daniel Naber (http://www.danielnaber.de) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +import org.junit.Test; +import org.languagetool.JLanguageTool; + +import java.io.IOException; + +import static org.junit.Assert.assertEquals; + +public class JapaneselTest { + + @Test + public void testJapanese() throws IOException { + final JLanguageTool tool = new JLanguageTool(new Japanese()); + assertEquals(0, tool.check("エラーを含まないテスト文です。").size()); + assertEquals(1, tool.check("エラーお含むテスト文です。").size()); + } + +} diff --git a/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/KhmerTest.java b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/KhmerTest.java new file mode 100644 index 000000000000..f3ddfd462b39 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/KhmerTest.java @@ -0,0 +1,39 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2019 Daniel Naber (http://www.danielnaber.de) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +import org.junit.Test; +import org.languagetool.LanguageSpecificTest; + +import java.io.IOException; +import java.util.Arrays; + +public class KhmerTest extends LanguageSpecificTest { + + @Test + public void testLanguage() throws IOException { + // NOTE: this text needs to be kept in sync with config.ts -> DEMO_TEXTS: + String s = "ឃ្លា\u200Bនេះ\u200Bបង្ហាញ\u200Bពី\u200Bពី\u200Bកំហុស\u200Bវេយ្យាករណ៍ ដើម្បី\u200Bបញ្ជាក់\u200Bពី\u200Bប្រសិទ្ធភាព\u200Bរបស់\u200Bកម្មវិធី LanguageTool សំរាប់\u200Bភាសាខ្មែរ។"; + Khmer lang = new Khmer(); + testDemoText(lang, s, + Arrays.asList("KM_WORD_REPEAT_RULE", "HUNSPELL_RULE", "HUNSPELL_RULE", "HUNSPELL_RULE", "HUNSPELL_RULE", "HUNSPELL_RULE", "KM_SIMPLE_REPLACE") + ); + runTests(lang, "km"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/LithuanianTest.java b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/LithuanianTest.java new file mode 100644 index 000000000000..219b22b399e9 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/LithuanianTest.java @@ -0,0 +1,35 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2013 Daniel Naber (http://www.danielnaber.de) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +import org.junit.Test; +import org.languagetool.Language; +import org.languagetool.LanguageSpecificTest; + +import java.io.IOException; + +public class LithuanianTest extends LanguageSpecificTest { + + @Test + public void testRules() throws IOException { + Language lang = new Lithuanian(); + runTests(lang, "lt"); + } + +} diff --git a/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/MalayalamTest.java b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/MalayalamTest.java new file mode 100644 index 000000000000..16ef41a38c1e --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/MalayalamTest.java @@ -0,0 +1,35 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2013 Daniel Naber (http://www.danielnaber.de) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +import org.junit.Test; +import org.languagetool.Language; +import org.languagetool.LanguageSpecificTest; + +import java.io.IOException; + +public class MalayalamTest extends LanguageSpecificTest { + + @Test + public void testRules() throws IOException { + Language lang = new Malayalam(); + runTests(lang, "ml"); + } + +} diff --git a/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/PersianTest.java b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/PersianTest.java new file mode 100644 index 000000000000..8a901f8a738d --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/PersianTest.java @@ -0,0 +1,39 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2019 Daniel Naber (http://www.danielnaber.de) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +import org.junit.Test; +import org.languagetool.LanguageSpecificTest; + +import java.io.IOException; + +public class PersianTest extends LanguageSpecificTest { + + @Test + public void testLanguage() throws IOException { + // NOTE: this text needs to be kept in sync with config.ts -> DEMO_TEXTS: + // commented out, as some rules seem to cause many (false?) alarms: + //String s = "لطفا متن خود را اینجا قرار دهید . یا بررسی کنید که این متن را\u200C برای دیدن بعضی بعضی از اشکال هایی که ابزار زبان توانسته تشخیس هدد. درباره ی نرم افزارهای بررسی کننده های گرامر چه فکر می کنید؟ لطفا در نظر داشته باشید که آن\u200Cها بی نقص نمی باشند.\u200E"; + Persian lang = new Persian(); + //testDemoText(lang, s, + // Arrays.asList("PERSIAN_COMMA_PARENTHESIS_WHITESPACE", "Bad_ZWNJ", "PERSIAN_WORD_REPEAT_RULE", "PluralFix", "PluralFix", "Complex_Present_Verbs", "Complex_Present_Verbs") + //); + runTests(lang, "fa", "ā"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/PolishTest.java b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/PolishTest.java new file mode 100644 index 000000000000..49b61d98a984 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/PolishTest.java @@ -0,0 +1,39 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2019 Daniel Naber (http://www.danielnaber.de) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +import org.junit.Test; +import org.languagetool.LanguageSpecificTest; + +import java.io.IOException; +import java.util.Arrays; + +public class PolishTest extends LanguageSpecificTest { + + @Test + public void testLanguage() throws IOException { + // NOTE: this text needs to be kept in sync with config.ts -> DEMO_TEXTS: + String s = "Wpisz tekst lub użyj istniejącego przykładu. To jest przykładowy tekst który pokazuje, jak jak działa LanguageTool. LanguageTool ma jusz korektor psowni, który wyrurznia bledy na czewrono."; + Polish lang = new Polish(); + testDemoText(lang, s, + Arrays.asList("BRAK_PRZECINKA_KTORY", "WORD_REPEAT_RULE", "PL_SIMPLE_REPLACE", "MORFOLOGIK_RULE_PL_PL", "MORFOLOGIK_RULE_PL_PL", "MORFOLOGIK_RULE_PL_PL", "MORFOLOGIK_RULE_PL_PL") + ); + runTests(lang, "pl", "ą"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/PortugueseTest.java b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/PortugueseTest.java new file mode 100644 index 000000000000..13e7f66e2fae --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/PortugueseTest.java @@ -0,0 +1,52 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2019 Daniel Naber (http://www.danielnaber.de) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +import org.junit.Test; +import org.languagetool.Language; +import org.languagetool.LanguageSpecificTest; + +import java.io.IOException; +import java.util.Arrays; + +public class PortugueseTest extends LanguageSpecificTest { + + @Test + public void testLanguage() throws IOException { + // NOTE: this text needs to be kept in sync with config.ts -> DEMO_TEXTS: + String s = "Cole aqui seu texto...ou verifique esta texto, afim de revelar alguns dos dos problemas que o LanguageTool consegue detectar. Isto tal vez permita corrigir os seus erro. Nós prometo ajudá-lo. para testar a grafia e as regrs do antigo) Acordo Ortográfico,, verifique o mesmo texto mesmo texto em Português de Angola ou Português do Moçambique e faça a analise dos resultados.. Nossa equipe anuncia a versão 4.5, que será lançada sexta-feira, 26 de março de 2019."; + PortugalPortuguese ptPT = new PortugalPortuguese(); + testDemoText(ptPT, s, + Arrays.asList("POSSESSIVE_WITHOUT_ARTICLE", "SPACE_AFTER_PUNCTUATION", "GENERAL_GENDER_AGREEMENT_ERRORS", "AFIM_DE", "PORTUGUESE_WORD_REPEAT_RULE", + "PT_AGREEMENT_REPLACE_DETECTAR", "TAL_VEZ", "GENERAL_NUMBER_AGREEMENT_ERRORS", "GENERAL_VERB_AGREEMENT_ERRORS", "UPPERCASE_SENTENCE_START", + "HUNSPELL_RULE", "UNPAIRED_BRACKETS", "DOUBLE_PUNCTUATION", "PHRASE_REPETITION", "GENTILICOS_LINGUAS", "GENTILICOS_LINGUAS", "ARTICLES_PRECEDING_LOCATIONS", //"REPEATED_WORDS", + "PARONYM_ANALISE_363", "DOUBLE_PUNCTUATION", "POSSESSIVE_WITHOUT_ARTICLE", "EQUIPES", "DATE_WEEKDAY") + ); + runTests(ptPT, "pt-PT", "õș"); + BrazilianPortuguese ptBR = new BrazilianPortuguese(); + String s2 = "Cole aqui seu texto...ou verifique esta texto, afim de revelar alguns dos dos problemas que o LanguageTool consegue detectar. Isto tal vez permita corrigir os seus erro. Nós prometo ajudá-lo. para testar a grafia e as regrs do antigo) Acordo Ortográfico,, verifique o mesmo texto mesmo texto em Português de Angola ou Português do Moçambique e faça a analise dos resultados.. Nossa equipe anuncia a versão 4.5, que será lançada sexta-feira, 26 de março de 2019."; + testDemoText(ptBR, s2, + Arrays.asList("SPACE_AFTER_PUNCTUATION", "GENERAL_GENDER_AGREEMENT_ERRORS", "AFIM_DE", "PORTUGUESE_WORD_REPEAT_RULE", "TAL_VEZ", + "GENERAL_NUMBER_AGREEMENT_ERRORS", "GENERAL_VERB_AGREEMENT_ERRORS", "UPPERCASE_SENTENCE_START", "HUNSPELL_RULE", + "UNPAIRED_BRACKETS", "DOUBLE_PUNCTUATION", "PHRASE_REPETITION", "GENTILICOS_LINGUAS", "GENTILICOS_LINGUAS", + "PARONYM_ANALISE_363", "DOUBLE_PUNCTUATION", "DATE_WEEKDAY") + ); + testReplaceRuleReplacements(ptBR); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/RomanianTest.java b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/RomanianTest.java new file mode 100644 index 000000000000..ea8abf269f7d --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/RomanianTest.java @@ -0,0 +1,32 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2019 Daniel Naber (http://www.danielnaber.de) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +import org.junit.Test; +import org.languagetool.LanguageSpecificTest; + +import java.io.IOException; + +public class RomanianTest extends LanguageSpecificTest { + + @Test + public void testLanguage() throws IOException { + runTests(new Romanian(), "ro"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/RussianTest.java b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/RussianTest.java new file mode 100644 index 000000000000..e1d5f98b8993 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/RussianTest.java @@ -0,0 +1,39 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2019 Daniel Naber (http://www.danielnaber.de) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +import org.junit.Test; +import org.languagetool.LanguageSpecificTest; + +import java.io.IOException; +import java.util.Arrays; + +public class RussianTest extends LanguageSpecificTest { + + @Test + public void testLanguage() throws IOException { + // NOTE: this text needs to be kept in sync with config.ts -> DEMO_TEXTS: + String s = "Вставьте ваш текст сюда .. или проверьте этот текстт. Релиз LanguageTool 4.7 состоялся в четверг 28 сентября 2019 года."; + Russian lang = new Russian(); + testDemoText(lang, s, + Arrays.asList( "DOUBLE_PUNCTUATION", "UPPERCASE_SENTENCE_START", "MORFOLOGIK_RULE_RU_RU", "DATE_WEEKDAY1") + ); + runTests(lang, "ru"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/SimpleGermanTest.java b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/SimpleGermanTest.java new file mode 100644 index 000000000000..fce57117f482 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/SimpleGermanTest.java @@ -0,0 +1,40 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2019 Daniel Naber (http://www.danielnaber.de) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +import org.junit.Test; +import org.languagetool.LanguageSpecificTest; + +import java.io.IOException; +import java.util.Arrays; + +public class SimpleGermanTest extends LanguageSpecificTest { + + @Test + public void testLanguage() throws IOException { + // NOTE: this text needs to be kept in sync with config.ts -> DEMO_TEXTS: + String s = "Fügen Sie hier Ihren Text ein oder benutzen Sie diesen Text als Beispiel. Dieser Text wurde nur zum Testen geschrieben. Die Donaudampfschifffahrt darf da nicht fehlen. Und die Nutzung des Genitivs auch nicht."; + SimpleGerman lang = new SimpleGerman(); + testDemoText(lang, s, + Arrays.asList("ZWEI_INFORMATIONSEINHEITEN_PRO_SATZ", /*"TOO_LONG_SENTENCE_DE", -- filtered due to overlapping other errors */ + "PASSIV", "LANGES_WORT", "VERNEINUNG", "ABSTRAKTE_WOERTER", "GENITIV") + ); + runTests(lang, "de-DE-x-simple-language"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/SlovakTest.java b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/SlovakTest.java new file mode 100644 index 000000000000..9f095dd2ae51 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/SlovakTest.java @@ -0,0 +1,35 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2019 Daniel Naber (http://www.danielnaber.de) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +import org.junit.Test; +import org.languagetool.LanguageSpecificTest; + +import java.io.IOException; + +public class SlovakTest extends LanguageSpecificTest { + + @Test + public void testLanguage() throws IOException { + // NOTE: this text needs to be kept in sync with config.ts -> DEMO_TEXTS: + //String s = "Toto je ukážkový vstup, na predvedenie funkčnosti LanguageTool. Pamätajte si si, že neobsahuje \"kontrolu\" preklepo."; -- commented out, as it's outdated + Slovak lang = new Slovak(); + runTests(lang, "sk"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/SlovenianTest.java b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/SlovenianTest.java new file mode 100644 index 000000000000..b0b616d2fd0a --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/SlovenianTest.java @@ -0,0 +1,39 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2019 Daniel Naber (http://www.danielnaber.de) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +import org.junit.Test; +import org.languagetool.LanguageSpecificTest; + +import java.io.IOException; +import java.util.Arrays; + +public class SlovenianTest extends LanguageSpecificTest { + + @Test + public void testLanguage() throws IOException { + // NOTE: this text needs to be kept in sync with config.ts -> DEMO_TEXTS: + String s = "Tukaj vnesite svoje besedilo... Pa poglejmo primer besedila s nekaj napakami ki jih lahko razpozna orodje LanguageTool; ko opazite napake, jih lahko enostavno popiravite. ( Obenem se izvrši tudi preverjanje črkovanja črkovanja."; + Slovenian lang = new Slovenian(); + testDemoText(lang, s, + Arrays.asList("TROPIČJETRI", "PREDLOG_S", "KI_BREZ_VEJICE", "MORFOLOGIK_RULE_SL_SI", "COMMA_PARENTHESIS_WHITESPACE", "WORD_REPEAT_RULE") + ); + runTests(lang, "sl"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/SpanishTest.java b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/SpanishTest.java new file mode 100644 index 000000000000..72ec4294d744 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/SpanishTest.java @@ -0,0 +1,51 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2019 Daniel Naber (http://www.danielnaber.de) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +import org.junit.Test; +import org.languagetool.LanguageSpecificTest; + +import java.io.IOException; +import java.util.Arrays; + +public class SpanishTest extends LanguageSpecificTest { + + @Test + public void testLanguage() throws IOException { + // NOTE: this text needs to be kept in sync with config.ts -> DEMO_TEXTS: + String s = "Escribe o pega tu texto aqui para tenerlo revisado contínuamente. los errores se subrayaran en diferentes colores: marcaremos los errores ortograficos en rojo; los errores de gramática son resaltado en amarillo; los problemas relacionados al estilo serán marcados en azul. Sabías que te proponemos sinónimos al hacer doble clic sobre una palabra? LanguageTool es un herramienta para textos impecables, sean e-mails, artículos, blogs o otros, incluso cuando el texto se complejice."; + Spanish lang = new Spanish(); + testDemoText(lang, s, + Arrays.asList("ES_SIMPLE_REPLACE_SIMPLE_AQUI", "MORFOLOGIK_RULE_ES", "UPPERCASE_SENTENCE_START", "SUBJUNTIVO_FUTURO", "MORFOLOGIK_RULE_ES", "AGREEMENT_VERB_PARTICIPLE", "RELACIONADO_A", "ES_QUESTION_MARK", "AGREEMENT_DET_NOUN", "Y_E_O_U", "COMPLEJIZAR") + ); + // , "ES_WIKIPEDIA_COMMON_ERRORS" + runTests(lang, "es", "ÍÚÑ"); + } + @Test + public void testLanguageVoseo() throws IOException { + // NOTE: this text needs to be kept in sync with config.ts -> DEMO_TEXTS: + String s = "Escribe o pega tu texto aqui para tenerlo revisado contínuamente. los errores se subrayaran en diferentes colores: marcaremos los errores ortograficos en rojo; los errores de gramática son resaltado en amarillo; los problemas relacionados al estilo serán marcados en azul. Sabías que te proponemos sinónimos al hacer doble clic sobre una palabra? LanguageTool es un herramienta para textos impecables, sean e-mails, artículos, blogs o otros, incluso cuando el texto se complejice."; + SpanishVoseo lang = new SpanishVoseo(); + testDemoText(lang, s, + Arrays.asList("ES_SIMPLE_REPLACE_SIMPLE_AQUI", "MORFOLOGIK_RULE_ES", "UPPERCASE_SENTENCE_START", "SUBJUNTIVO_FUTURO", "MORFOLOGIK_RULE_ES", "AGREEMENT_VERB_PARTICIPLE", "RELACIONADO_A", "ES_QUESTION_MARK", "AGREEMENT_DET_NOUN", "Y_E_O_U", "COMPLEJIZAR") + ); + // , "ES_WIKIPEDIA_COMMON_ERRORS" + runTests(lang, "es-AR", "ÍÚÑ"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/SwedishTest.java b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/SwedishTest.java new file mode 100644 index 000000000000..d4eaf5f69d6a --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/SwedishTest.java @@ -0,0 +1,33 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2019 Daniel Naber (http://www.danielnaber.de) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +import org.junit.Test; +import org.languagetool.LanguageSpecificTest; + +import java.io.IOException; + +public class SwedishTest extends LanguageSpecificTest { + + @Test + public void testLanguage() throws IOException { + runTests(new Swedish(), "sv"); + } + +} diff --git a/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/TagalogTest.java b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/TagalogTest.java new file mode 100644 index 000000000000..8c1d69102909 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/TagalogTest.java @@ -0,0 +1,39 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2019 Daniel Naber (http://www.danielnaber.de) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +import org.junit.Test; +import org.languagetool.LanguageSpecificTest; + +import java.io.IOException; +import java.util.Arrays; + +public class TagalogTest extends LanguageSpecificTest { + + @Test + public void testLanguage() throws IOException { + // NOTE: this text needs to be kept in sync with config.ts -> DEMO_TEXTS: + String s = "Ang LanguageTool ay maganda gamit sa araw-araw. Ang talatang ito ay nagpapakita ng ng kakayahan ng LanguageTool at hinahalimbawa kung paano ito gamitin. Litaw rin sa talatang ito na may mga bagaybagay na hindii pa kayang itama nng LanguageTool."; + Tagalog lang = new Tagalog(); + testDemoText(lang, s, + Arrays.asList("ADJECTIVE-V_COMMON_NOUN", "NG_NG", "MORFOLOGIK_RULE_TL", "R_WORDS", "MORFOLOGIK_RULE_TL", "MORFOLOGIK_RULE_TL", "MORFOLOGIK_RULE_TL") + ); + runTests(lang, "tl"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/TamilTest.java b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/TamilTest.java new file mode 100644 index 000000000000..4562d2906591 --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/TamilTest.java @@ -0,0 +1,39 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2019 Daniel Naber (http://www.danielnaber.de) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +import org.junit.Test; +import org.languagetool.LanguageSpecificTest; + +import java.io.IOException; +import java.util.Arrays; + +public class TamilTest extends LanguageSpecificTest { + + @Test + public void testLanguage() throws IOException { + // NOTE: this text needs to be kept in sync with config.ts -> DEMO_TEXTS: + String s = "இந்த பெட்டியில் உங்கள் உரையை ஒட்டி சரிவர சோதிக்கிறதா என பாருங்கள். 'லேங்குவேஜ் டூல்' சில இலக்கணப் பிழைகளைச் சரியாக கண்டுபிடிக்கும். பல பிழைகளைப் பிடிக்க தடுமாறலாம்."; + Tamil lang = new Tamil(); + testDemoText(lang, s, + Arrays.asList("Ends_in_A_1", "Ends_in_A_3", "Ends_in_A_3", "Ends_in_A_4", "Ends_in_A_2") + ); + runTests(lang, "ta"); + } +} diff --git a/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/UkrainianTest.java b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/UkrainianTest.java new file mode 100644 index 000000000000..ab9c1c4e131d --- /dev/null +++ b/languagetool-language-modules/language-java8compat/src/test/java/org/languagetool/language/UkrainianTest.java @@ -0,0 +1,43 @@ +/* LanguageTool, a natural language style checker + * Copyright (C) 2019 Daniel Naber (http://www.danielnaber.de) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ +package org.languagetool.language; + +import org.junit.Test; +import org.languagetool.Language; +import org.languagetool.LanguageSpecificTest; + +import java.io.IOException; +import java.util.Arrays; + +public class UkrainianTest extends LanguageSpecificTest { + + @Test + public void testLanguage() throws IOException { + // NOTE: this text needs to be kept in sync with config.ts -> DEMO_TEXTS: + String s = "УВАГА! Внизу наведено приклад тексту з помилками, які допоможе виправити LanguageTool. Будь-ласка, вставте тутт ваш текст, або перевірте цей текст на предмет помилок. Знайти всі помилки для LanguageTool є не по силах з багатьох причин але дещо він вам все таки підкаже. Порівняно з засобами перевірки орфографії LanguageTool також змайде граматичні та стильові проблеми. LanguageTool — ваш самий кращий помічник."; + Language lang = new Ukrainian(); + testDemoText(lang, s, + Arrays.asList("UK_SIMPLE_REPLACE", "MORFOLOGIK_RULE_UK_UA", "NE_V_SYLAH", "comma_before_but", "WORDS_WITH_DASH", +// "PORIVNYANO_Z", + "MORFOLOGIK_RULE_UK_UA", "SAMYI_WITH_ADJ") + ); + runTests(lang, "uk"); + lang = new Ukrainian1992(); + } +} diff --git a/languagetool-language-modules/lt/pom.xml b/languagetool-language-modules/lt/pom.xml index 6342bead6966..5b20fcc93ca3 100644 --- a/languagetool-language-modules/lt/pom.xml +++ b/languagetool-language-modules/lt/pom.xml @@ -67,6 +67,17 @@ org.apache.maven.plugins maven-surefire-plugin + + org.apache.maven.plugins + maven-jar-plugin + + + + org.languagetool.language.lt + + + + diff --git a/languagetool-language-modules/lt/src/main/java/org/languagetool/language/Lithuanian.java b/languagetool-language-modules/lt/src/main/java/org/languagetool/language/lt/Lithuanian.java similarity index 96% rename from languagetool-language-modules/lt/src/main/java/org/languagetool/language/Lithuanian.java rename to languagetool-language-modules/lt/src/main/java/org/languagetool/language/lt/Lithuanian.java index 57918881f6ee..69f90423b253 100644 --- a/languagetool-language-modules/lt/src/main/java/org/languagetool/language/Lithuanian.java +++ b/languagetool-language-modules/lt/src/main/java/org/languagetool/language/lt/Lithuanian.java @@ -16,11 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language; +package org.languagetool.language.lt; import org.jetbrains.annotations.NotNull; import org.languagetool.Language; import org.languagetool.UserConfig; +import org.languagetool.language.Contributor; import org.languagetool.rules.*; import org.languagetool.rules.lt.MorfologikLithuanianSpellerRule; import org.languagetool.tagging.Tagger; @@ -65,7 +66,7 @@ public Tagger createDefaultTagger() { @Override public Contributor[] getMaintainers() { - return new Contributor[] {new Contributor("Mantas Kriaučiūnas")}; + return new Contributor[] {new Contributor("Mantas Kriaučiūnas", null)}; } @Override diff --git a/languagetool-language-modules/lt/src/main/resources/META-INF/org/languagetool/language-module.properties b/languagetool-language-modules/lt/src/main/resources/META-INF/org/languagetool/language-module.properties index 4600775dd320..1cdf15d1bc04 100644 --- a/languagetool-language-modules/lt/src/main/resources/META-INF/org/languagetool/language-module.properties +++ b/languagetool-language-modules/lt/src/main/resources/META-INF/org/languagetool/language-module.properties @@ -1 +1 @@ -languageClasses=org.languagetool.language.Lithuanian +languageClasses=org.languagetool.language.lt.Lithuanian diff --git a/languagetool-language-modules/lt/src/test/java/org/languagetool/LithuanianConcurrencyTest.java b/languagetool-language-modules/lt/src/test/java/org/languagetool/LithuanianConcurrencyTest.java index f94af26f5529..86a33acf8fc9 100644 --- a/languagetool-language-modules/lt/src/test/java/org/languagetool/LithuanianConcurrencyTest.java +++ b/languagetool-language-modules/lt/src/test/java/org/languagetool/LithuanianConcurrencyTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.languagetool.language.AbstractLanguageConcurrencyTest; -import org.languagetool.language.Lithuanian; +import org.languagetool.language.lt.Lithuanian; public class LithuanianConcurrencyTest extends AbstractLanguageConcurrencyTest { @Override diff --git a/languagetool-language-modules/lt/src/test/java/org/languagetool/tokenizers/lt/LithuanianSRXSentenceTokenizerTest.java b/languagetool-language-modules/lt/src/test/java/org/languagetool/tokenizers/lt/LithuanianSRXSentenceTokenizerTest.java index c642b39f0a24..ea186e8e72ec 100644 --- a/languagetool-language-modules/lt/src/test/java/org/languagetool/tokenizers/lt/LithuanianSRXSentenceTokenizerTest.java +++ b/languagetool-language-modules/lt/src/test/java/org/languagetool/tokenizers/lt/LithuanianSRXSentenceTokenizerTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.languagetool.TestTools; -import org.languagetool.language.Lithuanian; +import org.languagetool.language.lt.Lithuanian; import org.languagetool.tokenizers.SRXSentenceTokenizer; public class LithuanianSRXSentenceTokenizerTest { diff --git a/languagetool-language-modules/ml/pom.xml b/languagetool-language-modules/ml/pom.xml index 7efd8d58f167..79fcc25ecc14 100644 --- a/languagetool-language-modules/ml/pom.xml +++ b/languagetool-language-modules/ml/pom.xml @@ -1,4 +1,5 @@ + 4.0.0 @@ -67,6 +68,17 @@ org.apache.maven.plugins maven-surefire-plugin + + org.apache.maven.plugins + maven-jar-plugin + + + + org.languagetool.language.ml + + + + diff --git a/languagetool-language-modules/ml/src/main/java/org/languagetool/language/Malayalam.java b/languagetool-language-modules/ml/src/main/java/org/languagetool/language/ml/Malayalam.java similarity index 94% rename from languagetool-language-modules/ml/src/main/java/org/languagetool/language/Malayalam.java rename to languagetool-language-modules/ml/src/main/java/org/languagetool/language/ml/Malayalam.java index d9682da2d3d1..a80922289497 100644 --- a/languagetool-language-modules/ml/src/main/java/org/languagetool/language/Malayalam.java +++ b/languagetool-language-modules/ml/src/main/java/org/languagetool/language/ml/Malayalam.java @@ -16,11 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language; +package org.languagetool.language.ml; import org.jetbrains.annotations.NotNull; import org.languagetool.Language; import org.languagetool.UserConfig; +import org.languagetool.language.Contributor; import org.languagetool.rules.*; import org.languagetool.rules.ml.MorfologikMalayalamSpellerRule; import org.languagetool.tagging.Tagger; @@ -70,7 +71,7 @@ public Tagger createDefaultTagger() { @Override public Contributor[] getMaintainers() { - return new Contributor[] { new Contributor("Jithesh.V.S") }; + return new Contributor[] { new Contributor("Jithesh.V.S", null) }; } @Override diff --git a/languagetool-language-modules/ml/src/main/resources/META-INF/org/languagetool/language-module.properties b/languagetool-language-modules/ml/src/main/resources/META-INF/org/languagetool/language-module.properties index 6b2f168012e1..95dd0fb2a695 100644 --- a/languagetool-language-modules/ml/src/main/resources/META-INF/org/languagetool/language-module.properties +++ b/languagetool-language-modules/ml/src/main/resources/META-INF/org/languagetool/language-module.properties @@ -1 +1 @@ -languageClasses=org.languagetool.language.Malayalam +languageClasses=org.languagetool.language.ml.Malayalam diff --git a/languagetool-language-modules/ml/src/test/java/org/languagetool/MalayalamConcurrencyTest.java b/languagetool-language-modules/ml/src/test/java/org/languagetool/MalayalamConcurrencyTest.java index cb2afbbcef29..00ceae7081a2 100644 --- a/languagetool-language-modules/ml/src/test/java/org/languagetool/MalayalamConcurrencyTest.java +++ b/languagetool-language-modules/ml/src/test/java/org/languagetool/MalayalamConcurrencyTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.languagetool.language.AbstractLanguageConcurrencyTest; -import org.languagetool.language.Malayalam; +import org.languagetool.language.ml.Malayalam; public class MalayalamConcurrencyTest extends AbstractLanguageConcurrencyTest { diff --git a/languagetool-language-modules/ml/src/test/java/org/languagetool/rules/ml/MorfologikMalayalamSpellerRuleTest.java b/languagetool-language-modules/ml/src/test/java/org/languagetool/rules/ml/MorfologikMalayalamSpellerRuleTest.java index e519a38387a3..41492a3a5813 100644 --- a/languagetool-language-modules/ml/src/test/java/org/languagetool/rules/ml/MorfologikMalayalamSpellerRuleTest.java +++ b/languagetool-language-modules/ml/src/test/java/org/languagetool/rules/ml/MorfologikMalayalamSpellerRuleTest.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Malayalam; +import org.languagetool.language.ml.Malayalam; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/ml/src/test/java/org/languagetool/tokenizers/ml/MalayalamSRXSentenceTokenizerTest.java b/languagetool-language-modules/ml/src/test/java/org/languagetool/tokenizers/ml/MalayalamSRXSentenceTokenizerTest.java index 1afd8d84ada4..caa4dea52608 100644 --- a/languagetool-language-modules/ml/src/test/java/org/languagetool/tokenizers/ml/MalayalamSRXSentenceTokenizerTest.java +++ b/languagetool-language-modules/ml/src/test/java/org/languagetool/tokenizers/ml/MalayalamSRXSentenceTokenizerTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.languagetool.TestTools; -import org.languagetool.language.Malayalam; +import org.languagetool.language.ml.Malayalam; import org.languagetool.tokenizers.SRXSentenceTokenizer; public class MalayalamSRXSentenceTokenizerTest { diff --git a/languagetool-language-modules/nl/pom.xml b/languagetool-language-modules/nl/pom.xml index 31c5e542a8fe..3de54cdaa319 100644 --- a/languagetool-language-modules/nl/pom.xml +++ b/languagetool-language-modules/nl/pom.xml @@ -71,6 +71,17 @@ org.apache.maven.plugins maven-surefire-plugin + + org.apache.maven.plugins + maven-jar-plugin + + + + org.languagetool.language.nl + + + + diff --git a/languagetool-language-modules/nl/src/main/java/org/languagetool/language/BelgianDutch.java b/languagetool-language-modules/nl/src/main/java/org/languagetool/language/nl/BelgianDutch.java similarity index 97% rename from languagetool-language-modules/nl/src/main/java/org/languagetool/language/BelgianDutch.java rename to languagetool-language-modules/nl/src/main/java/org/languagetool/language/nl/BelgianDutch.java index 1977f506854c..08e81937fc5f 100644 --- a/languagetool-language-modules/nl/src/main/java/org/languagetool/language/BelgianDutch.java +++ b/languagetool-language-modules/nl/src/main/java/org/languagetool/language/nl/BelgianDutch.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language; +package org.languagetool.language.nl; import org.languagetool.JLanguageTool; diff --git a/languagetool-language-modules/nl/src/main/java/org/languagetool/language/Dutch.java b/languagetool-language-modules/nl/src/main/java/org/languagetool/language/nl/Dutch.java similarity index 98% rename from languagetool-language-modules/nl/src/main/java/org/languagetool/language/Dutch.java rename to languagetool-language-modules/nl/src/main/java/org/languagetool/language/nl/Dutch.java index 39e9164cf8d8..0af733698c0c 100644 --- a/languagetool-language-modules/nl/src/main/java/org/languagetool/language/Dutch.java +++ b/languagetool-language-modules/nl/src/main/java/org/languagetool/language/nl/Dutch.java @@ -16,11 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language; +package org.languagetool.language.nl; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.languagetool.*; +import org.languagetool.language.Contributor; import org.languagetool.languagemodel.LanguageModel; import org.languagetool.rules.*; import org.languagetool.rules.nl.*; diff --git a/languagetool-language-modules/nl/src/main/java/org/languagetool/rules/nl/DutchNumberInWordFilter.java b/languagetool-language-modules/nl/src/main/java/org/languagetool/rules/nl/DutchNumberInWordFilter.java index 3f58e1eacbd3..19500bd502cd 100644 --- a/languagetool-language-modules/nl/src/main/java/org/languagetool/rules/nl/DutchNumberInWordFilter.java +++ b/languagetool-language-modules/nl/src/main/java/org/languagetool/rules/nl/DutchNumberInWordFilter.java @@ -19,7 +19,7 @@ package org.languagetool.rules.nl; import org.languagetool.JLanguageTool; -import org.languagetool.language.Dutch; +import org.languagetool.language.nl.Dutch; import org.languagetool.rules.AbstractNumberInWordFilter; import java.io.IOException; diff --git a/languagetool-language-modules/nl/src/main/java/org/languagetool/rules/nl/DutchSuppressMisspelledSuggestionsFilter.java b/languagetool-language-modules/nl/src/main/java/org/languagetool/rules/nl/DutchSuppressMisspelledSuggestionsFilter.java index c1069fc6decd..21f8e469d29a 100644 --- a/languagetool-language-modules/nl/src/main/java/org/languagetool/rules/nl/DutchSuppressMisspelledSuggestionsFilter.java +++ b/languagetool-language-modules/nl/src/main/java/org/languagetool/rules/nl/DutchSuppressMisspelledSuggestionsFilter.java @@ -20,7 +20,7 @@ package org.languagetool.rules.nl; import java.io.IOException; -import org.languagetool.language.Dutch; +import org.languagetool.language.nl.Dutch; import org.languagetool.rules.AbstractSuppressMisspelledSuggestionsFilter; public class DutchSuppressMisspelledSuggestionsFilter extends AbstractSuppressMisspelledSuggestionsFilter { diff --git a/languagetool-language-modules/nl/src/main/java/org/languagetool/rules/nl/SimpleReplaceRule.java b/languagetool-language-modules/nl/src/main/java/org/languagetool/rules/nl/SimpleReplaceRule.java index dd7adfe1c597..04bf50799f4a 100644 --- a/languagetool-language-modules/nl/src/main/java/org/languagetool/rules/nl/SimpleReplaceRule.java +++ b/languagetool-language-modules/nl/src/main/java/org/languagetool/rules/nl/SimpleReplaceRule.java @@ -24,7 +24,7 @@ import java.util.Locale; import java.util.ResourceBundle; -import org.languagetool.language.Dutch; +import org.languagetool.language.nl.Dutch; import org.languagetool.rules.*; /** diff --git a/languagetool-language-modules/nl/src/main/resources/META-INF/org/languagetool/language-module.properties b/languagetool-language-modules/nl/src/main/resources/META-INF/org/languagetool/language-module.properties index 88fb7492812c..8e1685ea1907 100644 --- a/languagetool-language-modules/nl/src/main/resources/META-INF/org/languagetool/language-module.properties +++ b/languagetool-language-modules/nl/src/main/resources/META-INF/org/languagetool/language-module.properties @@ -1 +1 @@ -languageClasses=org.languagetool.language.Dutch,org.languagetool.language.BelgianDutch +languageClasses=org.languagetool.language.nl.Dutch,org.languagetool.language.nl.BelgianDutch diff --git a/languagetool-language-modules/nl/src/test/java/org/languagetool/DutchConcurrencyTest.java b/languagetool-language-modules/nl/src/test/java/org/languagetool/DutchConcurrencyTest.java index a035b2bbaa0f..07b82d861264 100644 --- a/languagetool-language-modules/nl/src/test/java/org/languagetool/DutchConcurrencyTest.java +++ b/languagetool-language-modules/nl/src/test/java/org/languagetool/DutchConcurrencyTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.languagetool.language.AbstractLanguageConcurrencyTest; -import org.languagetool.language.Dutch; +import org.languagetool.language.nl.Dutch; public class DutchConcurrencyTest extends AbstractLanguageConcurrencyTest { @Override diff --git a/languagetool-language-modules/nl/src/test/java/org/languagetool/JLanguageToolTest.java b/languagetool-language-modules/nl/src/test/java/org/languagetool/JLanguageToolTest.java index 86e44de58595..e9419227a9c5 100644 --- a/languagetool-language-modules/nl/src/test/java/org/languagetool/JLanguageToolTest.java +++ b/languagetool-language-modules/nl/src/test/java/org/languagetool/JLanguageToolTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.junit.Test; -import org.languagetool.language.Dutch; +import org.languagetool.language.nl.Dutch; import java.io.IOException; diff --git a/languagetool-language-modules/nl/src/test/java/org/languagetool/rules/nl/CheckCaseRuleTest.java b/languagetool-language-modules/nl/src/test/java/org/languagetool/rules/nl/CheckCaseRuleTest.java index b41dd18fd0f4..32e83d6758aa 100644 --- a/languagetool-language-modules/nl/src/test/java/org/languagetool/rules/nl/CheckCaseRuleTest.java +++ b/languagetool-language-modules/nl/src/test/java/org/languagetool/rules/nl/CheckCaseRuleTest.java @@ -26,7 +26,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Dutch; +import org.languagetool.language.nl.Dutch; import org.languagetool.rules.RuleMatch; public class CheckCaseRuleTest { diff --git a/languagetool-language-modules/nl/src/test/java/org/languagetool/rules/nl/CompoundRuleTest.java b/languagetool-language-modules/nl/src/test/java/org/languagetool/rules/nl/CompoundRuleTest.java index aad08567debe..147fe5201cb9 100644 --- a/languagetool-language-modules/nl/src/test/java/org/languagetool/rules/nl/CompoundRuleTest.java +++ b/languagetool-language-modules/nl/src/test/java/org/languagetool/rules/nl/CompoundRuleTest.java @@ -23,7 +23,7 @@ import org.junit.Before; import org.junit.Test; import org.languagetool.JLanguageTool; -import org.languagetool.language.Dutch; +import org.languagetool.language.nl.Dutch; import org.languagetool.rules.AbstractCompoundRuleTest; public class CompoundRuleTest extends AbstractCompoundRuleTest { diff --git a/languagetool-language-modules/nl/src/test/java/org/languagetool/rules/nl/DutchTest.java b/languagetool-language-modules/nl/src/test/java/org/languagetool/rules/nl/DutchTest.java index c264830e3c82..c1e2dcf5f1b3 100644 --- a/languagetool-language-modules/nl/src/test/java/org/languagetool/rules/nl/DutchTest.java +++ b/languagetool-language-modules/nl/src/test/java/org/languagetool/rules/nl/DutchTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.languagetool.LanguageSpecificTest; -import org.languagetool.language.Dutch; +import org.languagetool.language.nl.Dutch; import java.io.IOException; import java.util.Arrays; diff --git a/languagetool-language-modules/nl/src/test/java/org/languagetool/rules/nl/DutchWrongWordInContextRuleTest.java b/languagetool-language-modules/nl/src/test/java/org/languagetool/rules/nl/DutchWrongWordInContextRuleTest.java index aec3eb2fca9f..bb44e748d83c 100644 --- a/languagetool-language-modules/nl/src/test/java/org/languagetool/rules/nl/DutchWrongWordInContextRuleTest.java +++ b/languagetool-language-modules/nl/src/test/java/org/languagetool/rules/nl/DutchWrongWordInContextRuleTest.java @@ -21,7 +21,7 @@ import org.junit.Ignore; import org.junit.Test; import org.languagetool.JLanguageTool; -import org.languagetool.language.Dutch; +import org.languagetool.language.nl.Dutch; import java.io.IOException; diff --git a/languagetool-language-modules/nl/src/test/java/org/languagetool/rules/nl/GenericUnpairedBracketsRuleTest.java b/languagetool-language-modules/nl/src/test/java/org/languagetool/rules/nl/GenericUnpairedBracketsRuleTest.java index cdfb7af05f64..6b87052bf285 100644 --- a/languagetool-language-modules/nl/src/test/java/org/languagetool/rules/nl/GenericUnpairedBracketsRuleTest.java +++ b/languagetool-language-modules/nl/src/test/java/org/languagetool/rules/nl/GenericUnpairedBracketsRuleTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; -import org.languagetool.language.Dutch; +import org.languagetool.language.nl.Dutch; import org.languagetool.rules.GenericUnpairedBracketsRule; import org.languagetool.rules.RuleMatch; diff --git a/languagetool-language-modules/nl/src/test/java/org/languagetool/rules/nl/MorfologikDutchSpellerRuleTest.java b/languagetool-language-modules/nl/src/test/java/org/languagetool/rules/nl/MorfologikDutchSpellerRuleTest.java index f9f2313a1142..bab06a1f2287 100644 --- a/languagetool-language-modules/nl/src/test/java/org/languagetool/rules/nl/MorfologikDutchSpellerRuleTest.java +++ b/languagetool-language-modules/nl/src/test/java/org/languagetool/rules/nl/MorfologikDutchSpellerRuleTest.java @@ -27,7 +27,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Dutch; +import org.languagetool.language.nl.Dutch; import org.languagetool.rules.RuleMatch; public class MorfologikDutchSpellerRuleTest { diff --git a/languagetool-language-modules/nl/src/test/java/org/languagetool/rules/nl/SimpleReplaceRuleTest.java b/languagetool-language-modules/nl/src/test/java/org/languagetool/rules/nl/SimpleReplaceRuleTest.java index f2eb9b9b23c5..cfd40551e2e3 100644 --- a/languagetool-language-modules/nl/src/test/java/org/languagetool/rules/nl/SimpleReplaceRuleTest.java +++ b/languagetool-language-modules/nl/src/test/java/org/languagetool/rules/nl/SimpleReplaceRuleTest.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Dutch; +import org.languagetool.language.nl.Dutch; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/nl/src/test/java/org/languagetool/rules/nl/UppercaseSentenceStartRuleTest.java b/languagetool-language-modules/nl/src/test/java/org/languagetool/rules/nl/UppercaseSentenceStartRuleTest.java index 8941a578c5a2..7bac47537431 100644 --- a/languagetool-language-modules/nl/src/test/java/org/languagetool/rules/nl/UppercaseSentenceStartRuleTest.java +++ b/languagetool-language-modules/nl/src/test/java/org/languagetool/rules/nl/UppercaseSentenceStartRuleTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; -import org.languagetool.language.Dutch; +import org.languagetool.language.nl.Dutch; import org.languagetool.rules.patterns.AbstractPatternRule; import java.io.IOException; diff --git a/languagetool-language-modules/nl/src/test/java/org/languagetool/rules/nl/WordCoherencyRuleTest.java b/languagetool-language-modules/nl/src/test/java/org/languagetool/rules/nl/WordCoherencyRuleTest.java index c4836db1224b..bb0d57620826 100644 --- a/languagetool-language-modules/nl/src/test/java/org/languagetool/rules/nl/WordCoherencyRuleTest.java +++ b/languagetool-language-modules/nl/src/test/java/org/languagetool/rules/nl/WordCoherencyRuleTest.java @@ -23,7 +23,7 @@ import org.languagetool.AnalyzedSentence; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Dutch; +import org.languagetool.language.nl.Dutch; import java.io.IOException; import java.util.List; diff --git a/languagetool-language-modules/nl/src/test/java/org/languagetool/tagging/nl/DutchTaggerTest.java b/languagetool-language-modules/nl/src/test/java/org/languagetool/tagging/nl/DutchTaggerTest.java index ff1c551a6a94..d2864ee3f3aa 100644 --- a/languagetool-language-modules/nl/src/test/java/org/languagetool/tagging/nl/DutchTaggerTest.java +++ b/languagetool-language-modules/nl/src/test/java/org/languagetool/tagging/nl/DutchTaggerTest.java @@ -23,7 +23,7 @@ import org.junit.Before; import org.junit.Test; import org.languagetool.TestTools; -import org.languagetool.language.Dutch; +import org.languagetool.language.nl.Dutch; import org.languagetool.tokenizers.WordTokenizer; import org.languagetool.tokenizers.nl.DutchWordTokenizer; diff --git a/languagetool-language-modules/nl/src/test/java/org/languagetool/tokenizers/nl/DutchSRXSentenceTokenizerTest.java b/languagetool-language-modules/nl/src/test/java/org/languagetool/tokenizers/nl/DutchSRXSentenceTokenizerTest.java index 8370fa83d52b..81dbeeff8f5b 100644 --- a/languagetool-language-modules/nl/src/test/java/org/languagetool/tokenizers/nl/DutchSRXSentenceTokenizerTest.java +++ b/languagetool-language-modules/nl/src/test/java/org/languagetool/tokenizers/nl/DutchSRXSentenceTokenizerTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.languagetool.TestTools; -import org.languagetool.language.Dutch; +import org.languagetool.language.nl.Dutch; import org.languagetool.tokenizers.SRXSentenceTokenizer; /** diff --git a/languagetool-language-modules/pl/pom.xml b/languagetool-language-modules/pl/pom.xml index 4441b0776f2e..a3ba3f7edae1 100644 --- a/languagetool-language-modules/pl/pom.xml +++ b/languagetool-language-modules/pl/pom.xml @@ -67,6 +67,17 @@ org.apache.maven.plugins maven-surefire-plugin + + org.apache.maven.plugins + maven-jar-plugin + + + + org.languagetool.language.pl + + + + diff --git a/languagetool-language-modules/pl/src/main/java/org/languagetool/language/Polish.java b/languagetool-language-modules/pl/src/main/java/org/languagetool/language/pl/Polish.java similarity index 96% rename from languagetool-language-modules/pl/src/main/java/org/languagetool/language/Polish.java rename to languagetool-language-modules/pl/src/main/java/org/languagetool/language/pl/Polish.java index 2a2e1aafe8a8..fae61f218b33 100644 --- a/languagetool-language-modules/pl/src/main/java/org/languagetool/language/Polish.java +++ b/languagetool-language-modules/pl/src/main/java/org/languagetool/language/pl/Polish.java @@ -16,11 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language; +package org.languagetool.language.pl; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.languagetool.*; +import org.languagetool.language.Contributor; +import org.languagetool.language.Contributors; import org.languagetool.rules.*; import org.languagetool.rules.pl.*; import org.languagetool.rules.spelling.SpellingCheckRule; diff --git a/languagetool-language-modules/pl/src/main/java/org/languagetool/tagging/disambiguation/pl/PolishHybridDisambiguator.java b/languagetool-language-modules/pl/src/main/java/org/languagetool/tagging/disambiguation/pl/PolishHybridDisambiguator.java index 14ed707a46a1..23b7db721a8c 100644 --- a/languagetool-language-modules/pl/src/main/java/org/languagetool/tagging/disambiguation/pl/PolishHybridDisambiguator.java +++ b/languagetool-language-modules/pl/src/main/java/org/languagetool/tagging/disambiguation/pl/PolishHybridDisambiguator.java @@ -21,7 +21,7 @@ import java.io.IOException; import org.languagetool.AnalyzedSentence; -import org.languagetool.language.Polish; +import org.languagetool.language.pl.Polish; import org.languagetool.tagging.disambiguation.AbstractDisambiguator; import org.languagetool.tagging.disambiguation.Disambiguator; import org.languagetool.tagging.disambiguation.MultiWordChunker; diff --git a/languagetool-language-modules/pl/src/main/resources/META-INF/org/languagetool/language-module.properties b/languagetool-language-modules/pl/src/main/resources/META-INF/org/languagetool/language-module.properties index 7734bba3a444..861acb3476eb 100644 --- a/languagetool-language-modules/pl/src/main/resources/META-INF/org/languagetool/language-module.properties +++ b/languagetool-language-modules/pl/src/main/resources/META-INF/org/languagetool/language-module.properties @@ -1 +1 @@ -languageClasses=org.languagetool.language.Polish +languageClasses=org.languagetool.language.pl.Polish diff --git a/languagetool-language-modules/pl/src/test/java/org/languagetool/JLanguageToolTest.java b/languagetool-language-modules/pl/src/test/java/org/languagetool/JLanguageToolTest.java index 8c1fc1269077..c3599a7d5f87 100644 --- a/languagetool-language-modules/pl/src/test/java/org/languagetool/JLanguageToolTest.java +++ b/languagetool-language-modules/pl/src/test/java/org/languagetool/JLanguageToolTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.junit.Test; -import org.languagetool.language.Polish; +import org.languagetool.language.pl.Polish; import org.languagetool.rules.RuleMatch; import org.languagetool.rules.patterns.AbstractPatternRule; diff --git a/languagetool-language-modules/pl/src/test/java/org/languagetool/PolishConcurrencyTest.java b/languagetool-language-modules/pl/src/test/java/org/languagetool/PolishConcurrencyTest.java index e452178196b1..6321484abeab 100644 --- a/languagetool-language-modules/pl/src/test/java/org/languagetool/PolishConcurrencyTest.java +++ b/languagetool-language-modules/pl/src/test/java/org/languagetool/PolishConcurrencyTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.languagetool.language.AbstractLanguageConcurrencyTest; -import org.languagetool.language.Polish; +import org.languagetool.language.pl.Polish; public class PolishConcurrencyTest extends AbstractLanguageConcurrencyTest { diff --git a/languagetool-language-modules/pl/src/test/java/org/languagetool/rules/pl/CompoundRuleTest.java b/languagetool-language-modules/pl/src/test/java/org/languagetool/rules/pl/CompoundRuleTest.java index 29f8b7857f3e..fefffdff2562 100644 --- a/languagetool-language-modules/pl/src/test/java/org/languagetool/rules/pl/CompoundRuleTest.java +++ b/languagetool-language-modules/pl/src/test/java/org/languagetool/rules/pl/CompoundRuleTest.java @@ -26,7 +26,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Polish; +import org.languagetool.language.pl.Polish; import org.languagetool.rules.AbstractCompoundRuleTest; import org.languagetool.rules.RuleMatch; diff --git a/languagetool-language-modules/pl/src/test/java/org/languagetool/rules/pl/DashRuleTest.java b/languagetool-language-modules/pl/src/test/java/org/languagetool/rules/pl/DashRuleTest.java index dddd459aed94..3ae7764d4b18 100644 --- a/languagetool-language-modules/pl/src/test/java/org/languagetool/rules/pl/DashRuleTest.java +++ b/languagetool-language-modules/pl/src/test/java/org/languagetool/rules/pl/DashRuleTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.Language; -import org.languagetool.language.Polish; +import org.languagetool.language.pl.Polish; import org.languagetool.rules.Rule; import org.languagetool.rules.RuleMatch; diff --git a/languagetool-language-modules/pl/src/test/java/org/languagetool/rules/pl/MatchTest.java b/languagetool-language-modules/pl/src/test/java/org/languagetool/rules/pl/MatchTest.java index cd2b06aeb415..7268711d9b67 100644 --- a/languagetool-language-modules/pl/src/test/java/org/languagetool/rules/pl/MatchTest.java +++ b/languagetool-language-modules/pl/src/test/java/org/languagetool/rules/pl/MatchTest.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.languagetool.AnalyzedToken; import org.languagetool.AnalyzedTokenReadings; -import org.languagetool.language.Polish; +import org.languagetool.language.pl.Polish; import org.languagetool.rules.patterns.Match; import org.languagetool.rules.patterns.Match.CaseConversion; import org.languagetool.rules.patterns.Match.IncludeRange; diff --git a/languagetool-language-modules/pl/src/test/java/org/languagetool/rules/pl/MorfologikPolishSpellerRuleTest.java b/languagetool-language-modules/pl/src/test/java/org/languagetool/rules/pl/MorfologikPolishSpellerRuleTest.java index d426ad884a50..1435c5e23bea 100644 --- a/languagetool-language-modules/pl/src/test/java/org/languagetool/rules/pl/MorfologikPolishSpellerRuleTest.java +++ b/languagetool-language-modules/pl/src/test/java/org/languagetool/rules/pl/MorfologikPolishSpellerRuleTest.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Polish; +import org.languagetool.language.pl.Polish; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/pl/src/test/java/org/languagetool/rules/pl/MultipleWhitespaceRuleTest.java b/languagetool-language-modules/pl/src/test/java/org/languagetool/rules/pl/MultipleWhitespaceRuleTest.java index 4dc4af1c4e37..6a72eeaac148 100644 --- a/languagetool-language-modules/pl/src/test/java/org/languagetool/rules/pl/MultipleWhitespaceRuleTest.java +++ b/languagetool-language-modules/pl/src/test/java/org/languagetool/rules/pl/MultipleWhitespaceRuleTest.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Polish; +import org.languagetool.language.pl.Polish; import org.languagetool.rules.MultipleWhitespaceRule; import java.io.IOException; diff --git a/languagetool-language-modules/pl/src/test/java/org/languagetool/rules/pl/PolishTest.java b/languagetool-language-modules/pl/src/test/java/org/languagetool/rules/pl/PolishTest.java index 33617b931eeb..f9c73d806586 100644 --- a/languagetool-language-modules/pl/src/test/java/org/languagetool/rules/pl/PolishTest.java +++ b/languagetool-language-modules/pl/src/test/java/org/languagetool/rules/pl/PolishTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.languagetool.LanguageSpecificTest; -import org.languagetool.language.Polish; +import org.languagetool.language.pl.Polish; import java.io.IOException; import java.util.Arrays; diff --git a/languagetool-language-modules/pl/src/test/java/org/languagetool/rules/pl/PolishUnpairedBracketsRuleTest.java b/languagetool-language-modules/pl/src/test/java/org/languagetool/rules/pl/PolishUnpairedBracketsRuleTest.java index 868cb815919d..e1108cd86b2f 100644 --- a/languagetool-language-modules/pl/src/test/java/org/languagetool/rules/pl/PolishUnpairedBracketsRuleTest.java +++ b/languagetool-language-modules/pl/src/test/java/org/languagetool/rules/pl/PolishUnpairedBracketsRuleTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Polish; +import org.languagetool.language.pl.Polish; import java.io.IOException; import java.util.Collections; diff --git a/languagetool-language-modules/pl/src/test/java/org/languagetool/rules/pl/PolishWordRepeatRuleTest.java b/languagetool-language-modules/pl/src/test/java/org/languagetool/rules/pl/PolishWordRepeatRuleTest.java index d284bdc90b7d..23a8f9a0240a 100644 --- a/languagetool-language-modules/pl/src/test/java/org/languagetool/rules/pl/PolishWordRepeatRuleTest.java +++ b/languagetool-language-modules/pl/src/test/java/org/languagetool/rules/pl/PolishWordRepeatRuleTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Polish; +import org.languagetool.language.pl.Polish; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/pl/src/test/java/org/languagetool/rules/pl/SimpleReplaceRuleTest.java b/languagetool-language-modules/pl/src/test/java/org/languagetool/rules/pl/SimpleReplaceRuleTest.java index 9f0579f3dc46..88927461166e 100644 --- a/languagetool-language-modules/pl/src/test/java/org/languagetool/rules/pl/SimpleReplaceRuleTest.java +++ b/languagetool-language-modules/pl/src/test/java/org/languagetool/rules/pl/SimpleReplaceRuleTest.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Polish; +import org.languagetool.language.pl.Polish; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/pl/src/test/java/org/languagetool/rules/pl/UppercaseSentenceStartRuleTest.java b/languagetool-language-modules/pl/src/test/java/org/languagetool/rules/pl/UppercaseSentenceStartRuleTest.java index a516d049a71a..54f762779eff 100644 --- a/languagetool-language-modules/pl/src/test/java/org/languagetool/rules/pl/UppercaseSentenceStartRuleTest.java +++ b/languagetool-language-modules/pl/src/test/java/org/languagetool/rules/pl/UppercaseSentenceStartRuleTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; -import org.languagetool.language.Polish; +import org.languagetool.language.pl.Polish; import java.io.IOException; diff --git a/languagetool-language-modules/pl/src/test/java/org/languagetool/rules/pl/WordRepeatRuleTest.java b/languagetool-language-modules/pl/src/test/java/org/languagetool/rules/pl/WordRepeatRuleTest.java index a731243c3218..743a3119e8da 100644 --- a/languagetool-language-modules/pl/src/test/java/org/languagetool/rules/pl/WordRepeatRuleTest.java +++ b/languagetool-language-modules/pl/src/test/java/org/languagetool/rules/pl/WordRepeatRuleTest.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Polish; +import org.languagetool.language.pl.Polish; import org.languagetool.rules.RuleMatch; import org.languagetool.rules.WordRepeatRule; diff --git a/languagetool-language-modules/pl/src/test/java/org/languagetool/synthesis/pl/PolishSynthesizerTest.java b/languagetool-language-modules/pl/src/test/java/org/languagetool/synthesis/pl/PolishSynthesizerTest.java index b3a097741153..82bac007cc8d 100644 --- a/languagetool-language-modules/pl/src/test/java/org/languagetool/synthesis/pl/PolishSynthesizerTest.java +++ b/languagetool-language-modules/pl/src/test/java/org/languagetool/synthesis/pl/PolishSynthesizerTest.java @@ -21,7 +21,6 @@ import org.junit.Test; import org.languagetool.AnalyzedToken; -import org.languagetool.language.Polish; import java.io.IOException; import java.util.Arrays; diff --git a/languagetool-language-modules/pl/src/test/java/org/languagetool/tagging/disambiguation/PolishDisambiguationRuleTest.java b/languagetool-language-modules/pl/src/test/java/org/languagetool/tagging/disambiguation/PolishDisambiguationRuleTest.java index 44df6576303d..5ac3023a2755 100644 --- a/languagetool-language-modules/pl/src/test/java/org/languagetool/tagging/disambiguation/PolishDisambiguationRuleTest.java +++ b/languagetool-language-modules/pl/src/test/java/org/languagetool/tagging/disambiguation/PolishDisambiguationRuleTest.java @@ -23,7 +23,7 @@ import org.junit.Before; import org.junit.Test; import org.languagetool.TestTools; -import org.languagetool.language.Polish; +import org.languagetool.language.pl.Polish; import org.languagetool.tagging.pl.PolishTagger; import org.languagetool.tokenizers.SRXSentenceTokenizer; import org.languagetool.tokenizers.SentenceTokenizer; diff --git a/languagetool-language-modules/pl/src/test/java/org/languagetool/tagging/pl/PolishTaggerTest.java b/languagetool-language-modules/pl/src/test/java/org/languagetool/tagging/pl/PolishTaggerTest.java index a75396f8b8e4..f49180b8285c 100644 --- a/languagetool-language-modules/pl/src/test/java/org/languagetool/tagging/pl/PolishTaggerTest.java +++ b/languagetool-language-modules/pl/src/test/java/org/languagetool/tagging/pl/PolishTaggerTest.java @@ -21,7 +21,7 @@ import org.junit.Before; import org.junit.Test; import org.languagetool.TestTools; -import org.languagetool.language.Polish; +import org.languagetool.language.pl.Polish; import org.languagetool.tokenizers.WordTokenizer; import java.io.IOException; diff --git a/languagetool-language-modules/pl/src/test/java/org/languagetool/tokenizers/pl/PolishSentenceTokenizerTest.java b/languagetool-language-modules/pl/src/test/java/org/languagetool/tokenizers/pl/PolishSentenceTokenizerTest.java index 6dbb11850a4d..380ae9d3348c 100644 --- a/languagetool-language-modules/pl/src/test/java/org/languagetool/tokenizers/pl/PolishSentenceTokenizerTest.java +++ b/languagetool-language-modules/pl/src/test/java/org/languagetool/tokenizers/pl/PolishSentenceTokenizerTest.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.languagetool.TestTools; -import org.languagetool.language.Polish; +import org.languagetool.language.pl.Polish; import org.languagetool.tokenizers.SRXSentenceTokenizer; import org.languagetool.tokenizers.SentenceTokenizer; diff --git a/languagetool-language-modules/pl/src/test/java/org/languagetool/tokenizers/pl/PolishWordTokenizerTest.java b/languagetool-language-modules/pl/src/test/java/org/languagetool/tokenizers/pl/PolishWordTokenizerTest.java index 5529df3bfaa8..4af086bb4fbb 100644 --- a/languagetool-language-modules/pl/src/test/java/org/languagetool/tokenizers/pl/PolishWordTokenizerTest.java +++ b/languagetool-language-modules/pl/src/test/java/org/languagetool/tokenizers/pl/PolishWordTokenizerTest.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.languagetool.Language; -import org.languagetool.language.Polish; +import org.languagetool.language.pl.Polish; import java.util.List; diff --git a/languagetool-language-modules/pl/src/test/java/org/languagetool/tools/ToolsTest.java b/languagetool-language-modules/pl/src/test/java/org/languagetool/tools/ToolsTest.java index 3352975fdd47..df95c7d56814 100644 --- a/languagetool-language-modules/pl/src/test/java/org/languagetool/tools/ToolsTest.java +++ b/languagetool-language-modules/pl/src/test/java/org/languagetool/tools/ToolsTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; -import org.languagetool.language.Polish; +import org.languagetool.language.pl.Polish; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/pt/pom.xml b/languagetool-language-modules/pt/pom.xml index 86c7bf393740..2a0a6af701b4 100644 --- a/languagetool-language-modules/pt/pom.xml +++ b/languagetool-language-modules/pt/pom.xml @@ -77,6 +77,17 @@ org.apache.maven.plugins maven-surefire-plugin + + org.apache.maven.plugins + maven-jar-plugin + + + + org.languagetool.language.pt + + + + diff --git a/languagetool-language-modules/pt/src/main/java/org/languagetool/language/AngolaPortuguese.java b/languagetool-language-modules/pt/src/main/java/org/languagetool/language/pt/AngolaPortuguese.java similarity index 97% rename from languagetool-language-modules/pt/src/main/java/org/languagetool/language/AngolaPortuguese.java rename to languagetool-language-modules/pt/src/main/java/org/languagetool/language/pt/AngolaPortuguese.java index 7c1f8bac2c80..aa4f18ce20db 100644 --- a/languagetool-language-modules/pt/src/main/java/org/languagetool/language/AngolaPortuguese.java +++ b/languagetool-language-modules/pt/src/main/java/org/languagetool/language/pt/AngolaPortuguese.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language; +package org.languagetool.language.pt; import org.languagetool.Language; import org.languagetool.UserConfig; diff --git a/languagetool-language-modules/pt/src/main/java/org/languagetool/language/BrazilianPortuguese.java b/languagetool-language-modules/pt/src/main/java/org/languagetool/language/pt/BrazilianPortuguese.java similarity index 98% rename from languagetool-language-modules/pt/src/main/java/org/languagetool/language/BrazilianPortuguese.java rename to languagetool-language-modules/pt/src/main/java/org/languagetool/language/pt/BrazilianPortuguese.java index 108f58834992..0911e9701552 100644 --- a/languagetool-language-modules/pt/src/main/java/org/languagetool/language/BrazilianPortuguese.java +++ b/languagetool-language-modules/pt/src/main/java/org/languagetool/language/pt/BrazilianPortuguese.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language; +package org.languagetool.language.pt; import org.languagetool.Language; import org.languagetool.UserConfig; diff --git a/languagetool-language-modules/pt/src/main/java/org/languagetool/language/MozambiquePortuguese.java b/languagetool-language-modules/pt/src/main/java/org/languagetool/language/pt/MozambiquePortuguese.java similarity index 98% rename from languagetool-language-modules/pt/src/main/java/org/languagetool/language/MozambiquePortuguese.java rename to languagetool-language-modules/pt/src/main/java/org/languagetool/language/pt/MozambiquePortuguese.java index 9f4d630dedc1..749030ad46ac 100644 --- a/languagetool-language-modules/pt/src/main/java/org/languagetool/language/MozambiquePortuguese.java +++ b/languagetool-language-modules/pt/src/main/java/org/languagetool/language/pt/MozambiquePortuguese.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language; +package org.languagetool.language.pt; import org.languagetool.Language; import org.languagetool.UserConfig; diff --git a/languagetool-language-modules/pt/src/main/java/org/languagetool/language/PortugalPortuguese.java b/languagetool-language-modules/pt/src/main/java/org/languagetool/language/pt/PortugalPortuguese.java similarity index 98% rename from languagetool-language-modules/pt/src/main/java/org/languagetool/language/PortugalPortuguese.java rename to languagetool-language-modules/pt/src/main/java/org/languagetool/language/pt/PortugalPortuguese.java index b120cb271239..0bf6c4a1b3fe 100644 --- a/languagetool-language-modules/pt/src/main/java/org/languagetool/language/PortugalPortuguese.java +++ b/languagetool-language-modules/pt/src/main/java/org/languagetool/language/pt/PortugalPortuguese.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language; +package org.languagetool.language.pt; import org.jetbrains.annotations.Nullable; import org.languagetool.Language; diff --git a/languagetool-language-modules/pt/src/main/java/org/languagetool/language/Portuguese.java b/languagetool-language-modules/pt/src/main/java/org/languagetool/language/pt/Portuguese.java similarity index 98% rename from languagetool-language-modules/pt/src/main/java/org/languagetool/language/Portuguese.java rename to languagetool-language-modules/pt/src/main/java/org/languagetool/language/pt/Portuguese.java index b9489cd35310..da8905675887 100644 --- a/languagetool-language-modules/pt/src/main/java/org/languagetool/language/Portuguese.java +++ b/languagetool-language-modules/pt/src/main/java/org/languagetool/language/pt/Portuguese.java @@ -16,11 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language; +package org.languagetool.language.pt; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.languagetool.*; +import org.languagetool.language.Contributor; import org.languagetool.languagemodel.LanguageModel; import org.languagetool.rules.*; import org.languagetool.rules.pt.*; @@ -70,7 +71,7 @@ public Language getDefaultLanguageVariant() { public Contributor[] getMaintainers() { return new Contributor[] { new Contributor("Marco A.G. Pinto", "http://www.marcoagpinto.com/"), - new Contributor("Susana Boatto (pt-BR)"), + new Contributor("Susana Boatto (pt-BR)", null), new Contributor("Tiago F. Santos (3.6-4.7)", "https://github.com/TiagoSantos81"), new Contributor("Matheus Poletto (pt-BR)", "https://github.com/MatheusPoletto") }; diff --git a/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/BrazilianPortugueseReplaceRule.java b/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/BrazilianPortugueseReplaceRule.java index 5eb483e0fe42..671fc5cc6bfe 100644 --- a/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/BrazilianPortugueseReplaceRule.java +++ b/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/BrazilianPortugueseReplaceRule.java @@ -20,7 +20,6 @@ import org.languagetool.AnalyzedTokenReadings; import org.languagetool.Language; -import org.languagetool.language.Portuguese; import org.languagetool.rules.AbstractSimpleReplaceRule2; import org.languagetool.rules.Categories; import org.languagetool.rules.Example; diff --git a/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/NoDisambiguationPortuguesePartialPosTagFilter.java b/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/NoDisambiguationPortuguesePartialPosTagFilter.java index 115c6c90ca56..8d8d68e34735 100644 --- a/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/NoDisambiguationPortuguesePartialPosTagFilter.java +++ b/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/NoDisambiguationPortuguesePartialPosTagFilter.java @@ -19,7 +19,7 @@ package org.languagetool.rules.pt; import org.languagetool.AnalyzedTokenReadings; -import org.languagetool.language.Portuguese; +import org.languagetool.language.pt.Portuguese; import org.languagetool.rules.PartialPosTagFilter; import org.languagetool.tagging.Tagger; diff --git a/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugalPortugueseReplaceRule.java b/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugalPortugueseReplaceRule.java index 5102071a338a..eeecb4fb862f 100644 --- a/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugalPortugueseReplaceRule.java +++ b/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugalPortugueseReplaceRule.java @@ -20,7 +20,6 @@ import org.languagetool.AnalyzedTokenReadings; import org.languagetool.Language; -import org.languagetool.language.Portuguese; import org.languagetool.rules.AbstractSimpleReplaceRule2; import org.languagetool.rules.Categories; import org.languagetool.rules.Example; diff --git a/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugueseArchaismsRule.java b/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugueseArchaismsRule.java index 72fd5878f35b..514802836714 100644 --- a/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugueseArchaismsRule.java +++ b/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugueseArchaismsRule.java @@ -19,7 +19,6 @@ package org.languagetool.rules.pt; import org.languagetool.Language; -import org.languagetool.language.Portuguese; import org.languagetool.rules.AbstractSimpleReplaceRule2; import org.languagetool.rules.Categories; import org.languagetool.rules.ITSIssueType; diff --git a/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugueseBarbarismsRule.java b/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugueseBarbarismsRule.java index d200ec810d26..83acc152760f 100644 --- a/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugueseBarbarismsRule.java +++ b/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugueseBarbarismsRule.java @@ -20,7 +20,6 @@ import org.languagetool.AnalyzedTokenReadings; import org.languagetool.Language; -import org.languagetool.language.Portuguese; import org.languagetool.rules.AbstractSimpleReplaceRule2; import org.languagetool.rules.Categories; import org.languagetool.rules.Example; diff --git a/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugueseClicheRule.java b/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugueseClicheRule.java index 9ed3653140ad..5c246ab03279 100644 --- a/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugueseClicheRule.java +++ b/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugueseClicheRule.java @@ -19,7 +19,6 @@ package org.languagetool.rules.pt; import org.languagetool.Language; -import org.languagetool.language.Portuguese; import org.languagetool.rules.AbstractSimpleReplaceRule2; import org.languagetool.rules.Categories; import org.languagetool.rules.Example; diff --git a/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugueseDiacriticsRule.java b/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugueseDiacriticsRule.java index c6fa90dc3d0f..de4f37aad88d 100644 --- a/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugueseDiacriticsRule.java +++ b/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugueseDiacriticsRule.java @@ -18,7 +18,7 @@ */ package org.languagetool.rules.pt; -import org.languagetool.language.Portuguese; +import org.languagetool.language.pt.Portuguese; import org.languagetool.rules.AbstractSimpleReplaceRule2; import org.languagetool.rules.Categories; import org.languagetool.rules.Example; diff --git a/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugueseRedundancyRule.java b/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugueseRedundancyRule.java index 336d1f61661f..f7423d14bdbe 100644 --- a/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugueseRedundancyRule.java +++ b/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugueseRedundancyRule.java @@ -19,7 +19,6 @@ package org.languagetool.rules.pt; import org.languagetool.Language; -import org.languagetool.language.Portuguese; import org.languagetool.rules.AbstractSimpleReplaceRule2; import org.languagetool.rules.Categories; import org.languagetool.rules.Example; diff --git a/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugueseSuppressMisspelledSuggestionsFilter.java b/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugueseSuppressMisspelledSuggestionsFilter.java index 95c4eb4b950b..40c70069d2b3 100644 --- a/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugueseSuppressMisspelledSuggestionsFilter.java +++ b/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugueseSuppressMisspelledSuggestionsFilter.java @@ -20,7 +20,7 @@ package org.languagetool.rules.pt; import java.io.IOException; -import org.languagetool.language.BrazilianPortuguese; +import org.languagetool.language.pt.BrazilianPortuguese; import org.languagetool.rules.AbstractSuppressMisspelledSuggestionsFilter; public class PortugueseSuppressMisspelledSuggestionsFilter extends AbstractSuppressMisspelledSuggestionsFilter { diff --git a/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugueseWeaselWordsRule.java b/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugueseWeaselWordsRule.java index 89f6f8e73612..26fede487ce0 100644 --- a/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugueseWeaselWordsRule.java +++ b/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugueseWeaselWordsRule.java @@ -18,7 +18,7 @@ */ package org.languagetool.rules.pt; -import org.languagetool.language.Portuguese; +import org.languagetool.language.pt.Portuguese; import org.languagetool.rules.AbstractSimpleReplaceRule2; import org.languagetool.rules.Categories; import org.languagetool.rules.Example; diff --git a/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugueseWikipediaRule.java b/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugueseWikipediaRule.java index 9949aff61403..fef65cddc4d4 100644 --- a/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugueseWikipediaRule.java +++ b/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugueseWikipediaRule.java @@ -19,10 +19,8 @@ package org.languagetool.rules.pt; import org.languagetool.Language; -import org.languagetool.language.Portuguese; import org.languagetool.rules.AbstractSimpleReplaceRule2; import org.languagetool.rules.Categories; -import org.languagetool.rules.Example; import org.languagetool.rules.ITSIssueType; import org.languagetool.tools.Tools; diff --git a/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugueseWordinessRule.java b/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugueseWordinessRule.java index 2b00daf90466..44f2acd7a66a 100644 --- a/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugueseWordinessRule.java +++ b/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugueseWordinessRule.java @@ -19,7 +19,6 @@ package org.languagetool.rules.pt; import org.languagetool.Language; -import org.languagetool.language.Portuguese; import org.languagetool.rules.AbstractSimpleReplaceRule2; import org.languagetool.rules.Categories; import org.languagetool.rules.Example; diff --git a/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/RegularIrregularParticipleFilter.java b/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/RegularIrregularParticipleFilter.java index f675352f825a..9858f64819c9 100644 --- a/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/RegularIrregularParticipleFilter.java +++ b/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/RegularIrregularParticipleFilter.java @@ -25,7 +25,7 @@ import org.languagetool.AnalyzedToken; import org.languagetool.AnalyzedTokenReadings; import org.languagetool.Language; -import org.languagetool.language.Portuguese; +import org.languagetool.language.pt.Portuguese; import org.languagetool.rules.RuleMatch; import org.languagetool.rules.patterns.RuleFilter; import org.languagetool.synthesis.pt.PortugueseSynthesizer; diff --git a/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/RomanNumeralFilter.java b/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/RomanNumeralFilter.java index 33963bd46b00..10b4618841cf 100644 --- a/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/RomanNumeralFilter.java +++ b/languagetool-language-modules/pt/src/main/java/org/languagetool/rules/pt/RomanNumeralFilter.java @@ -19,12 +19,8 @@ package org.languagetool.rules.pt; import org.languagetool.AnalyzedTokenReadings; -import org.languagetool.language.BrazilianPortuguese; -import org.languagetool.rules.AbstractAdvancedSynthesizerFilter; import org.languagetool.rules.RuleMatch; import org.languagetool.rules.patterns.RuleFilter; -import org.languagetool.synthesis.BaseSynthesizer; -import org.languagetool.synthesis.Synthesizer; import org.languagetool.synthesis.pt.PortugueseSynthesizer; import java.util.Map; diff --git a/languagetool-language-modules/pt/src/main/java/org/languagetool/tagging/disambiguation/pt/PortugueseHybridDisambiguator.java b/languagetool-language-modules/pt/src/main/java/org/languagetool/tagging/disambiguation/pt/PortugueseHybridDisambiguator.java index f4d06f67de9d..e42afa8c3fc9 100644 --- a/languagetool-language-modules/pt/src/main/java/org/languagetool/tagging/disambiguation/pt/PortugueseHybridDisambiguator.java +++ b/languagetool-language-modules/pt/src/main/java/org/languagetool/tagging/disambiguation/pt/PortugueseHybridDisambiguator.java @@ -20,14 +20,11 @@ package org.languagetool.tagging.disambiguation.pt; import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; import org.jetbrains.annotations.Nullable; -import org.languagetool.*; -import org.languagetool.language.PortugalPortuguese; -import org.languagetool.language.Portuguese; +import org.languagetool.AnalyzedSentence; +import org.languagetool.JLanguageTool; +import org.languagetool.Language; import org.languagetool.tagging.disambiguation.AbstractDisambiguator; import org.languagetool.tagging.disambiguation.Disambiguator; import org.languagetool.tagging.disambiguation.MultiWordChunker; diff --git a/languagetool-language-modules/pt/src/main/resources/META-INF/org/languagetool/language-module.properties b/languagetool-language-modules/pt/src/main/resources/META-INF/org/languagetool/language-module.properties index ed51e82c7419..5b23434d54b4 100644 --- a/languagetool-language-modules/pt/src/main/resources/META-INF/org/languagetool/language-module.properties +++ b/languagetool-language-modules/pt/src/main/resources/META-INF/org/languagetool/language-module.properties @@ -1,2 +1,2 @@ # Note: post an pre reform are not listed here, see https://github.com/languagetool-org/languagetool/issues/96 -languageClasses=org.languagetool.language.Portuguese,org.languagetool.language.PortugalPortuguese,org.languagetool.language.BrazilianPortuguese,org.languagetool.language.AngolaPortuguese,org.languagetool.language.MozambiquePortuguese +languageClasses=org.languagetool.language.pt.Portuguese,org.languagetool.language.pt.PortugalPortuguese,org.languagetool.language.pt.BrazilianPortuguese,org.languagetool.language.pt.AngolaPortuguese,org.languagetool.language.pt.MozambiquePortuguese diff --git a/languagetool-language-modules/pt/src/test/java/org/languagetool/BrazilianPortugueseConcurrencyTest.java b/languagetool-language-modules/pt/src/test/java/org/languagetool/BrazilianPortugueseConcurrencyTest.java index 20f84515b283..99979022b908 100644 --- a/languagetool-language-modules/pt/src/test/java/org/languagetool/BrazilianPortugueseConcurrencyTest.java +++ b/languagetool-language-modules/pt/src/test/java/org/languagetool/BrazilianPortugueseConcurrencyTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.languagetool.language.AbstractLanguageConcurrencyTest; -import org.languagetool.language.BrazilianPortuguese; +import org.languagetool.language.pt.BrazilianPortuguese; public class BrazilianPortugueseConcurrencyTest extends AbstractLanguageConcurrencyTest { @Override diff --git a/languagetool-language-modules/pt/src/test/java/org/languagetool/PortugalPortugueseConcurrencyTest.java b/languagetool-language-modules/pt/src/test/java/org/languagetool/PortugalPortugueseConcurrencyTest.java index 294194b6f133..0a37fed818b9 100644 --- a/languagetool-language-modules/pt/src/test/java/org/languagetool/PortugalPortugueseConcurrencyTest.java +++ b/languagetool-language-modules/pt/src/test/java/org/languagetool/PortugalPortugueseConcurrencyTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.languagetool.language.AbstractLanguageConcurrencyTest; -import org.languagetool.language.PortugalPortuguese; +import org.languagetool.language.pt.PortugalPortuguese; public class PortugalPortugueseConcurrencyTest extends AbstractLanguageConcurrencyTest { @Override diff --git a/languagetool-language-modules/pt/src/test/java/org/languagetool/rules/pt/AccentuationCheckRuleTest._java b/languagetool-language-modules/pt/src/test/java/org/languagetool/rules/pt/AccentuationCheckRuleTest._java index c3f6c9143966..fd8ca65e8bbd 100644 --- a/languagetool-language-modules/pt/src/test/java/org/languagetool/rules/pt/AccentuationCheckRuleTest._java +++ b/languagetool-language-modules/pt/src/test/java/org/languagetool/rules/pt/AccentuationCheckRuleTest._java @@ -22,7 +22,7 @@ import org.junit.Before; import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Portuguese; +import org.languagetool.language.pt.Portuguese; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/pt/src/test/java/org/languagetool/rules/pt/BrazilianPortugueseSimpleReplaceRuleTest.java b/languagetool-language-modules/pt/src/test/java/org/languagetool/rules/pt/BrazilianPortugueseSimpleReplaceRuleTest.java index 70e10316faaa..163e120c25cc 100644 --- a/languagetool-language-modules/pt/src/test/java/org/languagetool/rules/pt/BrazilianPortugueseSimpleReplaceRuleTest.java +++ b/languagetool-language-modules/pt/src/test/java/org/languagetool/rules/pt/BrazilianPortugueseSimpleReplaceRuleTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Portuguese; +import org.languagetool.language.pt.Portuguese; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/pt/src/test/java/org/languagetool/rules/pt/PortugueseClicheRuleTest.java b/languagetool-language-modules/pt/src/test/java/org/languagetool/rules/pt/PortugueseClicheRuleTest.java index de1f3da51fb6..f68cae8197b7 100644 --- a/languagetool-language-modules/pt/src/test/java/org/languagetool/rules/pt/PortugueseClicheRuleTest.java +++ b/languagetool-language-modules/pt/src/test/java/org/languagetool/rules/pt/PortugueseClicheRuleTest.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Portuguese; +import org.languagetool.language.pt.Portuguese; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/pt/src/test/java/org/languagetool/rules/pt/PortugueseDiacriticsRuleTest.java b/languagetool-language-modules/pt/src/test/java/org/languagetool/rules/pt/PortugueseDiacriticsRuleTest.java index 4b37f976e166..3c20cf2119a2 100644 --- a/languagetool-language-modules/pt/src/test/java/org/languagetool/rules/pt/PortugueseDiacriticsRuleTest.java +++ b/languagetool-language-modules/pt/src/test/java/org/languagetool/rules/pt/PortugueseDiacriticsRuleTest.java @@ -20,10 +20,9 @@ import org.junit.Test; import org.languagetool.JLanguageTool; -import org.languagetool.Languages; import org.languagetool.TestTools; -import org.languagetool.language.BrazilianPortuguese; -import org.languagetool.language.PortugalPortuguese; +import org.languagetool.language.pt.BrazilianPortuguese; +import org.languagetool.language.pt.PortugalPortuguese; import org.languagetool.markup.AnnotatedTextBuilder; import org.languagetool.rules.RuleMatch; diff --git a/languagetool-language-modules/pt/src/test/java/org/languagetool/rules/pt/PortugueseTest.java b/languagetool-language-modules/pt/src/test/java/org/languagetool/rules/pt/PortugueseTest.java index 615156c9407f..bad1da8ac85d 100644 --- a/languagetool-language-modules/pt/src/test/java/org/languagetool/rules/pt/PortugueseTest.java +++ b/languagetool-language-modules/pt/src/test/java/org/languagetool/rules/pt/PortugueseTest.java @@ -20,8 +20,8 @@ import org.junit.Test; import org.languagetool.LanguageSpecificTest; -import org.languagetool.language.BrazilianPortuguese; -import org.languagetool.language.PortugalPortuguese; +import org.languagetool.language.pt.BrazilianPortuguese; +import org.languagetool.language.pt.PortugalPortuguese; import java.io.IOException; import java.util.Arrays; diff --git a/languagetool-language-modules/pt/src/test/java/org/languagetool/rules/pt/PortugueseWordRepeatBeginningRuleTest.java b/languagetool-language-modules/pt/src/test/java/org/languagetool/rules/pt/PortugueseWordRepeatBeginningRuleTest.java index 7403b875061d..995c07e718d7 100644 --- a/languagetool-language-modules/pt/src/test/java/org/languagetool/rules/pt/PortugueseWordRepeatBeginningRuleTest.java +++ b/languagetool-language-modules/pt/src/test/java/org/languagetool/rules/pt/PortugueseWordRepeatBeginningRuleTest.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Portuguese; +import org.languagetool.language.pt.Portuguese; import java.io.IOException; diff --git a/languagetool-language-modules/pt/src/test/java/org/languagetool/tagging/disambiguation/pt/PortugueseDisambiguationRuleTest.java b/languagetool-language-modules/pt/src/test/java/org/languagetool/tagging/disambiguation/pt/PortugueseDisambiguationRuleTest.java index aa50a5bbd4d8..af43cca40bf5 100644 --- a/languagetool-language-modules/pt/src/test/java/org/languagetool/tagging/disambiguation/pt/PortugueseDisambiguationRuleTest.java +++ b/languagetool-language-modules/pt/src/test/java/org/languagetool/tagging/disambiguation/pt/PortugueseDisambiguationRuleTest.java @@ -23,10 +23,9 @@ import org.junit.Before; import org.junit.Test; import org.languagetool.TestTools; -import org.languagetool.language.Portuguese; +import org.languagetool.language.pt.Portuguese; //import org.languagetool.tagging.disambiguation.rules.XmlRuleDisambiguator; //import org.languagetool.tagging.disambiguation.xx.DemoDisambiguator; -import org.languagetool.tagging.disambiguation.pt.PortugueseHybridDisambiguator; import org.languagetool.tagging.pt.PortugueseTagger; import org.languagetool.tokenizers.SRXSentenceTokenizer; import org.languagetool.tokenizers.SentenceTokenizer; diff --git a/languagetool-language-modules/pt/src/test/java/org/languagetool/tagging/pt/PortugueseTaggerTest.java b/languagetool-language-modules/pt/src/test/java/org/languagetool/tagging/pt/PortugueseTaggerTest.java index 0a61574e775d..26ab6b73aa82 100644 --- a/languagetool-language-modules/pt/src/test/java/org/languagetool/tagging/pt/PortugueseTaggerTest.java +++ b/languagetool-language-modules/pt/src/test/java/org/languagetool/tagging/pt/PortugueseTaggerTest.java @@ -21,7 +21,7 @@ import org.junit.Before; import org.junit.Test; import org.languagetool.TestTools; -import org.languagetool.language.Portuguese; +import org.languagetool.language.pt.Portuguese; import org.languagetool.tokenizers.WordTokenizer; import org.languagetool.tokenizers.pt.PortugueseWordTokenizer; diff --git a/languagetool-language-modules/pt/src/test/java/org/languagetool/tokenizers/pt/PortugueseSRXSentenceTokenizerTest.java b/languagetool-language-modules/pt/src/test/java/org/languagetool/tokenizers/pt/PortugueseSRXSentenceTokenizerTest.java index 197c15ae2df4..1e659cd2265f 100644 --- a/languagetool-language-modules/pt/src/test/java/org/languagetool/tokenizers/pt/PortugueseSRXSentenceTokenizerTest.java +++ b/languagetool-language-modules/pt/src/test/java/org/languagetool/tokenizers/pt/PortugueseSRXSentenceTokenizerTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.languagetool.TestTools; -import org.languagetool.language.Portuguese; +import org.languagetool.language.pt.Portuguese; import org.languagetool.tokenizers.SRXSentenceTokenizer; public class PortugueseSRXSentenceTokenizerTest { diff --git a/languagetool-language-modules/ro/pom.xml b/languagetool-language-modules/ro/pom.xml index 14e9db171b28..46b9bac8ef22 100644 --- a/languagetool-language-modules/ro/pom.xml +++ b/languagetool-language-modules/ro/pom.xml @@ -73,6 +73,17 @@ org.apache.maven.plugins maven-surefire-plugin + + org.apache.maven.plugins + maven-jar-plugin + + + + org.languagetool.language.ro + + + + diff --git a/languagetool-language-modules/ro/src/main/java/org/languagetool/language/Romanian.java b/languagetool-language-modules/ro/src/main/java/org/languagetool/language/ro/Romanian.java similarity index 97% rename from languagetool-language-modules/ro/src/main/java/org/languagetool/language/Romanian.java rename to languagetool-language-modules/ro/src/main/java/org/languagetool/language/ro/Romanian.java index 2c45f63728a4..5d4c68284175 100644 --- a/languagetool-language-modules/ro/src/main/java/org/languagetool/language/Romanian.java +++ b/languagetool-language-modules/ro/src/main/java/org/languagetool/language/ro/Romanian.java @@ -16,12 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language; +package org.languagetool.language.ro; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.languagetool.Language; import org.languagetool.UserConfig; +import org.languagetool.language.Contributor; import org.languagetool.rules.*; import org.languagetool.rules.ro.*; import org.languagetool.rules.spelling.SpellingCheckRule; diff --git a/languagetool-language-modules/ro/src/main/java/org/languagetool/rules/ro/SimpleReplaceRule.java b/languagetool-language-modules/ro/src/main/java/org/languagetool/rules/ro/SimpleReplaceRule.java index 6aff52bf1021..0bdf9f801714 100644 --- a/languagetool-language-modules/ro/src/main/java/org/languagetool/rules/ro/SimpleReplaceRule.java +++ b/languagetool-language-modules/ro/src/main/java/org/languagetool/rules/ro/SimpleReplaceRule.java @@ -18,7 +18,7 @@ */ package org.languagetool.rules.ro; -import org.languagetool.language.Romanian; +import org.languagetool.language.ro.Romanian; import org.languagetool.rules.AbstractSimpleReplaceRule2; import org.languagetool.rules.Categories; diff --git a/languagetool-language-modules/ro/src/main/resources/META-INF/org/languagetool/language-module.properties b/languagetool-language-modules/ro/src/main/resources/META-INF/org/languagetool/language-module.properties index d6ec7c17cb59..a0283ad44b62 100644 --- a/languagetool-language-modules/ro/src/main/resources/META-INF/org/languagetool/language-module.properties +++ b/languagetool-language-modules/ro/src/main/resources/META-INF/org/languagetool/language-module.properties @@ -1 +1 @@ -languageClasses=org.languagetool.language.Romanian +languageClasses=org.languagetool.language.ro.Romanian diff --git a/languagetool-language-modules/ro/src/test/java/org/languagetool/RomanianConcurrencyTest.java b/languagetool-language-modules/ro/src/test/java/org/languagetool/RomanianConcurrencyTest.java index c922cee246bf..8515c2580430 100644 --- a/languagetool-language-modules/ro/src/test/java/org/languagetool/RomanianConcurrencyTest.java +++ b/languagetool-language-modules/ro/src/test/java/org/languagetool/RomanianConcurrencyTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.languagetool.language.AbstractLanguageConcurrencyTest; -import org.languagetool.language.Romanian; +import org.languagetool.language.ro.Romanian; public class RomanianConcurrencyTest extends AbstractLanguageConcurrencyTest { @Override diff --git a/languagetool-language-modules/ro/src/test/java/org/languagetool/rules/ro/CompoundRuleTest.java b/languagetool-language-modules/ro/src/test/java/org/languagetool/rules/ro/CompoundRuleTest.java index 23318bd62994..d723e9b6cc9e 100644 --- a/languagetool-language-modules/ro/src/test/java/org/languagetool/rules/ro/CompoundRuleTest.java +++ b/languagetool-language-modules/ro/src/test/java/org/languagetool/rules/ro/CompoundRuleTest.java @@ -24,7 +24,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Romanian; +import org.languagetool.language.ro.Romanian; import org.languagetool.rules.AbstractCompoundRuleTest; /** diff --git a/languagetool-language-modules/ro/src/test/java/org/languagetool/rules/ro/GenericUnpairedBracketsRuleTest.java b/languagetool-language-modules/ro/src/test/java/org/languagetool/rules/ro/GenericUnpairedBracketsRuleTest.java index 8bead6b1d4c5..6f05d3a5317a 100644 --- a/languagetool-language-modules/ro/src/test/java/org/languagetool/rules/ro/GenericUnpairedBracketsRuleTest.java +++ b/languagetool-language-modules/ro/src/test/java/org/languagetool/rules/ro/GenericUnpairedBracketsRuleTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; -import org.languagetool.language.Romanian; +import org.languagetool.language.ro.Romanian; import org.languagetool.rules.GenericUnpairedBracketsRule; import org.languagetool.rules.RuleMatch; diff --git a/languagetool-language-modules/ro/src/test/java/org/languagetool/rules/ro/RomanianTest.java b/languagetool-language-modules/ro/src/test/java/org/languagetool/rules/ro/RomanianTest.java index aa43d980fcd4..7d6156cd11cd 100644 --- a/languagetool-language-modules/ro/src/test/java/org/languagetool/rules/ro/RomanianTest.java +++ b/languagetool-language-modules/ro/src/test/java/org/languagetool/rules/ro/RomanianTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.languagetool.LanguageSpecificTest; -import org.languagetool.language.Romanian; +import org.languagetool.language.ro.Romanian; import java.io.IOException; diff --git a/languagetool-language-modules/ro/src/test/java/org/languagetool/rules/ro/SimpleReplaceRuleTest.java b/languagetool-language-modules/ro/src/test/java/org/languagetool/rules/ro/SimpleReplaceRuleTest.java index c81f8085e619..0b5ef08b7458 100644 --- a/languagetool-language-modules/ro/src/test/java/org/languagetool/rules/ro/SimpleReplaceRuleTest.java +++ b/languagetool-language-modules/ro/src/test/java/org/languagetool/rules/ro/SimpleReplaceRuleTest.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Romanian; +import org.languagetool.language.ro.Romanian; import org.languagetool.rules.RuleMatch; import org.languagetool.rules.SuggestionWithMessage; diff --git a/languagetool-language-modules/ro/src/test/java/org/languagetool/synthesis/ro/RomanianSynthesizerTest.java b/languagetool-language-modules/ro/src/test/java/org/languagetool/synthesis/ro/RomanianSynthesizerTest.java index 4e157803cfbd..0eb7a7b11baf 100644 --- a/languagetool-language-modules/ro/src/test/java/org/languagetool/synthesis/ro/RomanianSynthesizerTest.java +++ b/languagetool-language-modules/ro/src/test/java/org/languagetool/synthesis/ro/RomanianSynthesizerTest.java @@ -20,7 +20,6 @@ import org.junit.Test; import org.languagetool.AnalyzedToken; -import org.languagetool.language.Romanian; import java.io.IOException; import java.util.Arrays; diff --git a/languagetool-language-modules/ro/src/test/java/org/languagetool/tagging/disambiguation/rules/ro/RomanianRuleDisambiguatorTest.java b/languagetool-language-modules/ro/src/test/java/org/languagetool/tagging/disambiguation/rules/ro/RomanianRuleDisambiguatorTest.java index 8dc5f2eedbf7..658afded80ae 100644 --- a/languagetool-language-modules/ro/src/test/java/org/languagetool/tagging/disambiguation/rules/ro/RomanianRuleDisambiguatorTest.java +++ b/languagetool-language-modules/ro/src/test/java/org/languagetool/tagging/disambiguation/rules/ro/RomanianRuleDisambiguatorTest.java @@ -21,7 +21,7 @@ import org.junit.Before; import org.junit.Test; import org.languagetool.TestTools; -import org.languagetool.language.Romanian; +import org.languagetool.language.ro.Romanian; import org.languagetool.tagging.disambiguation.rules.XmlRuleDisambiguator; import org.languagetool.tagging.disambiguation.xx.DemoDisambiguator; import org.languagetool.tagging.ro.RomanianTagger; diff --git a/languagetool-language-modules/ro/src/test/java/org/languagetool/tagging/ro/AbstractRomanianTaggerTest.java b/languagetool-language-modules/ro/src/test/java/org/languagetool/tagging/ro/AbstractRomanianTaggerTest.java index 7d824805a093..18f8951b3a54 100644 --- a/languagetool-language-modules/ro/src/test/java/org/languagetool/tagging/ro/AbstractRomanianTaggerTest.java +++ b/languagetool-language-modules/ro/src/test/java/org/languagetool/tagging/ro/AbstractRomanianTaggerTest.java @@ -23,7 +23,7 @@ import org.languagetool.AnalyzedToken; import org.languagetool.AnalyzedTokenReadings; import org.languagetool.TestTools; -import org.languagetool.language.Romanian; +import org.languagetool.language.ro.Romanian; import org.languagetool.tokenizers.WordTokenizer; import java.io.IOException; diff --git a/languagetool-language-modules/ro/src/test/java/org/languagetool/tokenizers/ro/RomanianSentenceTokenizerTest.java b/languagetool-language-modules/ro/src/test/java/org/languagetool/tokenizers/ro/RomanianSentenceTokenizerTest.java index 8b9e86dc1e8f..7843715f4807 100644 --- a/languagetool-language-modules/ro/src/test/java/org/languagetool/tokenizers/ro/RomanianSentenceTokenizerTest.java +++ b/languagetool-language-modules/ro/src/test/java/org/languagetool/tokenizers/ro/RomanianSentenceTokenizerTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.languagetool.Language; import org.languagetool.TestTools; -import org.languagetool.language.Romanian; +import org.languagetool.language.ro.Romanian; import org.languagetool.tokenizers.SRXSentenceTokenizer; import org.languagetool.tokenizers.SentenceTokenizer; diff --git a/languagetool-language-modules/ru/pom.xml b/languagetool-language-modules/ru/pom.xml index c99bb44ba84a..b04eff67d8f7 100644 --- a/languagetool-language-modules/ru/pom.xml +++ b/languagetool-language-modules/ru/pom.xml @@ -77,6 +77,17 @@ org.apache.maven.plugins maven-surefire-plugin + + org.apache.maven.plugins + maven-jar-plugin + + + + org.languagetool.language.ru + + + + diff --git a/languagetool-language-modules/ru/src/main/java/org/languagetool/chunking/RussianChunker.java b/languagetool-language-modules/ru/src/main/java/org/languagetool/chunking/ru/RussianChunker.java similarity index 97% rename from languagetool-language-modules/ru/src/main/java/org/languagetool/chunking/RussianChunker.java rename to languagetool-language-modules/ru/src/main/java/org/languagetool/chunking/ru/RussianChunker.java index a3eb97049cc9..da351e613f3f 100644 --- a/languagetool-language-modules/ru/src/main/java/org/languagetool/chunking/RussianChunker.java +++ b/languagetool-language-modules/ru/src/main/java/org/languagetool/chunking/ru/RussianChunker.java @@ -16,17 +16,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.chunking; +package org.languagetool.chunking.ru; import org.languagetool.Experimental; import edu.washington.cs.knowitall.regex.Match; import edu.washington.cs.knowitall.regex.RegularExpression; import org.languagetool.AnalyzedTokenReadings; +import org.languagetool.chunking.ChunkTag; +import org.languagetool.chunking.ChunkTaggedToken; +import org.languagetool.chunking.Chunker; +import org.languagetool.chunking.TokenExpressionFactory; import java.util.*; import java.util.regex.Pattern; -import static org.languagetool.chunking.RussianChunker.PhraseType.*; +import static org.languagetool.chunking.ru.RussianChunker.PhraseType.*; /** * A rule-based prototype Russian chunker. Please note that this chunker diff --git a/languagetool-language-modules/ru/src/main/java/org/languagetool/language/Russian.java b/languagetool-language-modules/ru/src/main/java/org/languagetool/language/ru/Russian.java similarity index 98% rename from languagetool-language-modules/ru/src/main/java/org/languagetool/language/Russian.java rename to languagetool-language-modules/ru/src/main/java/org/languagetool/language/ru/Russian.java index 4b13a137dcdd..2f9c7405aa30 100644 --- a/languagetool-language-modules/ru/src/main/java/org/languagetool/language/Russian.java +++ b/languagetool-language-modules/ru/src/main/java/org/languagetool/language/ru/Russian.java @@ -16,13 +16,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language; +package org.languagetool.language.ru; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.languagetool.*; import org.languagetool.chunking.Chunker; -import org.languagetool.chunking.RussianChunker; +import org.languagetool.chunking.ru.RussianChunker; +import org.languagetool.language.Contributor; import org.languagetool.languagemodel.LanguageModel; import org.languagetool.rules.*; import org.languagetool.rules.ru.*; diff --git a/languagetool-language-modules/ru/src/main/java/org/languagetool/rules/ru/RussianPartialPosTagFilter.java b/languagetool-language-modules/ru/src/main/java/org/languagetool/rules/ru/RussianPartialPosTagFilter.java index 4c8ce115311a..1dc1123a5b24 100644 --- a/languagetool-language-modules/ru/src/main/java/org/languagetool/rules/ru/RussianPartialPosTagFilter.java +++ b/languagetool-language-modules/ru/src/main/java/org/languagetool/rules/ru/RussianPartialPosTagFilter.java @@ -20,7 +20,7 @@ import org.languagetool.AnalyzedSentence; import org.languagetool.AnalyzedTokenReadings; -import org.languagetool.language.Russian; +import org.languagetool.language.ru.Russian; import org.languagetool.rules.PartialPosTagFilter; import org.languagetool.tagging.Tagger; import org.languagetool.tagging.disambiguation.Disambiguator; diff --git a/languagetool-language-modules/ru/src/main/java/org/languagetool/rules/ru/RussianSimpleReplaceRule.java b/languagetool-language-modules/ru/src/main/java/org/languagetool/rules/ru/RussianSimpleReplaceRule.java index 9d4187097c58..951ad4265567 100644 --- a/languagetool-language-modules/ru/src/main/java/org/languagetool/rules/ru/RussianSimpleReplaceRule.java +++ b/languagetool-language-modules/ru/src/main/java/org/languagetool/rules/ru/RussianSimpleReplaceRule.java @@ -27,7 +27,7 @@ import java.util.Locale; import java.util.ResourceBundle; -import org.languagetool.language.Russian; +import org.languagetool.language.ru.Russian; import org.languagetool.rules.ITSIssueType; import org.languagetool.rules.Category; import org.languagetool.rules.CategoryId; diff --git a/languagetool-language-modules/ru/src/main/java/org/languagetool/rules/ru/RussianSuppressMisspelledSuggestionsFilter.java b/languagetool-language-modules/ru/src/main/java/org/languagetool/rules/ru/RussianSuppressMisspelledSuggestionsFilter.java index d7717befa152..f6a80c1c801d 100644 --- a/languagetool-language-modules/ru/src/main/java/org/languagetool/rules/ru/RussianSuppressMisspelledSuggestionsFilter.java +++ b/languagetool-language-modules/ru/src/main/java/org/languagetool/rules/ru/RussianSuppressMisspelledSuggestionsFilter.java @@ -20,7 +20,7 @@ package org.languagetool.rules.ru; import java.io.IOException; -import org.languagetool.language.Russian; +import org.languagetool.language.ru.Russian; import org.languagetool.rules.AbstractSuppressMisspelledSuggestionsFilter; public class RussianSuppressMisspelledSuggestionsFilter extends AbstractSuppressMisspelledSuggestionsFilter { diff --git a/languagetool-language-modules/ru/src/main/java/org/languagetool/tagging/disambiguation/ru/RussianHybridDisambiguator.java b/languagetool-language-modules/ru/src/main/java/org/languagetool/tagging/disambiguation/ru/RussianHybridDisambiguator.java index a72f95ec0e02..6c19145a8218 100644 --- a/languagetool-language-modules/ru/src/main/java/org/languagetool/tagging/disambiguation/ru/RussianHybridDisambiguator.java +++ b/languagetool-language-modules/ru/src/main/java/org/languagetool/tagging/disambiguation/ru/RussianHybridDisambiguator.java @@ -22,7 +22,7 @@ import org.jetbrains.annotations.Nullable; import org.languagetool.AnalyzedSentence; import org.languagetool.JLanguageTool; -import org.languagetool.language.Russian; +import org.languagetool.language.ru.Russian; import org.languagetool.tagging.disambiguation.AbstractDisambiguator; import org.languagetool.tagging.disambiguation.Disambiguator; import org.languagetool.tagging.disambiguation.MultiWordChunker; diff --git a/languagetool-language-modules/ru/src/main/resources/META-INF/org/languagetool/language-module.properties b/languagetool-language-modules/ru/src/main/resources/META-INF/org/languagetool/language-module.properties index 499173950b5e..46111c61688b 100644 --- a/languagetool-language-modules/ru/src/main/resources/META-INF/org/languagetool/language-module.properties +++ b/languagetool-language-modules/ru/src/main/resources/META-INF/org/languagetool/language-module.properties @@ -1 +1 @@ -languageClasses=org.languagetool.language.Russian +languageClasses=org.languagetool.language.ru.Russian diff --git a/languagetool-language-modules/ru/src/test/java/org/languagetool/RussianConcurrencyTest.java b/languagetool-language-modules/ru/src/test/java/org/languagetool/RussianConcurrencyTest.java index f01206f0aa0e..aafb9fe11f91 100644 --- a/languagetool-language-modules/ru/src/test/java/org/languagetool/RussianConcurrencyTest.java +++ b/languagetool-language-modules/ru/src/test/java/org/languagetool/RussianConcurrencyTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.languagetool.language.AbstractLanguageConcurrencyTest; -import org.languagetool.language.Russian; +import org.languagetool.language.ru.Russian; public class RussianConcurrencyTest extends AbstractLanguageConcurrencyTest { @Override diff --git a/languagetool-language-modules/ru/src/test/java/org/languagetool/rules/ru/MorfologikRussianSpellerRuleTest.java b/languagetool-language-modules/ru/src/test/java/org/languagetool/rules/ru/MorfologikRussianSpellerRuleTest.java index c3ad29cadf6d..168a49319b06 100644 --- a/languagetool-language-modules/ru/src/test/java/org/languagetool/rules/ru/MorfologikRussianSpellerRuleTest.java +++ b/languagetool-language-modules/ru/src/test/java/org/languagetool/rules/ru/MorfologikRussianSpellerRuleTest.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Russian; +import org.languagetool.language.ru.Russian; import java.io.IOException; import java.util.Collections; diff --git a/languagetool-language-modules/ru/src/test/java/org/languagetool/rules/ru/MorfologikRussianYOSpellerRuleTest.java b/languagetool-language-modules/ru/src/test/java/org/languagetool/rules/ru/MorfologikRussianYOSpellerRuleTest.java index fcfeb526e241..2ee8898ed80a 100644 --- a/languagetool-language-modules/ru/src/test/java/org/languagetool/rules/ru/MorfologikRussianYOSpellerRuleTest.java +++ b/languagetool-language-modules/ru/src/test/java/org/languagetool/rules/ru/MorfologikRussianYOSpellerRuleTest.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Russian; +import org.languagetool.language.ru.Russian; import java.io.IOException; import java.util.Collections; diff --git a/languagetool-language-modules/ru/src/test/java/org/languagetool/rules/ru/RussianCompoundRuleTest.java b/languagetool-language-modules/ru/src/test/java/org/languagetool/rules/ru/RussianCompoundRuleTest.java index 55068a864b72..cb85f4155f8a 100644 --- a/languagetool-language-modules/ru/src/test/java/org/languagetool/rules/ru/RussianCompoundRuleTest.java +++ b/languagetool-language-modules/ru/src/test/java/org/languagetool/rules/ru/RussianCompoundRuleTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Russian; +import org.languagetool.language.ru.Russian; import org.languagetool.rules.AbstractCompoundRuleTest; import java.io.IOException; diff --git a/languagetool-language-modules/ru/src/test/java/org/languagetool/rules/ru/RussianSimpleReplaceRuleTest.java b/languagetool-language-modules/ru/src/test/java/org/languagetool/rules/ru/RussianSimpleReplaceRuleTest.java index fe17535ce0a0..85e17a0c1279 100644 --- a/languagetool-language-modules/ru/src/test/java/org/languagetool/rules/ru/RussianSimpleReplaceRuleTest.java +++ b/languagetool-language-modules/ru/src/test/java/org/languagetool/rules/ru/RussianSimpleReplaceRuleTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Russian; +import org.languagetool.language.ru.Russian; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/ru/src/test/java/org/languagetool/rules/ru/RussianTest.java b/languagetool-language-modules/ru/src/test/java/org/languagetool/rules/ru/RussianTest.java index d0bb427c8507..0c19db5dd039 100644 --- a/languagetool-language-modules/ru/src/test/java/org/languagetool/rules/ru/RussianTest.java +++ b/languagetool-language-modules/ru/src/test/java/org/languagetool/rules/ru/RussianTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.languagetool.LanguageSpecificTest; -import org.languagetool.language.Russian; +import org.languagetool.language.ru.Russian; import java.io.IOException; import java.util.Arrays; diff --git a/languagetool-language-modules/ru/src/test/java/org/languagetool/rules/ru/RussianUnpairedBracketsRuleTest.java b/languagetool-language-modules/ru/src/test/java/org/languagetool/rules/ru/RussianUnpairedBracketsRuleTest.java index 61533b3200ac..ed13ba2e2c04 100644 --- a/languagetool-language-modules/ru/src/test/java/org/languagetool/rules/ru/RussianUnpairedBracketsRuleTest.java +++ b/languagetool-language-modules/ru/src/test/java/org/languagetool/rules/ru/RussianUnpairedBracketsRuleTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Russian; +import org.languagetool.language.ru.Russian; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/ru/src/test/java/org/languagetool/rules/ru/RussianVerbConjugationRuleTest.java b/languagetool-language-modules/ru/src/test/java/org/languagetool/rules/ru/RussianVerbConjugationRuleTest.java index cd33fac35f7d..6419624a7489 100644 --- a/languagetool-language-modules/ru/src/test/java/org/languagetool/rules/ru/RussianVerbConjugationRuleTest.java +++ b/languagetool-language-modules/ru/src/test/java/org/languagetool/rules/ru/RussianVerbConjugationRuleTest.java @@ -23,7 +23,7 @@ import org.languagetool.AnalyzedSentence; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Russian; +import org.languagetool.language.ru.Russian; import java.io.IOException; import java.util.Set; diff --git a/languagetool-language-modules/ru/src/test/java/org/languagetool/rules/ru/RussianWordCoherencyRuleTest.java b/languagetool-language-modules/ru/src/test/java/org/languagetool/rules/ru/RussianWordCoherencyRuleTest.java index c177b999b295..993a3aba8d92 100644 --- a/languagetool-language-modules/ru/src/test/java/org/languagetool/rules/ru/RussianWordCoherencyRuleTest.java +++ b/languagetool-language-modules/ru/src/test/java/org/languagetool/rules/ru/RussianWordCoherencyRuleTest.java @@ -22,7 +22,7 @@ import org.languagetool.AnalyzedSentence; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Russian; +import org.languagetool.language.ru.Russian; import java.io.IOException; import java.util.Collections; diff --git a/languagetool-language-modules/ru/src/test/java/org/languagetool/rules/ru/RussianWordRepeatRuleTest.java b/languagetool-language-modules/ru/src/test/java/org/languagetool/rules/ru/RussianWordRepeatRuleTest.java index d8b9e23509b0..cacfa72df457 100644 --- a/languagetool-language-modules/ru/src/test/java/org/languagetool/rules/ru/RussianWordRepeatRuleTest.java +++ b/languagetool-language-modules/ru/src/test/java/org/languagetool/rules/ru/RussianWordRepeatRuleTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Russian; +import org.languagetool.language.ru.Russian; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/ru/src/test/java/org/languagetool/synthesis/ru/RussianSynthesizerTest.java b/languagetool-language-modules/ru/src/test/java/org/languagetool/synthesis/ru/RussianSynthesizerTest.java index e1bf05e247ae..213ef2e93cf0 100644 --- a/languagetool-language-modules/ru/src/test/java/org/languagetool/synthesis/ru/RussianSynthesizerTest.java +++ b/languagetool-language-modules/ru/src/test/java/org/languagetool/synthesis/ru/RussianSynthesizerTest.java @@ -21,7 +21,6 @@ import org.junit.Test; import org.languagetool.AnalyzedToken; -import org.languagetool.language.Russian; import java.io.IOException; import java.util.Arrays; diff --git a/languagetool-language-modules/ru/src/test/java/org/languagetool/tagging/ru/RussianTaggerTest.java b/languagetool-language-modules/ru/src/test/java/org/languagetool/tagging/ru/RussianTaggerTest.java index fa83f53cbbd3..062431cea2c5 100644 --- a/languagetool-language-modules/ru/src/test/java/org/languagetool/tagging/ru/RussianTaggerTest.java +++ b/languagetool-language-modules/ru/src/test/java/org/languagetool/tagging/ru/RussianTaggerTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.languagetool.TestTools; -import org.languagetool.language.Russian; +import org.languagetool.language.ru.Russian; import org.languagetool.tokenizers.WordTokenizer; import java.io.IOException; diff --git a/languagetool-language-modules/ru/src/test/java/org/languagetool/tokenizers/ru/RussianSRXSentenceTokenizerTest.java b/languagetool-language-modules/ru/src/test/java/org/languagetool/tokenizers/ru/RussianSRXSentenceTokenizerTest.java index 11aa94d9aa67..e7c4fed3fb41 100644 --- a/languagetool-language-modules/ru/src/test/java/org/languagetool/tokenizers/ru/RussianSRXSentenceTokenizerTest.java +++ b/languagetool-language-modules/ru/src/test/java/org/languagetool/tokenizers/ru/RussianSRXSentenceTokenizerTest.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.languagetool.TestTools; -import org.languagetool.language.Russian; +import org.languagetool.language.ru.Russian; import org.languagetool.tokenizers.SRXSentenceTokenizer; import org.languagetool.tokenizers.SentenceTokenizer; diff --git a/languagetool-language-modules/sk/pom.xml b/languagetool-language-modules/sk/pom.xml index bc00931e1756..78cf27222d9a 100644 --- a/languagetool-language-modules/sk/pom.xml +++ b/languagetool-language-modules/sk/pom.xml @@ -67,6 +67,17 @@ org.apache.maven.plugins maven-surefire-plugin + + org.apache.maven.plugins + maven-jar-plugin + + + + org.languagetool.language.sk + + + + diff --git a/languagetool-language-modules/sk/src/main/java/org/languagetool/language/Slovak.java b/languagetool-language-modules/sk/src/main/java/org/languagetool/language/sk/Slovak.java similarity index 97% rename from languagetool-language-modules/sk/src/main/java/org/languagetool/language/Slovak.java rename to languagetool-language-modules/sk/src/main/java/org/languagetool/language/sk/Slovak.java index e68d9bf79b58..260c3b172384 100644 --- a/languagetool-language-modules/sk/src/main/java/org/languagetool/language/Slovak.java +++ b/languagetool-language-modules/sk/src/main/java/org/languagetool/language/sk/Slovak.java @@ -16,12 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language; +package org.languagetool.language.sk; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.languagetool.*; import org.languagetool.broker.ResourceDataBroker; +import org.languagetool.language.Contributor; import org.languagetool.rules.*; import org.languagetool.rules.sk.CompoundRule; import org.languagetool.rules.sk.MorfologikSlovakSpellerRule; diff --git a/languagetool-language-modules/sk/src/main/resources/META-INF/org/languagetool/language-module.properties b/languagetool-language-modules/sk/src/main/resources/META-INF/org/languagetool/language-module.properties index 15580ee3e34e..ec161e83c550 100644 --- a/languagetool-language-modules/sk/src/main/resources/META-INF/org/languagetool/language-module.properties +++ b/languagetool-language-modules/sk/src/main/resources/META-INF/org/languagetool/language-module.properties @@ -1 +1 @@ -languageClasses=org.languagetool.language.Slovak +languageClasses=org.languagetool.language.sk.Slovak diff --git a/languagetool-language-modules/sk/src/test/java/org/languagetool/SlovakConcurrencyTest.java b/languagetool-language-modules/sk/src/test/java/org/languagetool/SlovakConcurrencyTest.java index 0283579f2152..6b97a343e0c7 100644 --- a/languagetool-language-modules/sk/src/test/java/org/languagetool/SlovakConcurrencyTest.java +++ b/languagetool-language-modules/sk/src/test/java/org/languagetool/SlovakConcurrencyTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.languagetool.language.AbstractLanguageConcurrencyTest; -import org.languagetool.language.Slovak; +import org.languagetool.language.sk.Slovak; public class SlovakConcurrencyTest extends AbstractLanguageConcurrencyTest { @Override diff --git a/languagetool-language-modules/sk/src/test/java/org/languagetool/rules/sk/CompoundRuleTest.java b/languagetool-language-modules/sk/src/test/java/org/languagetool/rules/sk/CompoundRuleTest.java index 3116fda40e91..f398308e1828 100644 --- a/languagetool-language-modules/sk/src/test/java/org/languagetool/rules/sk/CompoundRuleTest.java +++ b/languagetool-language-modules/sk/src/test/java/org/languagetool/rules/sk/CompoundRuleTest.java @@ -24,7 +24,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Slovak; +import org.languagetool.language.sk.Slovak; import org.languagetool.rules.AbstractCompoundRuleTest; public class CompoundRuleTest extends AbstractCompoundRuleTest { diff --git a/languagetool-language-modules/sk/src/test/java/org/languagetool/rules/sk/SlovakTest.java b/languagetool-language-modules/sk/src/test/java/org/languagetool/rules/sk/SlovakTest.java index b9b8778534a6..24e9105d5b9d 100644 --- a/languagetool-language-modules/sk/src/test/java/org/languagetool/rules/sk/SlovakTest.java +++ b/languagetool-language-modules/sk/src/test/java/org/languagetool/rules/sk/SlovakTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.languagetool.LanguageSpecificTest; -import org.languagetool.language.Slovak; +import org.languagetool.language.sk.Slovak; import java.io.IOException; diff --git a/languagetool-language-modules/sk/src/test/java/org/languagetool/tagging/sk/SlovakTaggerTest.java b/languagetool-language-modules/sk/src/test/java/org/languagetool/tagging/sk/SlovakTaggerTest.java index 0725b977fc0f..8bcfccf71e2f 100644 --- a/languagetool-language-modules/sk/src/test/java/org/languagetool/tagging/sk/SlovakTaggerTest.java +++ b/languagetool-language-modules/sk/src/test/java/org/languagetool/tagging/sk/SlovakTaggerTest.java @@ -21,7 +21,7 @@ import org.junit.Before; import org.junit.Test; import org.languagetool.TestTools; -import org.languagetool.language.Slovak; +import org.languagetool.language.sk.Slovak; import org.languagetool.tokenizers.WordTokenizer; import java.io.IOException; diff --git a/languagetool-language-modules/sk/src/test/java/org/languagetool/tokenizers/sk/SlovakSentenceTokenizerTest.java b/languagetool-language-modules/sk/src/test/java/org/languagetool/tokenizers/sk/SlovakSentenceTokenizerTest.java index 8b4e95db5077..7205ab679cd5 100644 --- a/languagetool-language-modules/sk/src/test/java/org/languagetool/tokenizers/sk/SlovakSentenceTokenizerTest.java +++ b/languagetool-language-modules/sk/src/test/java/org/languagetool/tokenizers/sk/SlovakSentenceTokenizerTest.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.languagetool.Language; import org.languagetool.TestTools; -import org.languagetool.language.Slovak; +import org.languagetool.language.sk.Slovak; import org.languagetool.tokenizers.SRXSentenceTokenizer; import org.languagetool.tokenizers.SentenceTokenizer; diff --git a/languagetool-language-modules/sl/pom.xml b/languagetool-language-modules/sl/pom.xml index e3084f9f4107..7dd21814cf57 100644 --- a/languagetool-language-modules/sl/pom.xml +++ b/languagetool-language-modules/sl/pom.xml @@ -67,6 +67,17 @@ org.apache.maven.plugins maven-surefire-plugin + + org.apache.maven.plugins + maven-jar-plugin + + + + org.languagetool.language.sl + + + + diff --git a/languagetool-language-modules/sl/src/main/java/org/languagetool/language/Slovenian.java b/languagetool-language-modules/sl/src/main/java/org/languagetool/language/sl/Slovenian.java similarity index 96% rename from languagetool-language-modules/sl/src/main/java/org/languagetool/language/Slovenian.java rename to languagetool-language-modules/sl/src/main/java/org/languagetool/language/sl/Slovenian.java index e38e45f58b14..4aeb2b2e7ea3 100644 --- a/languagetool-language-modules/sl/src/main/java/org/languagetool/language/Slovenian.java +++ b/languagetool-language-modules/sl/src/main/java/org/languagetool/language/sl/Slovenian.java @@ -16,11 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language; +package org.languagetool.language.sl; import org.jetbrains.annotations.Nullable; import org.languagetool.Language; import org.languagetool.UserConfig; +import org.languagetool.language.Contributor; import org.languagetool.rules.*; import org.languagetool.rules.sl.MorfologikSlovenianSpellerRule; import org.languagetool.rules.spelling.SpellingCheckRule; @@ -58,7 +59,7 @@ public SentenceTokenizer createDefaultSentenceTokenizer() { @Override public Contributor[] getMaintainers() { - return new Contributor[] {new Contributor("Martin Srebotnjak")}; + return new Contributor[] {new Contributor("Martin Srebotnjak", null)}; } @Override diff --git a/languagetool-language-modules/sl/src/main/resources/META-INF/org/languagetool/language-module.properties b/languagetool-language-modules/sl/src/main/resources/META-INF/org/languagetool/language-module.properties index 9ed79a9c61a7..e1634aa23ccb 100644 --- a/languagetool-language-modules/sl/src/main/resources/META-INF/org/languagetool/language-module.properties +++ b/languagetool-language-modules/sl/src/main/resources/META-INF/org/languagetool/language-module.properties @@ -1 +1 @@ -languageClasses=org.languagetool.language.Slovenian +languageClasses=org.languagetool.language.sl.Slovenian diff --git a/languagetool-language-modules/sl/src/test/java/org/languagetool/JLanguageToolTest.java b/languagetool-language-modules/sl/src/test/java/org/languagetool/JLanguageToolTest.java index dbb0e9d25100..02683e20578d 100644 --- a/languagetool-language-modules/sl/src/test/java/org/languagetool/JLanguageToolTest.java +++ b/languagetool-language-modules/sl/src/test/java/org/languagetool/JLanguageToolTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.junit.Test; -import org.languagetool.language.Slovenian; +import org.languagetool.language.sl.Slovenian; import java.io.IOException; diff --git a/languagetool-language-modules/sl/src/test/java/org/languagetool/SlovenianConcurrencyTest.java b/languagetool-language-modules/sl/src/test/java/org/languagetool/SlovenianConcurrencyTest.java index 8ceab4609a5f..c00966b7b7a2 100644 --- a/languagetool-language-modules/sl/src/test/java/org/languagetool/SlovenianConcurrencyTest.java +++ b/languagetool-language-modules/sl/src/test/java/org/languagetool/SlovenianConcurrencyTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.languagetool.language.AbstractLanguageConcurrencyTest; -import org.languagetool.language.Slovenian; +import org.languagetool.language.sl.Slovenian; public class SlovenianConcurrencyTest extends AbstractLanguageConcurrencyTest { @Override diff --git a/languagetool-language-modules/sl/src/test/java/org/languagetool/rules/sl/SlovenianTest.java b/languagetool-language-modules/sl/src/test/java/org/languagetool/rules/sl/SlovenianTest.java index 4bd72225a012..bc1e0eede473 100644 --- a/languagetool-language-modules/sl/src/test/java/org/languagetool/rules/sl/SlovenianTest.java +++ b/languagetool-language-modules/sl/src/test/java/org/languagetool/rules/sl/SlovenianTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.languagetool.LanguageSpecificTest; -import org.languagetool.language.Slovenian; +import org.languagetool.language.sl.Slovenian; import java.io.IOException; import java.util.Arrays; diff --git a/languagetool-language-modules/sv/pom.xml b/languagetool-language-modules/sv/pom.xml index e963cfac80c5..539c6db7baad 100644 --- a/languagetool-language-modules/sv/pom.xml +++ b/languagetool-language-modules/sv/pom.xml @@ -67,6 +67,17 @@ org.apache.maven.plugins maven-surefire-plugin + + org.apache.maven.plugins + maven-jar-plugin + + + + org.languagetool.language.sv + + + + diff --git a/languagetool-language-modules/sv/src/main/java/org/languagetool/language/Swedish.java b/languagetool-language-modules/sv/src/main/java/org/languagetool/language/sv/Swedish.java similarity index 96% rename from languagetool-language-modules/sv/src/main/java/org/languagetool/language/Swedish.java rename to languagetool-language-modules/sv/src/main/java/org/languagetool/language/sv/Swedish.java index 8377289c0f94..858d5b34bfdb 100644 --- a/languagetool-language-modules/sv/src/main/java/org/languagetool/language/Swedish.java +++ b/languagetool-language-modules/sv/src/main/java/org/languagetool/language/sv/Swedish.java @@ -16,13 +16,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language; +package org.languagetool.language.sv; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.languagetool.Language; import org.languagetool.LanguageMaintainedState; import org.languagetool.UserConfig; +import org.languagetool.language.Contributor; import org.languagetool.rules.*; import org.languagetool.rules.spelling.SpellingCheckRule; import org.languagetool.rules.spelling.hunspell.HunspellRule; @@ -85,7 +86,7 @@ public Synthesizer createDefaultSynthesizer() { @Override public Contributor[] getMaintainers() { - return new Contributor[] {new Contributor("Leif-Jöran Olsson")}; + return new Contributor[] {new Contributor("ljo@fps_gbg")}; } @Override diff --git a/languagetool-language-modules/sv/src/main/java/org/languagetool/tagging/disambiguation/sv/SwedishHybridDisambiguator.java b/languagetool-language-modules/sv/src/main/java/org/languagetool/tagging/disambiguation/sv/SwedishHybridDisambiguator.java index 5e6d24d65c9f..3481ce1a4d0c 100644 --- a/languagetool-language-modules/sv/src/main/java/org/languagetool/tagging/disambiguation/sv/SwedishHybridDisambiguator.java +++ b/languagetool-language-modules/sv/src/main/java/org/languagetool/tagging/disambiguation/sv/SwedishHybridDisambiguator.java @@ -21,7 +21,7 @@ import java.io.IOException; import org.languagetool.AnalyzedSentence; -import org.languagetool.language.Swedish; +import org.languagetool.language.sv.Swedish; import org.languagetool.tagging.disambiguation.AbstractDisambiguator; import org.languagetool.tagging.disambiguation.Disambiguator; import org.languagetool.tagging.disambiguation.MultiWordChunker; diff --git a/languagetool-language-modules/sv/src/main/resources/META-INF/org/languagetool/language-module.properties b/languagetool-language-modules/sv/src/main/resources/META-INF/org/languagetool/language-module.properties index c23a3ba9085b..b628c0365c82 100644 --- a/languagetool-language-modules/sv/src/main/resources/META-INF/org/languagetool/language-module.properties +++ b/languagetool-language-modules/sv/src/main/resources/META-INF/org/languagetool/language-module.properties @@ -1 +1 @@ -languageClasses=org.languagetool.language.Swedish +languageClasses=org.languagetool.language.sv.Swedish diff --git a/languagetool-language-modules/sv/src/test/java/org/languagetool/SwedishConcurrencyTest.java b/languagetool-language-modules/sv/src/test/java/org/languagetool/SwedishConcurrencyTest.java index 9b9f2ffa8915..91a17cab6f48 100644 --- a/languagetool-language-modules/sv/src/test/java/org/languagetool/SwedishConcurrencyTest.java +++ b/languagetool-language-modules/sv/src/test/java/org/languagetool/SwedishConcurrencyTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.languagetool.language.AbstractLanguageConcurrencyTest; -import org.languagetool.language.Swedish; +import org.languagetool.language.sv.Swedish; public class SwedishConcurrencyTest extends AbstractLanguageConcurrencyTest { diff --git a/languagetool-language-modules/sv/src/test/java/org/languagetool/rules/sv/CompoundRuleTest.java b/languagetool-language-modules/sv/src/test/java/org/languagetool/rules/sv/CompoundRuleTest.java index 69f4b08c1a13..0803181aca89 100644 --- a/languagetool-language-modules/sv/src/test/java/org/languagetool/rules/sv/CompoundRuleTest.java +++ b/languagetool-language-modules/sv/src/test/java/org/languagetool/rules/sv/CompoundRuleTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Swedish; +import org.languagetool.language.sv.Swedish; import org.languagetool.rules.AbstractCompoundRuleTest; import java.io.IOException; diff --git a/languagetool-language-modules/sv/src/test/java/org/languagetool/rules/sv/SwedishTest.java b/languagetool-language-modules/sv/src/test/java/org/languagetool/rules/sv/SwedishTest.java index 6e2501d713bf..aa558eb45193 100644 --- a/languagetool-language-modules/sv/src/test/java/org/languagetool/rules/sv/SwedishTest.java +++ b/languagetool-language-modules/sv/src/test/java/org/languagetool/rules/sv/SwedishTest.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.LanguageSpecificTest; -import org.languagetool.language.Swedish; +import org.languagetool.language.sv.Swedish; import java.io.IOException; diff --git a/languagetool-language-modules/sv/src/test/java/org/languagetool/tagging/disambiguation/sv/SwedishDisambiguationRuleTest.java b/languagetool-language-modules/sv/src/test/java/org/languagetool/tagging/disambiguation/sv/SwedishDisambiguationRuleTest.java index b8d8d8254948..3d26015abede 100644 --- a/languagetool-language-modules/sv/src/test/java/org/languagetool/tagging/disambiguation/sv/SwedishDisambiguationRuleTest.java +++ b/languagetool-language-modules/sv/src/test/java/org/languagetool/tagging/disambiguation/sv/SwedishDisambiguationRuleTest.java @@ -23,7 +23,7 @@ import org.junit.Before; import org.junit.Test; import org.languagetool.TestTools; -import org.languagetool.language.Swedish; +import org.languagetool.language.sv.Swedish; import org.languagetool.tagging.sv.SwedishTagger; import org.languagetool.tagging.disambiguation.MultiWordChunker; import org.languagetool.tokenizers.SRXSentenceTokenizer; diff --git a/languagetool-language-modules/sv/src/test/java/org/languagetool/tagging/sv/SwedishTaggerTest.java b/languagetool-language-modules/sv/src/test/java/org/languagetool/tagging/sv/SwedishTaggerTest.java index fa9e95ae32db..4a49b827ffd2 100644 --- a/languagetool-language-modules/sv/src/test/java/org/languagetool/tagging/sv/SwedishTaggerTest.java +++ b/languagetool-language-modules/sv/src/test/java/org/languagetool/tagging/sv/SwedishTaggerTest.java @@ -21,7 +21,7 @@ import org.junit.Before; import org.junit.Test; import org.languagetool.TestTools; -import org.languagetool.language.Swedish; +import org.languagetool.language.sv.Swedish; import org.languagetool.tokenizers.WordTokenizer; import java.io.IOException; diff --git a/languagetool-language-modules/sv/src/test/java/org/languagetool/tokenizers/sv/SwedishSRXSentenceTokenizerTest.java b/languagetool-language-modules/sv/src/test/java/org/languagetool/tokenizers/sv/SwedishSRXSentenceTokenizerTest.java index 1ebd60604146..f1e024eae864 100644 --- a/languagetool-language-modules/sv/src/test/java/org/languagetool/tokenizers/sv/SwedishSRXSentenceTokenizerTest.java +++ b/languagetool-language-modules/sv/src/test/java/org/languagetool/tokenizers/sv/SwedishSRXSentenceTokenizerTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.languagetool.TestTools; -import org.languagetool.language.Swedish; +import org.languagetool.language.sv.Swedish; import org.languagetool.tokenizers.SRXSentenceTokenizer; public class SwedishSRXSentenceTokenizerTest { diff --git a/languagetool-language-modules/ta/pom.xml b/languagetool-language-modules/ta/pom.xml index ae48e124105c..dc99f61e84d4 100644 --- a/languagetool-language-modules/ta/pom.xml +++ b/languagetool-language-modules/ta/pom.xml @@ -61,6 +61,17 @@ org.apache.maven.plugins maven-surefire-plugin + + org.apache.maven.plugins + maven-jar-plugin + + + + org.languagetool.language.ta + + + + diff --git a/languagetool-language-modules/ta/src/main/java/org/languagetool/language/Tamil.java b/languagetool-language-modules/ta/src/main/java/org/languagetool/language/ta/Tamil.java similarity index 93% rename from languagetool-language-modules/ta/src/main/java/org/languagetool/language/Tamil.java rename to languagetool-language-modules/ta/src/main/java/org/languagetool/language/ta/Tamil.java index f62e2b27f306..9d6748055c61 100644 --- a/languagetool-language-modules/ta/src/main/java/org/languagetool/language/Tamil.java +++ b/languagetool-language-modules/ta/src/main/java/org/languagetool/language/ta/Tamil.java @@ -16,12 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language; +package org.languagetool.language.ta; import org.jetbrains.annotations.NotNull; import org.languagetool.Language; import org.languagetool.UserConfig; -import org.languagetool.language.tagging.TamilTagger; +import org.languagetool.language.Contributor; +import org.languagetool.tagging.ta.TamilTagger; import org.languagetool.rules.*; import org.languagetool.tagging.Tagger; import org.languagetool.tokenizers.SRXSentenceTokenizer; @@ -59,7 +60,7 @@ public Tagger createDefaultTagger() { @Override public Contributor[] getMaintainers() { - return new Contributor[] {new Contributor("Elanjelian Venugopal")}; + return new Contributor[] {new Contributor("Elanjelian Venugopal", null)}; } @Override diff --git a/languagetool-language-modules/ta/src/main/java/org/languagetool/language/tagging/TamilTagger.java b/languagetool-language-modules/ta/src/main/java/org/languagetool/tagging/ta/TamilTagger.java similarity index 96% rename from languagetool-language-modules/ta/src/main/java/org/languagetool/language/tagging/TamilTagger.java rename to languagetool-language-modules/ta/src/main/java/org/languagetool/tagging/ta/TamilTagger.java index 7d48c4c941c6..941bf8eba7af 100644 --- a/languagetool-language-modules/ta/src/main/java/org/languagetool/language/tagging/TamilTagger.java +++ b/languagetool-language-modules/ta/src/main/java/org/languagetool/tagging/ta/TamilTagger.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language.tagging; +package org.languagetool.tagging.ta; import org.languagetool.tagging.BaseTagger; diff --git a/languagetool-language-modules/ta/src/main/resources/META-INF/org/languagetool/language-module.properties b/languagetool-language-modules/ta/src/main/resources/META-INF/org/languagetool/language-module.properties index 5ef7cf73c671..4bfde2f121fe 100644 --- a/languagetool-language-modules/ta/src/main/resources/META-INF/org/languagetool/language-module.properties +++ b/languagetool-language-modules/ta/src/main/resources/META-INF/org/languagetool/language-module.properties @@ -1 +1 @@ -languageClasses=org.languagetool.language.Tamil +languageClasses=org.languagetool.language.ta.Tamil diff --git a/languagetool-language-modules/ta/src/test/java/org/languagetool/rules/ta/TamilTest.java b/languagetool-language-modules/ta/src/test/java/org/languagetool/rules/ta/TamilTest.java index 4942a6b21d2c..2a938b4f3cc1 100644 --- a/languagetool-language-modules/ta/src/test/java/org/languagetool/rules/ta/TamilTest.java +++ b/languagetool-language-modules/ta/src/test/java/org/languagetool/rules/ta/TamilTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.languagetool.LanguageSpecificTest; -import org.languagetool.language.Tamil; +import org.languagetool.language.ta.Tamil; import java.io.IOException; import java.util.Arrays; diff --git a/languagetool-language-modules/tl/pom.xml b/languagetool-language-modules/tl/pom.xml index f004265961d5..f812ed748615 100644 --- a/languagetool-language-modules/tl/pom.xml +++ b/languagetool-language-modules/tl/pom.xml @@ -67,6 +67,17 @@ org.apache.maven.plugins maven-surefire-plugin + + org.apache.maven.plugins + maven-jar-plugin + + + + org.languagetool.language.tl + + + + diff --git a/languagetool-language-modules/tl/src/main/java/org/languagetool/language/Tagalog.java b/languagetool-language-modules/tl/src/main/java/org/languagetool/language/tl/Tagalog.java similarity index 92% rename from languagetool-language-modules/tl/src/main/java/org/languagetool/language/Tagalog.java rename to languagetool-language-modules/tl/src/main/java/org/languagetool/language/tl/Tagalog.java index e6b87a246117..1a4e52b3a28f 100644 --- a/languagetool-language-modules/tl/src/main/java/org/languagetool/language/Tagalog.java +++ b/languagetool-language-modules/tl/src/main/java/org/languagetool/language/tl/Tagalog.java @@ -17,14 +17,14 @@ * USA */ -package org.languagetool.language; +package org.languagetool.language.tl; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.languagetool.Language; import org.languagetool.UserConfig; -import org.languagetool.language.tl.MorfologikTagalogSpellerRule; -import org.languagetool.language.tokenizers.TagalogWordTokenizer; +import org.languagetool.language.Contributor; +import org.languagetool.tokenizers.tl.TagalogWordTokenizer; import org.languagetool.rules.*; import org.languagetool.rules.spelling.SpellingCheckRule; import org.languagetool.tagging.Tagger; @@ -75,8 +75,8 @@ public Tagger createDefaultTagger() { @Override public Contributor[] getMaintainers() { return new Contributor[] { - new Contributor("Nathaniel Oco"), - new Contributor("Allan Borra") + new Contributor("Nathaniel Oco", null), + new Contributor("Allan Borra", null) }; } diff --git a/languagetool-language-modules/tl/src/main/java/org/languagetool/language/tokenizers/TagalogWordTokenizer.java b/languagetool-language-modules/tl/src/main/java/org/languagetool/tokenizers/tl/TagalogWordTokenizer.java similarity index 96% rename from languagetool-language-modules/tl/src/main/java/org/languagetool/language/tokenizers/TagalogWordTokenizer.java rename to languagetool-language-modules/tl/src/main/java/org/languagetool/tokenizers/tl/TagalogWordTokenizer.java index b3c5eaf69e21..dde10fbd0842 100644 --- a/languagetool-language-modules/tl/src/main/java/org/languagetool/language/tokenizers/TagalogWordTokenizer.java +++ b/languagetool-language-modules/tl/src/main/java/org/languagetool/tokenizers/tl/TagalogWordTokenizer.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language.tokenizers; +package org.languagetool.tokenizers.tl; import org.languagetool.tokenizers.WordTokenizer; diff --git a/languagetool-language-modules/tl/src/main/resources/META-INF/org/languagetool/language-module.properties b/languagetool-language-modules/tl/src/main/resources/META-INF/org/languagetool/language-module.properties index ce4c9c1d435a..e1254cfa3ebc 100644 --- a/languagetool-language-modules/tl/src/main/resources/META-INF/org/languagetool/language-module.properties +++ b/languagetool-language-modules/tl/src/main/resources/META-INF/org/languagetool/language-module.properties @@ -1 +1 @@ -languageClasses=org.languagetool.language.Tagalog +languageClasses=org.languagetool.language.tl.Tagalog diff --git a/languagetool-language-modules/tl/src/test/java/org/languagetool/TagalogConcurrencyTest.java b/languagetool-language-modules/tl/src/test/java/org/languagetool/TagalogConcurrencyTest.java index 92a1441cb9ab..e806cdc73c40 100644 --- a/languagetool-language-modules/tl/src/test/java/org/languagetool/TagalogConcurrencyTest.java +++ b/languagetool-language-modules/tl/src/test/java/org/languagetool/TagalogConcurrencyTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.languagetool.language.AbstractLanguageConcurrencyTest; -import org.languagetool.language.Tagalog; +import org.languagetool.language.tl.Tagalog; public class TagalogConcurrencyTest extends AbstractLanguageConcurrencyTest { @Override diff --git a/languagetool-language-modules/tl/src/test/java/org/languagetool/language/tl/MorfologikTagalogSpellerRuleTest.java b/languagetool-language-modules/tl/src/test/java/org/languagetool/language/tl/MorfologikTagalogSpellerRuleTest.java index 5a635d09fd1e..c5b2dc987bd3 100644 --- a/languagetool-language-modules/tl/src/test/java/org/languagetool/language/tl/MorfologikTagalogSpellerRuleTest.java +++ b/languagetool-language-modules/tl/src/test/java/org/languagetool/language/tl/MorfologikTagalogSpellerRuleTest.java @@ -21,7 +21,6 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Tagalog; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/tl/src/test/java/org/languagetool/rules/tl/TagalogTest.java b/languagetool-language-modules/tl/src/test/java/org/languagetool/rules/tl/TagalogTest.java index 9e7d82a79f25..b4b26a3daf14 100644 --- a/languagetool-language-modules/tl/src/test/java/org/languagetool/rules/tl/TagalogTest.java +++ b/languagetool-language-modules/tl/src/test/java/org/languagetool/rules/tl/TagalogTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.languagetool.LanguageSpecificTest; -import org.languagetool.language.Tagalog; +import org.languagetool.language.tl.Tagalog; import java.io.IOException; import java.util.Arrays; diff --git a/languagetool-language-modules/tl/src/test/java/org/languagetool/tokenizers/tl/TagalogSRXSentenceTokenizerTest.java b/languagetool-language-modules/tl/src/test/java/org/languagetool/tokenizers/tl/TagalogSRXSentenceTokenizerTest.java index bbc38eb4e9bf..8f923d43b4c8 100644 --- a/languagetool-language-modules/tl/src/test/java/org/languagetool/tokenizers/tl/TagalogSRXSentenceTokenizerTest.java +++ b/languagetool-language-modules/tl/src/test/java/org/languagetool/tokenizers/tl/TagalogSRXSentenceTokenizerTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.languagetool.TestTools; -import org.languagetool.language.Tagalog; +import org.languagetool.language.tl.Tagalog; import org.languagetool.tokenizers.SRXSentenceTokenizer; public class TagalogSRXSentenceTokenizerTest { diff --git a/languagetool-language-modules/uk/pom.xml b/languagetool-language-modules/uk/pom.xml index 16d75b0eb5fa..804d5e9f595f 100644 --- a/languagetool-language-modules/uk/pom.xml +++ b/languagetool-language-modules/uk/pom.xml @@ -97,6 +97,17 @@ org.apache.maven.plugins maven-surefire-plugin + + org.apache.maven.plugins + maven-jar-plugin + + + + org.languagetool.language.uk + + + + diff --git a/languagetool-language-modules/uk/src/main/java/org/languagetool/language/Ukrainian.java b/languagetool-language-modules/uk/src/main/java/org/languagetool/language/uk/Ukrainian.java similarity index 97% rename from languagetool-language-modules/uk/src/main/java/org/languagetool/language/Ukrainian.java rename to languagetool-language-modules/uk/src/main/java/org/languagetool/language/uk/Ukrainian.java index ed31bc07ab49..20cfa9b1f66f 100644 --- a/languagetool-language-modules/uk/src/main/java/org/languagetool/language/Ukrainian.java +++ b/languagetool-language-modules/uk/src/main/java/org/languagetool/language/uk/Ukrainian.java @@ -16,12 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language; +package org.languagetool.language.uk; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.languagetool.*; import org.languagetool.broker.ResourceDataBroker; +import org.languagetool.language.Contributor; import org.languagetool.rules.*; import org.languagetool.rules.spelling.SpellingCheckRule; import org.languagetool.rules.uk.*; @@ -120,8 +121,8 @@ public SentenceTokenizer createDefaultSentenceTokenizer() { @Override public Contributor[] getMaintainers() { return new Contributor[] { - new Contributor("Andriy Rysin"), - new Contributor("Maksym Davydov") + new Contributor("Andriy Rysin", null), + new Contributor("Maksym Davydov", null) }; } diff --git a/languagetool-language-modules/uk/src/main/java/org/languagetool/language/Ukrainian1992.java b/languagetool-language-modules/uk/src/main/java/org/languagetool/language/uk/Ukrainian1992.java similarity index 97% rename from languagetool-language-modules/uk/src/main/java/org/languagetool/language/Ukrainian1992.java rename to languagetool-language-modules/uk/src/main/java/org/languagetool/language/uk/Ukrainian1992.java index a88dfd10876f..30b6eaf0cc71 100644 --- a/languagetool-language-modules/uk/src/main/java/org/languagetool/language/Ukrainian1992.java +++ b/languagetool-language-modules/uk/src/main/java/org/languagetool/language/uk/Ukrainian1992.java @@ -17,7 +17,7 @@ * USA */ -package org.languagetool.language; +package org.languagetool.language.uk; import java.io.IOException; import java.util.Arrays; diff --git a/languagetool-language-modules/uk/src/main/java/org/languagetool/tagging/disambiguation/uk/UkrainianHybridDisambiguator.java b/languagetool-language-modules/uk/src/main/java/org/languagetool/tagging/disambiguation/uk/UkrainianHybridDisambiguator.java index febeee979534..ca2a6a6f307a 100644 --- a/languagetool-language-modules/uk/src/main/java/org/languagetool/tagging/disambiguation/uk/UkrainianHybridDisambiguator.java +++ b/languagetool-language-modules/uk/src/main/java/org/languagetool/tagging/disambiguation/uk/UkrainianHybridDisambiguator.java @@ -34,7 +34,7 @@ import org.languagetool.AnalyzedToken; import org.languagetool.AnalyzedTokenReadings; import org.languagetool.JLanguageTool; -import org.languagetool.language.Ukrainian; +import org.languagetool.language.uk.Ukrainian; import org.languagetool.rules.uk.CaseGovernmentHelper; import org.languagetool.rules.uk.InflectionHelper; import org.languagetool.rules.uk.InflectionHelper.Inflection; diff --git a/languagetool-language-modules/uk/src/main/java/org/languagetool/tagging/uk/UkrainianTagger.java b/languagetool-language-modules/uk/src/main/java/org/languagetool/tagging/uk/UkrainianTagger.java index b5f741e8de14..1bdf8eaba4ea 100644 --- a/languagetool-language-modules/uk/src/main/java/org/languagetool/tagging/uk/UkrainianTagger.java +++ b/languagetool-language-modules/uk/src/main/java/org/languagetool/tagging/uk/UkrainianTagger.java @@ -29,7 +29,7 @@ import java.util.stream.Stream; import org.languagetool.AnalyzedToken; -import org.languagetool.language.Ukrainian; +import org.languagetool.language.uk.Ukrainian; import org.languagetool.rules.uk.LemmaHelper; import org.languagetool.tagging.BaseTagger; import org.languagetool.tagging.TaggedWord; diff --git a/languagetool-language-modules/uk/src/main/resources/META-INF/org/languagetool/language-module.properties b/languagetool-language-modules/uk/src/main/resources/META-INF/org/languagetool/language-module.properties index 15a86b652183..75e49c3cd935 100644 --- a/languagetool-language-modules/uk/src/main/resources/META-INF/org/languagetool/language-module.properties +++ b/languagetool-language-modules/uk/src/main/resources/META-INF/org/languagetool/language-module.properties @@ -1 +1 @@ -languageClasses=org.languagetool.language.Ukrainian +languageClasses=org.languagetool.language.uk.Ukrainian diff --git a/languagetool-language-modules/uk/src/test/java/org/languagetool/UkrainianConcurrencyTest.java b/languagetool-language-modules/uk/src/test/java/org/languagetool/UkrainianConcurrencyTest.java index cd4a20bcbd4a..79595bcd6b0d 100644 --- a/languagetool-language-modules/uk/src/test/java/org/languagetool/UkrainianConcurrencyTest.java +++ b/languagetool-language-modules/uk/src/test/java/org/languagetool/UkrainianConcurrencyTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.languagetool.language.AbstractLanguageConcurrencyTest; -import org.languagetool.language.Ukrainian; +import org.languagetool.language.uk.Ukrainian; public class UkrainianConcurrencyTest extends AbstractLanguageConcurrencyTest { @Override diff --git a/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/AbstractRuleTest.java b/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/AbstractRuleTest.java index aae25009434b..2061f6b963f9 100644 --- a/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/AbstractRuleTest.java +++ b/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/AbstractRuleTest.java @@ -10,7 +10,7 @@ import org.junit.Before; import org.languagetool.AnalyzedSentence; import org.languagetool.JLanguageTool; -import org.languagetool.language.Ukrainian; +import org.languagetool.language.uk.Ukrainian; import org.languagetool.rules.Rule; import org.languagetool.rules.RuleMatch; diff --git a/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/HiddenCharacterRuleTest.java b/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/HiddenCharacterRuleTest.java index b824fecea8bf..0bdc825b8a09 100644 --- a/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/HiddenCharacterRuleTest.java +++ b/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/HiddenCharacterRuleTest.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Ukrainian; +import org.languagetool.language.uk.Ukrainian; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/MissingHyphenRuleTest.java b/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/MissingHyphenRuleTest.java index f1643d40620e..288225689da3 100644 --- a/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/MissingHyphenRuleTest.java +++ b/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/MissingHyphenRuleTest.java @@ -27,7 +27,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Ukrainian; +import org.languagetool.language.uk.Ukrainian; import org.languagetool.rules.RuleMatch; import org.languagetool.tagging.uk.UkrainianTagger; diff --git a/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/MixedAlphabetsRuleTest.java b/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/MixedAlphabetsRuleTest.java index 038d0fa3c872..c295952a46f1 100644 --- a/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/MixedAlphabetsRuleTest.java +++ b/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/MixedAlphabetsRuleTest.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Ukrainian; +import org.languagetool.language.uk.Ukrainian; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/MorfologikUkrainianSpellerRuleTest.java b/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/MorfologikUkrainianSpellerRuleTest.java index a7af6920d895..60dc40cddfd8 100644 --- a/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/MorfologikUkrainianSpellerRuleTest.java +++ b/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/MorfologikUkrainianSpellerRuleTest.java @@ -29,7 +29,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Ukrainian; +import org.languagetool.language.uk.Ukrainian; import org.languagetool.rules.RuleMatch; public class MorfologikUkrainianSpellerRuleTest { diff --git a/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/PunctuationCheckRuleTest.java b/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/PunctuationCheckRuleTest.java index 55912f90a308..44ad74143b3b 100644 --- a/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/PunctuationCheckRuleTest.java +++ b/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/PunctuationCheckRuleTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Ukrainian; +import org.languagetool.language.uk.Ukrainian; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/SimpleReplaceRenamedRuleTest.java b/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/SimpleReplaceRenamedRuleTest.java index 52a4f653403b..061a67a355d8 100644 --- a/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/SimpleReplaceRenamedRuleTest.java +++ b/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/SimpleReplaceRenamedRuleTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Ukrainian; +import org.languagetool.language.uk.Ukrainian; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/SimpleReplaceRuleTest.java b/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/SimpleReplaceRuleTest.java index 80393c930a06..367d034eb25f 100644 --- a/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/SimpleReplaceRuleTest.java +++ b/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/SimpleReplaceRuleTest.java @@ -31,7 +31,7 @@ import org.languagetool.JLanguageTool; import org.languagetool.Language; import org.languagetool.TestTools; -import org.languagetool.language.Ukrainian; +import org.languagetool.language.uk.Ukrainian; import org.languagetool.rules.RuleMatch; diff --git a/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/SimpleReplaceSoftRuleTest.java b/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/SimpleReplaceSoftRuleTest.java index 23400060e3c3..a7feb3d09c4a 100644 --- a/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/SimpleReplaceSoftRuleTest.java +++ b/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/SimpleReplaceSoftRuleTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Ukrainian; +import org.languagetool.language.uk.Ukrainian; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/SimpleReplaceSpelling1992RuleTest.java b/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/SimpleReplaceSpelling1992RuleTest.java index b566d9e5172e..a6991d9f9297 100644 --- a/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/SimpleReplaceSpelling1992RuleTest.java +++ b/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/SimpleReplaceSpelling1992RuleTest.java @@ -27,7 +27,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Ukrainian; +import org.languagetool.language.uk.Ukrainian; import org.languagetool.rules.RuleMatch; diff --git a/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/SimpleReplaceSpelling2019RuleTest.java b/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/SimpleReplaceSpelling2019RuleTest.java index 071907577fba..431d8ebc1926 100644 --- a/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/SimpleReplaceSpelling2019RuleTest.java +++ b/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/SimpleReplaceSpelling2019RuleTest.java @@ -26,7 +26,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Ukrainian1992; +import org.languagetool.language.uk.Ukrainian1992; import org.languagetool.rules.RuleMatch; diff --git a/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/TypographyRuleTest.java b/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/TypographyRuleTest.java index 55bc837a3363..b239fd5979cf 100644 --- a/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/TypographyRuleTest.java +++ b/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/TypographyRuleTest.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Ukrainian; +import org.languagetool.language.uk.Ukrainian; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/UkrainianTest.java b/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/UkrainianTest.java index de1cf55b455c..58aa67e244e5 100644 --- a/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/UkrainianTest.java +++ b/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/UkrainianTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.languagetool.LanguageSpecificTest; -import org.languagetool.language.Ukrainian; +import org.languagetool.language.uk.Ukrainian; import java.io.IOException; import java.util.Arrays; diff --git a/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/UkrainianWordRepeatRuleTest.java b/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/UkrainianWordRepeatRuleTest.java index 88f65064fedb..d4049f81257f 100644 --- a/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/UkrainianWordRepeatRuleTest.java +++ b/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/UkrainianWordRepeatRuleTest.java @@ -26,7 +26,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Ukrainian; +import org.languagetool.language.uk.Ukrainian; import org.languagetool.rules.RuleMatch; import static org.junit.Assert.assertEquals; diff --git a/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/UppercaseSentenceStartRuleTest.java b/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/UppercaseSentenceStartRuleTest.java index 2f7eb327b832..83e288837670 100644 --- a/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/UppercaseSentenceStartRuleTest.java +++ b/languagetool-language-modules/uk/src/test/java/org/languagetool/rules/uk/UppercaseSentenceStartRuleTest.java @@ -26,7 +26,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Ukrainian; +import org.languagetool.language.uk.Ukrainian; import org.languagetool.rules.Example; import org.languagetool.rules.RuleMatch; diff --git a/languagetool-language-modules/uk/src/test/java/org/languagetool/tagging/disambiguation/uk/UkrainianHybridDisambiguationTest.java b/languagetool-language-modules/uk/src/test/java/org/languagetool/tagging/disambiguation/uk/UkrainianHybridDisambiguationTest.java index ffc5fde31a02..4ff5532ebc9b 100644 --- a/languagetool-language-modules/uk/src/test/java/org/languagetool/tagging/disambiguation/uk/UkrainianHybridDisambiguationTest.java +++ b/languagetool-language-modules/uk/src/test/java/org/languagetool/tagging/disambiguation/uk/UkrainianHybridDisambiguationTest.java @@ -34,7 +34,7 @@ import org.languagetool.AnalyzedTokenReadings; import org.languagetool.JLanguageTool; import org.languagetool.TestTools; -import org.languagetool.language.Ukrainian; +import org.languagetool.language.uk.Ukrainian; import org.languagetool.tagging.disambiguation.Disambiguator; import org.languagetool.tagging.disambiguation.MultiWordChunker2; import org.languagetool.tagging.disambiguation.uk.SimpleDisambiguator.TokenMatcher; diff --git a/languagetool-language-modules/uk/src/test/java/org/languagetool/tagging/uk/UkrainianTaggerTest.java b/languagetool-language-modules/uk/src/test/java/org/languagetool/tagging/uk/UkrainianTaggerTest.java index 2eb8899a0ad9..7b3d675c365e 100644 --- a/languagetool-language-modules/uk/src/test/java/org/languagetool/tagging/uk/UkrainianTaggerTest.java +++ b/languagetool-language-modules/uk/src/test/java/org/languagetool/tagging/uk/UkrainianTaggerTest.java @@ -25,7 +25,7 @@ import org.junit.Before; import org.junit.Test; import org.languagetool.TestTools; -import org.languagetool.language.Ukrainian; +import org.languagetool.language.uk.Ukrainian; import org.languagetool.tokenizers.uk.UkrainianWordTokenizer; public class UkrainianTaggerTest { diff --git a/languagetool-language-modules/uk/src/test/java/org/languagetool/tokenizers/uk/UkrainianSRXSentenceTokenizerTest.java b/languagetool-language-modules/uk/src/test/java/org/languagetool/tokenizers/uk/UkrainianSRXSentenceTokenizerTest.java index e56bec97e542..5e9eb95ba221 100644 --- a/languagetool-language-modules/uk/src/test/java/org/languagetool/tokenizers/uk/UkrainianSRXSentenceTokenizerTest.java +++ b/languagetool-language-modules/uk/src/test/java/org/languagetool/tokenizers/uk/UkrainianSRXSentenceTokenizerTest.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.languagetool.TestTools; -import org.languagetool.language.Ukrainian; +import org.languagetool.language.uk.Ukrainian; import org.languagetool.tokenizers.SRXSentenceTokenizer; public class UkrainianSRXSentenceTokenizerTest { diff --git a/languagetool-language-modules/zh/pom.xml b/languagetool-language-modules/zh/pom.xml index fe886a9e9751..49959908634a 100644 --- a/languagetool-language-modules/zh/pom.xml +++ b/languagetool-language-modules/zh/pom.xml @@ -77,6 +77,17 @@ org.apache.maven.plugins maven-surefire-plugin + + org.apache.maven.plugins + maven-jar-plugin + + + + org.languagetool.language.zh + + + + diff --git a/languagetool-language-modules/zh/src/main/java/org/languagetool/language/Chinese.java b/languagetool-language-modules/zh/src/main/java/org/languagetool/language/zh/Chinese.java similarity index 95% rename from languagetool-language-modules/zh/src/main/java/org/languagetool/language/Chinese.java rename to languagetool-language-modules/zh/src/main/java/org/languagetool/language/zh/Chinese.java index 297aaad862f2..912ad5aceb62 100644 --- a/languagetool-language-modules/zh/src/main/java/org/languagetool/language/Chinese.java +++ b/languagetool-language-modules/zh/src/main/java/org/languagetool/language/zh/Chinese.java @@ -16,11 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 * USA */ -package org.languagetool.language; +package org.languagetool.language.zh; import org.jetbrains.annotations.NotNull; import org.languagetool.Language; import org.languagetool.UserConfig; +import org.languagetool.language.Contributor; import org.languagetool.languagemodel.LanguageModel; import org.languagetool.languagemodel.LuceneLanguageModel; import org.languagetool.rules.*; @@ -57,7 +58,7 @@ public String[] getCountries() { @Override public Contributor[] getMaintainers() { - return new Contributor[] { new Contributor("Tao Lin") }; + return new Contributor[] { new Contributor("Tao Lin", null) }; } @Override diff --git a/languagetool-language-modules/zh/src/main/resources/META-INF/org/languagetool/language-module.properties b/languagetool-language-modules/zh/src/main/resources/META-INF/org/languagetool/language-module.properties index e9c4fdc42ca8..e864248cc048 100644 --- a/languagetool-language-modules/zh/src/main/resources/META-INF/org/languagetool/language-module.properties +++ b/languagetool-language-modules/zh/src/main/resources/META-INF/org/languagetool/language-module.properties @@ -1 +1 @@ -languageClasses=org.languagetool.language.Chinese +languageClasses=org.languagetool.language.zh.Chinese diff --git a/languagetool-language-modules/zh/src/test/java/org/languagetool/ChineseConcurrencyTest.java b/languagetool-language-modules/zh/src/test/java/org/languagetool/ChineseConcurrencyTest.java index ce4239923a19..822e2e2297f8 100644 --- a/languagetool-language-modules/zh/src/test/java/org/languagetool/ChineseConcurrencyTest.java +++ b/languagetool-language-modules/zh/src/test/java/org/languagetool/ChineseConcurrencyTest.java @@ -19,7 +19,7 @@ package org.languagetool; import org.languagetool.language.AbstractLanguageConcurrencyTest; -import org.languagetool.language.Chinese; +import org.languagetool.language.zh.Chinese; public class ChineseConcurrencyTest extends AbstractLanguageConcurrencyTest { diff --git a/languagetool-language-modules/zh/src/test/java/org/languagetool/rules/zh/ChineseTest.java b/languagetool-language-modules/zh/src/test/java/org/languagetool/rules/zh/ChineseTest.java index 14c614220229..985f30ca883d 100644 --- a/languagetool-language-modules/zh/src/test/java/org/languagetool/rules/zh/ChineseTest.java +++ b/languagetool-language-modules/zh/src/test/java/org/languagetool/rules/zh/ChineseTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.languagetool.LanguageSpecificTest; -import org.languagetool.language.Chinese; +import org.languagetool.language.zh.Chinese; import java.io.IOException; import java.util.Arrays; diff --git a/languagetool-server/pom.xml b/languagetool-server/pom.xml index 73ea27da0dba..5d558ee83fa1 100644 --- a/languagetool-server/pom.xml +++ b/languagetool-server/pom.xml @@ -177,6 +177,17 @@ org.apache.maven.plugins maven-jar-plugin + + org.apache.maven.plugins + maven-jar-plugin + + + + org.languagetool.server + + + + org.apache.maven.plugins maven-shade-plugin diff --git a/languagetool-server/src/test/java/org/languagetool/server/HTTPSServerTest.java b/languagetool-server/src/test/java/org/languagetool/server/HTTPSServerTest.java index 0c47713ae68e..41ccd0f97f8c 100644 --- a/languagetool-server/src/test/java/org/languagetool/server/HTTPSServerTest.java +++ b/languagetool-server/src/test/java/org/languagetool/server/HTTPSServerTest.java @@ -21,8 +21,8 @@ import org.junit.Before; import org.junit.Test; import org.languagetool.Language; -import org.languagetool.language.German; -import org.languagetool.language.GermanyGerman; +import org.languagetool.language.de.German; +import org.languagetool.language.de.GermanyGerman; import java.io.File; import java.io.IOException; diff --git a/languagetool-server/src/test/java/org/languagetool/server/HTTPServerMultiLangLoadTest2.java b/languagetool-server/src/test/java/org/languagetool/server/HTTPServerMultiLangLoadTest2.java index c097340dc439..9ba18cccb095 100644 --- a/languagetool-server/src/test/java/org/languagetool/server/HTTPServerMultiLangLoadTest2.java +++ b/languagetool-server/src/test/java/org/languagetool/server/HTTPServerMultiLangLoadTest2.java @@ -22,7 +22,6 @@ import org.junit.Test; import org.languagetool.Language; import org.languagetool.Languages; -import org.languagetool.language.German; import org.languagetool.tools.StringTools; import org.xml.sax.SAXException; @@ -31,7 +30,6 @@ import java.io.FileReader; import java.io.IOException; import java.util.*; -import java.util.concurrent.atomic.AtomicInteger; import static org.junit.Assert.fail; diff --git a/languagetool-server/src/test/java/org/languagetool/server/HTTPServerTest.java b/languagetool-server/src/test/java/org/languagetool/server/HTTPServerTest.java index 5e1572c90bab..ae9766ce727c 100644 --- a/languagetool-server/src/test/java/org/languagetool/server/HTTPServerTest.java +++ b/languagetool-server/src/test/java/org/languagetool/server/HTTPServerTest.java @@ -26,7 +26,12 @@ import org.languagetool.Language; import org.languagetool.Languages; import org.languagetool.ToneTag; -import org.languagetool.language.*; +import org.languagetool.language.de.German; +import org.languagetool.language.de.GermanyGerman; +import org.languagetool.language.en.AmericanEnglish; +import org.languagetool.language.en.English; +import org.languagetool.language.pl.Polish; +import org.languagetool.language.ro.Romanian; import org.languagetool.tools.StringTools; import org.xml.sax.SAXException; diff --git a/languagetool-standalone/src/main/java/org/languagetool/dev/HomophoneOccurrenceDumper.java b/languagetool-standalone/src/main/java/org/languagetool/dev/HomophoneOccurrenceDumper.java index 2b4d22c4c684..23a95b4b5976 100644 --- a/languagetool-standalone/src/main/java/org/languagetool/dev/HomophoneOccurrenceDumper.java +++ b/languagetool-standalone/src/main/java/org/languagetool/dev/HomophoneOccurrenceDumper.java @@ -24,7 +24,7 @@ import org.apache.lucene.index.TermsEnum; import org.apache.lucene.util.BytesRef; import org.languagetool.JLanguageTool; -import org.languagetool.language.AmericanEnglish; +import org.languagetool.language.en.AmericanEnglish; import org.languagetool.languagemodel.LuceneSingleIndexLanguageModel; import org.languagetool.rules.ConfusionPair; import org.languagetool.rules.ConfusionSetLoader; diff --git a/languagetool-standalone/src/main/java/org/languagetool/dev/RuleCreator.java b/languagetool-standalone/src/main/java/org/languagetool/dev/RuleCreator.java index 07a52fc5c20f..9d991acfa69d 100644 --- a/languagetool-standalone/src/main/java/org/languagetool/dev/RuleCreator.java +++ b/languagetool-standalone/src/main/java/org/languagetool/dev/RuleCreator.java @@ -20,8 +20,8 @@ import org.apache.commons.lang3.StringUtils; import org.languagetool.JLanguageTool; -import org.languagetool.language.AmericanEnglish; -import org.languagetool.language.English; +import org.languagetool.language.en.AmericanEnglish; +import org.languagetool.language.en.English; import org.languagetool.rules.*; import org.languagetool.tokenizers.WordTokenizer; import org.languagetool.tools.StringTools; diff --git a/languagetool-standalone/src/test/java/org/languagetool/JLanguageToolTest.java b/languagetool-standalone/src/test/java/org/languagetool/JLanguageToolTest.java index 2f2afb974465..c815e8e24011 100644 --- a/languagetool-standalone/src/test/java/org/languagetool/JLanguageToolTest.java +++ b/languagetool-standalone/src/test/java/org/languagetool/JLanguageToolTest.java @@ -21,10 +21,10 @@ import org.hamcrest.CoreMatchers; import org.junit.Ignore; import org.junit.Test; -import org.languagetool.language.AmericanEnglish; +import org.languagetool.language.en.AmericanEnglish; import org.languagetool.language.Demo; -import org.languagetool.language.English; -import org.languagetool.language.GermanyGerman; +import org.languagetool.language.en.English; +import org.languagetool.language.de.GermanyGerman; import org.languagetool.markup.AnnotatedText; import org.languagetool.markup.AnnotatedTextBuilder; import org.languagetool.rules.*; diff --git a/languagetool-standalone/src/test/java/org/languagetool/LanguageTest.java b/languagetool-standalone/src/test/java/org/languagetool/LanguageTest.java index f230e97684bc..e6794bc1ff2f 100644 --- a/languagetool-standalone/src/test/java/org/languagetool/LanguageTest.java +++ b/languagetool-standalone/src/test/java/org/languagetool/LanguageTest.java @@ -19,7 +19,13 @@ package org.languagetool; import org.junit.Test; -import org.languagetool.language.*; +import org.languagetool.language.de.AustrianGerman; +import org.languagetool.language.de.German; +import org.languagetool.language.de.GermanyGerman; +import org.languagetool.language.de.SwissGerman; +import org.languagetool.language.en.AmericanEnglish; +import org.languagetool.language.en.BritishEnglish; +import org.languagetool.language.en.English; import static org.junit.Assert.*; diff --git a/languagetool-standalone/src/test/java/org/languagetool/LanguagesTest.java b/languagetool-standalone/src/test/java/org/languagetool/LanguagesTest.java index dacba02358df..ab8f2b0a4d25 100644 --- a/languagetool-standalone/src/test/java/org/languagetool/LanguagesTest.java +++ b/languagetool-standalone/src/test/java/org/languagetool/LanguagesTest.java @@ -122,10 +122,10 @@ public void testIsVariant() { @Test public void testHasPremium() { - assertTrue(Languages.hasPremium("org.languagetool.language.Portuguese")); - assertTrue(Languages.hasPremium("org.languagetool.language.GermanyGerman")); - assertTrue(Languages.hasPremium("org.languagetool.language.AmericanEnglish")); - assertFalse(Languages.hasPremium("org.languagetool.language.Danish")); + assertTrue(Languages.hasPremium("org.languagetool.language.pt.Portuguese")); + assertTrue(Languages.hasPremium("org.languagetool.language.de.GermanyGerman")); + assertTrue(Languages.hasPremium("org.languagetool.language.en.AmericanEnglish")); + assertFalse(Languages.hasPremium("org.languagetool.language.da.Danish")); } @Test diff --git a/languagetool-standalone/src/test/java/org/languagetool/SentenceRangeTest.java b/languagetool-standalone/src/test/java/org/languagetool/SentenceRangeTest.java index a181e58db9f0..2fd291a12e26 100644 --- a/languagetool-standalone/src/test/java/org/languagetool/SentenceRangeTest.java +++ b/languagetool-standalone/src/test/java/org/languagetool/SentenceRangeTest.java @@ -22,8 +22,8 @@ import org.jetbrains.annotations.Nullable; import org.junit.Test; -import org.languagetool.language.AmericanEnglish; -import org.languagetool.language.GermanyGerman; +import org.languagetool.language.en.AmericanEnglish; +import org.languagetool.language.de.GermanyGerman; import org.languagetool.languagemodel.LanguageModel; import org.languagetool.markup.AnnotatedText; import org.languagetool.markup.AnnotatedTextBuilder; diff --git a/languagetool-standalone/src/test/java/org/languagetool/dev/MultiThreadingTest2.java b/languagetool-standalone/src/test/java/org/languagetool/dev/MultiThreadingTest2.java index ccc5b2869ec1..9d82383542b7 100644 --- a/languagetool-standalone/src/test/java/org/languagetool/dev/MultiThreadingTest2.java +++ b/languagetool-standalone/src/test/java/org/languagetool/dev/MultiThreadingTest2.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.languagetool.JLanguageTool; import org.languagetool.Language; -import org.languagetool.language.GermanyGerman; +import org.languagetool.language.de.GermanyGerman; import org.languagetool.rules.RuleMatch; import java.io.IOException; diff --git a/languagetool-standalone/src/test/java/org/languagetool/gui/ConfigurationTest.java b/languagetool-standalone/src/test/java/org/languagetool/gui/ConfigurationTest.java index b8b6f4c9a6f0..9064e71bbb4e 100644 --- a/languagetool-standalone/src/test/java/org/languagetool/gui/ConfigurationTest.java +++ b/languagetool-standalone/src/test/java/org/languagetool/gui/ConfigurationTest.java @@ -20,8 +20,8 @@ import org.junit.Test; import org.languagetool.Language; -import org.languagetool.language.AmericanEnglish; -import org.languagetool.language.French; +import org.languagetool.language.en.AmericanEnglish; +import org.languagetool.language.fr.French; import java.io.File; import java.nio.file.Files; diff --git a/languagetool-standalone/src/test/java/org/languagetool/gui/RuleLinkTest.java b/languagetool-standalone/src/test/java/org/languagetool/gui/RuleLinkTest.java index 69d053029ed8..274898da5b5f 100644 --- a/languagetool-standalone/src/test/java/org/languagetool/gui/RuleLinkTest.java +++ b/languagetool-standalone/src/test/java/org/languagetool/gui/RuleLinkTest.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.languagetool.Language; import org.languagetool.TestTools; -import org.languagetool.language.English; +import org.languagetool.language.en.English; import org.languagetool.rules.WordRepeatRule; import static org.junit.Assert.assertEquals; diff --git a/languagetool-standalone/src/test/java/org/languagetool/language/multiLanguage/MultiLanguageTest.java b/languagetool-standalone/src/test/java/org/languagetool/language/multiLanguage/MultiLanguageTest.java index 1d2ab2900489..83e38a8258c6 100644 --- a/languagetool-standalone/src/test/java/org/languagetool/language/multiLanguage/MultiLanguageTest.java +++ b/languagetool-standalone/src/test/java/org/languagetool/language/multiLanguage/MultiLanguageTest.java @@ -24,8 +24,8 @@ import org.junit.Ignore; import org.junit.Test; import org.languagetool.*; -import org.languagetool.language.AmericanEnglish; -import org.languagetool.language.GermanyGerman; +import org.languagetool.language.en.AmericanEnglish; +import org.languagetool.language.de.GermanyGerman; import org.languagetool.language.identifier.LanguageIdentifierService; import org.languagetool.markup.AnnotatedText; import org.languagetool.markup.AnnotatedTextBuilder; diff --git a/languagetool-standalone/src/test/java/org/languagetool/rules/bitext/FalseFriendsAsBitextLoaderTest.java b/languagetool-standalone/src/test/java/org/languagetool/rules/bitext/FalseFriendsAsBitextLoaderTest.java index e2762afa711c..9532a691a14e 100644 --- a/languagetool-standalone/src/test/java/org/languagetool/rules/bitext/FalseFriendsAsBitextLoaderTest.java +++ b/languagetool-standalone/src/test/java/org/languagetool/rules/bitext/FalseFriendsAsBitextLoaderTest.java @@ -21,8 +21,8 @@ import org.junit.Test; import org.languagetool.AnalyzedSentence; import org.languagetool.JLanguageTool; -import org.languagetool.language.English; -import org.languagetool.language.Polish; +import org.languagetool.language.en.English; +import org.languagetool.language.pl.Polish; import org.languagetool.rules.RuleMatch; import org.languagetool.rules.patterns.bitext.BitextPatternRule; import org.languagetool.rules.patterns.bitext.FalseFriendsAsBitextLoader; diff --git a/languagetool-standalone/src/test/java/org/languagetool/rules/patterns/FalseFriendRuleTest.java b/languagetool-standalone/src/test/java/org/languagetool/rules/patterns/FalseFriendRuleTest.java index bec99e9220cd..dc22dbf432c6 100644 --- a/languagetool-standalone/src/test/java/org/languagetool/rules/patterns/FalseFriendRuleTest.java +++ b/languagetool-standalone/src/test/java/org/languagetool/rules/patterns/FalseFriendRuleTest.java @@ -27,7 +27,13 @@ import org.junit.Ignore; import org.junit.Test; import org.languagetool.JLanguageTool; -import org.languagetool.language.*; +import org.languagetool.language.de.German; +import org.languagetool.language.de.SwissGerman; +import org.languagetool.language.en.AmericanEnglish; +import org.languagetool.language.en.BritishEnglish; +import org.languagetool.language.en.English; +import org.languagetool.language.it.Italian; +import org.languagetool.language.pl.Polish; import org.languagetool.markup.AnnotatedText; import org.languagetool.markup.AnnotatedTextBuilder; import org.languagetool.rules.RuleMatch; diff --git a/languagetool-standalone/src/test/java/org/languagetool/tagging/disambiguation/MultiWordChunkerTest.java b/languagetool-standalone/src/test/java/org/languagetool/tagging/disambiguation/MultiWordChunkerTest.java index e86716676277..c25d497ae91d 100644 --- a/languagetool-standalone/src/test/java/org/languagetool/tagging/disambiguation/MultiWordChunkerTest.java +++ b/languagetool-standalone/src/test/java/org/languagetool/tagging/disambiguation/MultiWordChunkerTest.java @@ -22,8 +22,8 @@ import org.languagetool.AnalyzedSentence; import org.languagetool.AnalyzedTokenReadings; import org.languagetool.JLanguageTool; -import org.languagetool.language.English; -import org.languagetool.language.Ukrainian; +import org.languagetool.language.en.English; +import org.languagetool.language.uk.Ukrainian; import static org.junit.Assert.assertTrue; diff --git a/languagetool-tools/pom.xml b/languagetool-tools/pom.xml index 93113bdd7edc..4ccf8052c232 100644 --- a/languagetool-tools/pom.xml +++ b/languagetool-tools/pom.xml @@ -88,7 +88,18 @@ - + + org.apache.maven.plugins + maven-jar-plugin + + + + org.languagetool.tools + + + + + diff --git a/languagetool-wikipedia/src/test/java/org/languagetool/dev/dumpcheck/TatoebaSentenceSourceTest.java b/languagetool-wikipedia/src/test/java/org/languagetool/dev/dumpcheck/TatoebaSentenceSourceTest.java index 0739cd51d7fa..8c63f97f76cf 100644 --- a/languagetool-wikipedia/src/test/java/org/languagetool/dev/dumpcheck/TatoebaSentenceSourceTest.java +++ b/languagetool-wikipedia/src/test/java/org/languagetool/dev/dumpcheck/TatoebaSentenceSourceTest.java @@ -20,7 +20,7 @@ import org.junit.Ignore; import org.junit.Test; -import org.languagetool.language.English; +import org.languagetool.language.en.English; import java.io.ByteArrayInputStream; import java.io.InputStream; diff --git a/languagetool-wikipedia/src/test/java/org/languagetool/dev/dumpcheck/WikipediaSentenceSourceTest.java b/languagetool-wikipedia/src/test/java/org/languagetool/dev/dumpcheck/WikipediaSentenceSourceTest.java index 7333d643783e..e39dbf92cb84 100644 --- a/languagetool-wikipedia/src/test/java/org/languagetool/dev/dumpcheck/WikipediaSentenceSourceTest.java +++ b/languagetool-wikipedia/src/test/java/org/languagetool/dev/dumpcheck/WikipediaSentenceSourceTest.java @@ -20,7 +20,7 @@ import org.junit.Ignore; import org.junit.Test; -import org.languagetool.language.English; +import org.languagetool.language.en.English; import javax.xml.stream.XMLStreamException; import java.io.IOException; diff --git a/languagetool-wikipedia/src/test/java/org/languagetool/dev/index/IndexerSearcherTest.java b/languagetool-wikipedia/src/test/java/org/languagetool/dev/index/IndexerSearcherTest.java index 27dac8f6ab1d..febdc799d1e8 100644 --- a/languagetool-wikipedia/src/test/java/org/languagetool/dev/index/IndexerSearcherTest.java +++ b/languagetool-wikipedia/src/test/java/org/languagetool/dev/index/IndexerSearcherTest.java @@ -38,9 +38,9 @@ import org.junit.Ignore; import org.languagetool.JLanguageTool; import org.languagetool.Language; -import org.languagetool.language.English; -import org.languagetool.language.German; -import org.languagetool.language.GermanyGerman; +import org.languagetool.language.en.English; +import org.languagetool.language.de.German; +import org.languagetool.language.de.GermanyGerman; import org.languagetool.rules.IncorrectExample; import org.languagetool.rules.Rule; import org.languagetool.rules.RuleMatch; diff --git a/languagetool-wikipedia/src/test/java/org/languagetool/dev/index/LanguageToolFilterTest.java b/languagetool-wikipedia/src/test/java/org/languagetool/dev/index/LanguageToolFilterTest.java index a58fe73ae0e0..89677f5b50f8 100644 --- a/languagetool-wikipedia/src/test/java/org/languagetool/dev/index/LanguageToolFilterTest.java +++ b/languagetool-wikipedia/src/test/java/org/languagetool/dev/index/LanguageToolFilterTest.java @@ -30,7 +30,7 @@ import org.apache.lucene.analysis.tokenattributes.TypeAttribute; import org.junit.Ignore; import org.languagetool.JLanguageTool; -import org.languagetool.language.English; +import org.languagetool.language.en.English; @Ignore public class LanguageToolFilterTest extends BaseTokenStreamTestCase { diff --git a/languagetool-wikipedia/src/test/java/org/languagetool/dev/index/PatternRuleQueryBuilderTest.java b/languagetool-wikipedia/src/test/java/org/languagetool/dev/index/PatternRuleQueryBuilderTest.java index 8febf19486a4..420164ec80e3 100644 --- a/languagetool-wikipedia/src/test/java/org/languagetool/dev/index/PatternRuleQueryBuilderTest.java +++ b/languagetool-wikipedia/src/test/java/org/languagetool/dev/index/PatternRuleQueryBuilderTest.java @@ -33,7 +33,7 @@ import org.apache.lucene.util.LuceneTestCase; import org.junit.Ignore; import org.languagetool.Language; -import org.languagetool.language.English; +import org.languagetool.language.en.English; import org.languagetool.rules.patterns.AbstractPatternRule; import org.languagetool.rules.patterns.PatternRuleLoader; diff --git a/languagetool-wikipedia/src/test/java/org/languagetool/dev/wikipedia/SuggestionReplacerTest.java b/languagetool-wikipedia/src/test/java/org/languagetool/dev/wikipedia/SuggestionReplacerTest.java index e8d511ff1cd7..43f790c71ff9 100644 --- a/languagetool-wikipedia/src/test/java/org/languagetool/dev/wikipedia/SuggestionReplacerTest.java +++ b/languagetool-wikipedia/src/test/java/org/languagetool/dev/wikipedia/SuggestionReplacerTest.java @@ -25,8 +25,8 @@ import org.languagetool.JLanguageTool; import org.languagetool.Language; import org.languagetool.Premium; -import org.languagetool.language.English; -import org.languagetool.language.GermanyGerman; +import org.languagetool.language.en.English; +import org.languagetool.language.de.GermanyGerman; import org.languagetool.rules.RuleMatch; import org.languagetool.rules.de.GermanSpellerRule; import org.languagetool.rules.patterns.AbstractPatternRule; diff --git a/languagetool-wikipedia/src/test/java/org/languagetool/dev/wikipedia/WikipediaQuickCheckTest.java b/languagetool-wikipedia/src/test/java/org/languagetool/dev/wikipedia/WikipediaQuickCheckTest.java index c36d6ae5bb82..f3393410a454 100644 --- a/languagetool-wikipedia/src/test/java/org/languagetool/dev/wikipedia/WikipediaQuickCheckTest.java +++ b/languagetool-wikipedia/src/test/java/org/languagetool/dev/wikipedia/WikipediaQuickCheckTest.java @@ -29,7 +29,7 @@ import org.junit.Ignore; import org.junit.Test; -import org.languagetool.language.GermanyGerman; +import org.languagetool.language.de.GermanyGerman; @Ignore public class WikipediaQuickCheckTest { diff --git a/pom.xml b/pom.xml index b3264def9171..dd93b2dfe398 100644 --- a/pom.xml +++ b/pom.xml @@ -77,6 +77,7 @@ languagetool-http-client languagetool-tools languagetool-dev + languagetool-language-modules/language-java8compat