adapt workingSetSelectionDialog to new getUuidAndTitleCache method and nomencl ref...

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredCdmResourceSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredCdmResourceSelectionDialog.java
index e547acf53e26f6afc86dc868e51d5c4ebb8e0414..ba3309f1f680a6de9feb49c113631f452cdcc300 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredCdmResourceSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredCdmResourceSelectionDialog.java
@@ -23,7 +23,6 @@ import org.apache.commons.lang.StringUtils;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.viewers.CellEditor.LayoutData;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
@@ -39,7 +38,6 @@ import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
@@ -423,18 +421,18 @@ public abstract class AbstractFilteredCdmResourceSelectionDialog<T extends ICdmB
        @Override
     protected void createButtonsForButtonBar(Composite parent) {
            String[] newButtonText = getNewWizardText();
-           
+
            if (newButtonText!= null){
                this.newButton1 = createButton(parent, this.new_id, newButtonText[0], false);
                newButton1.addSelectionListener(getNewWizardButtonSelectionListener());
-              
-           
+
+
                if (newButtonText.length > 1){
                    newButton2 = createButton(parent, this.new_id2, newButtonText[1], false);
                    newButton2.addSelectionListener(getNewWizardButtonSelectionListener());
 
                }
-       
+
            }
            Button space = createButton(parent, this.space_id, " ", false);
            space.setEnabled(false);
@@ -451,7 +449,7 @@ public abstract class AbstractFilteredCdmResourceSelectionDialog<T extends ICdmB
                gridLayout.numColumns=2;
            }
            parent.setLayout(gridLayout);
-    
+
         super.createButtonsForButtonBar(parent);
     }
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NomenclaturalReferenceSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NomenclaturalReferenceSelectionDialog.java
index e3ad649735ddee42a4b5667b44275e11e029fb20..8a2fd0d29bf5fd48d6b4d8c5f236c786134721f2 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NomenclaturalReferenceSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NomenclaturalReferenceSelectionDialog.java
@@ -4,6 +4,7 @@ import java.text.Collator;
 import java.util.Comparator;
 import java.util.List;
 
+import org.apache.commons.lang.StringUtils;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.swt.SWT;
@@ -54,10 +55,11 @@ public class NomenclaturalReferenceSelectionDialog extends
             pattern = author.getNomenclaturalTitle();
             if (control!= null){
                 firstCall = false;
-                ((Text)control).setText(pattern);
+                model = CdmStore.getService(IReferenceService.class).getUuidAndAbbrevTitleCacheForAuthor(limitOfInitialElements, pattern, null);
+
             }
 
-        }
+        }else{
 
             if (isUseIdentifier()){
                 List<IdentifiedEntityDTO<Reference>> list = CdmStore.getService(IReferenceService.class).listByIdentifierAbbrev(pattern, null, MatchMode.EXACT, limitOfInitialElements);
@@ -72,7 +74,7 @@ public class NomenclaturalReferenceSelectionDialog extends
                 model = CdmStore.getService(IReferenceService.class).getUuidAndAbbrevTitleCache(limitOfInitialElements, pattern);
             }
 
-
+        }
 
 
 
@@ -233,6 +235,23 @@ public class NomenclaturalReferenceSelectionDialog extends
 
     }
 
+        @Override
+           protected void search() {
+               Control control =getSearchField();
+               String pattern = null;
+               if (control != null){
+                   pattern = ((Text)control).getText();
+                   if (pattern.equals("*") || pattern.equals("?")){
+                       callService(null);
+                   }else if (StringUtils.isNotBlank(pattern)){
+                       callService(pattern);
+                   } else if (firstCall){
+                       callService(null);
+                   }
+                   fillContentProvider(null);
+               }
+        }
+
 
 
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/PrimerSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/PrimerSelectionDialog.java
index 8ce81ace31e9eabb5321a3ceca27d4815a9647d3..a0166e807c8606d2898143c0866b5a26ac3182d9 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/PrimerSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/PrimerSelectionDialog.java
@@ -62,7 +62,7 @@ AbstractFilteredCdmResourceSelectionDialog<Primer> {
     /** {@inheritDoc} */
     @Override
     protected void callService(String pattern) {
-        model = CdmStore.getService(IPrimerService.class).getUuidAndTitleCache(limitOfInitialElements, pattern);
+        model = CdmStore.getService(IPrimerService.class).getPrimerUuidAndTitleCache(limitOfInitialElements, pattern);
     }
 
     /* (non-Javadoc)

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 9ab483c8c3f65e278b402039275c707af8412ebb..16ec1076788558663a0a746c6d03861fc063b350 100644 (file)
--- 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
@@ -64,7 +64,7 @@ AbstractFilteredCdmResourceSelectionDialog<WorkingSet> {
     /** {@inheritDoc} */
     @Override
     protected void callService(String pattern) {
-        model = CdmStore.getService(IWorkingSetService.class).getUuidAndTitleCache(limitOfInitialElements, pattern);
+        model = CdmStore.getService(IWorkingSetService.class).getWorkingSetUuidAndTitleCache(limitOfInitialElements, pattern);
     }
 
     @Override