You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by al...@apache.org on 2007/02/12 19:59:02 UTC
svn commit: r506577 - in /incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer: AnnotationViewerDialog.java DocumentAnalyzer.java

Author: alally
Date: Mon Feb 12 10:59:02 2007
New Revision: 506577

URL: http://svn.apache.org/viewvc?view=rev&rev=506577
Log:
Fix for DocumentAnalyzer HTML View
UIMA-304: http://issues.apache.org/jira/browse/UIMA-304

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

Modified: incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/AnnotationViewerDialog.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/AnnotationViewerDialog.java?view=diff&rev=506577&r1=506576&r2=506577
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/AnnotationViewerDialog.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/AnnotationViewerDialog.java Mon Feb 12 10:59:02 2007
@@ -459,6 +459,10 @@
           // generate HTML view
           // first process style map if not done already
           if (!processedStyleMap) {
+            if (!styleMapFile.exists()) {
+              annotationViewGenerator.autoGenerateStyleMapFile(
+                      promptForAE().getAnalysisEngineMetaData(), styleMapFile);
+            }
             annotationViewGenerator.processStyleMap(styleMapFile);
             processedStyleMap = true;
           }

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=506577&r1=506576&r2=506577
==============================================================================
--- 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 Mon Feb 12 10:59:02 2007
@@ -151,7 +151,7 @@
 
   protected String[] currentTaeOutputTypes; // JMP
 
-  private File styleMapFile;
+  private File userStyleMapFile;
 
   protected boolean useGeneratedStyleMap = false; // JMP
 
@@ -1272,10 +1272,10 @@
    * @return Returns the styleMapFile.
    */
   public File getStyleMapFile() {
-    if (styleMapFile == null && prefsMed != null) {
-      styleMapFile = prefsMed.getStylemapFile();
+    if (userStyleMapFile == null && prefsMed != null) {
+      return prefsMed.getStylemapFile();
     }
-    return styleMapFile;
+    return userStyleMapFile;
   }
 
   /**
@@ -1283,7 +1283,7 @@
    *          The styleMapFile to set.
    */
   public void setStyleMapFile(File styleMapFile) {
-    this.styleMapFile = styleMapFile;
+    this.userStyleMapFile = styleMapFile;
   }
 
   /*