From: Cherian Mathew <c.mathew@bgbm.org>
Date: Thu, 10 Sep 2015 08:42:27 +0000 (+0200)
Subject: Add initModel call to constructor since it requires the type to be set beforehand
X-Git-Tag: remoting-3.9.0~16
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/48f63837fa5110e2d622eb0c9962c0cd215313ea

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 99e5890e8..b4901d2d3 100644
--- 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$
 /**
-* Copyright (C) 2007 EDIT
-* 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.
-*/
+ * Copyright (C) 2007 EDIT
+ * 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.
+ */
 
 package eu.etaxonomy.taxeditor.ui.dialog.selection;
 
@@ -31,117 +31,114 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @created Sep 21, 2009
  * @version 1.0
  */
-public class TaxonBaseSelectionDialog extends
-		AbstractFilteredCdmResourceSelectionDialog<TaxonBase> {
-	
-		
-	/**
-	 * <p>select</p>
-	 *
-	 * @param shell a {@link org.eclipse.swt.widgets.Shell} object.
-	 * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-	 * @return a {@link eu.etaxonomy.cdm.model.taxon.TaxonBase} object.
-	 */
-	public static TaxonBase selectTaxonBase(Shell shell, ConversationHolder conversation) {
-		AbstractFilteredCdmResourceSelectionDialog<TaxonBase> dialog = new TaxonBaseSelectionDialog(TaxonBase.class, shell, conversation,
-				"Choose a taxon", false, null, null);
-		return getSelectionFromDialog(dialog);
-	}
-	
-	/**
-	 * <p>select</p>
-	 *
-	 * @param shell a {@link org.eclipse.swt.widgets.Shell} object.
-	 * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-	 * @return a {@link eu.etaxonomy.cdm.model.taxon.TaxonBase} object.
-	 */
-	public static Taxon selectTaxon(Shell shell, ConversationHolder conversation, Taxon taxonToBeFiltered) {
-		
-
-		AbstractFilteredCdmResourceSelectionDialog<TaxonBase> dialog = new TaxonBaseSelectionDialog(Taxon.class, shell, conversation,
-				"Choose a taxon", false, null, taxonToBeFiltered);
-		return (Taxon) getSelectionFromDialog(dialog);
-	}
-	
-	/**
-	 * <p>select</p>
-	 *
-	 * @param shell a {@link org.eclipse.swt.widgets.Shell} object.
-	 * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-	 * @return a {@link eu.etaxonomy.cdm.model.taxon.TaxonBase} object.
-	 */
-	public static Synonym selectSynonym(Shell shell, ConversationHolder conversation) {
-		AbstractFilteredCdmResourceSelectionDialog<TaxonBase> dialog = new TaxonBaseSelectionDialog(Synonym.class, shell, conversation,
-				"Choose a taxon", false, null, null);
-		return (Synonym) getSelectionFromDialog(dialog);
-	}
-
-	private final Class<? extends TaxonBase> clazz;
-	
-	/**
-	 * <p>Constructor for FilteredTaxonBaseSelectionDialog.</p>
-	 *
-	 * @param shell a {@link org.eclipse.swt.widgets.Shell} object.
-	 * @param title a {@link java.lang.String} object.
-	 * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-	 * @param multi a boolean.
-	 * @param taxon a {@link eu.etaxonomy.cdm.model.taxon.TaxonBase} object.
-	 */
-	protected TaxonBaseSelectionDialog(Class<? extends TaxonBase> clazz, Shell shell, ConversationHolder conversation, String title, boolean multi, TaxonBase taxon, TaxonBase taxonToBeFiltered) {
-		super(shell, conversation, title, multi, ReferenceSelectionDialog.class.getCanonicalName(), taxon);
-		this.cdmBaseToBeFiltered = taxonToBeFiltered;
-
-		
-		
-		this.clazz = clazz;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.dialogs.FilteredItemsSelectionDialog#createExtendedContentArea(org.eclipse.swt.widgets.Composite)
-	 */
-	/** {@inheritDoc} */
-	@Override
-	protected Control createExtendedContentArea(Composite parent) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see eu.etaxonomy.taxeditor.dialogs.AbstractFilteredCdmResourceSelectionDialog#getPersistentObject(java.util.UUID)
-	 */
-	/** {@inheritDoc} */
-	@Override
-	protected TaxonBase getPersistentObject(UUID uuid) {
-		return CdmStore.getService(ITaxonService.class).load(uuid);
-	}
-
-	/* (non-Javadoc)
-	 * @see eu.etaxonomy.taxeditor.dialogs.AbstractFilteredCdmResourceSelectionDialog#initModel()
-	 */
-	/** {@inheritDoc} */
-	@Override
-	protected void initModel() {
-		if(clazz == TaxonBase.class){
-			model = CdmStore.getService(ITaxonService.class).getUuidAndTitleCache();
-		}
-		else if(clazz == Taxon.class){
-						
-			model = CdmStore.getService(ITaxonService.class).getUuidAndTitleCacheTaxon();
-			
-		}
-		else if(clazz == Synonym.class){
-			model = CdmStore.getService(ITaxonService.class).getUuidAndTitleCacheSynonym();
-		}
-	}
-
-	/** {@inheritDoc} */
-	@Override
-	protected AbstractNewEntityWizard getNewEntityWizard(String parameter) {
-		return null;
-	}
-
-	/** {@inheritDoc} */
-	@Override
-	protected String getNewWizardLinkText() {
-		return null;
-	}
+public class TaxonBaseSelectionDialog extends AbstractFilteredCdmResourceSelectionDialog<TaxonBase> {
+
+
+    /**
+     * <p>select</p>
+     *
+     * @param shell a {@link org.eclipse.swt.widgets.Shell} object.
+     * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
+     * @return a {@link eu.etaxonomy.cdm.model.taxon.TaxonBase} object.
+     */
+    public static TaxonBase selectTaxonBase(Shell shell, ConversationHolder conversation) {
+        AbstractFilteredCdmResourceSelectionDialog<TaxonBase> dialog = new TaxonBaseSelectionDialog(TaxonBase.class, shell, conversation,
+                "Choose a taxon", false, null, null);
+        return getSelectionFromDialog(dialog);
+    }
+
+    /**
+     * <p>select</p>
+     *
+     * @param shell a {@link org.eclipse.swt.widgets.Shell} object.
+     * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
+     * @return a {@link eu.etaxonomy.cdm.model.taxon.TaxonBase} object.
+     */
+    public static Taxon selectTaxon(Shell shell, ConversationHolder conversation, Taxon taxonToBeFiltered) {
+
+
+        AbstractFilteredCdmResourceSelectionDialog<TaxonBase> dialog = new TaxonBaseSelectionDialog(Taxon.class, shell, conversation,
+                "Choose a taxon", false, null, taxonToBeFiltered);
+        return (Taxon) getSelectionFromDialog(dialog);
+    }
+
+    /**
+     * <p>select</p>
+     *
+     * @param shell a {@link org.eclipse.swt.widgets.Shell} object.
+     * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
+     * @return a {@link eu.etaxonomy.cdm.model.taxon.TaxonBase} object.
+     */
+    public static Synonym selectSynonym(Shell shell, ConversationHolder conversation) {
+        AbstractFilteredCdmResourceSelectionDialog<TaxonBase> dialog = new TaxonBaseSelectionDialog(Synonym.class, shell, conversation,
+                "Choose a taxon", false, null, null);
+        return (Synonym) getSelectionFromDialog(dialog);
+    }
+
+    private final Class<? extends TaxonBase> clazz;
+
+    /**
+     * <p>Constructor for FilteredTaxonBaseSelectionDialog.</p>
+     *
+     * @param shell a {@link org.eclipse.swt.widgets.Shell} object.
+     * @param title a {@link java.lang.String} object.
+     * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
+     * @param multi a boolean.
+     * @param taxon a {@link eu.etaxonomy.cdm.model.taxon.TaxonBase} object.
+     */
+    protected TaxonBaseSelectionDialog(Class<? extends TaxonBase> clazz, Shell shell, ConversationHolder conversation, String title, boolean multi, TaxonBase taxon, TaxonBase taxonToBeFiltered) {
+        super(shell, conversation, title, multi, ReferenceSelectionDialog.class.getCanonicalName(), taxon);
+        this.cdmBaseToBeFiltered = taxonToBeFiltered;
+        this.clazz = clazz;
+        initModel();
+    }
+
+    /* (non-Javadoc)
+     * @see org.eclipse.ui.dialogs.FilteredItemsSelectionDialog#createExtendedContentArea(org.eclipse.swt.widgets.Composite)
+     */
+    /** {@inheritDoc} */
+    @Override
+    protected Control createExtendedContentArea(Composite parent) {
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see eu.etaxonomy.taxeditor.dialogs.AbstractFilteredCdmResourceSelectionDialog#getPersistentObject(java.util.UUID)
+     */
+    /** {@inheritDoc} */
+    @Override
+    protected TaxonBase getPersistentObject(UUID uuid) {
+        return CdmStore.getService(ITaxonService.class).load(uuid);
+    }
+
+    /* (non-Javadoc)
+     * @see eu.etaxonomy.taxeditor.dialogs.AbstractFilteredCdmResourceSelectionDialog#initModel()
+     */
+    /** {@inheritDoc} */
+    @Override
+    protected void initModel() {
+        if(clazz == TaxonBase.class){
+            model = CdmStore.getService(ITaxonService.class).getUuidAndTitleCache();
+        }
+        else if(clazz == Taxon.class){
+
+            model = CdmStore.getService(ITaxonService.class).getUuidAndTitleCacheTaxon();
+
+        }
+        else if(clazz == Synonym.class){
+            model = CdmStore.getService(ITaxonService.class).getUuidAndTitleCacheSynonym();
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected AbstractNewEntityWizard getNewEntityWizard(String parameter) {
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected String getNewWizardLinkText() {
+        return null;
+    }
 }