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 2009/04/27 10:16:36 UTC

svn commit: r768891 - in /incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor: AnnotationEditor.java outline/AnnotationOutline.java

Author: joern
Date: Mon Apr 27 08:16:36 2009
New Revision: 768891

URL: http://svn.apache.org/viewvc?rev=768891&view=rev
Log:
UIMA-1099

Modified:
    incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
    incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationOutline.java

Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java?rev=768891&r1=768890&r2=768891&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java Mon Apr 27 08:16:36 2009
@@ -941,6 +941,8 @@
     // remove selection listener
     getSite().getWorkbenchWindow().getSelectionService().removeSelectionListener(this);
 
+    getSite().getPage().removeSelectionListener(this);
+    
     ICasDocument document = getDocument();
 
     if (document != null) {

Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationOutline.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationOutline.java?rev=768891&r1=768890&r2=768891&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationOutline.java (original)
+++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/src/main/java/org/apache/uima/caseditor/editor/outline/AnnotationOutline.java Mon Apr 27 08:16:36 2009
@@ -69,7 +69,7 @@
  * This outline view displays all <code>AnnotationFS</code>s of the current
  * mode/type from the binded editor.
  */
-public final class AnnotationOutline extends ContentOutlinePage 
+public final class AnnotationOutline extends ContentOutlinePage
 		implements ISelectionListener {
   
   /**
@@ -273,7 +273,7 @@
     
     Action action = new SwitchStyleAction(this);
     
-    IMenuManager dropDownMenu = actionBars.getMenuManager();    
+    IMenuManager dropDownMenu = actionBars.getMenuManager();
     dropDownMenu.add(action);
     
     super.setActionBars(actionBars);
@@ -353,7 +353,7 @@
 				
 				if (shownTypes.contains(typeNode.getType()))
 					return true;
-				else 
+				else
 					return false;
 			}
 			else if (element instanceof AnnotationTreeNode) {
@@ -395,6 +395,11 @@
 
   @Override
   public void dispose() {
+    
+    super.dispose();
+    
+    getSite().getPage().removeSelectionListener(this);
+    
     // remove selection listener
     getSite().getWorkbenchWindow().getSelectionService().removeSelectionListener(this);
   }