Merge branch 'release/4.6.0'

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / newWizard / NewTaxonWizard.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonWizard.java
index 1947c452fc8605984f61a867df5e05cdc26d2c1e..a558f0c406967fac2b1653252407c02f1c4f293a 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonWizard.java
@@ -1,4 +1,3 @@
-// $Id$
 /**
 * Copyright (C) 2007 EDIT
 * European Distributed Institute of Taxonomy
@@ -12,6 +11,8 @@ package eu.etaxonomy.taxeditor.newWizard;
 
 import eu.etaxonomy.cdm.api.service.ITaxonService;
 import eu.etaxonomy.cdm.model.name.NonViralName;
+import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.ui.section.name.NonViralNameWizardPage;
@@ -25,20 +26,17 @@ import eu.etaxonomy.taxeditor.ui.section.taxon.TaxonWizardPage;
  */
 public class NewTaxonWizard extends AbstractNewEntityWizard<Taxon> {
 
-       private TaxonWizardPage taxonWizardPage;
-
        /** {@inheritDoc} */
        @Override
        public void addPages() {
+           addPage(new TaxonWizardPage(formFactory, getConversationHolder(), getEntity()));
            addPage(new NonViralNameWizardPage(formFactory, getConversationHolder(), (NonViralName) getEntity().getName()));
-               taxonWizardPage = new TaxonWizardPage(formFactory, getConversationHolder(), getEntity());
-               addPage(taxonWizardPage);
        }
 
        /** {@inheritDoc} */
        @Override
        protected Taxon createNewEntity() {
-               return Taxon.NewInstance(NonViralName.NewInstance(null), null);
+               return Taxon.NewInstance(TaxonNameFactory.NewNonViralInstance(null), null);
        }
 
        /** {@inheritDoc} */