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/11/03 09:46:13 UTC

svn commit: r1196994 - in /uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor: outline/AnnotationOutline.java styleview/AnnotationStyleViewPage.java

Author: joern
Date: Thu Nov  3 08:46:13 2011
New Revision: 1196994

URL: http://svn.apache.org/viewvc?rev=1196994&view=rev
Log:
UIMA-2265 Views which are using this listener are now correctly removing their listener in their dispose method.

Modified:
    uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationOutline.java
    uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/styleview/AnnotationStyleViewPage.java

Modified: uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationOutline.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationOutline.java?rev=1196994&r1=1196993&r2=1196994&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationOutline.java (original)
+++ uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationOutline.java Thu Nov  3 08:46:13 2011
@@ -105,6 +105,8 @@ public final class AnnotationOutline ext
     }
   }
 
+  private IAnnotationEditorModifyListener editorChangeListener;
+  
   private OutlineStyles style = OutlineStyles.TYPE;
   
   private Composite mOutlineComposite;
@@ -144,8 +146,8 @@ public final class AnnotationOutline ext
 
     changeAnnotationMode();
 
-    // TODO: create a listener interface ... for editor listener
-    editor.addAnnotationListener(new EditorListener());
+    editorChangeListener = new EditorListener();
+    editor.addAnnotationListener(editorChangeListener);
 
     DragSource source = new DragSource(mTableViewer.getTree(), DND.DROP_COPY);
 
@@ -395,5 +397,7 @@ public final class AnnotationOutline ext
     
     // remove selection listener
     getSite().getWorkbenchWindow().getSelectionService().removeSelectionListener(this);
+    
+    editor.removeAnnotationListener(editorChangeListener);
   }
 }

Modified: uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/styleview/AnnotationStyleViewPage.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/styleview/AnnotationStyleViewPage.java?rev=1196994&r1=1196993&r2=1196994&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/styleview/AnnotationStyleViewPage.java (original)
+++ uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/styleview/AnnotationStyleViewPage.java Thu Nov  3 08:46:13 2011
@@ -361,5 +361,7 @@ class AnnotationStyleViewPage extends Pa
     
     editor.getCasDocumentProvider().getTypeSystemPreferenceStore(
             editor.getEditorInput()).removePropertyChangeListener(changeListener);
+    
+    editor.removeAnnotationListener(editorListener);
   }
 }