Menu
▾
▴
[LanguageTool] JLanguageTool/src/java/de/danielnaber/languagetool/openoffice OOoDialog.java,1.3,1.4 Main.java,1.4,1.5
|
From: Daniel N. <dn...@us...> - 2005-11-30 23:40:55
|
Update of /cvsroot/languagetool/JLanguageTool/src/java/de/danielnaber/languagetool/openoffice In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5742/src/java/de/danielnaber/languagetool/openoffice Modified Files: OOoDialog.java Main.java Log Message: make configuration dialog work; loading and saving of configuration Index: Main.java =================================================================== RCS file: /cvsroot/languagetool/JLanguageTool/src/java/de/danielnaber/languagetool/openoffice/Main.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Main.java 29 Nov 2005 22:48:33 -0000 1.4 +++ Main.java 30 Nov 2005 23:40:48 -0000 1.5 @@ -19,6 +19,7 @@ package de.danielnaber.languagetool.openoffice; import java.io.IOException; +import java.util.Iterator; import java.util.List; import javax.swing.JOptionPane; @@ -42,6 +43,7 @@ import de.danielnaber.languagetool.JLanguageTool; import de.danielnaber.languagetool.Language; +import de.danielnaber.languagetool.gui.Configuration; /** * Basic OpenOffice.org integration. @@ -112,14 +114,19 @@ private void checkText(String text) throws IOException, ParserConfigurationException, SAXException { // TODO: show splash screen, as init takes some time? // TODO: use document language + Configuration config = new Configuration(); JLanguageTool langTool = new JLanguageTool(Language.ENGLISH); langTool.activateDefaultPatternRules(); + for (Iterator iter = config.getDisabledRuleIds().iterator(); iter.hasNext();) { + String id = (String) iter.next(); + langTool.disableRule(id); + } List ruleMatches = langTool.check(text); if (ruleMatches.size() == 0) { JOptionPane.showMessageDialog(null, "No errors and warnings found"); // TODO: display language setting used etc. } else { - OOoDialog dialog = new OOoDialog(xTextDoc, ruleMatches, text); + OOoDialog dialog = new OOoDialog(config, langTool.getAllRules(), xTextDoc, ruleMatches, text); dialog.show(); } } Index: OOoDialog.java =================================================================== RCS file: /cvsroot/languagetool/JLanguageTool/src/java/de/danielnaber/languagetool/openoffice/OOoDialog.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- OOoDialog.java 29 Nov 2005 22:49:30 -0000 1.3 +++ OOoDialog.java 30 Nov 2005 23:40:48 -0000 1.4 @@ -26,6 +26,7 @@ import java.awt.event.ActionListener; import java.io.IOException; import java.util.ArrayList; +import java.util.Iterator; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -46,6 +47,8 @@ import de.danielnaber.languagetool.JLanguageTool; import de.danielnaber.languagetool.Language; +import de.danielnaber.languagetool.gui.Configuration; +import de.danielnaber.languagetool.gui.ConfigurationDialog; import de.danielnaber.languagetool.gui.Tools; import de.danielnaber.languagetool.rules.RuleMatch; @@ -59,6 +62,7 @@ private static final String COMPLETE_TEXT = "JLanguageTool check is complete."; + private List rules = null; private JDialog dialog = null; private JTextPane contextArea = null; @@ -76,11 +80,15 @@ private RuleMatch currentRuleMatch = null; private int currentRuleMatchPos = 0; + + private Configuration configuration = null; - OOoDialog(XTextDocument xTextDoc, List ruleMatches, String text) { + OOoDialog(Configuration configuration, List rules, XTextDocument xTextDoc, List ruleMatches, String text) { + this.rules = rules; this.xTextDoc = xTextDoc; this.ruleMatches = ruleMatches; this.text = text; + this.configuration = configuration; } void show() { @@ -89,6 +97,7 @@ return; } dialog = new JDialog(); + //dialog.setDefaultCloseOperation(JDialog.EXIT_ON_CLOSE); dialog.setTitle("JLanguageTool/OOo ALPHA Version"); Container contentPane = dialog.getContentPane(); contentPane.setLayout(new GridBagLayout()); @@ -166,8 +175,10 @@ showError(0); dialog.pack(); + //dialog.setModal(true); dialog.setSize(500, 500); dialog.setVisible(true); + // FIXME: close via "X" in the window must behave like close via "close" button } private void showError(int i) { @@ -234,8 +245,17 @@ } else if (event.getActionCommand().equals(IGNORE_ALL_BUTTON)) { JOptionPane.showMessageDialog(null, "fixme: not yet implemented"); //FIXME } else if (event.getActionCommand().equals(OPTIONS_BUTTON)) { - JOptionPane.showMessageDialog(null, "fixme: not yet implemented"); //FIXME + ConfigurationDialog cfgDialog = new ConfigurationDialog(); + cfgDialog.setDisabledRules(configuration.getDisabledRuleIds()); + cfgDialog.show(rules); + configuration.setDisabledRuleIds(cfgDialog.getDisabledRuleIds()); } else if (event.getActionCommand().equals(CLOSE_BUTTON)) { + try { + configuration.saveConfiguration(); + } catch (IOException e) { + e.printStackTrace(); + throw new RuntimeException(e); + } dialog.setVisible(false); // FIXME: does this really close the dialog? } else { System.err.println("Unknown action: " + event); @@ -252,10 +272,15 @@ public static void main(String[] args) throws IOException, ParserConfigurationException, SAXException { JLanguageTool lt = new JLanguageTool(Language.ENGLISH); lt.activateDefaultPatternRules(); + Configuration config = new Configuration(); + for (Iterator iter = config.getDisabledRuleIds().iterator(); iter.hasNext();) { + String id = (String) iter.next(); + lt.disableRule(id); + } //String text = "and a hour ago. this is a test, I thing that's a good idea."; - String text = "I thing that's a good idea."; + String text = "I thing that's a good idea. This is an test."; List ruleMatches = lt.check(text); - OOoDialog prg = new OOoDialog(null, ruleMatches, text); + OOoDialog prg = new OOoDialog(config, lt.getAllRules(), null, ruleMatches, text); prg.show(); } |