diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/GenericAnnotationView.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/GenericAnnotationView.java
index 951876b07b2530fd581a578b9199281a5e702305..fea99680cd87a05e7e07f5445990411c74ee557c 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/GenericAnnotationView.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/GenericAnnotationView.java
@@ -79,7 +79,7 @@ import org.fortiss.tooling.base.ui.annotation.view.generic.filter.AnnotationFilt
  * @author eder, diewald, barner
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating GREEN Hash: E2E53108D4A685762999DA9FFD10C0D7
+ * @ConQAT.Rating YELLOW Hash: 20B02B59811C764AEE63BC45A9279241
  */
 public class GenericAnnotationView extends AnnotationViewPartBase {
 	/** Root composite of {@link GenericAnnotationView}. */
@@ -273,7 +273,8 @@ public class GenericAnnotationView extends AnnotationViewPartBase {
 		super.update(modelElement);
 
 		// ensure that selected model element is visible in annotation view
-		AnnotationEntry entry = IAnnotationValueService.getInstance().getAnnotationEntry(modelElement);
+		AnnotationEntry entry =
+				IAnnotationValueService.getInstance().getAnnotationEntry(modelElement);
 		assert (entry.getModelElement() == modelElement);
 
 		tableViewer.reveal(entry);
@@ -560,7 +561,7 @@ public class GenericAnnotationView extends AnnotationViewPartBase {
 
 	/** {@inheritDoc} */
 	@Override
-	public void dispose() {
+	public synchronized void dispose() {
 		tableViewer.getTable().dispose();
 		super.dispose();
 	}