瀏覽代碼

Return subdiagram editor if element was inside a subdiagram (#2106)

* Return subdiagram editor if element was inside a subdiagram

* Move ResourceUtil to SGraph plugin for better reusability
Thomas Kutz 7 年之前
父節點
當前提交
af8f61fef9

+ 1 - 1
plugins/org.yakindu.sct.simulation.core/src/org/yakindu/sct/simulation/core/util/ResourceUtil.java

@@ -8,7 +8,7 @@
  * committers of YAKINDU - initial API and implementation
  *
 */
-package org.yakindu.sct.simulation.core.util;
+package org.yakindu.sct.model.sgraph.resource;
 
 import java.io.IOException;
 import java.util.Collections;

+ 1 - 1
plugins/org.yakindu.sct.simulation.core/src/org/yakindu/sct/simulation/core/hmr/SCTHotModelReplacementManager.java

@@ -34,9 +34,9 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
 import org.yakindu.sct.model.sgraph.Statechart;
+import org.yakindu.sct.model.sgraph.resource.ResourceUtil;
 import org.yakindu.sct.simulation.core.debugmodel.SCTDebugElement;
 import org.yakindu.sct.simulation.core.debugmodel.SCTDebugTarget;
-import org.yakindu.sct.simulation.core.util.ResourceUtil;
 
 /**
  * 

+ 1 - 1
plugins/org.yakindu.sct.simulation.core/src/org/yakindu/sct/simulation/core/launch/AbstractSCTLaunchConfigurationDelegate.java

@@ -25,9 +25,9 @@ import org.eclipse.debug.core.model.LaunchConfigurationDelegate;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.URIConverter;
 import org.yakindu.sct.model.sgraph.Statechart;
+import org.yakindu.sct.model.sgraph.resource.ResourceUtil;
 import org.yakindu.sct.simulation.core.debugmodel.SCTDebugTarget;
 import org.yakindu.sct.simulation.core.engine.ISimulationEngine;
-import org.yakindu.sct.simulation.core.util.ResourceUtil;
 
 /**
  * 

+ 1 - 1
plugins/org.yakindu.sct.ui.editor/src/org/yakindu/sct/ui/editor/editor/SCTFileEditorOpener.java

@@ -64,7 +64,7 @@ public class SCTFileEditorOpener implements IURIEditorOpener {
 						DiagramPartitioningUtil.selectElementsInDiagram(diagramEditor,
 								Arrays.asList(new EditPart[] { targetEditPart }));
 					}
-
+					return diagramEditor;
 				}
 				return editor;
 			}