diff --git a/org.fortiss.tooling.kernel.ui/trunk/META-INF/MANIFEST.MF b/org.fortiss.tooling.kernel.ui/trunk/META-INF/MANIFEST.MF
index 63cc664fd775d682b7a80fc3b1cb6200ae8fad5d..3a5367104a39530f876461e5c582b1c33b51f179 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/META-INF/MANIFEST.MF
+++ b/org.fortiss.tooling.kernel.ui/trunk/META-INF/MANIFEST.MF
@@ -19,6 +19,7 @@ Export-Package: org.fortiss.tooling.kernel.ui,
  org.fortiss.tooling.kernel.ui.databinding,
  org.fortiss.tooling.kernel.ui.extension,
  org.fortiss.tooling.kernel.ui.extension.base,
+ org.fortiss.tooling.kernel.ui.extension.data,
  org.fortiss.tooling.kernel.ui.listener,
  org.fortiss.tooling.kernel.ui.service,
  org.fortiss.tooling.kernel.ui.util
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/IContextMenuContributor.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/IContextMenuContributor.java
index 7a14d3c655500302ea852957c36ecc581d4b14f0..cdd5f5bde4115bd94292d00667d3d4586ae7491b 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/IContextMenuContributor.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/IContextMenuContributor.java
@@ -38,7 +38,7 @@ import org.fortiss.tooling.kernel.ui.service.IContextMenuService;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating YELLOW Hash: A3D0687E3D1D0D0C582ACCCF73501BEE
+ * @ConQAT.Rating YELLOW Hash: 477CB9CFFBADD034DBEA59D615E3478B
  */
 public interface IContextMenuContributor {
 
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ActionService.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ActionService.java
index 318806dfd7829f5bee3a6c44f9b965c76178a423..c48924a8592641286c583c90ab72be4bd653ea61 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ActionService.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ActionService.java
@@ -41,7 +41,7 @@ import org.fortiss.tooling.kernel.ui.util.EObjectSelectionUtils;
  * @author hoelzlf
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating RED Hash: F3C8B78E9226F14E8525172266DE08DB
+ * @ConQAT.Rating YELLOW Hash: 329EC88BD38752F5F1BBA3DCE57B32B2
  */
 public class ActionService implements IActionService,
 		IPersistencyServiceListener, CommandStackListener {
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ContextMenuService.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ContextMenuService.java
index f825cd36cbecd39e5884a78c2044dd998455ac00..18c9b2e5130486ba8e0a2e3d1c4d76f326288feb 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ContextMenuService.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ContextMenuService.java
@@ -43,7 +43,7 @@ import org.osgi.framework.Bundle;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 7F5948CB427F7D93D99D032797B9D8BF
+ * @ConQAT.Rating YELLOW Hash: D70B79C16761E3D0398CE26B0F56D9EF
  */
 public class ContextMenuService implements IContextMenuService {
 
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/EditPartFactoryService.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/EditPartFactoryService.java
index 4dbf02b56f10b1e716fa16856f606afebd091845..173234f867a32c572a306e519e4cfa3f87e1cbcb 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/EditPartFactoryService.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/EditPartFactoryService.java
@@ -34,7 +34,7 @@ import org.fortiss.tooling.kernel.util.LoggingUtils;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating RED Hash: BEE73AF516ACDE4004D62697BCB393DE
+ * @ConQAT.Rating GREEN Hash: FA0D1BF818E0D93FE58A4223631F6C11
  */
 public class EditPartFactoryService extends
 		EObjectAwareServiceBase<IEditPartFactory<EObject>> implements
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/MarkerService.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/MarkerService.java
index e437adb0b03e0b3a143ed256c0dbbd9dfeab8f6b..0b628db1311f0517d9e4972c072c8b9b2bbcd8c4 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/MarkerService.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/MarkerService.java
@@ -52,7 +52,7 @@ import org.fortiss.tooling.kernel.ui.service.IMarkerService;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating RED Hash: A83BBC26E08D5AB813E50781BA34F5A9
+ * @ConQAT.Rating RED Hash: E88CDA645FF2179C1BCD023756100167
  */
 public class MarkerService implements IMarkerService,
 		IPersistencyServiceListener, ILightweightLabelDecorator {
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ModelEditorBindingService.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ModelEditorBindingService.java
index af2628fee7d0475547ead1ea038768cdf5d391c6..b4a3be93df8e6730a6ce318c666a2c9b4795c05b 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ModelEditorBindingService.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ModelEditorBindingService.java
@@ -39,7 +39,7 @@ import org.fortiss.tooling.kernel.util.LoggingUtils;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating RED Hash: 80940F7C24146436FD45962207978F27
+ * @ConQAT.Rating RED Hash: B32E1EDD37CC2E7D3D6ACF0F320E8056
  */
 public class ModelEditorBindingService extends
 		EObjectAwareServiceBase<IModelEditorBinding<EObject>> implements
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ModelElementHandlerService.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ModelElementHandlerService.java
index 1250c305bf62613ca3619392a2d70c7c0c72c3a7..c010720c17e4bc47c8e25aab40402168bd876d12 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ModelElementHandlerService.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ModelElementHandlerService.java
@@ -32,7 +32,7 @@ import org.fortiss.tooling.kernel.ui.service.IModelElementHandlerService;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating RED Hash: 0AE8193FCAF85717E5934397C28B8F7A
+ * @ConQAT.Rating YELLOW Hash: A510A8DE044CF387EF7FE93B54FC883C
  */
 public class ModelElementHandlerService extends
 		EObjectAwareServiceBase<IModelElementHandler<EObject>> implements
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/NavigatorService.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/NavigatorService.java
index eebc4d9c62684db5a6dd9d6323540e35155ed7dc..94a456c375f9c447c8823b15ad9d0c21ebbb355f 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/NavigatorService.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/NavigatorService.java
@@ -36,6 +36,7 @@ import org.fortiss.tooling.kernel.ToolingKernelActivator;
 import org.fortiss.tooling.kernel.extension.data.ITopLevelElement;
 import org.fortiss.tooling.kernel.service.IPersistencyService;
 import org.fortiss.tooling.kernel.service.listener.IPersistencyServiceListener;
+import org.fortiss.tooling.kernel.ui.extension.data.ContextMenuContextProvider;
 import org.fortiss.tooling.kernel.ui.internal.views.NavigatorViewPart;
 import org.fortiss.tooling.kernel.ui.service.INavigatorService;
 import org.fortiss.tooling.kernel.ui.util.EObjectSelectionUtils;
@@ -46,7 +47,7 @@ import org.fortiss.tooling.kernel.ui.util.EObjectSelectionUtils;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating RED Hash: 2B43E83179135573DB711E13D95E0A0E
+ * @ConQAT.Rating YELLOW Hash: 10615C5F91C539B5021A54DC0DAC1AB6
  */
 public class NavigatorService implements INavigatorService,
 		IPersistencyServiceListener, CommandStackListener {
@@ -72,6 +73,12 @@ public class NavigatorService implements INavigatorService,
 		this.navigatorViewPart = part;
 	}
 
+	/** {@inheritDoc} */
+	@Override
+	public boolean isNavigatorView(ContextMenuContextProvider provider) {
+		return provider == navigatorViewPart;
+	}
+
 	/** Returns the navigator view part. */
 	public NavigatorViewPart getNavigatorViewPart() {
 		return navigatorViewPart;
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/PropertiesService.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/PropertiesService.java
index 1b8f8c5fc9ec65b825b0a42757fed3bdc43e7256..a0643623b0becf83fea27d1bb384b5d1a59e05ec 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/PropertiesService.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/PropertiesService.java
@@ -25,7 +25,7 @@ import org.fortiss.tooling.kernel.ui.service.IPropertiesService;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating RED Hash: 94B90137442EBBDF8F76FF04C1E89F67
+ * @ConQAT.Rating YELLOW Hash: 92B0DF1AD44755A2887040BB639164DE
  * 
  */
 public class PropertiesService implements IPropertiesService {
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/package.html b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/package.html
index 25cd4af1acc308b8d27e0343186af56dcca673ff..15d6b0148cc9d9a4f188e7e8d4708ae98495da61 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/package.html
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/package.html
@@ -1,7 +1,7 @@
 <!--  
   $Id$
   @version $Rev$
-  @ConQAT.Rating RED Hash: D84A5C6496771D8C6A05C92D32848117
+  @ConQAT.Rating YELLOW Hash: DEE82E65C55976C18489848C51FF6CCB
 -->
 <body>
 Implementations of the user-interface kernel services defined in the <code>kernel.ui.services</code> package.
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/properties/IdLabeledPropertySection.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/properties/IdLabeledPropertySection.java
index df7df2dd1161464e3308d5928f1ca1eec0d2dc2c..66443a0db1596f4a39fbed0d82d7da12f9d5ef7c 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/properties/IdLabeledPropertySection.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/properties/IdLabeledPropertySection.java
@@ -34,7 +34,7 @@ import org.fortiss.tooling.kernel.ui.extension.base.PropertySectionBase;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating RED Hash: B9E1CFD49FBD28FE48C7F08950EDF883
+ * @ConQAT.Rating GREEN Hash: 6C1B9DD6756E4361E0614970079A07F3
  */
 public class IdLabeledPropertySection extends PropertySectionBase {
 
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/properties/NamedCommentedPropertySection.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/properties/NamedCommentedPropertySection.java
index dc0832e34ab1c653a3f66f7daf372e83135b7c6e..1dfaee3b66f617b5a335102dc93595fc7c2aa0b5 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/properties/NamedCommentedPropertySection.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/properties/NamedCommentedPropertySection.java
@@ -34,7 +34,7 @@ import org.fortiss.tooling.kernel.ui.extension.base.PropertySectionBase;
  * @author ratiu
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating RED Hash: 6EAB385BB7F1B7AF4EDE6283E31040DF
+ * @ConQAT.Rating GREEN Hash: A33E2B1B32618310BB439BCCFB4B532D
  */
 public class NamedCommentedPropertySection extends PropertySectionBase {
 
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/properties/PropertiesAdapterFactory.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/properties/PropertiesAdapterFactory.java
index 9f6ba77b400dbe9919da1a33a5dfc9e76ede66be..4efe7250f6f785e457b03757e0e01f2b4f4378ed 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/properties/PropertiesAdapterFactory.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/properties/PropertiesAdapterFactory.java
@@ -29,7 +29,7 @@ import org.fortiss.tooling.kernel.ui.service.IPropertiesService;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating RED Hash: FA62107F953F93F03357E1F156705532
+ * @ConQAT.Rating GREEN Hash: 62200E721F79C87E1A42A7BD8EA7094F
  */
 @SuppressWarnings("rawtypes")
 public final class PropertiesAdapterFactory implements IAdapterFactory {
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/properties/package.html b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/properties/package.html
index 33210f687b87be06c4a72771f2758cf03648de40..0a48d5dd632afb62f39136f8519ce43088a36c0f 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/properties/package.html
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/properties/package.html
@@ -1,7 +1,7 @@
 <!--  
   $Id$
   @version $Rev$
-  @ConQAT.Rating RED Hash: 5937FCD6DFE80AAF1E9222712A4ABAA3
+  @ConQAT.Rating GREEN Hash: 5D4ABF80310EC18886A1F3E311843798
 -->
 <body>
 Implementations of the default property sections provided by the kernel.
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/EObjectDragSourceListener.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/EObjectDragSourceListener.java
index 04b2e465f53dbeae2fa2bdfa660e043ce03cc62d..2f343ebb90da9940683c36677e921633d382bbb0 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/EObjectDragSourceListener.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/EObjectDragSourceListener.java
@@ -29,7 +29,7 @@ import org.eclipse.swt.dnd.DragSourceEvent;
  * @author eder
  * @author $Author: hoelzl $
  * @version $Rev: 18709 $
- * @ConQAT.Rating RED Hash: F45F49DB156B0BA24EDB3C2DF6EA4643
+ * @ConQAT.Rating YELLOW Hash: 7274445CF4D8976F98D2261373206375
  */
 public class EObjectDragSourceListener extends DragSourceAdapter {
 
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/LibraryView.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/LibraryView.java
index d780187212e56629f1bf08974aeba6396c80c8a5..c4be220662904d939f3e1b10ad329f6b62ca0301 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/LibraryView.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/LibraryView.java
@@ -53,7 +53,7 @@ import org.fortiss.tooling.kernel.ui.service.IModelElementHandlerService;
  * @author eder
  * @author $Author: hoelzl $
  * @version $Rev: 18709 $
- * @ConQAT.Rating RED Hash: FA1076E5BA0F8F61159A8A358F835F7E
+ * @ConQAT.Rating YELLOW Hash: 92F80D3F6619406729FAF681F459C9F1
  */
 public class LibraryView extends ViewPart {
 
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/LinkWithEditorPartListener.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/LinkWithEditorPartListener.java
index 0638971768c371f8c491921448c4a755f7653fad..b32b5ec0ee42eab44c490f0c666ab8293e2c73de 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/LinkWithEditorPartListener.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/LinkWithEditorPartListener.java
@@ -31,7 +31,7 @@ import org.fortiss.tooling.kernel.ui.service.INavigatorService;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating RED Hash: AE36C3E6EB99CEEDDF01E4C513BF0DE9
+ * @ConQAT.Rating YELLOW Hash: 4D718D32000E7A02F1567CB87E44EA97
  */
 final class LinkWithEditorPartListener implements IPartListener2 {
 
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/NavigatorViewPart.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/NavigatorViewPart.java
index 18511327a506e9b14721590a59417ec38b7bf189..9909358270f4283c4af7c7af19669e9ab6605408 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/NavigatorViewPart.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/NavigatorViewPart.java
@@ -71,7 +71,7 @@ import org.fortiss.tooling.kernel.ui.util.EObjectSelectionUtils;
  * @author hoelzlf
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 5B96D1888CCFDECD1BD5CB7B5CAE37C3
+ * @ConQAT.Rating RED Hash: 07C7E317D08A33F1390AA582B92EA185
  */
 public final class NavigatorViewPart extends ViewPart implements
 		ISelectionListener, ISelectionChangedListener, IDoubleClickListener,
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/NewMenu.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/NewMenu.java
index 1330c897a5fe2ae8806a79de5265b809c2dff75b..4fa4377d5ff5acf7bd23575c861ae98c725b0695 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/NewMenu.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/NewMenu.java
@@ -29,7 +29,6 @@ import org.fortiss.tooling.kernel.service.IElementCompositorService;
 import org.fortiss.tooling.kernel.service.IPrototypeService;
 import org.fortiss.tooling.kernel.ui.extension.IContextMenuContributor;
 import org.fortiss.tooling.kernel.ui.extension.data.ContextMenuContextProvider;
-import org.fortiss.tooling.kernel.ui.internal.NavigatorService;
 import org.fortiss.tooling.kernel.ui.service.IContextMenuService;
 import org.fortiss.tooling.kernel.ui.service.IModelEditorBindingService;
 import org.fortiss.tooling.kernel.ui.service.IModelElementHandlerService;
@@ -41,7 +40,7 @@ import org.fortiss.tooling.kernel.ui.service.INavigatorService;
  * @author hoelzlf
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 2A9F31EED7F63B0AD81B4661CCC42A0C
+ * @ConQAT.Rating YELLOW Hash: DF1A32386F4941DD835D87B7943AAE75
  */
 public class NewMenu implements IContextMenuContributor {
 
@@ -62,8 +61,8 @@ public class NewMenu implements IContextMenuContributor {
 	@Override
 	public List<IContributionItem> getContributedItems(EObject selectedObject,
 			ContextMenuContextProvider contextProvider) {
-		if (contextProvider != ((NavigatorService) INavigatorService.INSTANCE)
-				.getNavigatorViewPart() || selectedObject == null) {
+		if (INavigatorService.INSTANCE.isNavigatorView(contextProvider)
+				|| selectedObject == null) {
 			return Collections.emptyList();
 		}
 
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/IContextMenuService.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/IContextMenuService.java
index e854251be0e90237053cf736dd54b56e8f9185e4..9ac1135eea8d4f269be0bcbcc8e184fa431892dd 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/IContextMenuService.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/IContextMenuService.java
@@ -45,7 +45,7 @@ import org.fortiss.tooling.kernel.ui.internal.ContextMenuService;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 91C3E6037D25DA7463D1835098D132AC
+ * @ConQAT.Rating YELLOW Hash: D8550C3C8DF97FAC802F2F02068318B6
  */
 public interface IContextMenuService {
 
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/INavigatorService.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/INavigatorService.java
index 91ade08596880c709530d459bdcb325204f0d01b..f596a73b32ef7d04f54f603a2201d900aad54af4 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/INavigatorService.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/service/INavigatorService.java
@@ -20,6 +20,8 @@ package org.fortiss.tooling.kernel.ui.service;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.ui.Saveable;
+import org.fortiss.tooling.kernel.ui.extension.IContextMenuContributor;
+import org.fortiss.tooling.kernel.ui.extension.data.ContextMenuContextProvider;
 import org.fortiss.tooling.kernel.ui.internal.NavigatorService;
 
 /**
@@ -38,7 +40,7 @@ import org.fortiss.tooling.kernel.ui.internal.NavigatorService;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating GREEN Hash: 388D5C71A93808938DB0FB0189D5D62B
+ * @ConQAT.Rating YELLOW Hash: BCEF298D7704D4ECC20EA5A33E380794
  */
 public interface INavigatorService {
 	/** Returns the singleton instance of the service. */
@@ -50,6 +52,13 @@ public interface INavigatorService {
 	/** Returns the current naviaator selection. */
 	ISelection getCurrentSelection();
 
+	/**
+	 * Returns whether the given {@link ContextMenuContextProvider} is equal to
+	 * the navigator view part. An {@link IContextMenuContributor} may use this
+	 * method to restrict its contributions to the navigator view.
+	 */
+	boolean isNavigatorView(ContextMenuContextProvider provider);
+
 	/** Returns the saveables. */
 	Saveable[] getSaveables();
 
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/EObjectSelectionUtils.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/EObjectSelectionUtils.java
index cd47ba65f927c7ad7564cfcdcca948761dd8cd1a..fd549e5bf1cac17e687c1a3a04ea2c87688b9d09 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/EObjectSelectionUtils.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/EObjectSelectionUtils.java
@@ -34,7 +34,7 @@ import org.eclipse.ui.PlatformUI;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating GREEN Hash: A8D571A5DA7E4057916EA1DD96006069
+ * @ConQAT.Rating YELLOW Hash: 09583AEC04999BB3282FCCA1CC0CC1A2
  */
 public final class EObjectSelectionUtils {
 
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/ObjectAwareServiceBase.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/ObjectAwareServiceBase.java
index a248413f7c4a8074b36bdd8322b8fd90bbb720bf..c25909c62db2814fc06425254483cf5517860b16 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/ObjectAwareServiceBase.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/ObjectAwareServiceBase.java
@@ -64,7 +64,7 @@ import org.osgi.framework.Bundle;
  * @author hoelzlf
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating YELLOW Hash: C95FA4B92D38FA50F6780210135FA88F
+ * @ConQAT.Rating YELLOW Hash: 1A071A45F987F422A550D0D78B863F90
  */
 public abstract class ObjectAwareServiceBase<T extends IObjectAware<? extends Object>> {