Merge pull request #893 from Yakindu/issue_892

#892 remove dependency to GMF
itemisCREATE · Aug 11, 2016 · 9810b88 · 9810b88
2 parents 5a43406 + 6c9fa21
commit 9810b88
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/plugins/org.yakindu.sct.model.sgraph/META-INF/MANIFEST.MF b/plugins/org.yakindu.sct.model.sgraph/META-INF/MANIFEST.MF
@@ -18,7 +18,5 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.emf.ecore.xmi,
  org.eclipse.xtext,
- org.yakindu.base.xtext.utils.gmf,
- org.eclipse.gmf.runtime.emf.core,
  org.yakindu.base.types;visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/...kindu.sct.model.sgraph/src/org/yakindu/sct/model/sgraph/resource/AbstractSCTResource.java b/...kindu.sct.model.sgraph/src/org/yakindu/sct/model/sgraph/resource/AbstractSCTResource.java
@@ -30,7 +30,7 @@
 import org.eclipse.emf.ecore.util.EContentAdapter;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.gmf.runtime.emf.core.resources.GMFResource;
+import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
 import org.eclipse.xtext.Constants;
 import org.eclipse.xtext.EcoreUtil2;
 import org.eclipse.xtext.ParserRule;
@@ -73,7 +73,7 @@
  * @author andreas muelder - Initial contribution and API
  * 
  */
-public abstract class AbstractSCTResource extends GMFResource {
+public abstract class AbstractSCTResource extends XMIResourceImpl {
 
 	public static final String SCT_PREFIX = "SCT_";
 
@@ -123,7 +123,6 @@ public abstract class AbstractSCTResource extends GMFResource {
 
 	public AbstractSCTResource(URI uri) {
 		super(uri);
-		setUseIDAttributes(true);
 		syntaxDiagnostics = HashMultimap.create();
 		linkingDiagnostics = HashMultimap.create();
 		setIntrinsicIDToEObjectMap(new HashMap<String, EObject>());
@@ -478,9 +477,16 @@ public String getLinkText() {
 	 */
 	@Override
 	public void setURI(URI uri) {
-
 		if (getResourceSet() != null) {
 			setRawURI(uri);
 		}
 	}
+
+	public void setRawURI(URI uri) {
+		URI oldURI = getURI();
+		if ((uri == oldURI) || ((uri != null) && (uri.equals(oldURI))))
+			return;
+
+		super.setURI(uri);
+	}
 }
diff --git a/plugins/org.yakindu.sct.model.stext/META-INF/MANIFEST.MF b/plugins/org.yakindu.sct.model.stext/META-INF/MANIFEST.MF
@@ -17,8 +17,6 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport,
  org.eclipse.emf.common,
  org.antlr.runtime,
  org.yakindu.sct.model.sgraph;visibility:=reexport,
- org.yakindu.base.xtext.utils.gmf,
- org.eclipse.gmf.runtime.emf.core,
  org.yakindu.base.types,
  org.yakindu.base.xtext.utils.jface,
  org.yakindu.base.expressions;visibility:=reexport,