diff options
| author | mvelten | 2012-05-10 09:08:12 +0000 |
|---|---|---|
| committer | mvelten | 2012-05-10 09:08:12 +0000 |
| commit | ab2023bb36f797a25a0b267e193caa9b25fc0b16 (patch) | |
| tree | 9f48d9186b242e25d8e5fe4a14262930c3ae59f5 /plugins/views | |
| parent | 7ee8e631e1e8561212c4cb4eb61a4e7a9db456b8 (diff) | |
| download | org.eclipse.papyrus-ab2023bb36f797a25a0b267e193caa9b25fc0b16.tar.gz org.eclipse.papyrus-ab2023bb36f797a25a0b267e193caa9b25fc0b16.tar.xz org.eclipse.papyrus-ab2023bb36f797a25a0b267e193caa9b25fc0b16.zip | |
backport :
NEW - bug 377077: [Properties framework] empty editing domain leading to "write transaction" exceptions
https://bugs.eclipse.org/bugs/show_bug.cgi?id=377077
Diffstat (limited to 'plugins/views')
2 files changed, 2 insertions, 4 deletions
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/AnnotationModelElementFactory.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/AnnotationModelElementFactory.java index f3fddb3a4fd..3dd13364b61 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/AnnotationModelElementFactory.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/AnnotationModelElementFactory.java @@ -13,7 +13,6 @@ package org.eclipse.papyrus.views.properties.modelelement; import org.eclipse.emf.ecore.EModelElement;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
import org.eclipse.papyrus.views.properties.Activator;
@@ -37,7 +36,7 @@ public class AnnotationModelElementFactory implements ModelElementFactory { Activator.log.warn("The selected element must be an EModelElement"); //$NON-NLS-1$
}
- EditingDomain domain = AdapterFactoryEditingDomain.getEditingDomainFor(source);
+ EditingDomain domain = EMFHelper.resolveEditingDomain(source);
return new AnnotationModelElement((EModelElement)source, domain, context.getName());
}
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/EMFModelElementFactory.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/EMFModelElementFactory.java index 3095b8c4f30..8877aca5120 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/EMFModelElementFactory.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/EMFModelElementFactory.java @@ -12,7 +12,6 @@ package org.eclipse.papyrus.views.properties.modelelement;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
import org.eclipse.papyrus.views.properties.Activator;
@@ -33,7 +32,7 @@ public class EMFModelElementFactory implements ModelElementFactory { return null;
}
- EditingDomain domain = AdapterFactoryEditingDomain.getEditingDomainFor(source);
+ EditingDomain domain = EMFHelper.resolveEditingDomain(source);
return new EMFModelElement(source, domain);
}
|