Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordwagelaar2015-11-29 15:48:59 -0500
committerdwagelaar2015-11-29 15:48:59 -0500
commit16175622cf0c92c4766c61fb95a27c094bcaf2a6 (patch)
tree507656392e10cf045af3e6fec305d2153b1a36d0 /plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse
parent9496f0f2e889dd77a3497674624543b74a11122c (diff)
downloadorg.eclipse.atl-16175622cf0c92c4766c61fb95a27c094bcaf2a6.tar.gz
org.eclipse.atl-16175622cf0c92c4766c61fb95a27c094bcaf2a6.tar.xz
org.eclipse.atl-16175622cf0c92c4766c61fb95a27c094bcaf2a6.zip
483199: ATL Parser/Compiler performance is degraded by dynamic ATL.ecore
Small EMFTVM fix to prevent unnecessary calls to org.eclipse.m2m.atl.emftvm.util.EMFTVMUtil.updateResource(EObject, EObject).
Diffstat (limited to 'plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse')
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/EMFTVMUtil.java78
1 files changed, 17 insertions, 61 deletions
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/EMFTVMUtil.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/EMFTVMUtil.java
index 8b640014..7b2ada7e 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/EMFTVMUtil.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/EMFTVMUtil.java
@@ -670,11 +670,13 @@ public final class EMFTVMUtil {
assert value == null || ((EObject) value).eResource() != null;
assert oldValue == null || oldValue.eResource() != null;
eo.eSet(sf, value);
- if (value != null) {
- updateResource(eo, (EObject) value);
- }
- if (oldValue != null) {
- updateResource(eo, oldValue);
+ if (ref.isContainment() || ref.isContainer()) {
+ if (value != null) {
+ updateResource(eo, (EObject) value);
+ }
+ if (oldValue != null) {
+ updateResource(eo, oldValue);
+ }
}
assert eo.eResource() != null;
assert value == null || ((EObject) value).eResource() != null;
@@ -920,7 +922,9 @@ public final class EMFTVMUtil {
} else {
values.add(v);
}
- updateResource(eo, v);
+ if (ref.isContainment() || ref.isContainer()) {
+ updateResource(eo, v);
+ }
}
assert eo.eResource() != null;
assert v.eResource() != null;
@@ -939,7 +943,7 @@ public final class EMFTVMUtil {
private static void removeRefValue(final EReference ref, final EObject eo, final Collection<Object> values, final EObject v) {
assert eo.eResource() != null;
assert v.eResource() != null;
- if (values.remove(v)) {
+ if (values.remove(v) && (ref.isContainment() || ref.isContainer())) {
updateResource(eo, v);
}
assert eo.eResource() != null;
@@ -2187,26 +2191,10 @@ public final class EMFTVMUtil {
}
/**
- * Retrieves the transitive closure of
- *
- * <pre>
- * field
- * </pre>
- *
- * on
- *
- * <pre>
- * object
- * </pre>
- *
- * .
+ * Retrieves the transitive closure of <code>field</code> on <code>object</code>.
*
* @param object
- * the object on which to retrieve
- *
- * <pre>
- * field
- * </pre>
+ * the object on which to retrieve <code>field</code>
* @param field
* the field for which to retrieve the value
* @param frame
@@ -2239,26 +2227,10 @@ public final class EMFTVMUtil {
}
/**
- * Retrieves the transitive closure of
- *
- * <pre>
- * sf
- * </pre>
- *
- * on
- *
- * <pre>
- * object
- * </pre>
- *
- * .
+ * Retrieves the transitive closure of <code>sf</code> on <code>object</code>.
*
* @param object
- * the object on which to retrieve
- *
- * <pre>
- * sf
- * </pre>
+ * the object on which to retrieve <code>sf</code>
* @param sf
* the structural feature for which to retrieve the value
* @param env
@@ -2298,26 +2270,10 @@ public final class EMFTVMUtil {
}
/**
- * Retrieves the transitive closure of
- *
- * <pre>
- * field
- * </pre>
- *
- * on
- *
- * <pre>
- * object
- * </pre>
- *
- * .
+ * Retrieves the transitive closure of <code>field</code> on <code>object</code>.
*
* @param object
- * the object on which to retrieve
- *
- * <pre>
- * field
- * </pre>
+ * the object on which to retrieve <code>field</code>
* @param field
* the field for which to retrieve the value
* @param result

Back to the top