Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Goubet2015-01-20 09:49:42 +0000
committerLaurent Goubet2015-01-20 09:49:42 +0000
commit4ff5bb270565bb483f02f7e3db1777eec81b6dfa (patch)
treebd0e3426883e86f6d3c32d9d07210d156cbff13c
parent1208ef765c36cd97af76bf433bdc684e6d71d66c (diff)
downloadorg.eclipse.emf.compare-4ff5bb270565bb483f02f7e3db1777eec81b6dfa.tar.gz
org.eclipse.emf.compare-4ff5bb270565bb483f02f7e3db1777eec81b6dfa.tar.xz
org.eclipse.emf.compare-4ff5bb270565bb483f02f7e3db1777eec81b6dfa.zip
Never use DISABLE_NOTIFY and DEFER_ATTACHMENT load options
... because of UML. See bugs 455572 and 455580 for more information. Change-Id: I991e7100b2a99027f6f70e93e11990a4681bcb76 Signed-off-by: Laurent Goubet <laurent.goubet@obeo.fr>
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/SynchronizedResourceSet.java5
1 files changed, 0 insertions, 5 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/SynchronizedResourceSet.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/SynchronizedResourceSet.java
index 35ffbcfac..a3cef1542 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/SynchronizedResourceSet.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/SynchronizedResourceSet.java
@@ -63,7 +63,6 @@ class SynchronizedResourceSet extends ResourceSetImpl {
*/
loadOptions.put(XMLResource.OPTION_USE_PARSER_POOL, new NoNotificationParserPool());
loadOptions.put(XMLResource.OPTION_USE_DEPRECATED_METHODS, Boolean.FALSE);
- loadOptions.put(XMLResource.OPTION_DISABLE_NOTIFY, Boolean.TRUE);
final int bufferSize = 16384;
final Map<String, Object> parserProperties = Maps.newHashMap();
@@ -71,10 +70,6 @@ class SynchronizedResourceSet extends ResourceSetImpl {
.valueOf(bufferSize));
loadOptions.put(XMLResource.OPTION_PARSER_PROPERTIES, parserProperties);
- // These two might be superfluous
- loadOptions.put(XMLResource.OPTION_DEFER_ATTACHMENT, Boolean.TRUE);
- loadOptions.put(XMLResource.OPTION_DEFER_IDREF_RESOLUTION, Boolean.TRUE);
-
/*
* We don't use XMLResource.OPTION_USE_XML_NAME_TO_FEATURE_MAP whereas it could bring performance
* improvements because we are loading the resources concurrently and this map could be used (put and

Back to the top