svn commit: r481362 - in /incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer: DocumentAnalyzer.java PrefsMediator.java

[al...@apache.org]

Author: alally
Date: Fri Dec  1 11:58:35 2006
New Revision: 481362

URL: http://svn.apache.org/viewvc?view=rev&rev=481362
Log:
UIMA-31: Fixed DocumentAnalyzer to save/restore preferences for
file encoding, language, and XML tag containing text.
https://issues.apache.org/jira/browse/UIMA-31

Modified:
    incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/DocumentAnalyzer.java
    incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/PrefsMediator.java

Modified: incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/DocumentAnalyzer.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/DocumentAnalyzer.java?view=diff&rev=481362&r1=481361&r2=481362
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/DocumentAnalyzer.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/DocumentAnalyzer.java Fri Dec  1 11:58:35 2006
@@ -339,6 +339,7 @@
 
     prefsMed.setFileSelectors(inputFileSelector, outputFileSelector, xmlFileSelector);
     runParametersField = new JTextField(16);
+    runParametersField.setText(prefsMed.getXmlTag());
 
     JPanel runParametersPanel = new JPanel();
     runParametersPanel.setLayout(new FlowLayout(FlowLayout.LEFT, 2, 2));
@@ -347,6 +348,7 @@
     languageComboBox = new JComboBox(new Object[] { "en", "de", "es", "fr", "it", "pt", "ja",
         "ko-kr", "pt-br", "zh-cn", "zh-tw", "x-unspecified" });
     languageComboBox.setEditable(true);
+    languageComboBox.setSelectedItem(prefsMed.getLanguage());
     JPanel languagePanel = new JPanel();
     languagePanel.setLayout(new FlowLayout(FlowLayout.LEFT, 2, 2));
     languagePanel.add(languageComboBox);
@@ -356,7 +358,7 @@
     Object[] charsetArr = charsets.toArray();
     encodingComboBox = new JComboBox(charsetArr);
     encodingComboBox.setEditable(true);
-    encodingComboBox.setSelectedItem("UTF-8");
+    encodingComboBox.setSelectedItem(prefsMed.getEncoding());
     JPanel encodingPanel = new JPanel();
     encodingPanel.setLayout(new FlowLayout(FlowLayout.LEFT, 2, 2));
     encodingPanel.add(encodingComboBox);

Modified: incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/PrefsMediator.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/PrefsMediator.java?view=diff&rev=481362&r1=481361&r2=481362
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/PrefsMediator.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/PrefsMediator.java Fri Dec  1 11:58:35 2006
@@ -71,6 +71,8 @@
   private static final String OUTDIR = "outDir";
 
   private static final String INDIR = "inDir";
+  
+  private static final String XMLTAG = "xmlTag";
 
   public PrefsMediator() {
     // get the installed UIMA home directory
@@ -87,6 +89,7 @@
     language = prefs.get(LANGUAGE, "en");
     encoding = prefs.get(ENCODING, "UTF-8");
     viewType = prefs.get(VIEWTYPE, "Java Viewer");
+    xmlTag = prefs.get(XMLTAG, "");
   }
 
   // saves current preferences
@@ -251,6 +254,7 @@
    */
   public void setXmlTag(String xmlTag) {
     this.xmlTag = xmlTag;
+    prefs.put(XMLTAG, xmlTag);
   }
 
   /** returns the new edited stylemap file */