merged/implemented cdm3.3 model adaptations

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

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java
index e05e0490693200044f22084906e3766f1d7dca99..194bc3c7a66cc560dd971e896e9b39c094a462e4 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  */
 package eu.etaxonomy.taxeditor.newWizard;
 
@@ -10,7 +10,7 @@ import org.apache.commons.lang.StringUtils;
 import eu.etaxonomy.cdm.api.service.IClassificationService;
 import eu.etaxonomy.cdm.api.service.ITaxonNodeService;
 import eu.etaxonomy.cdm.model.taxon.Classification;
-import eu.etaxonomy.cdm.model.taxon.ITreeNode;
+import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.taxeditor.store.CdmStore;
@@ -24,7 +24,7 @@ import eu.etaxonomy.taxeditor.ui.section.classification.TaxonNodeWizardPage;
  * @created Sep 15, 2009
  * @version 1.0
  */
-public class NewTaxonNodeWizard extends AbstractNewEntityWizard<ITreeNode>{
+public class NewTaxonNodeWizard extends AbstractNewEntityWizard<ITaxonTreeNode>{
 
        private TaxonNodeWizardPage taxonNodePage;
        private boolean openEmptyEditor;
@@ -35,14 +35,14 @@ public class NewTaxonNodeWizard extends AbstractNewEntityWizard<ITreeNode>{
                taxonNodePage = new TaxonNodeWizardPage(formFactory, getConversationHolder(), getEntity());
                addPage(taxonNodePage);
        }
-       
+
        @Override
        protected void saveEntity() {
                if(taxonNodePage.getTaxon() == null || StringUtils.isEmpty(taxonNodePage.getTaxon().getName().getFullTitleCache())){
                        openEmptyEditor = true;
                }else{
                        getConversationHolder().bind();
-                       ITreeNode parent = getParentTreeNode();
+                       ITaxonTreeNode parent = getParentTreeNode();
                        Taxon taxon = taxonNodePage.getTaxon();
                        try{
                                TaxonNode taxonNode = parent.addChildTaxon(taxon, parent.getReference(), parent.getMicroReference());
@@ -54,12 +54,12 @@ public class NewTaxonNodeWizard extends AbstractNewEntityWizard<ITreeNode>{
        }
 
        @Override
-       protected ITreeNode createNewEntity() {         
+       protected ITaxonTreeNode createNewEntity() {
                if(getSelection() != null){
                        Object selectedObject = getSelection().getFirstElement();
-                       if(selectedObject instanceof ITreeNode){
-                               ITreeNode treeNode = (ITreeNode) selectedObject;
-                               
+                       if(selectedObject instanceof ITaxonTreeNode){
+                           ITaxonTreeNode treeNode = (ITaxonTreeNode) selectedObject;
+
                                if(treeNode instanceof Classification){
                                        return CdmStore.getService(IClassificationService.class).load(treeNode.getUuid());
                                }
@@ -68,10 +68,10 @@ public class NewTaxonNodeWizard extends AbstractNewEntityWizard<ITreeNode>{
                                }
                        }
                }
-               
+
                return null;
        }
-       
+
        /**
         * <p>openInEditor</p>
         *
@@ -80,7 +80,7 @@ public class NewTaxonNodeWizard extends AbstractNewEntityWizard<ITreeNode>{
        public boolean openInEditor(){
                return taxonNodePage.openInEditor();
        }
-       
+
        /**
         * <p>openEmpty</p>
         *
@@ -89,7 +89,7 @@ public class NewTaxonNodeWizard extends AbstractNewEntityWizard<ITreeNode>{
        public boolean openEmpty(){
                return openInEditor() && openEmptyEditor;
        }
-       
+
        /**
         * <p>getTaxonNode</p>
         *
@@ -97,12 +97,12 @@ public class NewTaxonNodeWizard extends AbstractNewEntityWizard<ITreeNode>{
         */
        public TaxonNode getTaxonNode(){
                if(generatedTaxonNodeUuid != null){
-                       return CdmStore.getService(ITaxonNodeService.class).load(generatedTaxonNodeUuid);                       
+                       return CdmStore.getService(ITaxonNodeService.class).load(generatedTaxonNodeUuid);
                }
                return null;
        }
-       
-       public ITreeNode getParentTreeNode(){
+
+       public ITaxonTreeNode getParentTreeNode(){
                return taxonNodePage.getParentTreeNode();
        }
 
@@ -110,5 +110,5 @@ public class NewTaxonNodeWizard extends AbstractNewEntityWizard<ITreeNode>{
        protected String getEntityName() {
                return "Taxon";
        }
-       
+
 }
\ No newline at end of file