You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by jo...@apache.org on 2011/10/10 13:42:45 UTC

svn commit: r1180883 - /uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java

Author: joern
Date: Mon Oct 10 11:42:45 2011
New Revision: 1180883

URL: http://svn.apache.org/viewvc?rev=1180883&view=rev
Log:
UIMA-2245 Moved annotation style settigns methods to the Annotation Editor (and away form the Cas Document Provider) and defined a new storage format for an Annotation Style.

Modified:
    uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java

Modified: uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java?rev=1180883&r1=1180882&r2=1180883&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java (original)
+++ uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java Mon Oct 10 11:42:45 2011
@@ -239,7 +239,7 @@ public class DefaultCasDocumentProvider 
               if (dotCorpus != null) {
                 tsPrefStore = new PreferenceStore(prefFile.getName());
                 for (AnnotationStyle style : dotCorpus.getAnnotationStyles()) {
-                  putAnnotatationStyleToStore(tsPrefStore, style);
+                  AnnotationStyle.putAnnotatationStyleToStore(tsPrefStore, style);
                 }
                 
                 for (String shownType : dotCorpus.getShownTypes()) {
@@ -273,7 +273,7 @@ public class DefaultCasDocumentProvider 
             
             // TODO: Settings defaults must be moved to the AnnotationEditor
             for (AnnotationStyle style : newStyles) {
-              putAnnotatationStyleToStore(tsPrefStore, style);
+              AnnotationStyle.putAnnotatationStyleToStore(tsPrefStore, style);
             }
           }
           
@@ -382,7 +382,8 @@ public class DefaultCasDocumentProvider 
     return null;
   }
   
-  private void savePreferences(Object element) {
+  @Override
+  public void saveTypeSystemPreferenceStore(Object element) {
     String prefereceFileId = getPreferenceFileForTypeSystem(getTypesystemId(element));
     
     PreferenceStore preferences = typeSystemPreferences.get(prefereceFileId);
@@ -423,26 +424,6 @@ public class DefaultCasDocumentProvider 
     
     return typeSystemPreferences.get(getPreferenceFileForTypeSystem(tsId));
   }
-
-  // TODO: Disk must be accessed for every changed annotation style
-  // add a second method which can take all changed styles
-  @Override
-  public void setAnnotationStyle(Object element, AnnotationStyle style) {
-    super.setAnnotationStyle(element, style);
-    savePreferences(element); 
-  }
-  
-  @Override
-  protected void addShownType(Object element, Type type) {
-    super.addShownType(element, type);
-    savePreferences(element);
-  }
-  
-  @Override
-  protected void removeShownType(Object element, Type type) {
-    super.removeShownType(element, type);
-    savePreferences(element);
-  }
   
   // TODO: How to move these two methods away?
   @Override