From 827bea532381fd9e0ffeb550a83fb162bcba39ee Mon Sep 17 00:00:00 2001
From: Katja Luther <k.luther@bgbm.org>
Date: Sun, 12 Jun 2016 07:28:43 +0200
Subject: [PATCH] fix selection dialog

---
 .../AbstractFilteredCdmResourceSelectionDialog.java   |  7 ++-----
 .../selection/CdmFilteredItemsSelectionDialog.java    | 11 +++++++++--
 2 files changed, 11 insertions(+), 7 deletions(-)

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 8f8fa3144..230cb9837 100644
--- 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
@@ -223,15 +223,12 @@ public abstract class AbstractFilteredCdmResourceSelectionDialog<T extends ICdmB
 	/** {@inheritDoc} */
 	@Override
 	public void refresh() {
-		initModel();
+		//initModel();
 		filterExcludedObjects();
 		super.refresh();
 	}
 
-	/**
-	 * <p>initModel</p>
-	 */
-	abstract protected void initModel();
+
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.dialogs.FilteredItemsSelectionDialog#createFilter()
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/CdmFilteredItemsSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/CdmFilteredItemsSelectionDialog.java
index 975673b48..45a581043 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/CdmFilteredItemsSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/CdmFilteredItemsSelectionDialog.java
@@ -1190,7 +1190,7 @@ public abstract class CdmFilteredItemsSelectionDialog extends SelectionStatusDia
          * refiltering.
          */
         protected void applyFilter() {
-
+            initModel();
             ItemsFilter newFilter = createFilter();
 
             // don't apply filtering for patterns which mean the same, for example:
@@ -2938,11 +2938,13 @@ public abstract class CdmFilteredItemsSelectionDialog extends SelectionStatusDia
              */
             @Override
             public Object[] getElements(Object inputElement) {
+                //return items.toArray();
                 return lastFilteredItems.toArray();
             }
 
             public int getNumberOfElements() {
-                return lastFilteredItems.size();
+
+               return lastFilteredItems.size();
             }
 
             /*
@@ -3401,6 +3403,11 @@ public abstract class CdmFilteredItemsSelectionDialog extends SelectionStatusDia
             return pattern;
         }
 
+        /**
+         * <p>initModel</p>
+         */
+        abstract protected void initModel();
+
     }
 
 
-- 
2.34.1