remove conversation from selectiondialog

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 c579a01b4a05b36ccc22961df2519528b322592e..e25e4713c14ee69437fad480a2b9489cf5dcc8f4 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
@@ -39,12 +39,10 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Shell;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
-import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.common.ICdmBase;
 import eu.etaxonomy.cdm.model.common.IIdentifiableEntity;
 import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
-import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
 import eu.etaxonomy.taxeditor.l10n.Messages;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
 import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
@@ -60,9 +58,9 @@ import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
  * @version 1.0
  */
 public abstract class AbstractFilteredCdmResourceSelectionDialog<T extends ICdmBase> extends
-               SearchDialog implements IConversationEnabled {
+               SearchDialog {//implements IConversationEnabled {
 
-       private final ConversationHolder conversation;
+//     private final ConversationHolder conversation = null;
 
        protected List<UuidAndTitleCache<T>> model;
        private final Set<T> transientCdmObjects = new HashSet<T>();
@@ -92,7 +90,7 @@ public abstract class AbstractFilteredCdmResourceSelectionDialog<T extends ICdmB
                setMessage(Messages.SearchDialog_patternLabel);
                this.settings = settings;
 
-               this.conversation = conversation;
+//             this.conversation = conversation;
                this.cdmBaseToBeFiltered = cdmObject;
                Cursor cursor = shell.getCursor();
                shell.setCursor(shell.getDisplay().getSystemCursor(SWT.CURSOR_WAIT));
@@ -434,14 +432,14 @@ public abstract class AbstractFilteredCdmResourceSelectionDialog<T extends ICdmB
                                        T entity = (T) wizard.getEntity();
                                        refresh();
                                        setPattern(entity);
-                                       if (getConversationHolder() != null){
-                                           getConversationHolder().bind();
-                                       }
+//                                     if (getConversationHolder() != null){
+//                                         getConversationHolder().bind();
+//                                     }
                                    }
                                    //FIXME : Need to make sure this is a stable fix (ticket 3822)
-                                   if (getConversationHolder() != null){
-                                       getConversationHolder().commit();
-                                   }
+//                                 if (getConversationHolder() != null){
+//                                     getConversationHolder().commit();
+//                                 }
                                }
                            }
                        }
@@ -452,15 +450,15 @@ public abstract class AbstractFilteredCdmResourceSelectionDialog<T extends ICdmB
         * <p>getConversationHolder</p>
         *
         * @return a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        */
-       @Override
-       public ConversationHolder getConversationHolder() {
-               return conversation;
-       }
+//      */
+//     @Override
+//     public ConversationHolder getConversationHolder() {
+//             return conversation;
+//     }
 
        /** {@inheritDoc} */
-       @Override
-       public void update(CdmDataChangeMap changeEvents) {}
+//     @Override
+//     public void update(CdmDataChangeMap changeEvents) {}
 
        /**
         * Don't want to add for example a taxon or synonym to itself

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/DerivedUnitSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/DerivedUnitSelectionDialog.java
index 56d3dd2cc284511568fa60ff5d651b2b7da305be..50c358072297619c9f7ce0ac51a4132d11c3f916 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/DerivedUnitSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/DerivedUnitSelectionDialog.java
@@ -11,7 +11,10 @@ package eu.etaxonomy.taxeditor.ui.dialog.selection;
 
 import java.util.UUID;
 
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.service.IOccurrenceService;
@@ -79,7 +82,25 @@ public class DerivedUnitSelectionDialog extends
        /** {@inheritDoc} */
        @Override
        protected void search() {
-               model = CdmStore.getService(IOccurrenceService.class).getDerivedUnitUuidAndTitleCache();
+
+        Control control =getSearchField();
+        String pattern = null;
+        if (control != null){
+            pattern = ((Text)control).getText();
+        }
+
+        if (pattern == null || pattern.equals("?")){
+            model = CdmStore.getService(IOccurrenceService.class).getDerivedUnitUuidAndTitleCache(null,null);
+        }else{
+            model = CdmStore.getService(IOccurrenceService.class).getDerivedUnitUuidAndTitleCache(limitOfInitialElements,pattern);
+        }
+        try {
+            fillContentProvider(null);
+        } catch (CoreException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+
        }
 
        /** {@inheritDoc} */

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SearchDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SearchDialog.java
index d34098d0253f9160e81668e0d8d23abba5d34ae0..4be7699a8eb195fa33f2d843cc0fb7b641653571 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SearchDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SearchDialog.java
@@ -77,7 +77,6 @@ import org.eclipse.ui.internal.WorkbenchImages;
 import org.eclipse.ui.internal.WorkbenchMessages;
 import org.eclipse.ui.internal.WorkbenchPlugin;
 
-import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
 import eu.etaxonomy.cdm.model.common.ICdmBase;
 import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
 import eu.etaxonomy.taxeditor.l10n.Messages;
@@ -88,7 +87,7 @@ import eu.etaxonomy.taxeditor.ui.dialog.selection.CdmFilteredItemsSelectionDialo
  * @date 15.11.2017
  *
  */
-public abstract class SearchDialog<T extends ICdmBase> extends Dialog implements IConversationEnabled{
+public abstract class SearchDialog<T extends ICdmBase> extends Dialog{// implements IConversationEnabled{
 
         private TableViewer list;
         private Text searchField;

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SpecimenOrObservationBaseSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SpecimenOrObservationBaseSelectionDialog.java
index 41766afde64a9574547a8890d41c62706eae04ca..304d0f638ffbf576836893fefb79f62ab20e203b 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SpecimenOrObservationBaseSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SpecimenOrObservationBaseSelectionDialog.java
@@ -11,7 +11,10 @@ package eu.etaxonomy.taxeditor.ui.dialog.selection;
 
 import java.util.UUID;
 
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.service.IOccurrenceService;
@@ -49,7 +52,24 @@ public class SpecimenOrObservationBaseSelectionDialog extends
        /** {@inheritDoc} */
        @Override
        protected void search() {
-               model = CdmStore.getService(IOccurrenceService.class).getUuidAndTitleCache(null, null);
+
+           Control control =getSearchField();
+        String pattern = null;
+        if (control != null){
+            pattern = ((Text)control).getText();
+        }
+
+        if (pattern == null || pattern.equals("?")){
+            model = CdmStore.getService(IOccurrenceService.class).getUuidAndTitleCache(null,null);
+        }else{
+            model =CdmStore.getService(IOccurrenceService.class).getUuidAndTitleCache(limitOfInitialElements,pattern);
+        }
+        try {
+            fillContentProvider(null);
+        } catch (CoreException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
        }
 
        /** {@inheritDoc} */