Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2020-05-27 05:13:56 +0000
committerEike Stepper2020-05-27 05:13:56 +0000
commitc85e9dd8deec54e46c9ded8f693082e79bfebd6a (patch)
treede67d3b8055c21070d21318b60d8042f7210e67b
parent237678ad4bba83d314a3bb0096e2d4cbdc4efd7a (diff)
downloadcdo-c85e9dd8deec54e46c9ded8f693082e79bfebd6a.tar.gz
cdo-c85e9dd8deec54e46c9ded8f693082e79bfebd6a.tar.xz
cdo-c85e9dd8deec54e46c9ded8f693082e79bfebd6a.zip
[Releng] Cleanup EditObjectDialog
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/EditObjectDialog.java17
1 files changed, 9 insertions, 8 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/EditObjectDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/EditObjectDialog.java
index 89470cfbff..d096140f51 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/EditObjectDialog.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/EditObjectDialog.java
@@ -14,11 +14,6 @@ import org.eclipse.emf.cdo.internal.ui.CDOPropertyAdapterFactory;
import org.eclipse.emf.cdo.ui.shared.SharedIcons;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecp.ui.view.swt.DefaultReferenceService;
-import org.eclipse.emf.ecp.ui.view.swt.ECPSWTViewRenderer;
-import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
-import org.eclipse.emf.ecp.view.spi.context.ViewModelContextFactory;
-import org.eclipse.emf.ecp.view.spi.provider.ViewProviderHelper;
import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
import org.eclipse.jface.dialogs.TitleAreaDialog;
@@ -69,10 +64,16 @@ public class EditObjectDialog extends TitleAreaDialog
try
{
- ViewModelContext viewModelContext = ViewModelContextFactory.INSTANCE.createViewModelContext(ViewProviderHelper.getView(eObject, null), eObject,
- new DefaultReferenceService());
+ org.eclipse.emf.ecp.view.spi.model.VView view = //
+ org.eclipse.emf.ecp.view.spi.provider.ViewProviderHelper.getView(eObject, null);
- ECPSWTViewRenderer.INSTANCE.render(container, viewModelContext);
+ org.eclipse.emf.ecp.view.spi.context.ViewModelService viewModelService = //
+ new org.eclipse.emf.ecp.ui.view.swt.DefaultReferenceService();
+
+ org.eclipse.emf.ecp.view.spi.context.ViewModelContext viewModelContext = //
+ org.eclipse.emf.ecp.view.spi.context.ViewModelContextFactory.INSTANCE.createViewModelContext(view, eObject, viewModelService);
+
+ org.eclipse.emf.ecp.ui.view.swt.ECPSWTViewRenderer.INSTANCE.render(container, viewModelContext);
}
catch (RuntimeException ex)
{

Back to the top