merged/implemented cdm3.3 model adaptations

[taxeditor.git] / eu.etaxonomy.taxeditor.navigation / src / main / java / eu / etaxonomy / taxeditor / navigation / navigator / operation / MoveTaxonOperation.java

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/MoveTaxonOperation.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/MoveTaxonOperation.java
index 5fc9af8317ea992fee407ef71c761f9f0c02b9e1..87df0560eeb31d7313dc83b478ea83196c7c670e 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/MoveTaxonOperation.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/MoveTaxonOperation.java
@@ -1,8 +1,8 @@
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* 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.
 */
@@ -21,7 +21,7 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 
 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
-import eu.etaxonomy.cdm.model.taxon.ITreeNode;
+import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
 import eu.etaxonomy.cdm.model.taxon.IllegalAncestryException;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.taxeditor.operation.AbstractPersistentPostOperation;
@@ -36,16 +36,16 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
  * @version 1.0
  */
 public class MoveTaxonOperation extends AbstractPersistentPostOperation {
-       
+
        /**
         * A reference to the new taxonomical parent.
         */
-       private ITreeNode newParentTreeNode;
+       private ITaxonTreeNode newParentTreeNode;
        /**
         * A reference to the former taxonomical parents
         */
-       private Map<TaxonNode, ITreeNode> oldParentTreeNodes;
-       
+       private Map<TaxonNode, ITaxonTreeNode> oldParentTreeNodes;
+
        private Set<TaxonNode> taxonNodes;
 
        /**
@@ -54,25 +54,25 @@ public class MoveTaxonOperation extends AbstractPersistentPostOperation {
         * @param label a {@link java.lang.String} object.
         * @param undoContext a {@link org.eclipse.core.commands.operations.IUndoContext} object.
         * @param taxonNodes a {@link java.util.Set} object.
-        * @param newParentTreeNode a {@link eu.etaxonomy.cdm.model.taxon.ITreeNode} object.
+        * @param newParentTreeNode a {@link eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode} object.
         * @param postOperationEnabled a {@link eu.etaxonomy.taxeditor.operation.IPostOperationEnabled} object.
         * @param conversationEnabled a {@link eu.etaxonomy.cdm.api.conversation.IConversationEnabled} object.
         */
        public MoveTaxonOperation(String label, IUndoContext undoContext,
-                       Set<TaxonNode> taxonNodes, ITreeNode newParentTreeNode, IPostOperationEnabled postOperationEnabled, IConversationEnabled conversationEnabled) {
+                       Set<TaxonNode> taxonNodes, ITaxonTreeNode newParentTreeNode, IPostOperationEnabled postOperationEnabled, IConversationEnabled conversationEnabled) {
                super(label, undoContext, postOperationEnabled, conversationEnabled);
 
                this.taxonNodes = taxonNodes;
-               
+
                this.newParentTreeNode = newParentTreeNode;
-               
-               // Save old parent ITreeNodes for undo
-               oldParentTreeNodes = new HashMap<TaxonNode, ITreeNode>();
+
+               // Save old parent ITaxonTreeNodes for undo
+               oldParentTreeNodes = new HashMap<TaxonNode, ITaxonTreeNode>();
                for(TaxonNode taxonNode : taxonNodes){
                        this.oldParentTreeNodes.put(taxonNode, taxonNode.getParent());
                }
        }
-       
+
        /* (non-Javadoc)
         * @see org.eclipse.core.commands.operations.AbstractOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
         */
@@ -82,10 +82,10 @@ public class MoveTaxonOperation extends AbstractPersistentPostOperation {
                        throws ExecutionException {
                bind();
                monitor.worked(20);
-               
+
                try {
                        for (TaxonNode taxonNode : taxonNodes){
-                               TaxonNode newTaxonNode = newParentTreeNode.addChildNode(taxonNode, 
+                               TaxonNode newTaxonNode = newParentTreeNode.addChildNode(taxonNode,
                                                newParentTreeNode.getReference(), newParentTreeNode.getMicroReference());
                                taxonNodes.add(newTaxonNode);
                                monitor.worked(2);
@@ -94,7 +94,7 @@ public class MoveTaxonOperation extends AbstractPersistentPostOperation {
                        StoreUtil.warningDialog("Illegal ancestry", this, e.getMessage());
                }
                monitor.worked(40);
-               
+
                return postExecute(null);
        }
 
@@ -116,9 +116,9 @@ public class MoveTaxonOperation extends AbstractPersistentPostOperation {
        public IStatus undo(IProgressMonitor monitor, IAdaptable info)
                        throws ExecutionException {
                StoreUtil.warn(this.getClass(), "Not implemented yet.");
-               
-               // iterate over oldParentTreeNodes, delete each TaxonNode from its actual parent and add to its former parent           
-               
+
+               // iterate over oldParentTreeNodes, delete each TaxonNode from its actual parent and add to its former parent
+
                return Status.OK_STATUS;
        }
 }