Revision: 7210
http://languagetool.svn.sourceforge.net/languagetool/?rev=7210&view=rev
Author: dnaber
Date: 2012-06-03 13:38:55 +0000 (Sun, 03 Jun 2012)
Log Message:
-----------
small code cleanup/simplification
Modified Paths:
--------------
trunk/JLanguageTool/src/java/org/languagetool/rules/patterns/Match.java
trunk/JLanguageTool/src/java/org/languagetool/rules/patterns/PatternRuleHandler.java
trunk/JLanguageTool/src/test/org/languagetool/rules/patterns/MatchTest.java
Modified:
trunk/JLanguageTool/src/java/org/languagetool/rules/patterns/Match.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/rules/patterns/Match.java
2012-06-03 13:18:12 UTC (rev 7209)
+++ trunk/JLanguageTool/src/java/org/languagetool/rules/patterns/Match.java
2012-06-03 13:38:55 UTC (rev 7210)
@@ -342,22 +342,17 @@
}
helper[i] = formattedString[i] + skippedTokens;
}
-
- formattedString = helper;
-
+ formattedString = helper;
}
if (this.suppressMisspelled && lang != null) {
- List<String> formattedStringElements = new
ArrayList<String>(formattedString.length);
- for (final String str : formattedString) {
- formattedStringElements.add(str);
- }
+ final List<String> formattedStringElements =
Arrays.asList(formattedString);
//tagger-based speller
- List<AnalyzedTokenReadings> analyzed =
lang.getTagger().tag(formattedStringElements);
+ final List<AnalyzedTokenReadings> analyzed =
lang.getTagger().tag(formattedStringElements);
for (int i = 0; i < formattedString.length; i++) {
- if (analyzed.get(i).getAnalyzedToken(0).getLemma() == null
- && analyzed.get(i).getAnalyzedToken(0).hasNoTag()) {
- formattedString[i] = "";
- }
+ final AnalyzedToken analyzedToken =
analyzed.get(i).getAnalyzedToken(0);
+ if (analyzedToken.getLemma() == null && analyzedToken.hasNoTag()) {
+ formattedString[i] = "";
+ }
}
}
return formattedString;
Modified:
trunk/JLanguageTool/src/java/org/languagetool/rules/patterns/PatternRuleHandler.java
===================================================================
---
trunk/JLanguageTool/src/java/org/languagetool/rules/patterns/PatternRuleHandler.java
2012-06-03 13:18:12 UTC (rev 7209)
+++
trunk/JLanguageTool/src/java/org/languagetool/rules/patterns/PatternRuleHandler.java
2012-06-03 13:38:55 UTC (rev 7210)
@@ -143,7 +143,7 @@
subId = 0;
} else if ("suggestion".equals(qName) && inMessage) {
if (YES.equals(attrs.getValue("suppress_misspelled"))) {
- message.append("<pleasespellme/>");
+ message.append("<pleasespellme/>");
}
message.append("<suggestion>");
inSuggestion = true;
Modified:
trunk/JLanguageTool/src/test/org/languagetool/rules/patterns/MatchTest.java
===================================================================
--- trunk/JLanguageTool/src/test/org/languagetool/rules/patterns/MatchTest.java
2012-06-03 13:18:12 UTC (rev 7209)
+++ trunk/JLanguageTool/src/test/org/languagetool/rules/patterns/MatchTest.java
2012-06-03 13:38:55 UTC (rev 7210)
@@ -121,7 +121,7 @@
public void testStartUpper() throws Exception {
Match match = getMatch("POS1", "POS2",
Match.CaseConversion.STARTUPPER);
match.setToken(getAnalyzedTokenReadings("inflectedform11",
"POS1", "Lemma1"));
- assertEquals("[Inflectedform121, Inflectedform122]",
Arrays.toString( match.toFinalString(null)));
+ assertEquals("[Inflectedform121, Inflectedform122]",
Arrays.toString(match.toFinalString(null)));
}
public void testStartLower() throws Exception {
@@ -248,30 +248,30 @@
match.setSynthesizer(Language.POLISH.getSynthesizer());
match.setToken(getAnalyzedTokenReadings("inflectedform11", "POS1",
"Lemma1"));
//getting empty strings, which is what we want
- assertEquals("[]", Arrays.toString(
match.toFinalString(Language.POLISH)));
+ assertEquals("[]",
Arrays.toString(match.toFinalString(Language.POLISH)));
// contrast with a speller = false!
match = getMatch("POS1", "POS2", false);
match.setSynthesizer(Language.POLISH.getSynthesizer());
match.setToken(getAnalyzedTokenReadings("inflectedform11", "POS1",
"Lemma1"));
- assertEquals("[(inflectedform11)]", Arrays.toString(
match.toFinalString(Language.POLISH)));
+ assertEquals("[(inflectedform11)]",
Arrays.toString(match.toFinalString(Language.POLISH)));
//and now a real word - we should get something
match = getMatch("subst:sg:acc.nom:m3", "subst:sg:gen:m3", true);
match.setSynthesizer(Language.POLISH.getSynthesizer());
match.setToken(getAnalyzedTokenReadings("AON", "subst:sg:acc.nom:m3",
"AON"));
- assertEquals("[AON-u]", Arrays.toString(
match.toFinalString(Language.POLISH)));
+ assertEquals("[AON-u]",
Arrays.toString(match.toFinalString(Language.POLISH)));
//and now pure text changes
match = getTextMatch("^(.*)$", "$0-u", true);
match.setSynthesizer(Language.POLISH.getSynthesizer());
match.setLemmaString("AON");
- assertEquals("[AON-u]", Arrays.toString(
match.toFinalString(Language.POLISH)));
+ assertEquals("[AON-u]",
Arrays.toString(match.toFinalString(Language.POLISH)));
match.setLemmaString("batalion");
//should be empty
- assertEquals("[]", Arrays.toString(
match.toFinalString(Language.POLISH)));
+ assertEquals("[]",
Arrays.toString(match.toFinalString(Language.POLISH)));
match.setLemmaString("ASEAN");
//and this one not
- assertEquals("[ASEAN-u]", Arrays.toString(
match.toFinalString(Language.POLISH)));
+ assertEquals("[ASEAN-u]",
Arrays.toString(match.toFinalString(Language.POLISH)));
}
}
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
