Add initModel call to constructor since it requires the type to be set beforehand

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TaxonBaseSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TaxonBaseSelectionDialog.java
index 99e5890e83e29da2616fd2f3863ebce081685680..b4901d2d38fb7d3f31d3cd24fb74c49afd642d2d 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TaxonBaseSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TaxonBaseSelectionDialog.java
@@ -1,12 +1,12 @@
 // $Id$\r
 /**\r
 // $Id$\r
 /**\r

-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
+ * Copyright (C) 2007 EDIT\r
+ * European Distributed Institute of Taxonomy\r
+ * http://www.e-taxonomy.eu\r
+ *\r
+ * The contents of this file are subject to the Mozilla Public License Version 1.1\r
+ * See LICENSE.TXT at the top of this package for the full license terms.\r
+ */\r

 \r
 package eu.etaxonomy.taxeditor.ui.dialog.selection;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.ui.dialog.selection;\r
 \r


@@ -31,117 +31,114 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @created Sep 21, 2009\r
  * @version 1.0\r
  */\r
  * @created Sep 21, 2009\r
  * @version 1.0\r
  */\r

-public class TaxonBaseSelectionDialog extends\r
-               AbstractFilteredCdmResourceSelectionDialog<TaxonBase> {\r
-       \r
-               \r
-       /**\r
-        * <p>select</p>\r
-        *\r
-        * @param shell a {@link org.eclipse.swt.widgets.Shell} object.\r
-        * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.\r
-        * @return a {@link eu.etaxonomy.cdm.model.taxon.TaxonBase} object.\r
-        */\r
-       public static TaxonBase selectTaxonBase(Shell shell, ConversationHolder conversation) {\r
-               AbstractFilteredCdmResourceSelectionDialog<TaxonBase> dialog = new TaxonBaseSelectionDialog(TaxonBase.class, shell, conversation,\r
-                               "Choose a taxon", false, null, null);\r
-               return getSelectionFromDialog(dialog);\r
-       }\r
-       \r
-       /**\r
-        * <p>select</p>\r
-        *\r
-        * @param shell a {@link org.eclipse.swt.widgets.Shell} object.\r
-        * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.\r
-        * @return a {@link eu.etaxonomy.cdm.model.taxon.TaxonBase} object.\r
-        */\r
-       public static Taxon selectTaxon(Shell shell, ConversationHolder conversation, Taxon taxonToBeFiltered) {\r
-               \r
-\r
-               AbstractFilteredCdmResourceSelectionDialog<TaxonBase> dialog = new TaxonBaseSelectionDialog(Taxon.class, shell, conversation,\r
-                               "Choose a taxon", false, null, taxonToBeFiltered);\r
-               return (Taxon) getSelectionFromDialog(dialog);\r
-       }\r
-       \r
-       /**\r
-        * <p>select</p>\r
-        *\r
-        * @param shell a {@link org.eclipse.swt.widgets.Shell} object.\r
-        * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.\r
-        * @return a {@link eu.etaxonomy.cdm.model.taxon.TaxonBase} object.\r
-        */\r
-       public static Synonym selectSynonym(Shell shell, ConversationHolder conversation) {\r
-               AbstractFilteredCdmResourceSelectionDialog<TaxonBase> dialog = new TaxonBaseSelectionDialog(Synonym.class, shell, conversation,\r
-                               "Choose a taxon", false, null, null);\r
-               return (Synonym) getSelectionFromDialog(dialog);\r
-       }\r
-\r
-       private final Class<? extends TaxonBase> clazz;\r
-       \r
-       /**\r
-        * <p>Constructor for FilteredTaxonBaseSelectionDialog.</p>\r
-        *\r
-        * @param shell a {@link org.eclipse.swt.widgets.Shell} object.\r
-        * @param title a {@link java.lang.String} object.\r
-        * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.\r
-        * @param multi a boolean.\r
-        * @param taxon a {@link eu.etaxonomy.cdm.model.taxon.TaxonBase} object.\r
-        */\r
-       protected TaxonBaseSelectionDialog(Class<? extends TaxonBase> clazz, Shell shell, ConversationHolder conversation, String title, boolean multi, TaxonBase taxon, TaxonBase taxonToBeFiltered) {\r
-               super(shell, conversation, title, multi, ReferenceSelectionDialog.class.getCanonicalName(), taxon);\r
-               this.cdmBaseToBeFiltered = taxonToBeFiltered;\r
-\r
-               \r
-               \r
-               this.clazz = clazz;\r
-       }\r
-\r
-       /* (non-Javadoc)\r
-        * @see org.eclipse.ui.dialogs.FilteredItemsSelectionDialog#createExtendedContentArea(org.eclipse.swt.widgets.Composite)\r
-        */\r
-       /** {@inheritDoc} */\r
-       @Override\r
-       protected Control createExtendedContentArea(Composite parent) {\r
-               return null;\r
-       }\r
-\r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.taxeditor.dialogs.AbstractFilteredCdmResourceSelectionDialog#getPersistentObject(java.util.UUID)\r
-        */\r
-       /** {@inheritDoc} */\r
-       @Override\r
-       protected TaxonBase getPersistentObject(UUID uuid) {\r
-               return CdmStore.getService(ITaxonService.class).load(uuid);\r
-       }\r
-\r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.taxeditor.dialogs.AbstractFilteredCdmResourceSelectionDialog#initModel()\r
-        */\r
-       /** {@inheritDoc} */\r
-       @Override\r
-       protected void initModel() {\r
-               if(clazz == TaxonBase.class){\r
-                       model = CdmStore.getService(ITaxonService.class).getUuidAndTitleCache();\r
-               }\r
-               else if(clazz == Taxon.class){\r
-                                               \r
-                       model = CdmStore.getService(ITaxonService.class).getUuidAndTitleCacheTaxon();\r
-                       \r
-               }\r
-               else if(clazz == Synonym.class){\r
-                       model = CdmStore.getService(ITaxonService.class).getUuidAndTitleCacheSynonym();\r
-               }\r
-       }\r
-\r
-       /** {@inheritDoc} */\r
-       @Override\r
-       protected AbstractNewEntityWizard getNewEntityWizard(String parameter) {\r
-               return null;\r
-       }\r
-\r
-       /** {@inheritDoc} */\r
-       @Override\r
-       protected String getNewWizardLinkText() {\r
-               return null;\r
-       }\r
+public class TaxonBaseSelectionDialog extends AbstractFilteredCdmResourceSelectionDialog<TaxonBase> {\r
+\r
+\r
+    /**\r
+     * <p>select</p>\r
+     *\r
+     * @param shell a {@link org.eclipse.swt.widgets.Shell} object.\r
+     * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.\r
+     * @return a {@link eu.etaxonomy.cdm.model.taxon.TaxonBase} object.\r
+     */\r
+    public static TaxonBase selectTaxonBase(Shell shell, ConversationHolder conversation) {\r
+        AbstractFilteredCdmResourceSelectionDialog<TaxonBase> dialog = new TaxonBaseSelectionDialog(TaxonBase.class, shell, conversation,\r
+                "Choose a taxon", false, null, null);\r
+        return getSelectionFromDialog(dialog);\r
+    }\r
+\r
+    /**\r
+     * <p>select</p>\r
+     *\r
+     * @param shell a {@link org.eclipse.swt.widgets.Shell} object.\r
+     * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.\r
+     * @return a {@link eu.etaxonomy.cdm.model.taxon.TaxonBase} object.\r
+     */\r
+    public static Taxon selectTaxon(Shell shell, ConversationHolder conversation, Taxon taxonToBeFiltered) {\r
+\r
+\r
+        AbstractFilteredCdmResourceSelectionDialog<TaxonBase> dialog = new TaxonBaseSelectionDialog(Taxon.class, shell, conversation,\r
+                "Choose a taxon", false, null, taxonToBeFiltered);\r
+        return (Taxon) getSelectionFromDialog(dialog);\r
+    }\r
+\r
+    /**\r
+     * <p>select</p>\r
+     *\r
+     * @param shell a {@link org.eclipse.swt.widgets.Shell} object.\r
+     * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.\r
+     * @return a {@link eu.etaxonomy.cdm.model.taxon.TaxonBase} object.\r
+     */\r
+    public static Synonym selectSynonym(Shell shell, ConversationHolder conversation) {\r
+        AbstractFilteredCdmResourceSelectionDialog<TaxonBase> dialog = new TaxonBaseSelectionDialog(Synonym.class, shell, conversation,\r
+                "Choose a taxon", false, null, null);\r
+        return (Synonym) getSelectionFromDialog(dialog);\r
+    }\r
+\r
+    private final Class<? extends TaxonBase> clazz;\r
+\r
+    /**\r
+     * <p>Constructor for FilteredTaxonBaseSelectionDialog.</p>\r
+     *\r
+     * @param shell a {@link org.eclipse.swt.widgets.Shell} object.\r
+     * @param title a {@link java.lang.String} object.\r
+     * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.\r
+     * @param multi a boolean.\r
+     * @param taxon a {@link eu.etaxonomy.cdm.model.taxon.TaxonBase} object.\r
+     */\r
+    protected TaxonBaseSelectionDialog(Class<? extends TaxonBase> clazz, Shell shell, ConversationHolder conversation, String title, boolean multi, TaxonBase taxon, TaxonBase taxonToBeFiltered) {\r
+        super(shell, conversation, title, multi, ReferenceSelectionDialog.class.getCanonicalName(), taxon);\r
+        this.cdmBaseToBeFiltered = taxonToBeFiltered;\r
+        this.clazz = clazz;\r
+        initModel();\r
+    }\r
+\r
+    /* (non-Javadoc)\r
+     * @see org.eclipse.ui.dialogs.FilteredItemsSelectionDialog#createExtendedContentArea(org.eclipse.swt.widgets.Composite)\r
+     */\r
+    /** {@inheritDoc} */\r
+    @Override\r
+    protected Control createExtendedContentArea(Composite parent) {\r
+        return null;\r
+    }\r
+\r
+    /* (non-Javadoc)\r
+     * @see eu.etaxonomy.taxeditor.dialogs.AbstractFilteredCdmResourceSelectionDialog#getPersistentObject(java.util.UUID)\r
+     */\r
+    /** {@inheritDoc} */\r
+    @Override\r
+    protected TaxonBase getPersistentObject(UUID uuid) {\r
+        return CdmStore.getService(ITaxonService.class).load(uuid);\r
+    }\r
+\r
+    /* (non-Javadoc)\r
+     * @see eu.etaxonomy.taxeditor.dialogs.AbstractFilteredCdmResourceSelectionDialog#initModel()\r
+     */\r
+    /** {@inheritDoc} */\r
+    @Override\r
+    protected void initModel() {\r
+        if(clazz == TaxonBase.class){\r
+            model = CdmStore.getService(ITaxonService.class).getUuidAndTitleCache();\r
+        }\r
+        else if(clazz == Taxon.class){\r
+\r
+            model = CdmStore.getService(ITaxonService.class).getUuidAndTitleCacheTaxon();\r
+\r
+        }\r
+        else if(clazz == Synonym.class){\r
+            model = CdmStore.getService(ITaxonService.class).getUuidAndTitleCacheSynonym();\r
+        }\r
+    }\r
+\r
+    /** {@inheritDoc} */\r
+    @Override\r
+    protected AbstractNewEntityWizard getNewEntityWizard(String parameter) {\r
+        return null;\r
+    }\r
+\r
+    /** {@inheritDoc} */\r
+    @Override\r
+    protected String getNewWizardLinkText() {\r
+        return null;\r
+    }\r

 }\r
 }\r