revert changes in selection dialogs for enums

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/OriginalSourceTypeSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/OriginalSourceTypeSelectionDialog.java
index a62e25066c5ac013a03ce1782dbe602e88d5ee3a..c947c08f905e99d8077431479093490624b7deff 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/OriginalSourceTypeSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/OriginalSourceTypeSelectionDialog.java
@@ -1,8 +1,8 @@
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* European Distributed Institute of Taxonomy
 * http://www.e-taxonomy.eu
-* 
+*
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
@@ -36,15 +36,15 @@ public class OriginalSourceTypeSelectionDialog extends
         * @return a {@link eu.etaxonomy.cdm.model.common.OriginalSourceType} object.
         */
        public static OriginalSourceType select(Shell shell, ConversationHolder conversation){
-               OriginalSourceTypeSelectionDialog dialog = 
-                               new OriginalSourceTypeSelectionDialog(shell, 
+               OriginalSourceTypeSelectionDialog dialog =
+                               new OriginalSourceTypeSelectionDialog(shell,
                                                conversation,
-                                               "Choose Original Source Type", 
-                                               false, 
+                                               "Choose Original Source Type",
+                                               false,
                                                OriginalSourceTypeSelectionDialog.class.getCanonicalName());
                return getSelectionFromDialog(dialog);
        }
-       
+
        /**
         * <p>Constructor for FilteredDerivedUnitSelectionDialog.</p>
         *
@@ -54,10 +54,10 @@ public class OriginalSourceTypeSelectionDialog extends
         * @param multi a boolean.
         * @param settings a {@link java.lang.String} object.
         */
-       protected OriginalSourceTypeSelectionDialog(Shell shell, 
-                       ConversationHolder conversation, 
+       protected OriginalSourceTypeSelectionDialog(Shell shell,
+                       ConversationHolder conversation,
                        String title,
-                       boolean multi, 
+                       boolean multi,
                        String settings) {
                super(shell, conversation, title, multi, settings, OriginalSourceType.PrimaryTaxonomicSource);
        }
@@ -65,9 +65,9 @@ public class OriginalSourceTypeSelectionDialog extends
 
        /** {@inheritDoc} */
        @Override
-       protected void search() {
+       protected void initModel() {
                model = new ArrayList<OriginalSourceType>();
-               model.addAll(EnumSet.allOf(OriginalSourceType.class));          
+               model.addAll(EnumSet.allOf(OriginalSourceType.class));
        }
 
        /** {@inheritDoc} */

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SpecimenOrObservationTypeSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SpecimenOrObservationTypeSelectionDialog.java
index 10eb88826e221b864ca8017c73d83986d530e4be..86ecfcc1eeffb469811a33379f8ec5c889bf454e 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SpecimenOrObservationTypeSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SpecimenOrObservationTypeSelectionDialog.java
@@ -29,15 +29,15 @@ public class SpecimenOrObservationTypeSelectionDialog extends
         * @return a {@link eu.etaxonomy.cdm.model.common.OriginalSourceType} object.
         */
        public static SpecimenOrObservationType select(Shell shell, ConversationHolder conversation){
-               SpecimenOrObservationTypeSelectionDialog dialog = 
-                               new SpecimenOrObservationTypeSelectionDialog(shell, 
+               SpecimenOrObservationTypeSelectionDialog dialog =
+                               new SpecimenOrObservationTypeSelectionDialog(shell,
                                                conversation,
-                                               "Choose Specimen / Observation Type", 
-                                               false, 
+                                               "Choose Specimen / Observation Type",
+                                               false,
                                                SpecimenOrObservationTypeSelectionDialog.class.getCanonicalName());
                return getSelectionFromDialog(dialog);
        }
-       
+
        /**
         * <p>Constructor for FilteredDerivedUnitSelectionDialog.</p>
         *
@@ -47,10 +47,10 @@ public class SpecimenOrObservationTypeSelectionDialog extends
         * @param multi a boolean.
         * @param settings a {@link java.lang.String} object.
         */
-       protected SpecimenOrObservationTypeSelectionDialog(Shell shell, 
-                       ConversationHolder conversation, 
+       protected SpecimenOrObservationTypeSelectionDialog(Shell shell,
+                       ConversationHolder conversation,
                        String title,
-                       boolean multi, 
+                       boolean multi,
                        String settings) {
                super(shell, conversation, title, multi, settings, SpecimenOrObservationType.Unknown);
        }
@@ -58,9 +58,9 @@ public class SpecimenOrObservationTypeSelectionDialog extends
 
        /** {@inheritDoc} */
        @Override
-       protected void search() {
+       protected void initModel() {
                model = new ArrayList<SpecimenOrObservationType>();
-               model.addAll(EnumSet.allOf(SpecimenOrObservationType.class));           
+               model.addAll(EnumSet.allOf(SpecimenOrObservationType.class));
        }
 
        /** {@inheritDoc} */