Revision: 7253
http://languagetool.svn.sourceforge.net/languagetool/?rev=7253&view=rev
Author: dnaber
Date: 2012-06-05 21:34:18 +0000 (Tue, 05 Jun 2012)
Log Message:
-----------
[en] avoid some code duplication by using the super class; re-indent
Modified Paths:
--------------
trunk/JLanguageTool/src/java/org/languagetool/language/AmericanEnglish.java
trunk/JLanguageTool/src/java/org/languagetool/language/BritishEnglish.java
Modified:
trunk/JLanguageTool/src/java/org/languagetool/language/AmericanEnglish.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/language/AmericanEnglish.java
2012-06-05 21:00:35 UTC (rev 7252)
+++ trunk/JLanguageTool/src/java/org/languagetool/language/AmericanEnglish.java
2012-06-05 21:34:18 UTC (rev 7253)
@@ -19,50 +19,30 @@
package org.languagetool.language;
-import java.util.Arrays;
-import java.util.List;
-
-import org.languagetool.rules.CommaWhitespaceRule;
-import org.languagetool.rules.DoublePunctuationRule;
-import org.languagetool.rules.LongSentenceRule;
import org.languagetool.rules.Rule;
-import org.languagetool.rules.UppercaseSentenceStartRule;
-import org.languagetool.rules.WhitespaceRule;
-import org.languagetool.rules.en.AvsAnRule;
-import org.languagetool.rules.en.CompoundRule;
-import org.languagetool.rules.en.EnglishUnpairedBracketsRule;
-import org.languagetool.rules.en.EnglishWordRepeatBeginningRule;
-import org.languagetool.rules.en.EnglishWordRepeatRule;
import org.languagetool.rules.spelling.hunspell.HunspellRule;
+import java.util.ArrayList;
+import java.util.List;
+
public class AmericanEnglish extends English {
-
- @Override
- public final String[] getCountryVariants() {
- return new String[]{"US"};
- }
-
- @Override
- public final String getName() {
- return "American English";
- }
-
- public List<Class<? extends Rule>> getRelevantRules() {
- return Arrays.asList(
- CommaWhitespaceRule.class,
- DoublePunctuationRule.class,
- EnglishUnpairedBracketsRule.class,
- UppercaseSentenceStartRule.class,
- WhitespaceRule.class,
- EnglishWordRepeatRule.class,
- LongSentenceRule.class,
- HunspellRule.class,
- // specific to English:
- AvsAnRule.class,
- EnglishWordRepeatBeginningRule.class,
- CompoundRule.class
- );
- }
-
+ @Override
+ public final String[] getCountryVariants() {
+ return new String[]{"US"};
+ }
+
+ @Override
+ public final String getName() {
+ return "American English";
+ }
+
+ public List<Class<? extends Rule>> getRelevantRules() {
+ final List<Class<? extends Rule>> rules = new ArrayList<Class<? extends
Rule>>();
+ rules.addAll(super.getRelevantRules());
+ rules.add(HunspellRule.class);
+ // nothing specific to American English yet...
+ return rules;
+ }
+
}
Modified:
trunk/JLanguageTool/src/java/org/languagetool/language/BritishEnglish.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/language/BritishEnglish.java
2012-06-05 21:00:35 UTC (rev 7252)
+++ trunk/JLanguageTool/src/java/org/languagetool/language/BritishEnglish.java
2012-06-05 21:34:18 UTC (rev 7253)
@@ -19,51 +19,31 @@
package org.languagetool.language;
-import java.util.Arrays;
-import java.util.List;
-
-import org.languagetool.rules.CommaWhitespaceRule;
-import org.languagetool.rules.DoublePunctuationRule;
-import org.languagetool.rules.LongSentenceRule;
import org.languagetool.rules.Rule;
-import org.languagetool.rules.UppercaseSentenceStartRule;
-import org.languagetool.rules.WhitespaceRule;
-import org.languagetool.rules.en.AvsAnRule;
import org.languagetool.rules.en.BritishReplaceRule;
-import org.languagetool.rules.en.CompoundRule;
-import org.languagetool.rules.en.EnglishUnpairedBracketsRule;
-import org.languagetool.rules.en.EnglishWordRepeatBeginningRule;
-import org.languagetool.rules.en.EnglishWordRepeatRule;
import org.languagetool.rules.spelling.hunspell.HunspellRule;
+import java.util.ArrayList;
+import java.util.List;
+
public class BritishEnglish extends English {
-
- @Override
- public final String[] getCountryVariants() {
- return new String[]{"GB"};
- }
-
- @Override
- public String getName() {
- return "British English";
- }
-
- public List<Class<? extends Rule>> getRelevantRules() {
- return Arrays.asList(
- CommaWhitespaceRule.class,
- DoublePunctuationRule.class,
- EnglishUnpairedBracketsRule.class,
- UppercaseSentenceStartRule.class,
- WhitespaceRule.class,
- EnglishWordRepeatRule.class,
- LongSentenceRule.class,
- HunspellRule.class,
- // specific to English:
- AvsAnRule.class,
- EnglishWordRepeatBeginningRule.class,
- CompoundRule.class,
- // specific to British English:
- BritishReplaceRule.class
- );
- }
+
+ @Override
+ public final String[] getCountryVariants() {
+ return new String[]{"GB"};
+ }
+
+ @Override
+ public String getName() {
+ return "British English";
+ }
+
+ public List<Class<? extends Rule>> getRelevantRules() {
+ final List<Class<? extends Rule>> rules = new ArrayList<Class<? extends
Rule>>();
+ rules.addAll(super.getRelevantRules());
+ rules.add(HunspellRule.class);
+ // specific to British English:
+ rules.add(BritishReplaceRule.class);
+ return rules;
+ }
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Languagetool-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/languagetool-cvs
