浏览代码

#892: Removed dependency to GMF Resource.

Thomas Kutz 9 年之前
父节点
当前提交
3e9ec240da

+ 2 - 3
plugins/org.yakindu.sct.model.resource/META-INF/MANIFEST.MF

@@ -8,12 +8,11 @@ Bundle-Activator: org.yakindu.sct.model.resource.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.yakindu.sct.model.sgraph;visibility:=reexport,
- org.yakindu.base.xtext.utils.gmf,
- org.eclipse.gmf.runtime.emf.core,
  org.yakindu.sct.model.stext,
  org.eclipse.xtext.ui,
  org.yakindu.sct.model.stext.ui,
- org.yakindu.sct.domain
+ org.yakindu.sct.domain,
+ org.eclipse.emf.ecore.xmi
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Export-Package: org.yakindu.sct.model.resource

+ 2 - 2
plugins/org.yakindu.sct.model.resource/src/org/yakindu/sct/model/resource/SCTResourceFactory.java

@@ -16,7 +16,7 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.URIConverter;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
-import org.eclipse.gmf.runtime.emf.core.resources.GMFResource;
+import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
 import org.yakindu.sct.domain.extension.DomainRegistry;
 import org.yakindu.sct.domain.extension.IDomainDescriptor;
 
@@ -32,7 +32,7 @@ public class SCTResourceFactory extends XMIResourceFactoryImpl {
 
 		// if file is not existing, AND no generic/default domain is available, resource creation will fail
 		if (!URIConverter.INSTANCE.exists(uri, null)) {
-			return new GMFResource(uri);
+			return new XMIResourceImpl(uri);
 		}
 
 		String determinedDomainID = DomainRegistry.determineDomainID(uri);

+ 2 - 2
plugins/org.yakindu.sct.ui.editor/src/org/yakindu/sct/ui/editor/partitioning/DiagramPartitioningUtil.java

@@ -28,7 +28,6 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
 import org.eclipse.gmf.runtime.diagram.core.DiagramEditingDomainFactory;
 import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramEditorInput;
-import org.eclipse.gmf.runtime.emf.core.resources.GMFResource;
 import org.eclipse.gmf.runtime.notation.BooleanValueStyle;
 import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.gmf.runtime.notation.NotationFactory;
@@ -46,6 +45,7 @@ import org.eclipse.ui.part.FileEditorInput;
 import org.yakindu.sct.model.sgraph.CompositeElement;
 import org.yakindu.sct.model.sgraph.State;
 import org.yakindu.sct.model.sgraph.Statechart;
+import org.yakindu.sct.model.sgraph.resource.AbstractSCTResource;
 import org.yakindu.sct.ui.editor.editor.StatechartDiagramEditor;
 import org.yakindu.sct.ui.editor.utils.GMFNotationUtil;
 
@@ -107,7 +107,7 @@ public class DiagramPartitioningUtil {
 					return true;
 				}
 				public boolean handleResourceChanged(Resource resource) {
-					if (resource instanceof GMFResource) {
+					if (resource instanceof AbstractSCTResource) {
 						// do not unload GMF resources as it might be the one
 						// underlying the currently opened editor
 						return true;