From: Patrick Plitzner Date: Wed, 6 Dec 2017 10:41:44 +0000 (+0100) Subject: ref #7086 Adapt selection dialog to cdm service changes X-Git-Tag: 4.13.0^2~129 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/cf1d5509efd6d2e9d8fd1366ea31fb0bc59a3b6d ref #7086 Adapt selection dialog to cdm service changes --- diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/WorkingSetSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/WorkingSetSelectionDialog.java index edf110b08..3a6474308 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/WorkingSetSelectionDialog.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/WorkingSetSelectionDialog.java @@ -16,9 +16,7 @@ import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.Text; import eu.etaxonomy.cdm.api.service.IWorkingSetService; import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; @@ -65,18 +63,8 @@ AbstractFilteredCdmResourceSelectionDialog { /** {@inheritDoc} */ @Override - protected void search() { - Control control =getSearchField(); - String pattern = null; - if (control != null){ - pattern = ((Text)control).getText(); - } - - if (pattern == null || pattern.equals("?")){ - model = CdmStore.getService(IWorkingSetService.class).getUuidAndTitleCache(null, null); - }else{ - model = CdmStore.getService(IWorkingSetService.class).getUuidAndTitleCache(limitOfInitialElements, pattern); - } + protected void callService(String pattern) { + model = CdmStore.getService(IWorkingSetService.class).getUuidAndTitleCache(limitOfInitialElements, pattern); } @Override @@ -122,4 +110,5 @@ AbstractFilteredCdmResourceSelectionDialog { protected String[] getNewWizardText() { return new String[]{"Working set "}; } + }