Bug 497342: [ControlMode] LoadResourceSnippet makes changes without a transaction

https://bugs.eclipse.org/bugs/show_bug.cgi?id=497342

Use an API that can provide a transactional editing domain for a
resource, especially because no other kind of editing domain would
be of interest, anyways.

Change-Id: I65e2076a1f00b9c8a2d68106bd6a89b1b46f0cdb
(cherry picked from commit 31ce19683f796db0a5303ab890b2a31900d33a69)

3 files changed, 6 insertions, 5 deletions

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF
index 8ed3b371f9b..c4254a28fc4 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)";visibili
  org.eclipse.papyrus.infra.types.core;bundle-version="[2.0.0,3.0.0)"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.1.qualifier
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-Activator: org.eclipse.papyrus.infra.services.controlmode.ControlModePlugin
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/pom.xml
index 4261df2e9d7..416d6aa6e65 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/pom.xml
@@ -7,6 +7,6 @@
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.services.controlmode</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
+	<version>1.2.1-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/listener/LoadResourceSnippet.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/listener/LoadResourceSnippet.java
index 5d59edf742f..a7847f05444 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/listener/LoadResourceSnippet.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/listener/LoadResourceSnippet.java
@@ -8,19 +8,20 @@
  *
  * Contributors:
  *   Céline Janssens (ALL4TEC) celine.janssens@all4tec.net - Initial API and implementation
- *   Christian W. Damus - bug 485220
+ *   Christian W. Damus - bugs 485220, 497342
  *   
  *****************************************************************************/
 
 package org.eclipse.papyrus.infra.services.controlmode.listener;
 
 import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.emf.transaction.RollbackException;
+import org.eclipse.emf.transaction.util.TransactionUtil;
 import org.eclipse.papyrus.infra.core.resource.IModelSetSnippet;
 import org.eclipse.papyrus.infra.core.resource.ModelSet;
 import org.eclipse.papyrus.infra.core.resource.ResourceAdapter;
+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal.PageManagerImpl;
 import org.eclipse.papyrus.infra.core.utils.TransactionHelper;
 import org.eclipse.papyrus.infra.services.controlmode.commands.LoadDiagramCommand;
 
@@ -73,7 +74,7 @@ public class LoadResourceSnippet implements IModelSetSnippet {
 		 */
 		@Override
 		protected void handleResourceLoaded(Resource resource) {
-			EditingDomain editingDomain = AdapterFactoryEditingDomain.getEditingDomainFor(resource);
+			EditingDomain editingDomain = TransactionUtil.getEditingDomain(resource);
 			final LoadDiagramCommand loadCommand = new LoadDiagramCommand(resource);
 			try {
 				TransactionHelper.run(editingDomain, loadCommand);