Merge pull request #150 from Yakindu/Bugfix_149

fixed #149  new subdiagram editor is opened if error occures in

plugins/org.yakindu.sct.ui.editor/src/org/yakindu/sct/ui/editor/providers/StatechartMarkerNavigationProvider.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2010 committers of YAKINDU and others.
+ * Copyright (c) 2010 - 2015 committers of YAKINDU and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -25,58 +25,52 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;
 import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
 import org.eclipse.gmf.runtime.emf.ui.providers.marker.AbstractModelMarkerNavigationProvider;
+import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.xtext.EcoreUtil2;
 import org.yakindu.base.xtext.utils.gmf.directedit.IXtextAwareEditPart;
 import org.yakindu.sct.model.sgraph.SGraphPackage;
+import org.yakindu.sct.ui.editor.partitioning.DiagramPartitioningUtil;
 import org.yakindu.sct.ui.editor.validation.IMarkerType;
 
 /**
- * TODO: Move common code to gmf.runtime.commons
  * 
  * @author andreas muelder
  * 
  */
-public class StatechartMarkerNavigationProvider extends
-		AbstractModelMarkerNavigationProvider implements IMarkerType {
+public class StatechartMarkerNavigationProvider extends AbstractModelMarkerNavigationProvider implements IMarkerType {
 
 	@Override
 	@SuppressWarnings("rawtypes")
 	protected void doGotoMarker(IMarker marker) {
 
-		String elementId = marker
-				.getAttribute(
-						org.eclipse.gmf.runtime.common.core.resources.IMarker.ELEMENT_ID,
-						null);
+		String elementId = marker.getAttribute(org.eclipse.gmf.runtime.common.core.resources.IMarker.ELEMENT_ID, null);
 		if (elementId == null || !(getEditor() instanceof DiagramEditor)) {
 			return;
 		}
 		DiagramEditor editor = (DiagramEditor) getEditor();
-		Map editPartRegistry = editor.getDiagramGraphicalViewer()
-				.getEditPartRegistry();
-		EObject targetView = editor.getDiagram().eResource()
-				.getEObject(elementId);
+		View targetView = (View) editor.getDiagram().eResource().getEObject(elementId);
 		if (targetView == null) {
 			return;
 		}
+		Diagram element = DiagramPartitioningUtil.getDiagramContaining(targetView.getElement());
+		editor = (DiagramEditor) DiagramPartitioningUtil.openEditor(element);
+		Map editPartRegistry = editor.getDiagramGraphicalViewer().getEditPartRegistry();
+
 		EditPart targetEditPart = (EditPart) editPartRegistry.get(targetView);
 		if (targetEditPart != null) {
-			selectElementsInDiagram(editor,
-					Arrays.asList(new EditPart[] { targetEditPart }));
+			selectElementsInDiagram(editor, Arrays.asList(new EditPart[] { targetEditPart }));
 		}
 
 		try {
 			String type = marker.getType();
 			if (type.equals(SCT_MARKER_TYPE)) {
 				final DirectEditRequest request = new DirectEditRequest();
-				request.setDirectEditFeature(SGraphPackage.eINSTANCE
-						.getSpecificationElement_Specification());
-				List<EObject> allNotationElements = EcoreUtil2
-						.eAllContentsAsList(targetView);
+				request.setDirectEditFeature(SGraphPackage.eINSTANCE.getSpecificationElement_Specification());
+				List<EObject> allNotationElements = EcoreUtil2.eAllContentsAsList(targetView);
 				for (EObject eObject : allNotationElements) {
 					if (eObject instanceof View) {
-						IGraphicalEditPart editPart = (IGraphicalEditPart) editPartRegistry
-								.get(eObject);
+						IGraphicalEditPart editPart = (IGraphicalEditPart) editPartRegistry.get(eObject);
 						if (editPart instanceof IXtextAwareEditPart) {
 							editPart.performRequest(request);
 						}
@@ -89,8 +83,7 @@ public class StatechartMarkerNavigationProvider extends
 
 	}
 
-	public static void selectElementsInDiagram(
-			IDiagramWorkbenchPart diagramPart, List<EditPart> editParts) {
+	public static void selectElementsInDiagram(IDiagramWorkbenchPart diagramPart, List<EditPart> editParts) {
 		diagramPart.getDiagramGraphicalViewer().deselectAll();
 
 		EditPart firstPrimary = null;
@@ -102,10 +95,8 @@ public class StatechartMarkerNavigationProvider extends
 			}
 		}
 		if (!editParts.isEmpty()) {
-			// TODO animation
-			diagramPart.getDiagramGraphicalViewer().reveal(
-					firstPrimary != null ? firstPrimary : (EditPart) editParts
-							.get(0));
+			diagramPart.getDiagramGraphicalViewer()
+					.reveal(firstPrimary != null ? firstPrimary : (EditPart) editParts.get(0));
 		}
 	}