Added statechart object filter for statechart object navigator (CNF).

Added icons to "sgraph.edit" project and customized item provider for Entry object.
Update of tool palette icons.

plugins/org.yakindu.sct.model.sgraph.edit/src/org/yakindu/sct/model/sgraph/provider/EntryItemProvider.java

@@ -101,10 +101,21 @@ public class EntryItemProvider
 	 * This returns Entry.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	@Override
 	public Object getImage(Object object) {
+		if (object instanceof Entry) {
+			Entry entry = (Entry) object;
+			switch (entry.getKind()) {
+			case INITIAL:
+				return overlayImage(object, getResourceLocator().getImage("full/obj16/InitialState"));
+			case DEEP_HISTORY:
+				return overlayImage(object, getResourceLocator().getImage("full/obj16/DeepHistoryState"));
+			case SHALLOW_HISTORY:
+				return overlayImage(object, getResourceLocator().getImage("full/obj16/ShallowHistoryState"));
+			}
+		}
 		return overlayImage(object, getResourceLocator().getImage("full/obj16/Entry"));
 	}
 

plugins/org.yakindu.sct.ui.editor/plugin.xml

@@ -41,7 +41,7 @@
          </metamodelType>
          <metamodelType
                eclass="Region"
-               icon="icons/obj16/region_16x16.png"
+               icon="icons/obj16/region-32.png"
                id="org.yakindu.sct.ui.editor.Region"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                name="Region">
@@ -53,7 +53,7 @@
          <metamodelType
                eclass="State"
                edithelper="org.yakindu.sct.ui.editor.edithelper.VertexEditHelper"
-               icon="icons/obj16/state_16x16.png"
+               icon="icons/obj16/state-32.png"
                id="org.yakindu.sct.ui.editor.State"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                name="State">
@@ -65,7 +65,7 @@
          <metamodelType
                eclass="Transition"
                edithelper="org.yakindu.sct.ui.editor.edithelper.TransitionEditHelper"
-               icon="icons/obj16/transition_16x16.png"
+               icon="icons/obj16/transition-32.png"
                id="org.yakindu.sct.ui.editor.Transition"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                name="Transition">
@@ -77,7 +77,7 @@
          <metamodelType
                eclass="Choice"
                edithelper="org.yakindu.sct.ui.editor.edithelper.VertexEditHelper"
-               icon="icons/obj16/choice_16x16.png"
+               icon="icons/obj16/choice-32.png"
                id="org.yakindu.sct.ui.editor.Choice"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                name="Choice">
@@ -89,7 +89,7 @@
          <metamodelType
                eclass="Entry"
                edithelper="org.yakindu.sct.ui.editor.edithelper.EntryEditHelper"
-               icon="icons/obj16/initial_state_16x16.png"
+               icon="icons/obj16/initial-state-32.png"
                id="org.yakindu.sct.ui.editor.Entry"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                name="Entry">
@@ -101,7 +101,7 @@
          <metamodelType
                eclass="Entry"
                edithelper="org.yakindu.sct.ui.editor.edithelper.EntryEditHelper"
-               icon="icons/obj16/shallow_history_16x16.png"
+               icon="icons/obj16/shallow-history-32.png"
                id="org.yakindu.sct.ui.editor.ShallowHistory"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                name="ShallowHistory">
@@ -113,7 +113,7 @@
          <metamodelType
                eclass="Entry"
                edithelper="org.yakindu.sct.ui.editor.edithelper.EntryEditHelper"
-               icon="icons/obj16/deep_history_16x16.png"
+               icon="icons/obj16/deep-history-32.png"
                id="org.yakindu.sct.ui.editor.DeepHistory"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                name="DeepHistory">
@@ -125,7 +125,7 @@
          <metamodelType
                eclass="FinalState"
                edithelper="org.yakindu.sct.ui.editor.edithelper.VertexEditHelper"
-               icon="icons/obj16/final_state_16x16.png"
+               icon="icons/obj16/final-state-32.png"
                id="org.yakindu.sct.ui.editor.FinalState"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                name="FinalState">
@@ -137,7 +137,7 @@
           <metamodelType
                 eclass="Exit"
                 edithelper="org.yakindu.sct.ui.editor.edithelper.VertexEditHelper"
-                icon="icons/obj16/exit_point_16x16.png"
+                icon="icons/obj16/exit-point-32.png"
                 id="org.yakindu.sct.ui.editor.Exit"
                 kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                 name="Exit">
@@ -149,7 +149,7 @@
          <metamodelType
                eclass="Junction"
                edithelper="org.yakindu.sct.ui.editor.edithelper.VertexEditHelper"
-               icon="icons/obj16/junction_16x16.png"
+               icon="icons/obj16/junction-32.png"
                id="org.yakindu.sct.ui.editor.Junction"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                name="Junction">
@@ -244,18 +244,18 @@
                    id="org.yakindu.sct.ui.editor.Transition"
                    kind="tool"
                    label="Transition"
-                   large_icon="icons/obj16/transition_16x16.png"
+                   large_icon="icons/obj16/transition-32.png"
                    path="/tools/"
-                   small_icon="icons/obj16/transition_16x16.png">
+                   small_icon="icons/obj16/transition-16.png">
              </entry>
              <entry
                   description="Creates a state"
                   id="org.yakindu.sct.ui.editor.State"
                   kind="tool"
                   label="State"
-                  large_icon="icons/obj16/state_16x16.png"
+                  large_icon="icons/obj16/state-32.png"
                   path="/tools/"
-                  small_icon="icons/obj16/state_16x16.png">
+                  small_icon="icons/obj16/state-16.png">
                    <expand
                          force="true">
                            <content>
@@ -267,72 +267,72 @@
                    id="org.yakindu.sct.ui.editor.Region"
                    kind="tool"
                    label="Region"
-                   large_icon="icons/obj16/region_16x16.png"
+                   large_icon="icons/obj16/region-32.png"
                    path="/tools/"
-                   small_icon="icons/obj16/region_16x16.png">
+                   small_icon="icons/obj16/region-16.png">
              </entry>
              <entry
                    description="Creates an initial state"
                    id="org.yakindu.sct.ui.editor.Entry"
                    kind="tool"
                    label="Initial State"
-                   large_icon="icons/obj16/initial_state_16x16.png"
+                   large_icon="icons/obj16/initial-state-32.png"
                    path="/tools/"
-                   small_icon="icons/obj16/initial_state_16x16.png">
+                   small_icon="icons/obj16/initial-state-16.png">
              </entry>
               <entry
                    description="Creates a shallow history"
                    id="org.yakindu.sct.ui.editor.ShallowHistory"
                    kind="tool"
                    label="Shallow History"
-                   large_icon="icons/obj16/shallow_history_16x16.png"
+                   large_icon="icons/obj16/shallow-history-32.png"
                    path="/tools/"
-                   small_icon="icons/obj16/shallow_history_16x16.png">
+                   small_icon="icons/obj16/shallow-history-16.png">
              </entry>
              <entry
                    description="Creates a deep history"
                    id="org.yakindu.sct.ui.editor.DeepHistory"
                    kind="tool"
                    label="Deep History"
-                   large_icon="icons/obj16/deep_history_16x16.png"
+                   large_icon="icons/obj16/deep-history-32.png"
                    path="/tools/"
-                   small_icon="icons/obj16/deep_history_16x16.png">
+                   small_icon="icons/obj16/deep-history-16.png">
              </entry>
              <entry
                    description="Creates a final state"
                    id="org.yakindu.sct.ui.editor.FinalState"
                    kind="tool"
                    label="Final State"
-                   large_icon="icons/obj16/final_state_16x16.png"
+                   large_icon="icons/obj16/final-state-32.png"
                    path="/tools/"
-                   small_icon="icons/obj16/final_state_16x16.png">
+                   small_icon="icons/obj16/final-state-16.png">
              </entry>
                <entry
                    description="Creates an exit point"
                    id="org.yakindu.sct.ui.editor.Exit"
                    kind="tool"
                    label="Exit Point"
-                   large_icon="icons/obj16/exit_point_16x16.png"
+                   large_icon="icons/obj16/exit-point-32.png"
                    path="/tools/"
-                   small_icon="icons/obj16/exit_point_16x16.png">
+                   small_icon="icons/obj16/exit-point-16.png">
              </entry>
              <entry
                    description="Creates a choice"
                    id="org.yakindu.sct.ui.editor.Choice"
                    kind="tool"
                    label="Choice"
-                   large_icon="icons/obj16/choice_16x16.png"
+                   large_icon="icons/obj16/choice-32.png"
                    path="/tools/"
-                   small_icon="icons/obj16/choice_16x16.png">
+                   small_icon="icons/obj16/choice-16.png">
              </entry>
              <entry
                    description="Creates a junction"
                    id="org.yakindu.sct.ui.editor.Junction"
                    kind="tool"
                    label="Junction"
-                   large_icon="icons/obj16/junction_16x16.png"
+                   large_icon="icons/obj16/junction-32.png"
                    path="/tools/"
-                   small_icon="icons/obj16/junction_16x16.png">
+                   small_icon="icons/obj16/junction-16.png">
              </entry>
              <entry
                    description="Creates a synchronization"

plugins/org.yakindu.sct.ui.navigator/META-INF/MANIFEST.MF

@@ -24,6 +24,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
  org.eclipse.ui.ide;bundle-version="3.7.0",
  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.4.1",
- de.itemis.xtext.utils.jface;bundle-version="1.0.0"
+ de.itemis.xtext.utils.jface;bundle-version="1.0.0",
+ org.yakindu.sct.model.sgraph.edit;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy

plugins/org.yakindu.sct.ui.navigator/plugin.xml

@@ -6,6 +6,9 @@
          <includes>
             <contentExtension pattern="org.yakindu.sct.ui.navigator.resourceContent"/>
                 <contentExtension pattern="org.yakindu.sct.ui.navigator.navigatorLinkHelper"/>
+                <contentExtension
+                      pattern="org.yakindu.sct.ui.navigator.statechartObjectFilter">
+                </contentExtension>
          </includes>
       </viewerContentBinding>
    </extension>
@@ -18,11 +21,18 @@
             labelProvider="org.yakindu.sct.ui.navigator.StatechartNavigatorLabelProvider"
             activeByDefault="true">
          <triggerPoints>
-    	          <instanceof value="org.eclipse.core.resources.IFile"/>
-        	      <test
-                     forcePluginActivation="true"
-                     property="org.eclipse.core.resources.extension"
-                     value="sct"/>
+               <or>
+                  <and>
+                     <instanceof
+                           value="org.eclipse.core.resources.IFile">
+                     </instanceof>
+                     <test
+                           forcePluginActivation="true"
+                           property="org.eclipse.core.resources.extension"
+                           value="sct">
+                     </test>
+                  </and>
+               </or>
          </triggerPoints>
       </navigatorContent>
        <actionProvider
@@ -31,17 +41,21 @@
          <enablement>
          </enablement>
       </actionProvider>
+       <commonFilter
+             class="org.yakindu.sct.ui.navigator.StatechartObjectViewerFilter"
+             id="org.yakindu.sct.ui.navigator.statechartObjectFilter"
+             name="Statechart Object Filter">
+       </commonFilter>
    </extension>
-     <extension point="org.eclipse.ui.navigator.linkHelper" id="navigator-linkhelper">
+     <extension point="org.eclipse.ui.navigator.linkHelper" id="org.yakindu.sct.ui.navigator.navigatorLinkHelper">
       <linkHelper
             id="org.yakindu.sct.ui.navigator.navigatorLinkHelper"
             class="org.yakindu.sct.ui.navigator.NavigatorLinkHelper">
-         <editorInputEnablement>
-               <instanceof value="org.eclipse.emf.common.ui.URIEditorInput"/>
-         </editorInputEnablement>
          <selectionEnablement>
-            <instanceof value="org.yakindu.sct.ui.navigator.AbstractNavigatorItem"/>
+            <instanceof
+                  value="org.yakindu.sct.ui.navigator.DomainNavigatorItem">
+            </instanceof>
          </selectionEnablement>
       </linkHelper>
-   </extension>
+   </extension>
 </plugin>

plugins/org.yakindu.sct.ui.navigator/src/org/yakindu/sct/ui/navigator/AbstractNavigatorItem.java

@@ -1,46 +0,0 @@
-package org.yakindu.sct.ui.navigator;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.PlatformObject;
-import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor;
-
-@SuppressWarnings("rawtypes")
-public abstract class AbstractNavigatorItem extends PlatformObject {
-
-	public static final String ID = "org.yakindu.sct.ui.editor.editor.StatechartDiagramEditor";
-
-	static {
-		final Class[] supportedTypes = new Class[] { ITabbedPropertySheetPageContributor.class };
-		final ITabbedPropertySheetPageContributor propertySheetPageContributor = new ITabbedPropertySheetPageContributor() {
-			public String getContributorId() {
-				return ID;
-			}
-		};
-		Platform.getAdapterManager().registerAdapters(new IAdapterFactory() {
-
-			public Object getAdapter(Object adaptableObject, Class adapterType) {
-				if (adaptableObject instanceof AbstractNavigatorItem
-						&& adapterType == ITabbedPropertySheetPageContributor.class) {
-					return propertySheetPageContributor;
-				}
-				return null;
-			}
-
-			public Class[] getAdapterList() {
-				return supportedTypes;
-			}
-		}, AbstractNavigatorItem.class);
-	}
-
-	private Object myParent;
-
-	protected AbstractNavigatorItem(Object parent) {
-		myParent = parent;
-	}
-
-	public Object getParent() {
-		return myParent;
-	}
-
-}

plugins/org.yakindu.sct.ui.navigator/src/org/yakindu/sct/ui/navigator/NavigatorActionProvider.java

@@ -76,9 +76,9 @@ public class NavigatorActionProvider extends CommonActionProvider {
 			myDiagram = null;
 			if (selection.size() == 1) {
 				Object selectedElement = selection.getFirstElement();
-				if (selectedElement instanceof NavigatorItem) {
-					selectedElement = ((NavigatorItem) selectedElement)
-							.getView();
+				if (selectedElement instanceof DomainNavigatorItem) {
+					selectedElement = ((DomainNavigatorItem) selectedElement)
+							.getEObject();
 				} else if (selectedElement instanceof IAdaptable) {
 					selectedElement = ((IAdaptable) selectedElement)
 							.getAdapter(View.class);

plugins/org.yakindu.sct.ui.navigator/src/org/yakindu/sct/ui/navigator/NavigatorGroup.java

@@ -1,59 +0,0 @@
-package org.yakindu.sct.ui.navigator;
-
-import java.util.Collection;
-import java.util.LinkedList;
-@SuppressWarnings("rawtypes")
-
-public class NavigatorGroup extends AbstractNavigatorItem {
-
-	private String myGroupName;
-
-	private String myIcon;
-
-	private Collection<Object> myChildren = new LinkedList<Object>();
-
-	NavigatorGroup(String groupName, String icon, Object parent) {
-		super(parent);
-		myGroupName = groupName;
-		myIcon = icon;
-	}
-
-	public String getGroupName() {
-		return myGroupName;
-	}
-
-	public String getIcon() {
-		return myIcon;
-	}
-
-	public Object[] getChildren() {
-		return myChildren.toArray();
-	}
-
-	public void addChildren(Collection children) {
-		myChildren.addAll(children);
-	}
-
-	public void addChild(Object child) {
-		myChildren.add(child);
-	}
-
-	public boolean isEmpty() {
-		return myChildren.size() == 0;
-	}
-
-	public boolean equals(Object obj) {
-		if (obj instanceof NavigatorGroup) {
-			NavigatorGroup anotherGroup = (NavigatorGroup)obj;
-			if (getGroupName().equals(anotherGroup.getGroupName())) {
-				return getParent().equals(anotherGroup.getParent());
-			}
-		}
-		return super.equals(obj);
-	}
-	
-	public int hashCode() {
-		return getGroupName().hashCode();
-	}
-
-}

plugins/org.yakindu.sct.ui.navigator/src/org/yakindu/sct/ui/navigator/NavigatorItem.java

@@ -1,60 +0,0 @@
-package org.yakindu.sct.ui.navigator;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.gmf.runtime.notation.View;
-
-@SuppressWarnings("rawtypes")
-public class NavigatorItem extends AbstractNavigatorItem {
-
-	static {
-		final Class[] supportedTypes = new Class[] { View.class, EObject.class };
-		Platform.getAdapterManager().registerAdapters(new IAdapterFactory() {
-
-			public Object getAdapter(Object adaptableObject, Class adapterType) {
-				if (adaptableObject instanceof NavigatorItem
-						&& (adapterType == View.class || adapterType == EObject.class)) {
-					return ((NavigatorItem) adaptableObject).getView();
-				}
-				return null;
-			}
-
-			public Class[] getAdapterList() {
-				return supportedTypes;
-			}
-		}, NavigatorItem.class);
-	}
-
-	private View myView;
-
-	private boolean myLeaf = false;
-
-	public NavigatorItem(View view, Object parent, boolean isLeaf) {
-		super(parent);
-		myView = view;
-		myLeaf = isLeaf;
-	}
-
-	public View getView() {
-		return myView;
-	}
-
-	public boolean isLeaf() {
-		return myLeaf;
-	}
-
-	public boolean equals(Object obj) {
-		if (obj instanceof NavigatorItem) {
-			return EcoreUtil.getURI(getView()).equals(
-					EcoreUtil.getURI(((NavigatorItem) obj).getView()));
-		}
-		return super.equals(obj);
-	}
-
-	public int hashCode() {
-		return EcoreUtil.getURI(getView()).hashCode();
-	}
-
-}

plugins/org.yakindu.sct.ui.navigator/src/org/yakindu/sct/ui/navigator/NavigatorLinkHelper.java

@@ -1,111 +1,89 @@
 package org.yakindu.sct.ui.navigator;
 
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.common.ui.URIEditorInput;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalViewer;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.parts.DiagramDocumentEditor;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.navigator.ILinkHelper;
-import org.eclipse.ui.part.FileEditorInput;
-
-import de.itemis.xtext.utils.jface.viewers.util.ActiveEditorResolver;
 
 public class NavigatorLinkHelper implements ILinkHelper {
 
 	public NavigatorLinkHelper() {
-		System.out.println("CREATED!!!!!!!!!!!!!!!");
 	}
 	
 	
-	private static IEditorInput getEditorInput(Diagram diagram) {
-		Resource diagramResource = diagram.eResource();
-		for (Iterator<EObject> it = diagramResource.getContents().iterator(); it.hasNext();) {
-			EObject nextEObject = (EObject)it.next();
-			if (nextEObject == diagram) {
-				return new FileEditorInput(WorkspaceSynchronizer.getFile(diagramResource));
-			}
-			if (nextEObject instanceof Diagram) {
-				break;
-			}
-		}
-		URI uri = EcoreUtil.getURI(diagram);
-		String editorName = uri.lastSegment() + "#" + diagram.eResource().getContents().indexOf(diagram);
-		IEditorInput editorInput = new URIEditorInput(uri, editorName);
-		return editorInput;
-	}
+//	private static IEditorInput getEditorInput(Diagram diagram) {
+//		Resource diagramResource = diagram.eResource();
+//		for (Iterator<EObject> it = diagramResource.getContents().iterator(); it.hasNext();) {
+//			EObject nextEObject = (EObject)it.next();
+//			if (nextEObject == diagram) {
+//				return new FileEditorInput(WorkspaceSynchronizer.getFile(diagramResource));
+//			}
+//			if (nextEObject instanceof Diagram) {
+//				break;
+//			}
+//		}
+//		URI uri = EcoreUtil.getURI(diagram);
+//		String editorName = uri.lastSegment() + "#" + diagram.eResource().getContents().indexOf(diagram);
+//		IEditorInput editorInput = new URIEditorInput(uri, editorName);
+//		return editorInput;
+//	}
 
 	public IStructuredSelection findSelection(IEditorInput anInput) {
-		IEditorPart activeEditor = ActiveEditorResolver.getActiveEditor();
-		if(activeEditor instanceof DiagramDocumentEditor){
-			Diagram diagram = ((DiagramDocumentEditor) activeEditor)
-					.getDiagram();
-			IFile file = WorkspaceSynchronizer.getFile(diagram.eResource());
-			if (file != null) {
-				NavigatorItem item = new NavigatorItem(diagram, file, false);
-				return new StructuredSelection(item);
-			}
-		}
+//		IEditorPart activeEditor = ActiveEditorResolver.getActiveEditor();
+//		if(activeEditor instanceof DiagramDocumentEditor){
+//			Diagram diagram = ((DiagramDocumentEditor) activeEditor)
+//					.getDiagram();
+//			IFile file = WorkspaceSynchronizer.getFile(diagram.eResource());
+//			if (file != null) {
+//				DomainNavigatorItem item = new DomainNavigatorItem(diagram, file, false);
+//				return new StructuredSelection(item);
+//			}
+//		}
 		return StructuredSelection.EMPTY;
 	}
 
 	public void activateEditor(IWorkbenchPage aPage, IStructuredSelection aSelection) {
-		if (aSelection == null || aSelection.isEmpty()) {
-			return;
-		}
-		if (false == aSelection.getFirstElement() instanceof AbstractNavigatorItem) {
-			return;
-		}
-
-		AbstractNavigatorItem abstractNavigatorItem = (AbstractNavigatorItem)aSelection.getFirstElement();
-		View navigatorView = null;
-		if (abstractNavigatorItem instanceof NavigatorItem) {
-			navigatorView = ((NavigatorItem)abstractNavigatorItem).getView();
-		} else if (abstractNavigatorItem instanceof NavigatorGroup) {
-			NavigatorGroup navigatorGroup = (NavigatorGroup)abstractNavigatorItem;
-			if (navigatorGroup.getParent() instanceof NavigatorItem) {
-				navigatorView = ((NavigatorItem)navigatorGroup.getParent()).getView();
-			}
-		}
-		if (navigatorView == null) {
-			return;
-		}
-		IEditorInput editorInput = getEditorInput(navigatorView.getDiagram());
-		IEditorPart editor = aPage.findEditor(editorInput);
-		if (editor == null) {
-			return;
-		}
-		aPage.bringToTop(editor);
-		if (editor instanceof DiagramEditor) {
-			DiagramEditor diagramEditor = (DiagramEditor)editor;
-			ResourceSet diagramEditorResourceSet = diagramEditor.getEditingDomain().getResourceSet();
-			EObject selectedView = diagramEditorResourceSet.getEObject(EcoreUtil.getURI(navigatorView), true);
-			if (selectedView == null) {
-				return;
-			}
-			GraphicalViewer graphicalViewer = (GraphicalViewer)diagramEditor
-					.getAdapter(GraphicalViewer.class);
-			EditPart selectedEditPart = (EditPart)graphicalViewer.getEditPartRegistry().get(selectedView);
-			if (selectedEditPart != null) {
-				graphicalViewer.select(selectedEditPart);
-			}
-		}
+//		if (aSelection == null || aSelection.isEmpty()) {
+//			return;
+//		}
+//		if (false == aSelection.getFirstElement() instanceof AbstractNavigatorItem) {
+//			return;
+//		}
+//
+//		AbstractNavigatorItem abstractNavigatorItem = (AbstractNavigatorItem)aSelection.getFirstElement();
+//		View navigatorView = null;
+//		if (abstractNavigatorItem instanceof NavigatorItem) {
+//			navigatorView = ((NavigatorItem)abstractNavigatorItem).getView();
+//		} else if (abstractNavigatorItem instanceof NavigatorGroup) {
+//			NavigatorGroup navigatorGroup = (NavigatorGroup)abstractNavigatorItem;
+//			if (navigatorGroup.getParent() instanceof NavigatorItem) {
+//				navigatorView = ((NavigatorItem)navigatorGroup.getParent()).getView();
+//			}
+//		}
+//		if (navigatorView == null) {
+//			return;
+//		}
+//		IEditorInput editorInput = getEditorInput(navigatorView.getDiagram());
+//		IEditorPart editor = aPage.findEditor(editorInput);
+//		if (editor == null) {
+//			return;
+//		}
+//		aPage.bringToTop(editor);
+//		if (editor instanceof DiagramEditor) {
+//			DiagramEditor diagramEditor = (DiagramEditor)editor;
+//			ResourceSet diagramEditorResourceSet = diagramEditor.getEditingDomain().getResourceSet();
+//			EObject selectedView = diagramEditorResourceSet.getEObject(EcoreUtil.getURI(navigatorView), true);
+//			if (selectedView == null) {
+//				return;
+//			}
+//			GraphicalViewer graphicalViewer = (GraphicalViewer)diagramEditor
+//					.getAdapter(GraphicalViewer.class);
+//			EditPart selectedEditPart = (EditPart)graphicalViewer.getEditPartRegistry().get(selectedView);
+//			if (selectedEditPart != null) {
+//				graphicalViewer.select(selectedEditPart);
+//			}
+//		}
 	}
 
 }

plugins/org.yakindu.sct.ui.navigator/src/org/yakindu/sct/ui/navigator/StatechartNavigatorContentProvider.java

@@ -36,17 +36,23 @@ public class StatechartNavigatorContentProvider implements
 	private Runnable myViewerRefreshRunnable;
 
 	public StatechartNavigatorContentProvider() {
-
+		System.out.println("ContentProvider");
 		myAdapterFctoryContentProvier = new AdapterFactoryContentProvider(
 				ComposedAdapterFactoryUtil.FACTORY);
+		
 
 		TransactionalEditingDomain editingDomain = GMFEditingDomainFactory.INSTANCE
 				.createEditingDomain();
 		myEditingDomain = (AdapterFactoryEditingDomain) editingDomain;
-		myEditingDomain.setResourceToReadOnlyMap(new HashMap() {
-			public Object get(Object key) {
+		myEditingDomain.setResourceToReadOnlyMap(new HashMap<Resource, Boolean>() {
+			/**
+			 * 
+			 */
+			private static final long serialVersionUID = -7623655803631543084L;
+
+			public Boolean get(Object key) {
 				if (!containsKey(key)) {
-					put(key, Boolean.TRUE);
+					put((Resource) key, Boolean.TRUE);
 				}
 				return super.get(key);
 			}
@@ -136,6 +142,7 @@ public class StatechartNavigatorContentProvider implements
 	}
 
 	public Object[] getChildren(Object parentElement) {
+		
 		if (parentElement instanceof IFile) {
 			IFile file = (IFile) parentElement;
 			URI fileURI = URI.createPlatformResourceURI(file.getFullPath()
@@ -167,9 +174,9 @@ public class StatechartNavigatorContentProvider implements
 	}
 
 	public Object getParent(Object element) {
-		if (element instanceof AbstractNavigatorItem) {
-			AbstractNavigatorItem abstractNavigatorItem = (AbstractNavigatorItem) element;
-			return abstractNavigatorItem.getParent();
+		if (element instanceof DomainNavigatorItem) {
+			DomainNavigatorItem domainNavigatorItem = (DomainNavigatorItem) element;
+			return domainNavigatorItem.getParent();
 		}
 		return null;
 	}
@@ -177,5 +184,4 @@ public class StatechartNavigatorContentProvider implements
 	public boolean hasChildren(Object element) {
 		return element instanceof IFile || getChildren(element).length > 0;
 	}
-
-}
+}

plugins/org.yakindu.sct.ui.navigator/src/org/yakindu/sct/ui/navigator/StatechartObjectViewerFilter.java

@@ -0,0 +1,31 @@
+package org.yakindu.sct.ui.navigator;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerFilter;
+import org.yakindu.sct.model.sgraph.Scope;
+import org.yakindu.sct.model.stext.stext.InterfaceScope;
+import org.yakindu.sct.model.stext.stext.InternalScope;
+
+public class StatechartObjectViewerFilter extends ViewerFilter {
+
+	@Override
+	public boolean select(Viewer viewer, Object parentElement, Object element) {
+		if (element instanceof DomainNavigatorItem) {
+			DomainNavigatorItem navigatorItem = (DomainNavigatorItem) element;
+			EObject modelElement = navigatorItem.getEObject();
+			if (modelElement instanceof Diagram) {
+				return false;
+			}
+			if (modelElement instanceof InternalScope
+					|| modelElement instanceof InterfaceScope) {
+				return true;
+			}
+			if (modelElement instanceof Scope) {
+				return false;
+			}
+		}
+		return true;
+	}
+}

plugins/org.yakindu.sct.ui.navigator/src/org/yakindu/sct/ui/navigator/utils/ComposedAdapterFactoryUtil.java

@@ -3,6 +3,7 @@ package org.yakindu.sct.ui.navigator.utils;
 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
 import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
 import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
+import org.yakindu.sct.model.sgraph.provider.SGraphItemProviderAdapterFactory;
 import org.yakindu.sct.model.sgraph.util.SGraphAdapterFactory;
 import org.yakindu.sct.model.stext.stext.util.StextAdapterFactory;
 
@@ -15,6 +16,7 @@ public class ComposedAdapterFactoryUtil {
 		FACTORY.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
 		FACTORY.addAdapterFactory(new SGraphAdapterFactory());
 		FACTORY.addAdapterFactory(new StextAdapterFactory());
+		FACTORY.addAdapterFactory(new SGraphItemProviderAdapterFactory());
 
 	}
 }