Revision: 7294
http://languagetool.svn.sourceforge.net/languagetool/?rev=7294&view=rev
Author: dnaber
Date: 2012-06-07 21:45:31 +0000 (Thu, 07 Jun 2012)
Log Message:
-----------
prevent automatic language detection being called up to four times per check
Modified Paths:
--------------
trunk/JLanguageTool/src/java/org/languagetool/gui/Main.java
Modified: trunk/JLanguageTool/src/java/org/languagetool/gui/Main.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/gui/Main.java 2012-06-07
21:27:21 UTC (rev 7293)
+++ trunk/JLanguageTool/src/java/org/languagetool/gui/Main.java 2012-06-07
21:45:31 UTC (rev 7294)
@@ -30,8 +30,6 @@
import org.languagetool.tools.LanguageIdentifierTools;
import org.languagetool.AnalyzedSentence;
-import org.apache.tika.language.*;
-
import javax.swing.*;
import javax.swing.event.HyperlinkEvent;
import javax.swing.event.HyperlinkListener;
@@ -280,9 +278,10 @@
}
void showOptions() {
- final JLanguageTool langTool = getCurrentLanguageTool();
+ final Language currentLanguage = getCurrentLanguage();
+ final JLanguageTool langTool = getCurrentLanguageTool(currentLanguage);
final List<Rule> rules = langTool.getAllRules();
- final ConfigurationDialog configDialog = getCurrentConfigDialog();
+ final ConfigurationDialog configDialog =
getCurrentConfigDialog(currentLanguage);
configDialog.show(rules); // this blocks until OK/Cancel is clicked in the
dialog
config.setDisabledRuleIds(configDialog.getDisabledRuleIds());
config.setEnabledRuleIds(configDialog.getEnabledRuleIds());
@@ -347,7 +346,8 @@
}
void tagText() {
- final JLanguageTool langTool = getCurrentLanguageTool();
+ final Language currentLanguage = getCurrentLanguage();
+ final JLanguageTool langTool = getCurrentLanguageTool(currentLanguage);
tagTextAndDisplayResults(langTool);
}
@@ -362,7 +362,8 @@
void quit() {
stopServer();
try {
- config.saveConfiguration(getCurrentLanguageTool().getLanguage());
+ final Language currentLanguage = getCurrentLanguage();
+
config.saveConfiguration(getCurrentLanguageTool(currentLanguage).getLanguage());
} catch (final IOException e) {
Tools.showError(e);
}
@@ -399,8 +400,7 @@
}
}
- private ConfigurationDialog getCurrentConfigDialog() {
- final Language language = getCurrentLanguage();
+ private ConfigurationDialog getCurrentConfigDialog(Language language) {
final ConfigurationDialog configDialog;
if (configDialogs.containsKey(language)) {
configDialog = configDialogs.get(language);
@@ -418,13 +418,12 @@
return configDialog;
}
- private JLanguageTool getCurrentLanguageTool() {
+ private JLanguageTool getCurrentLanguageTool(Language currentLanguage) {
final JLanguageTool langTool;
try {
- final ConfigurationDialog configDialog = getCurrentConfigDialog();
- langTool = new JLanguageTool(getCurrentLanguage(), configDialog
- .getMotherTongue());
- config = new Configuration(new File(System.getProperty("user.home")),
CONFIG_FILE, getCurrentLanguage());
+ final ConfigurationDialog configDialog =
getCurrentConfigDialog(currentLanguage);
+ langTool = new JLanguageTool(currentLanguage,
configDialog.getMotherTongue());
+ config = new Configuration(new File(System.getProperty("user.home")),
CONFIG_FILE, currentLanguage);
langTool.activateDefaultPatternRules();
langTool.activateDefaultFalseFriendRules();
final Set<String> disabledRules = configDialog.getDisabledRuleIds();
@@ -478,7 +477,7 @@
sb.append("<br>\n");
int matches = 0;
try {
- final JLanguageTool langTool = getCurrentLanguageTool();
+ final JLanguageTool langTool = getCurrentLanguageTool(lang);
matches = checkText(langTool, textArea.getText(), sb);
} catch (final Exception e) {
sb.append("<br><br><b><font color=\"red\">");
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
