- Ensure that the annotation view is updated when switching between multiple...

- Ensure that the annotation view is updated when switching between multiple projects by fixing a bug in the EAdapter registration
refs 2236

org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/AnnotationViewPartBase.java

@@ -229,19 +229,22 @@ public abstract class AnnotationViewPartBase extends ViewPart implements ISelect
 			lastAnnotationEntriesMap.put(rootElement, annotationEntries);
 		}
 
-		// If required, do change listener registration
-		if(watchedElement == null) {
-			watchedElement = rootElement;
-			while(watchedElement.eContainer() != null) {
-				watchedElement = watchedElement.eContainer();
-			}
+		// If required, update change listener registration
+		EObject newWatchedElement = rootElement;
+		while(newWatchedElement.eContainer() != null) {
+			newWatchedElement = newWatchedElement.eContainer();
+		}
 
+		if(watchedElement != newWatchedElement) {
+			if(watchedElement != null) {
+				watchedElement.eAdapters().remove(changeListener);
+			}
+			watchedElement = newWatchedElement;
 			watchedElement.eAdapters().add(changeListener);
 		}
 
 		// Update the view
 		update(annotationEntries);
-
 	}
 
 	/** Update concrete view */