From f3c0b9dd872afb1c9ca679075a710afd32756688 Mon Sep 17 00:00:00 2001 From: Andreas Muelder Date: Wed, 10 Aug 2016 11:53:14 +0200 Subject: [PATCH 1/3] #892 remove dependency to GMF --- .../META-INF/MANIFEST.MF | 2 -- .../model/sgraph/resource/AbstractSCTResource.java | 14 ++++++++++---- 2 files changed, 10 insertions(+), 6 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 index edfadd5f56..2048fb910f 100644 --- 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/plugins/org.yakindu.sct.model.sgraph/src/org/yakindu/sct/model/sgraph/resource/AbstractSCTResource.java b/plugins/org.yakindu.sct.model.sgraph/src/org/yakindu/sct/model/sgraph/resource/AbstractSCTResource.java index dd80659d19..d983d56bf0 100644 --- a/plugins/org.yakindu.sct.model.sgraph/src/org/yakindu/sct/model/sgraph/resource/AbstractSCTResource.java +++ b/plugins/org.yakindu.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()); @@ -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); + } } From 9f3e7baee32061425a2e57d5226743884178f708 Mon Sep 17 00:00:00 2001 From: Andreas Muelder Date: Wed, 10 Aug 2016 13:20:53 +0200 Subject: [PATCH 2/3] remove dependency to GMF --- plugins/org.yakindu.sct.model.stext/META-INF/MANIFEST.MF | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/org.yakindu.sct.model.stext/META-INF/MANIFEST.MF b/plugins/org.yakindu.sct.model.stext/META-INF/MANIFEST.MF index 21ab1efe17..81ed502b07 100644 --- a/plugins/org.yakindu.sct.model.stext/META-INF/MANIFEST.MF +++ b/plugins/org.yakindu.sct.model.stext/META-INF/MANIFEST.MF @@ -18,7 +18,6 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport, 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, From 6c9fa219dbc79691978bd247a4eaadc4e3b31b4f Mon Sep 17 00:00:00 2001 From: Andreas Muelder Date: Wed, 10 Aug 2016 13:21:20 +0200 Subject: [PATCH 3/3] remove dependency to GMF --- plugins/org.yakindu.sct.model.stext/META-INF/MANIFEST.MF | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/org.yakindu.sct.model.stext/META-INF/MANIFEST.MF b/plugins/org.yakindu.sct.model.stext/META-INF/MANIFEST.MF index 81ed502b07..ab40348e4e 100644 --- a/plugins/org.yakindu.sct.model.stext/META-INF/MANIFEST.MF +++ b/plugins/org.yakindu.sct.model.stext/META-INF/MANIFEST.MF @@ -17,7 +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.yakindu.base.types, org.yakindu.base.xtext.utils.jface, org.yakindu.base.expressions;visibility:=reexport,