Refactoring of navigator link helper.

Model assistant provider uses 16x16 pixel icons now.
Refactoring of ItemProvider for Entry model element.

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

@@ -120,17 +120,28 @@ public class EntryItemProvider
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
+	 * This returns the label text for the adapted class. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((Entry)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Entry_type") :
-			getString("_UI_Entry_type") + " " + label;
+		Entry entry = (Entry) object;
+
+		switch (entry.getKind()) {
+		case DEEP_HISTORY:
+			return "Deep History";
+		case INITIAL:
+			return "Initial State";
+		case SHALLOW_HISTORY:
+			return "Shallow History";
+		default:
+			String label = ((Entry) object).getName();
+
+			return label == null || label.length() == 0 ? getString("_UI_Entry_type")
+					: getString("_UI_Entry_type") + " " + label;
+		}
 	}
 
 	/**

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

@@ -41,7 +41,7 @@
          </metamodelType>
          <metamodelType
                eclass="Region"
-               icon="icons/obj16/region-32.png"
+               icon="icons/obj16/region-16.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-32.png"
+               icon="icons/obj16/state-16.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="SubchartState"
                edithelper="org.yakindu.sct.ui.editor.edithelper.VertexEditHelper"
-               icon="icons/obj16/substatechart-32.png"
+               icon="icons/obj16/substatechart-16.png"
                id="org.yakindu.sct.ui.editor.SubchartState"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                name="SubchartState">
@@ -78,7 +78,7 @@
          <metamodelType
                eclass="Transition"
                edithelper="org.yakindu.sct.ui.editor.edithelper.TransitionEditHelper"
-               icon="icons/obj16/transition-32.png"
+               icon="icons/obj16/transition-16.png"
                id="org.yakindu.sct.ui.editor.Transition"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                name="Transition">
@@ -90,7 +90,7 @@
          <metamodelType
                eclass="Choice"
                edithelper="org.yakindu.sct.ui.editor.edithelper.VertexEditHelper"
-               icon="icons/obj16/choice-32.png"
+               icon="icons/obj16/choice-16.png"
                id="org.yakindu.sct.ui.editor.Choice"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                name="Choice">
@@ -102,7 +102,7 @@
          <metamodelType
                eclass="Entry"
                edithelper="org.yakindu.sct.ui.editor.edithelper.EntryEditHelper"
-               icon="icons/obj16/initial-state-32.png"
+               icon="icons/obj16/initial-state-16.png"
                id="org.yakindu.sct.ui.editor.Entry"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                name="Entry">
@@ -114,7 +114,7 @@
          <metamodelType
                eclass="Entry"
                edithelper="org.yakindu.sct.ui.editor.edithelper.EntryEditHelper"
-               icon="icons/obj16/shallow-history-32.png"
+               icon="icons/obj16/shallow-history-16.png"
                id="org.yakindu.sct.ui.editor.ShallowHistory"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                name="ShallowHistory">
@@ -126,7 +126,7 @@
          <metamodelType
                eclass="Entry"
                edithelper="org.yakindu.sct.ui.editor.edithelper.EntryEditHelper"
-               icon="icons/obj16/deep-history-32.png"
+               icon="icons/obj16/deep-history-16.png"
                id="org.yakindu.sct.ui.editor.DeepHistory"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                name="DeepHistory">
@@ -138,7 +138,7 @@
          <metamodelType
                eclass="FinalState"
                edithelper="org.yakindu.sct.ui.editor.edithelper.VertexEditHelper"
-               icon="icons/obj16/final-state-32.png"
+               icon="icons/obj16/final-state-16.png"
                id="org.yakindu.sct.ui.editor.FinalState"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                name="FinalState">
@@ -150,7 +150,7 @@
           <metamodelType
                 eclass="Exit"
                 edithelper="org.yakindu.sct.ui.editor.edithelper.VertexEditHelper"
-                icon="icons/obj16/exit-point-32.png"
+                icon="icons/obj16/exit-point-16.png"
                 id="org.yakindu.sct.ui.editor.Exit"
                 kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                 name="Exit">
@@ -162,7 +162,7 @@
          <metamodelType
                eclass="Junction"
                edithelper="org.yakindu.sct.ui.editor.edithelper.VertexEditHelper"
-               icon="icons/obj16/junction-32.png"
+               icon="icons/obj16/junction-16.png"
                id="org.yakindu.sct.ui.editor.Junction"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                name="Junction">

plugins/org.yakindu.sct.ui.editor/src/org/yakindu/sct/ui/editor/assistent/StatechartModelingAssistantProvider.java

@@ -81,5 +81,4 @@ public class StatechartModelingAssistantProvider extends
 			IAdaptable target) {
 		return Lists.newArrayList(TRANSITION);
 	}
-
 }

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

@@ -63,7 +63,7 @@
          </selectionEnablement>
          <editorInputEnablement>
             <instanceof
-                  value="org.eclipse.emf.common.ui.URIEditorInput">
+                  value="org.eclipse.ui.IFileEditorInput">
             </instanceof>
          </editorInputEnablement>
       </linkHelper>

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

@@ -71,7 +71,7 @@ public class NavigatorLinkHelper implements ILinkHelper {
 		}
 		return StructuredSelection.EMPTY;
 	}
-
+	
 	public void activateEditor(IWorkbenchPage aPage,
 			IStructuredSelection aSelection) {
 

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

@@ -5,6 +5,7 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
 
+import org.eclipse.core.internal.resources.WorkspaceRoot;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
@@ -205,6 +206,10 @@ public class StatechartNavigatorContentProvider implements
 	}
 
 	public Object getParent(Object element) {
+		if (element instanceof IFile) {
+			IFile file = (IFile) element;
+			return file.getParent();
+		}
 		if (element instanceof DomainNavigatorItem) {
 			DomainNavigatorItem domainNavigatorItem = (DomainNavigatorItem) element;
 			return domainNavigatorItem.getParent();