Revision: 9892
http://languagetool.svn.sourceforge.net/languagetool/?rev=9892&view=rev
Author: dnaber
Date: 2013-04-07 07:36:47 +0000 (Sun, 07 Apr 2013)
Log Message:
-----------
improve javadoc and variable names
Modified Paths:
--------------
trunk/languagetool/languagetool-core/src/main/java/org/languagetool/JLanguageTool.java
trunk/languagetool/languagetool-core/src/main/java/org/languagetool/rules/Rule.java
trunk/languagetool/languagetool-core/src/main/java/org/languagetool/rules/patterns/bitext/BitextPatternRule.java
trunk/languagetool/languagetool-core/src/main/java/org/languagetool/rules/spelling/SuggestionExtractor.java
Modified:
trunk/languagetool/languagetool-core/src/main/java/org/languagetool/JLanguageTool.java
===================================================================
---
trunk/languagetool/languagetool-core/src/main/java/org/languagetool/JLanguageTool.java
2013-04-06 18:35:32 UTC (rev 9891)
+++
trunk/languagetool/languagetool-core/src/main/java/org/languagetool/JLanguageTool.java
2013-04-07 07:36:47 UTC (rev 9892)
@@ -541,20 +541,20 @@
unknownWords = new HashSet<String>();
for (final String sentence : sentences) {
sentenceCount++;
- AnalyzedSentence analyzedText = getAnalyzedSentence(sentence);
- rememberUnknownWords(analyzedText);
+ AnalyzedSentence analyzedSentence = getAnalyzedSentence(sentence);
+ rememberUnknownWords(analyzedSentence);
if (sentenceCount == sentences.size()) {
- final AnalyzedTokenReadings[] anTokens = analyzedText.getTokens();
+ final AnalyzedTokenReadings[] anTokens = analyzedSentence.getTokens();
anTokens[anTokens.length - 1].setParaEnd();
- analyzedText = new AnalyzedSentence(anTokens);
+ analyzedSentence = new AnalyzedSentence(anTokens);
}
- printIfVerbose(analyzedText.toString());
- printIfVerbose(analyzedText.getAnnotations());
+ printIfVerbose(analyzedSentence.toString());
+ printIfVerbose(analyzedSentence.getAnnotations());
final List<RuleMatch> sentenceMatches =
checkAnalyzedSentence(paraMode, allRules, charCount, lineCount,
- columnCount, sentence, analyzedText);
+ columnCount, sentence, analyzedSentence);
Collections.sort(sentenceMatches);
ruleMatches.addAll(sentenceMatches);
@@ -596,7 +596,7 @@
public List<RuleMatch> checkAnalyzedSentence(final ParagraphHandling
paraMode,
final List<Rule> allRules, int tokenCount, int lineCount,
- int columnCount, final String sentence, AnalyzedSentence analyzedText)
+ int columnCount, final String sentence, AnalyzedSentence
analyzedSentence)
throws IOException {
final List<RuleMatch> sentenceMatches = new ArrayList<RuleMatch>();
for (final Rule rule : allRules) {
@@ -627,7 +627,7 @@
default:
}
- final RuleMatch[] thisMatches = rule.match(analyzedText);
+ final RuleMatch[] thisMatches = rule.match(analyzedSentence);
for (final RuleMatch element1 : thisMatches) {
final RuleMatch thisMatch = adjustRuleMatchPos(element1,
tokenCount, columnCount, lineCount, sentence);
Modified:
trunk/languagetool/languagetool-core/src/main/java/org/languagetool/rules/Rule.java
===================================================================
---
trunk/languagetool/languagetool-core/src/main/java/org/languagetool/rules/Rule.java
2013-04-06 18:35:32 UTC (rev 9891)
+++
trunk/languagetool/languagetool-core/src/main/java/org/languagetool/rules/Rule.java
2013-04-07 07:36:47 UTC (rev 9892)
@@ -79,8 +79,11 @@
public abstract String getDescription();
/**
- * Check whether the given text matches this error rule, i.e. whether the
text
- * contains this error.
+ * Check whether the given sentence matches this error rule, i.e. whether it
+ * contains the error detected by this rule. Note that the order in which
+ * this method is called is not always guaranteed, i.e. the sentence order
in the
+ * text may be different than the order in which you get the sentences (this
may be the
+ * case when LanguageTool is used as a LibreOffice/OpenOffice add-on, for
example).
*
* @param text a pre-analyzed sentence
* @return an array of {@link RuleMatch} objects
Modified:
trunk/languagetool/languagetool-core/src/main/java/org/languagetool/rules/patterns/bitext/BitextPatternRule.java
===================================================================
---
trunk/languagetool/languagetool-core/src/main/java/org/languagetool/rules/patterns/bitext/BitextPatternRule.java
2013-04-06 18:35:32 UTC (rev 9891)
+++
trunk/languagetool/languagetool-core/src/main/java/org/languagetool/rules/patterns/bitext/BitextPatternRule.java
2013-04-07 07:36:47 UTC (rev 9892)
@@ -77,10 +77,10 @@
}
@Override
- public RuleMatch[] match(AnalyzedSentence sourceText,
- AnalyzedSentence targetText) throws IOException {
- if (srcRule.match(sourceText).length > 0) {
- return trgRule.match(targetText);
+ public RuleMatch[] match(AnalyzedSentence sourceSentence,
+ AnalyzedSentence targetSentence) throws IOException {
+ if (srcRule.match(sourceSentence).length > 0) {
+ return trgRule.match(targetSentence);
}
return new RuleMatch[0];
}
Modified:
trunk/languagetool/languagetool-core/src/main/java/org/languagetool/rules/spelling/SuggestionExtractor.java
===================================================================
---
trunk/languagetool/languagetool-core/src/main/java/org/languagetool/rules/spelling/SuggestionExtractor.java
2013-04-06 18:35:32 UTC (rev 9891)
+++
trunk/languagetool/languagetool-core/src/main/java/org/languagetool/rules/spelling/SuggestionExtractor.java
2013-04-07 07:36:47 UTC (rev 9892)
@@ -156,8 +156,8 @@
final List<String> tokens = getSuggestionTokens(rule, lang);
tokenCount += tokens.size();
for (String token : tokens) {
- final AnalyzedSentence analyzedToken =
languageTool.getAnalyzedSentence(token);
- final RuleMatch[] matches = spellcheckRule.match(analyzedToken);
+ final AnalyzedSentence sentence =
languageTool.getAnalyzedSentence(token);
+ final RuleMatch[] matches = spellcheckRule.match(sentence);
if (matches.length > 0) {
suggestionTokens.add(token);
} else {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Minimize network downtime and maximize team effectiveness.
Reduce network management and security costs.Learn how to hire
the most talented Cisco Certified professionals. Visit the
Employer Resources Portal
http://www.cisco.com/web/learning/employer_resources/index.html
_______________________________________________
Languagetool-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/languagetool-commits
