Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian W. Damus2016-08-25 15:37:00 +0000
committerChristian W. Damus2016-08-25 19:15:43 +0000
commit8defeb361c8aeea5ccc121b439c339ce46954f47 (patch)
tree24289575bdb5bc72ced917c7e109f72fe4c833eb /plugins/infra/core
parent680d10686b7415998fadc7252aa38950efea4d87 (diff)
downloadorg.eclipse.papyrus-8defeb361c8aeea5ccc121b439c339ce46954f47.tar.gz
org.eclipse.papyrus-8defeb361c8aeea5ccc121b439c339ce46954f47.tar.xz
org.eclipse.papyrus-8defeb361c8aeea5ccc121b439c339ce46954f47.zip
Bug 461709: [Performances] Opening a model for the first time in a new workspace causes all dependencies to be resolved
https://bugs.eclipse.org/bugs/show_bug.cgi?id=461709 Revise the determination of 'legacy mode' to support also sub-models, as required by bug 497865. Change-Id: Ib9709cf01062204ce8170750298ee234b425e40b (cherry picked from commit de4b0f294afe2fb5cafcaf2daae6756d683ea600)
Diffstat (limited to 'plugins/infra/core')
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModel.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModel.java
index 800f7a9e981..82483db1073 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModel.java
@@ -229,7 +229,7 @@ public class SashModel extends EMFLogicalModel implements IModel {
@Override
public void createModel(URI uriWithoutExtension) {
- if (isLegacy(uriWithoutExtension)) {
+ if (!isLegacy(uriWithoutExtension)) {
// http://eclip.se/461709
// Initialize the workspace-private sash model from our template
// to avoid resolving all proxies in the ProxyModificationTrackingAdapter
@@ -285,7 +285,11 @@ public class SashModel extends EMFLogicalModel implements IModel {
if (uriWithoutExtension == null) {
return false;
}
- return Objects.equal(uriWithoutExtension, getModelManager().getURIWithoutExtension());
+
+ URI legacy = getLegacyURI(uriWithoutExtension);
+ URI sash = getSashModelURI(uriWithoutExtension);
+
+ return Objects.equal(legacy, sash);
}
/**

Back to the top