diff options
| author | Eugen Neufeld | 2016-09-05 09:29:55 +0000 |
|---|---|---|
| committer | Eugen Neufeld | 2016-09-05 09:29:55 +0000 |
| commit | 5c1e40ad746b0bff6e1ea25afd030b59c3f6d59a (patch) | |
| tree | 8d922096005c2ca9d33c3f51ec987ae96ac0e67f | |
| parent | b41577f4219fc6ed46a3bd1f949cc3da2c2bc7cd (diff) | |
| download | org.eclipse.emf.ecp.core-5c1e40ad746b0bff6e1ea25afd030b59c3f6d59a.tar.gz org.eclipse.emf.ecp.core-5c1e40ad746b0bff6e1ea25afd030b59c3f6d59a.tar.xz org.eclipse.emf.ecp.core-5c1e40ad746b0bff6e1ea25afd030b59c3f6d59a.zip | |
TCI - Fixed log for missing TableControlService
Change-Id: I1824b8e6897fe414e0df7c2a58735619ced8627b
Signed-off-by: Eugen Neufeld <eneufeld@eclipsesource.com>
| -rw-r--r-- | bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/spi/table/swt/TableControlSWTRenderer.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/spi/table/swt/TableControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/spi/table/swt/TableControlSWTRenderer.java index 8e1d0adca2..4a90d8678d 100644 --- a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/spi/table/swt/TableControlSWTRenderer.java +++ b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/spi/table/swt/TableControlSWTRenderer.java @@ -1091,12 +1091,10 @@ public class TableControlSWTRenderer extends AbstractControlSWTRenderer<VTableCo * @since 1.6 */ protected void addRow(EClass clazz, EObject eObject, EStructuralFeature structuralFeature) { - final TableControlService tableService = getViewModelContext() - .getService(TableControlService.class); Optional<EObject> eObjectToAdd; /* no table service available, fall back to default */ - if (tableService == null) { + if (!getViewModelContext().hasService(TableControlService.class)) { if (clazz.isAbstract() || clazz.isInterface()) { getReportService().report(new StatusReport( new Status(IStatus.WARNING, "org.eclipse.emf.ecp.view.table.ui.swt", //$NON-NLS-1$ @@ -1108,6 +1106,8 @@ public class TableControlSWTRenderer extends AbstractControlSWTRenderer<VTableCo } /* table service available */ else { + final TableControlService tableService = getViewModelContext() + .getService(TableControlService.class); eObjectToAdd = tableService.createNewElement(clazz, eObject, structuralFeature); } @@ -1433,15 +1433,15 @@ public class TableControlSWTRenderer extends AbstractControlSWTRenderer<VTableCo private final class DoubleClickListener implements IDoubleClickListener { @Override public void doubleClick(DoubleClickEvent event) { - final TableControlService tableService = getViewModelContext() - .getService(TableControlService.class); - if (tableService == null) { + if (!getViewModelContext().hasService(TableControlService.class)) { return; } final ISelection selection = event.getSelection(); if (!StructuredSelection.class.isInstance(selection)) { return; } + final TableControlService tableService = getViewModelContext() + .getService(TableControlService.class); tableService.doubleClick(getVElement(), (EObject) StructuredSelection.class.cast(selection).getFirstElement()); } |