Merged refactoring from development branch.

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

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/wizard/NewTaxonNodeWizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizardPage.java
similarity index 90%
rename from taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/wizard/NewTaxonNodeWizardPage.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizardPage.java
index 07ae7af4bf58b3ca7dad4c50817b2ba2af3fcf14..db659db689dec1f67a2bbee39ecd230348ecc6c8 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/wizard/NewTaxonNodeWizardPage.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizardPage.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.wizard;
+package eu.etaxonomy.taxeditor.newWizard;
 
 import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.jface.util.PropertyChangeEvent;
@@ -25,22 +25,19 @@ import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.taxon.Classification;
 import eu.etaxonomy.cdm.model.taxon.ITreeNode;
-import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
-import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.SelectionType;
-import eu.etaxonomy.taxeditor.forms.CheckboxElement;
-import eu.etaxonomy.taxeditor.forms.RootElement;
-import eu.etaxonomy.taxeditor.forms.TextWithLabelElement;
-import eu.etaxonomy.taxeditor.forms.selection.ClassificationSelectionElement;
-import eu.etaxonomy.taxeditor.forms.selection.NameSelectionElement;
-import eu.etaxonomy.taxeditor.forms.selection.TaxonNodeSelectionElement;
-import eu.etaxonomy.taxeditor.forms.selection.TaxonSelectionElement;
-import eu.etaxonomy.taxeditor.navigation.NavigationUtil;
 import eu.etaxonomy.taxeditor.parser.ParseHandler;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.CheckboxElement;
+import eu.etaxonomy.taxeditor.ui.forms.RootElement;
+import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;
+import eu.etaxonomy.taxeditor.ui.selection.ClassificationSelectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.NameSelectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.TaxonNodeSelectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.TaxonSelectionElement;
 
 /**
  * <p>NewTaxonNodeWizardPage class.</p>
@@ -49,6 +46,7 @@ import eu.etaxonomy.taxeditor.parser.ParseHandler;
  * @created Sep 29, 2010
  * @version 1.0
  */
+@Deprecated //delete this file when refactoring is complete 
 public class NewTaxonNodeWizardPage extends WizardPage implements IPropertyChangeListener, IConversationEnabled{       
        private ClassificationSelectionElement selection_classification;
        private TaxonNodeSelectionElement selection_parentTaxonNode;
@@ -209,7 +207,7 @@ public class NewTaxonNodeWizardPage extends WizardPage implements IPropertyChang
        }
        
        private void setTaxon(String taxonNameString){
-               TaxonNameBase taxonName = ParseHandler.quickParse(taxonNameString);
+               TaxonNameBase taxonName = ParseHandler.parseReferencedName(taxonNameString, null);
                setTaxon(taxonName);
        }               
                
@@ -272,7 +270,6 @@ public class NewTaxonNodeWizardPage extends WizardPage implements IPropertyChang
        /** {@inheritDoc} */
        @Override
        public void update(CdmDataChangeMap changeEvents) {
-               // TODO Auto-generated method stub
                
        }