Revision: 7470
          
http://languagetool.svn.sourceforge.net/languagetool/?rev=7470&view=rev
Author:   dnaber
Date:     2012-06-23 10:18:35 +0000 (Sat, 23 Jun 2012)
Log Message:
-----------
use a more generic way to disable spell rules in LibreOffice/OO

Modified Paths:
--------------
    trunk/JLanguageTool/src/java/org/languagetool/openoffice/Main.java
    trunk/JLanguageTool/src/java/org/languagetool/rules/Rule.java
    
trunk/JLanguageTool/src/java/org/languagetool/rules/spelling/SpellingCheckRule.java

Modified: trunk/JLanguageTool/src/java/org/languagetool/openoffice/Main.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/openoffice/Main.java  
2012-06-23 09:50:21 UTC (rev 7469)
+++ trunk/JLanguageTool/src/java/org/languagetool/openoffice/Main.java  
2012-06-23 10:18:35 UTC (rev 7470)
@@ -66,10 +66,8 @@
 import org.languagetool.JLanguageTool;
 import org.languagetool.Language;
 import org.languagetool.gui.Configuration;
+import org.languagetool.rules.Rule;
 import org.languagetool.rules.RuleMatch;
-import org.languagetool.rules.spelling.hunspell.HunspellNoSuggestionRule;
-import org.languagetool.rules.spelling.hunspell.HunspellRule;
-import org.languagetool.rules.spelling.morfologik.MorfologikSpellerRule;
 import org.languagetool.tools.StringTools;
 import org.languagetool.tools.Tools;
 
@@ -359,9 +357,11 @@
       langTool = new JLanguageTool(docLanguage, config.getMotherTongue());
       langTool.activateDefaultPatternRules();
       langTool.activateDefaultFalseFriendRules();
-      langTool.disableRule(HunspellRule.RULE_ID);
-      langTool.disableRule(HunspellNoSuggestionRule.RULE_ID);
-      langTool.disableRule(MorfologikSpellerRule.RULE_ID);
+      for (Rule rule : langTool.getAllActiveRules()) {
+        if (rule.isSpellingRule()) {
+          langTool.disableRule(rule.getId());
+        }
+      }
       recheck = false;
     } catch (final Throwable t) {
       showError(t);

Modified: trunk/JLanguageTool/src/java/org/languagetool/rules/Rule.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/rules/Rule.java       
2012-06-23 09:50:21 UTC (rev 7469)
+++ trunk/JLanguageTool/src/java/org/languagetool/rules/Rule.java       
2012-06-23 10:18:35 UTC (rev 7470)
@@ -102,6 +102,15 @@
   }
 
   /**
+   * Whether this is a spelling rule. Used e.g. by the LanguageTool GUI to mark
+   * spelling errors with a different color.
+   * @since 1.8
+   */
+  public boolean isSpellingRule() {
+    return false;
+  }
+
+  /**
    * Set the examples that are correct and thus do not trigger the rule.
    */
   public final void setCorrectExamples(final List<String> correctExamples) {

Modified: 
trunk/JLanguageTool/src/java/org/languagetool/rules/spelling/SpellingCheckRule.java
===================================================================
--- 
trunk/JLanguageTool/src/java/org/languagetool/rules/spelling/SpellingCheckRule.java
 2012-06-23 09:50:21 UTC (rev 7469)
+++ 
trunk/JLanguageTool/src/java/org/languagetool/rules/spelling/SpellingCheckRule.java
 2012-06-23 10:18:35 UTC (rev 7470)
@@ -53,6 +53,11 @@
   public abstract RuleMatch[] match(AnalyzedSentence text) throws IOException;
 
   @Override
+  public boolean isSpellingRule() {
+    return true;
+  }
+
+  @Override
   public void reset() {
   }
 

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

Reply via email to