diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/AnnotationViewPartBase2.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/AnnotationViewPartBase2.java
index 3392c27a34cb6a514046bf57580d5ef6feeed274..b939f535312da81826e0e247e0f6e789ef5fb9c1 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/AnnotationViewPartBase2.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/AnnotationViewPartBase2.java
@@ -75,4 +75,15 @@ public abstract class AnnotationViewPartBase2 extends ViewPart implements ISelec
 		getSite().getWorkbenchWindow().getSelectionService().addSelectionListener(this);
 	}
 
+	/** Returns currentlySelectedObject. */
+	public IModelElement getCurrentlySelectedObject() {
+		return currentlySelectedObject;
+	}
+
+	/** {@inheritDoc} */
+	@Override
+	public void dispose() {
+		getSite().getWorkbenchWindow().getSelectionService().removeSelectionListener(this);
+		super.dispose();
+	}
 }
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/GenericAnnotationView.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/GenericAnnotationView.java
index 506c55a273d749aaed1f8f174fa90f8f5f8ed669..d82837ee7e51f7a1d05c39280281fe0951dc32dc 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/GenericAnnotationView.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/GenericAnnotationView.java
@@ -53,7 +53,7 @@ import org.fortiss.tooling.kernel.service.IPersistencyService;
  * @version $Rev$
  * @ConQAT.Rating RED Hash:
  */
-public class GenericAnnotationView extends AnnotationViewPartBase {
+public class GenericAnnotationView extends AnnotationViewPartBase2 {
 
 	/** mapping of {@link IAnnotatedSpecification} -> TableViewerColumn */
 	private HashMap<Class<? extends IAnnotatedSpecification>, TableViewerColumn> columns =