From 5c425b0f0912307b1e8c89402fdd5f01adf114b5 Mon Sep 17 00:00:00 2001
From: Florian Hoelzl <hoelzl@fortiss.org>
Date: Tue, 26 Jul 2011 12:28:19 +0000
Subject: [PATCH] kernel cleanup => YELLOW some refactored only classes =>
GREEN
---
.../trunk/META-INF/MANIFEST.MF | 1 +
.../kernel/ui/extension/IContextMenuContributor.java | 2 +-
.../tooling/kernel/ui/internal/ActionService.java | 2 +-
.../kernel/ui/internal/ContextMenuService.java | 2 +-
.../kernel/ui/internal/EditPartFactoryService.java | 2 +-
.../tooling/kernel/ui/internal/MarkerService.java | 2 +-
.../kernel/ui/internal/ModelEditorBindingService.java | 2 +-
.../ui/internal/ModelElementHandlerService.java | 2 +-
.../tooling/kernel/ui/internal/NavigatorService.java | 9 ++++++++-
.../tooling/kernel/ui/internal/PropertiesService.java | 2 +-
.../fortiss/tooling/kernel/ui/internal/package.html | 2 +-
.../internal/properties/IdLabeledPropertySection.java | 2 +-
.../properties/NamedCommentedPropertySection.java | 2 +-
.../internal/properties/PropertiesAdapterFactory.java | 2 +-
.../kernel/ui/internal/properties/package.html | 2 +-
.../ui/internal/views/EObjectDragSourceListener.java | 2 +-
.../tooling/kernel/ui/internal/views/LibraryView.java | 2 +-
.../ui/internal/views/LinkWithEditorPartListener.java | 2 +-
.../kernel/ui/internal/views/NavigatorViewPart.java | 2 +-
.../tooling/kernel/ui/internal/views/NewMenu.java | 7 +++----
.../kernel/ui/service/IContextMenuService.java | 2 +-
.../tooling/kernel/ui/service/INavigatorService.java | 11 ++++++++++-
.../tooling/kernel/ui/util/EObjectSelectionUtils.java | 2 +-
.../kernel/service/base/ObjectAwareServiceBase.java | 2 +-
24 files changed, 42 insertions(+), 26 deletions(-)
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 63cc664fd..3a5367104 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 7a14d3c65..cdd5f5bde 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 318806dfd..c48924a85 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 f825cd36c..18c9b2e51 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 4dbf02b56..173234f86 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 e437adb0b..0b628db13 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 af2628fee..b4a3be93d 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 1250c305b..c010720c1 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 eebc4d9c6..94a456c37 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 1b8f8c5fc..a0643623b 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 25cd4af1a..15d6b0148 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 df7df2dd1..66443a0db 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 dc0832e34..1dfaee3b6 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 9f6ba77b4..4efe7250f 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 33210f687..0a48d5dd6 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 04b2e465f..2f343ebb9 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 d78018721..c4be22066 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 063897176..b32b5ec0e 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 18511327a..990935827 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 1330c897a..4fa4377d5 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 e854251be..9ac1135ee 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 91ade0859..f596a73b3 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 cd47ba65f..fd549e5bf 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 a248413f7..c25909c62 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>> {
--
GitLab