Revision: 7537
http://languagetool.svn.sourceforge.net/languagetool/?rev=7537&view=rev
Author: dnaber
Date: 2012-06-27 21:50:50 +0000 (Wed, 27 Jun 2012)
Log Message:
-----------
small code cleanup
Modified Paths:
--------------
trunk/JLanguageTool/src/java/org/languagetool/language/LanguageBuilder.java
trunk/JLanguageTool/src/java/org/languagetool/rules/AbstractSimpleReplaceRule.java
trunk/JLanguageTool/src/java/org/languagetool/rules/en/BritishReplaceRule.java
trunk/JLanguageTool/src/test/org/languagetool/rules/en/BritishReplaceRuleTest.java
trunk/JLanguageTool/src/test/org/languagetool/rules/en/MorfologikAmericanSpellerRuleTest.java
trunk/JLanguageTool/src/test/org/languagetool/rules/en/MorfologikAustralianSpellerRuleTest.java
trunk/JLanguageTool/src/test/org/languagetool/rules/en/MorfologikBritishSpellerRuleTest.java
trunk/JLanguageTool/src/test/org/languagetool/rules/en/MorfologikCanadianSpellerRuleTest.java
trunk/JLanguageTool/src/test/org/languagetool/rules/en/MorfologikNewZealandSpellerRuleTest.java
trunk/JLanguageTool/src/test/org/languagetool/rules/en/MorfologikSouthAfricanSpellerRuleTest.java
Modified:
trunk/JLanguageTool/src/java/org/languagetool/language/LanguageBuilder.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/language/LanguageBuilder.java
2012-06-27 21:04:50 UTC (rev 7536)
+++ trunk/JLanguageTool/src/java/org/languagetool/language/LanguageBuilder.java
2012-06-27 21:50:50 UTC (rev 7537)
@@ -75,14 +75,16 @@
}
@Override
public String getShortName() {
- if (parts[1].length() == 2)
- return parts[1];
+ if (parts[1].length() == 2) {
+ return parts[1];
+ }
return parts[1].split("_")[0]; //en as in en_US
}
@Override
public String[] getCountryVariants() {
- if (parts[1].length() == 2)
- return new String[] {""};
+ if (parts[1].length() == 2) {
+ return new String[] {""};
+ }
return new String[] {parts[1].split("_")[1]}; //US as in en_US
}
@Override
@@ -95,7 +97,7 @@
}
@Override
public List<String> getRuleFileName() {
- List<String> ruleFiles = new ArrayList<String>();
+ final List<String> ruleFiles = new ArrayList<String>();
ruleFiles.add(file.getAbsolutePath());
return ruleFiles;
}
Modified:
trunk/JLanguageTool/src/java/org/languagetool/rules/AbstractSimpleReplaceRule.java
===================================================================
---
trunk/JLanguageTool/src/java/org/languagetool/rules/AbstractSimpleReplaceRule.java
2012-06-27 21:04:50 UTC (rev 7536)
+++
trunk/JLanguageTool/src/java/org/languagetool/rules/AbstractSimpleReplaceRule.java
2012-06-27 21:50:50 UTC (rev 7537)
@@ -45,7 +45,7 @@
private static final String FILE_ENCODING = "utf-8";
- private Map<String, String> wrongWords; // e.g. "вреѿті реѿт" -> "зреѿтою"
+ private final Map<String, String> wrongWords; // e.g. "вреѿті реѿт" ->
"зреѿтою"
public abstract String getFileName();
@@ -102,7 +102,7 @@
final String token = tokens[i].getToken();
final String origToken = token;
- final String replacement =
isCaseSensitive()?wrongWords.get(token):wrongWords.get(token.toLowerCase(getLocale()));
+ final String replacement = isCaseSensitive() ? wrongWords.get(token) :
wrongWords.get(token.toLowerCase(getLocale()));
if (replacement != null) {
final String msg = token + getSuggestion() + replacement;
final int pos = tokens[i].getStartPos();
Modified:
trunk/JLanguageTool/src/java/org/languagetool/rules/en/BritishReplaceRule.java
===================================================================
---
trunk/JLanguageTool/src/java/org/languagetool/rules/en/BritishReplaceRule.java
2012-06-27 21:04:50 UTC (rev 7536)
+++
trunk/JLanguageTool/src/java/org/languagetool/rules/en/BritishReplaceRule.java
2012-06-27 21:50:50 UTC (rev 7537)
@@ -28,9 +28,6 @@
* A rule that matches words or phrases which should not be used and suggests
* correct ones instead.
*
- * Polish implementations. Loads the list of words from
- * <code>rules/pl/replace.txt</code>.
- *
* @author Marcin Miłkowski
*/
public class BritishReplaceRule extends AbstractSimpleReplaceRule {
Modified:
trunk/JLanguageTool/src/test/org/languagetool/rules/en/BritishReplaceRuleTest.java
===================================================================
---
trunk/JLanguageTool/src/test/org/languagetool/rules/en/BritishReplaceRuleTest.java
2012-06-27 21:04:50 UTC (rev 7536)
+++
trunk/JLanguageTool/src/test/org/languagetool/rules/en/BritishReplaceRuleTest.java
2012-06-27 21:50:50 UTC (rev 7537)
@@ -28,12 +28,6 @@
import org.languagetool.TestTools;
import org.languagetool.rules.RuleMatch;
-/**
- *
- * Simple tests for rules/pl/SimpleReplaceRule class
- *
- * @author Ionuț Păduraru
- */
public class BritishReplaceRuleTest extends TestCase {
private BritishReplaceRule rule;
@@ -60,17 +54,12 @@
/**
* Check if a specific replace rule applies.
- *
- * @param sentence
- * the sentence containing the incorrect/misspeled word.
- * @param word
- * the word that is correct (the suggested replacement).
+ * @param sentence the sentence containing the incorrect/misspelled
word.
+ * @param word the word that is correct (the suggested replacement).
* @throws IOException
*/
- private void checkSimpleReplaceRule(String sentence, String word)
- throws IOException {
- RuleMatch[] matches;
- matches = rule.match(langTool.getAnalyzedSentence(sentence));
+ private void checkSimpleReplaceRule(String sentence, String word)
throws IOException {
+ final RuleMatch[] matches =
rule.match(langTool.getAnalyzedSentence(sentence));
assertEquals("Invalid matches.length while checking sentence: "
+ sentence, 1, matches.length);
assertEquals("Invalid replacement count wile checking sentence:
"
Modified:
trunk/JLanguageTool/src/test/org/languagetool/rules/en/MorfologikAmericanSpellerRuleTest.java
===================================================================
---
trunk/JLanguageTool/src/test/org/languagetool/rules/en/MorfologikAmericanSpellerRuleTest.java
2012-06-27 21:04:50 UTC (rev 7536)
+++
trunk/JLanguageTool/src/test/org/languagetool/rules/en/MorfologikAmericanSpellerRuleTest.java
2012-06-27 21:50:50 UTC (rev 7537)
@@ -32,13 +32,11 @@
@Test
public void testMorfologikSpeller() throws IOException {
- MorfologikAmericanSpellerRule rule =
+ final MorfologikAmericanSpellerRule rule =
new MorfologikAmericanSpellerRule
(TestTools.getMessages("English"), Language.AMERICAN_ENGLISH);
- RuleMatch[] matches;
- JLanguageTool langTool = new JLanguageTool(Language.AMERICAN_ENGLISH);
+ final JLanguageTool langTool = new
JLanguageTool(Language.AMERICAN_ENGLISH);
-
// correct sentences:
assertEquals(0, rule.match(langTool.getAnalyzedSentence("This is an
example: we get behavior as a dictionary word.")).length);
assertEquals(0, rule.match(langTool.getAnalyzedSentence("Why don't we
speak today.")).length);
@@ -49,7 +47,7 @@
//incorrect sentences:
- matches = rule.match(langTool.getAnalyzedSentence("behaviour"));
+ final RuleMatch[] matches =
rule.match(langTool.getAnalyzedSentence("behaviour"));
// check match positions:
assertEquals(1, matches.length);
assertEquals(0, matches[0].getFromPos());
@@ -58,7 +56,6 @@
assertEquals(1,
rule.match(langTool.getAnalyzedSentence("aõh")).length);
assertEquals(0, rule.match(langTool.getAnalyzedSentence("a")).length);
-
}
}
Modified:
trunk/JLanguageTool/src/test/org/languagetool/rules/en/MorfologikAustralianSpellerRuleTest.java
===================================================================
---
trunk/JLanguageTool/src/test/org/languagetool/rules/en/MorfologikAustralianSpellerRuleTest.java
2012-06-27 21:04:50 UTC (rev 7536)
+++
trunk/JLanguageTool/src/test/org/languagetool/rules/en/MorfologikAustralianSpellerRuleTest.java
2012-06-27 21:50:50 UTC (rev 7537)
@@ -32,13 +32,11 @@
@Test
public void testMorfologikSpeller() throws IOException {
- MorfologikAustralianSpellerRule rule =
+ final MorfologikAustralianSpellerRule rule =
new MorfologikAustralianSpellerRule
(TestTools.getMessages("English"), Language.AUSTRALIAN_ENGLISH);
- RuleMatch[] matches;
- JLanguageTool langTool = new
JLanguageTool(Language.AUSTRALIAN_ENGLISH);
+ final JLanguageTool langTool = new
JLanguageTool(Language.AUSTRALIAN_ENGLISH);
-
// correct sentences:
assertEquals(0, rule.match(langTool.getAnalyzedSentence("This is an
example: we get behaviour as a dictionary word.")).length);
assertEquals(0, rule.match(langTool.getAnalyzedSentence("Why don't we
speak today.")).length);
@@ -52,7 +50,7 @@
//incorrect sentences:
- matches = rule.match(langTool.getAnalyzedSentence("behavior"));
+ final RuleMatch[] matches =
rule.match(langTool.getAnalyzedSentence("behavior"));
// check match positions:
assertEquals(1, matches.length);
assertEquals(0, matches[0].getFromPos());
@@ -61,7 +59,6 @@
assertEquals(1,
rule.match(langTool.getAnalyzedSentence("aõh")).length);
assertEquals(0, rule.match(langTool.getAnalyzedSentence("a")).length);
-
}
}
Modified:
trunk/JLanguageTool/src/test/org/languagetool/rules/en/MorfologikBritishSpellerRuleTest.java
===================================================================
---
trunk/JLanguageTool/src/test/org/languagetool/rules/en/MorfologikBritishSpellerRuleTest.java
2012-06-27 21:04:50 UTC (rev 7536)
+++
trunk/JLanguageTool/src/test/org/languagetool/rules/en/MorfologikBritishSpellerRuleTest.java
2012-06-27 21:50:50 UTC (rev 7537)
@@ -32,13 +32,11 @@
@Test
public void testMorfologikSpeller() throws IOException {
- MorfologikBritishSpellerRule rule =
+ final MorfologikBritishSpellerRule rule =
new MorfologikBritishSpellerRule
(TestTools.getMessages("English"), Language.BRITISH_ENGLISH);
- RuleMatch[] matches;
- JLanguageTool langTool = new JLanguageTool(Language.BRITISH_ENGLISH);
+ final JLanguageTool langTool = new
JLanguageTool(Language.BRITISH_ENGLISH);
-
// correct sentences:
assertEquals(0, rule.match(langTool.getAnalyzedSentence("This is an
example: we get behaviour as a dictionary word.")).length);
assertEquals(0, rule.match(langTool.getAnalyzedSentence("Why don't we
speak today.")).length);
@@ -51,7 +49,7 @@
//incorrect sentences:
- matches = rule.match(langTool.getAnalyzedSentence("Behavior"));
+ final RuleMatch[] matches =
rule.match(langTool.getAnalyzedSentence("Behavior"));
// check match positions:
assertEquals(1, matches.length);
assertEquals(0, matches[0].getFromPos());
@@ -60,7 +58,6 @@
assertEquals(1,
rule.match(langTool.getAnalyzedSentence("aõh")).length);
assertEquals(0, rule.match(langTool.getAnalyzedSentence("a")).length);
-
}
}
Modified:
trunk/JLanguageTool/src/test/org/languagetool/rules/en/MorfologikCanadianSpellerRuleTest.java
===================================================================
---
trunk/JLanguageTool/src/test/org/languagetool/rules/en/MorfologikCanadianSpellerRuleTest.java
2012-06-27 21:04:50 UTC (rev 7536)
+++
trunk/JLanguageTool/src/test/org/languagetool/rules/en/MorfologikCanadianSpellerRuleTest.java
2012-06-27 21:50:50 UTC (rev 7537)
@@ -32,13 +32,11 @@
@Test
public void testMorfologikSpeller() throws IOException {
- MorfologikBritishSpellerRule rule =
+ final MorfologikBritishSpellerRule rule =
new MorfologikBritishSpellerRule
(TestTools.getMessages("English"), Language.CANADIAN_ENGLISH);
- RuleMatch[] matches;
- JLanguageTool langTool = new JLanguageTool(Language.CANADIAN_ENGLISH);
+ final JLanguageTool langTool = new
JLanguageTool(Language.CANADIAN_ENGLISH);
-
// correct sentences:
assertEquals(0, rule.match(langTool.getAnalyzedSentence("This is an
example: we get behaviour as a dictionary word.")).length);
assertEquals(0, rule.match(langTool.getAnalyzedSentence("Why don't we
speak today.")).length);
@@ -49,7 +47,7 @@
//incorrect sentences:
- matches = rule.match(langTool.getAnalyzedSentence("arbor"));
+ final RuleMatch[] matches =
rule.match(langTool.getAnalyzedSentence("arbor"));
// check match positions:
assertEquals(1, matches.length);
assertEquals(0, matches[0].getFromPos());
@@ -58,7 +56,6 @@
assertEquals(1,
rule.match(langTool.getAnalyzedSentence("aõh")).length);
assertEquals(0, rule.match(langTool.getAnalyzedSentence("a")).length);
-
}
}
Modified:
trunk/JLanguageTool/src/test/org/languagetool/rules/en/MorfologikNewZealandSpellerRuleTest.java
===================================================================
---
trunk/JLanguageTool/src/test/org/languagetool/rules/en/MorfologikNewZealandSpellerRuleTest.java
2012-06-27 21:04:50 UTC (rev 7536)
+++
trunk/JLanguageTool/src/test/org/languagetool/rules/en/MorfologikNewZealandSpellerRuleTest.java
2012-06-27 21:50:50 UTC (rev 7537)
@@ -32,13 +32,11 @@
@Test
public void testMorfologikSpeller() throws IOException {
- MorfologikNewZealandSpellerRule rule =
+ final MorfologikNewZealandSpellerRule rule =
new MorfologikNewZealandSpellerRule
(TestTools.getMessages("English"), Language.NEW_ZEALAND_ENGLISH);
- RuleMatch[] matches;
- JLanguageTool langTool = new
JLanguageTool(Language.NEW_ZEALAND_ENGLISH);
+ final JLanguageTool langTool = new
JLanguageTool(Language.NEW_ZEALAND_ENGLISH);
-
// correct sentences:
assertEquals(0, rule.match(langTool.getAnalyzedSentence("This is an
example: we get behaviour as a dictionary word.")).length);
assertEquals(0, rule.match(langTool.getAnalyzedSentence("Why don't we
speak today.")).length);
@@ -52,7 +50,7 @@
//incorrect sentences:
- matches = rule.match(langTool.getAnalyzedSentence("behavior"));
+ final RuleMatch[] matches =
rule.match(langTool.getAnalyzedSentence("behavior"));
// check match positions:
assertEquals(1, matches.length);
assertEquals(0, matches[0].getFromPos());
@@ -61,7 +59,6 @@
assertEquals(1,
rule.match(langTool.getAnalyzedSentence("aõh")).length);
assertEquals(0, rule.match(langTool.getAnalyzedSentence("a")).length);
-
}
}
Modified:
trunk/JLanguageTool/src/test/org/languagetool/rules/en/MorfologikSouthAfricanSpellerRuleTest.java
===================================================================
---
trunk/JLanguageTool/src/test/org/languagetool/rules/en/MorfologikSouthAfricanSpellerRuleTest.java
2012-06-27 21:04:50 UTC (rev 7536)
+++
trunk/JLanguageTool/src/test/org/languagetool/rules/en/MorfologikSouthAfricanSpellerRuleTest.java
2012-06-27 21:50:50 UTC (rev 7537)
@@ -32,13 +32,11 @@
@Test
public void testMorfologikSpeller() throws IOException {
- MorfologikSouthAfricanSpellerRule rule =
+ final MorfologikSouthAfricanSpellerRule rule =
new MorfologikSouthAfricanSpellerRule
(TestTools.getMessages("English"), Language.SOUTH_AFRICAN_ENGLISH);
- RuleMatch[] matches;
- JLanguageTool langTool = new
JLanguageTool(Language.SOUTH_AFRICAN_ENGLISH);
+ final JLanguageTool langTool = new
JLanguageTool(Language.SOUTH_AFRICAN_ENGLISH);
-
// correct sentences:
assertEquals(0, rule.match(langTool.getAnalyzedSentence("This is an
example: we get behaviour as a dictionary word.")).length);
assertEquals(0, rule.match(langTool.getAnalyzedSentence("Why don't we
speak today.")).length);
@@ -52,7 +50,7 @@
//incorrect sentences:
- matches = rule.match(langTool.getAnalyzedSentence("behavior"));
+ final RuleMatch[] matches =
rule.match(langTool.getAnalyzedSentence("behavior"));
// check match positions:
assertEquals(1, matches.length);
assertEquals(0, matches[0].getFromPos());
@@ -61,7 +59,6 @@
assertEquals(1,
rule.match(langTool.getAnalyzedSentence("aõh")).length);
assertEquals(0, rule.match(langTool.getAnalyzedSentence("a")).length);
-
}
}
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
