Fixes a problem that could have solved #2071; Resolves the problems described in...

[taxeditor.git] / taxeditor-editor / src / main / java / eu / etaxonomy / taxeditor / editor / name / handler / ChangeSynonymToAcceptedTaxonHandler.java

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java
index 3eaeccd718049299e6bfa288eb861ede55a00c3b..26dc6daa04264d0e3af771ffcc494526a9174907 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java
@@ -28,15 +28,17 @@ import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
-import eu.etaxonomy.taxeditor.dialogs.filteredSelection.FilteredTaxonNodeSelectionDialog;
+import eu.etaxonomy.taxeditor.dialogs.filteredSelection.TaxonNodeSelectionDialog;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor;
 import eu.etaxonomy.taxeditor.editor.TaxonEditorInput;
-import eu.etaxonomy.taxeditor.operations.AbstractPostOperation;
-import eu.etaxonomy.taxeditor.operations.ChangeSynonymToAcceptedTaxonOperation;
-import eu.etaxonomy.taxeditor.operations.IPostOperationEnabled;
+import eu.etaxonomy.taxeditor.editor.name.operation.ChangeSynonymToAcceptedTaxonOperation;
+import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
+import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 /**
+ * <p>ChangeSynonymToAcceptedTaxonHandler class.</p>
+ *
  * @author n.hoffmann
  * @created 21.04.2009
  * @version 1.0
@@ -49,6 +51,7 @@ public class ChangeSynonymToAcceptedTaxonHandler extends AbstractHandler impleme
        /* (non-Javadoc)
         * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
         */
+       /** {@inheritDoc} */
        public Object execute(ExecutionEvent event) throws ExecutionException {
                editor =  (MultiPageTaxonEditor) HandlerUtil.getActiveEditor(event);
                Shell shell = HandlerUtil.getActiveShell(event);
@@ -80,7 +83,7 @@ public class ChangeSynonymToAcceptedTaxonHandler extends AbstractHandler impleme
                
                List<UUID> excludeTaxa = null;
                
-               TaxonNode newParentNode = FilteredTaxonNodeSelectionDialog.selectTaxonNode(HandlerUtil.getActiveShell(event), editor.getConversationHolder(), "Select parent", excludeTaxa, null);
+               TaxonNode newParentNode = TaxonNodeSelectionDialog.select(HandlerUtil.getActiveShell(event), editor.getConversationHolder(), "Select parent", excludeTaxa, null);
                
                if(newParentNode != null){
                        
@@ -99,12 +102,13 @@ public class ChangeSynonymToAcceptedTaxonHandler extends AbstractHandler impleme
        /* (non-Javadoc)
         * @see eu.etaxonomy.taxeditor.operations.IPostOperationEnabled#postOperation(eu.etaxonomy.cdm.model.common.CdmBase)
         */
+       /** {@inheritDoc} */
        public boolean postOperation(CdmBase objectAffectedByOperation) {
                
                // Redraw existing editor
                ((IPostOperationEnabled) editor).postOperation(null);
                
-               editor.doSave(null);
+               editor.doSave(EditorUtil.getMonitor());
                
                if (objectAffectedByOperation instanceof TaxonNode) {
                
@@ -125,12 +129,17 @@ public class ChangeSynonymToAcceptedTaxonHandler extends AbstractHandler impleme
                                // TODO Auto-generated catch block
                                e.printStackTrace();
                        } catch (Exception e) {
-                               EditorUtil.warningDialog("Could not create Taxon", e.getMessage());
+                               EditorUtil.warningDialog("Could not create Taxon", this, e.getMessage());
                        }
                }
                return true;
        }
 
+       /**
+        * <p>onComplete</p>
+        *
+        * @return a boolean.
+        */
        public boolean onComplete() {
                // TODO Auto-generated method stub
                return false;