diff options
author | Camille Letavernier | 2014-05-06 11:45:02 +0000 |
---|---|---|
committer | Camille Letavernier | 2014-05-06 11:47:26 +0000 |
commit | 5e02bb2e917ef1c3d97af7102bd0964c7cc7850e (patch) | |
tree | 3d99c12c169b466249d3b1472ddd4cfcb00dd985 /plugins | |
parent | 5d3aa60ec10de3fc6965e9047310a28a99c1bbb7 (diff) | |
download | org.eclipse.papyrus-5e02bb2e917ef1c3d97af7102bd0964c7cc7850e.tar.gz org.eclipse.papyrus-5e02bb2e917ef1c3d97af7102bd0964c7cc7850e.tar.xz org.eclipse.papyrus-5e02bb2e917ef1c3d97af7102bd0964c7cc7850e.zip |
431615: Implement rarther than adapt to IEditingDomainProvider
https://bugs.eclipse.org/bugs/show_bug.cgi?id=431615
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/CoreMultiDiagramEditor.java | 35 |
1 files changed, 4 insertions, 31 deletions
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/CoreMultiDiagramEditor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/CoreMultiDiagramEditor.java index 45a38352380..70800f02d49 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/CoreMultiDiagramEditor.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/editor/CoreMultiDiagramEditor.java @@ -108,7 +108,7 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage; *
* TODO : remove GMF dependency !
*/
-public class CoreMultiDiagramEditor extends AbstractMultiPageSashEditor implements IMultiDiagramEditor, ITabbedPropertySheetPageContributor, IGotoMarker {
+public class CoreMultiDiagramEditor extends AbstractMultiPageSashEditor implements IMultiDiagramEditor, ITabbedPropertySheetPageContributor, IGotoMarker, IEditingDomainProvider {
/** Gef adapter */
private MultiDiagramEditorGefDelegate gefAdaptorDelegate;
@@ -208,29 +208,6 @@ public class CoreMultiDiagramEditor extends AbstractMultiPageSashEditor implemen */
protected DoSaveEvent lifeCycleEvent;
- private static class EditingDomainProvider implements IEditingDomainProvider {
-
- private CoreMultiDiagramEditor editor;
-
- public EditingDomainProvider(CoreMultiDiagramEditor editor) {
- this.editor = editor;
- }
-
- @Override
- public EditingDomain getEditingDomain() {
- return editor.transactionalEditingDomain;
- }
-
- public void dispose() {
- this.editor = null;
- }
- }
-
- /**
- * My editing domain provider.
- */
- private EditingDomainProvider domainProvider = new EditingDomainProvider(this);
-
private class ContentChangedListener implements IContentChangedListener {
/**
@@ -442,7 +419,7 @@ public class CoreMultiDiagramEditor extends AbstractMultiPageSashEditor implemen // EMF requirements
if(IEditingDomainProvider.class == adapter) {
- return domainProvider;
+ return this;
}
// GEF diagram requirements
@@ -548,7 +525,7 @@ public class CoreMultiDiagramEditor extends AbstractMultiPageSashEditor implemen // Must create a new adapter factory
factory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
}
-
+
/** label provider for EMF objects */
ILabelProvider labelProvider = new AdapterFactoryLabelProvider(factory) {
@@ -784,11 +761,6 @@ public class CoreMultiDiagramEditor extends AbstractMultiPageSashEditor implemen }
}
- if(domainProvider != null) {
- this.domainProvider.dispose();
- this.domainProvider = null;
- }
-
if(contentChangedListener != null) {
this.contentChangedListener = null;
}
@@ -948,6 +920,7 @@ public class CoreMultiDiagramEditor extends AbstractMultiPageSashEditor implemen *
* @see org.eclipse.emf.edit.domain.IEditingDomainProvider#getEditingDomain()
*/
+ @Override
public EditingDomain getEditingDomain() {
return transactionalEditingDomain;
}
|