refactor: language-pt

Signed-off-by: Hiroshi Miura <[email protected]>
languagetool-org · Sep 29, 2023 · 2307242 · 2307242
1 parent 978e0b5
commit 2307242
Show file tree

Hide file tree

Showing 32 changed files with 26 additions and 42 deletions.
diff --git a/...nguagetool/language/AngolaPortuguese.java → ...agetool/language/pt/AngolaPortuguese.java b/...nguagetool/language/AngolaPortuguese.java → ...agetool/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/...agetool/language/BrazilianPortuguese.java → ...tool/language/pt/BrazilianPortuguese.java b/...agetool/language/BrazilianPortuguese.java → ...tool/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.jetbrains.annotations.Nullable;
 import org.languagetool.Language;

diff --git a/...getool/language/MozambiquePortuguese.java → ...ool/language/pt/MozambiquePortuguese.java b/...getool/language/MozambiquePortuguese.java → ...ool/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/...uagetool/language/PortugalPortuguese.java → ...etool/language/pt/PortugalPortuguese.java b/...uagetool/language/PortugalPortuguese.java → ...etool/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/...org/languagetool/language/Portuguese.java → .../languagetool/language/pt/Portuguese.java b/...org/languagetool/language/Portuguese.java → .../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.*;
@@ -69,7 +70,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/...ge-modules/pt/src/main/java/org/languagetool/rules/pt/BrazilianPortugueseReplaceRule.java b/...ge-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/...rc/main/java/org/languagetool/rules/pt/NoDisambiguationPortuguesePartialPosTagFilter.java b/...rc/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/...age-modules/pt/src/main/java/org/languagetool/rules/pt/PortugalPortugueseReplaceRule.java b/...age-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/...-language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugueseArchaismsRule.java b/...-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/...language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugueseBarbarismsRule.java b/...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/...ool-language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugueseClicheRule.java b/...ool-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/...language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugueseDiacriticsRule.java b/...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/...language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugueseRedundancyRule.java b/...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/...rc/main/java/org/languagetool/rules/pt/PortugueseSuppressMisspelledSuggestionsFilter.java b/...rc/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/...anguage-modules/pt/src/main/java/org/languagetool/rules/pt/PortugueseWeaselWordsRule.java b/...anguage-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/...-language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugueseWikipediaRule.java b/...-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/...-language-modules/pt/src/main/java/org/languagetool/rules/pt/PortugueseWordinessRule.java b/...-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/...-modules/pt/src/main/java/org/languagetool/rules/pt/RegularIrregularParticipleFilter.java b/...-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/...etool-language-modules/pt/src/main/java/org/languagetool/rules/pt/RomanNumeralFilter.java b/...etool-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/...c/main/java/org/languagetool/tagging/disambiguation/pt/PortugueseHybridDisambiguator.java b/...c/main/java/org/languagetool/tagging/disambiguation/pt/PortugueseHybridDisambiguator.java
@@ -28,8 +28,6 @@
 import org.languagetool.AnalyzedToken;
 import org.languagetool.AnalyzedTokenReadings;
 import org.languagetool.Language;
-import org.languagetool.language.PortugalPortuguese;
-import org.languagetool.language.Portuguese;
 import org.languagetool.tagging.disambiguation.AbstractDisambiguator;
 import org.languagetool.tagging.disambiguation.Disambiguator;
 import org.languagetool.tagging.disambiguation.MultiWordChunker;

diff --git a/...anguage-modules/pt/src/test/java/org/languagetool/BrazilianPortugueseConcurrencyTest.java b/...anguage-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/...language-modules/pt/src/test/java/org/languagetool/PortugalPortugueseConcurrencyTest.java b/...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/...nguage-modules/pt/src/test/java/org/languagetool/rules/pt/AccentuationCheckRuleTest._java b/...nguage-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/.../pt/src/test/java/org/languagetool/rules/pt/BrazilianPortugueseSimpleReplaceRuleTest.java b/.../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/...language-modules/pt/src/test/java/org/languagetool/rules/pt/PortugueseClicheRuleTest.java b/...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/...uage-modules/pt/src/test/java/org/languagetool/rules/pt/PortugueseDiacriticsRuleTest.java b/...uage-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
@@ -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/...les/pt/src/test/java/org/languagetool/rules/pt/PortugueseWordRepeatBeginningRuleTest.java b/...les/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/...est/java/org/languagetool/tagging/disambiguation/pt/PortugueseDisambiguationRuleTest.java b/...est/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/...l-language-modules/pt/src/test/java/org/languagetool/tagging/pt/PortugueseTaggerTest.java b/...l-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 java.io.IOException;

diff --git a/...s/pt/src/test/java/org/languagetool/tokenizers/pt/PortugueseSRXSentenceTokenizerTest.java b/...s/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-standalone/src/test/java/org/languagetool/LanguagesTest.java b/languagetool-standalone/src/test/java/org/languagetool/LanguagesTest.java
@@ -122,7 +122,7 @@ public void testIsVariant() {
 
   @Test
   public void testHasPremium() {
-    assertTrue(Languages.hasPremium("org.languagetool.language.Portuguese"));
+    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"));