Merged refactoring from development branch.

[taxeditor.git] / taxeditor-navigation / src / main / java / eu / etaxonomy / taxeditor / navigation / navigator / handler / NewTaxonNodeHandler.java

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/NewTaxonNodeHandler.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/NewTaxonNodeHandler.java
similarity index 86%
rename from taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/NewTaxonNodeHandler.java
rename to taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/NewTaxonNodeHandler.java
index b3b0ad8335525f0dc2e832fd574967df8bd27a37..e6dd07aa3ef3bb3fdab9d8170ff077e7b46bc458 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/NewTaxonNodeHandler.java
+++ b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/NewTaxonNodeHandler.java
@@ -1,4 +1,4 @@
-package eu.etaxonomy.taxeditor.navigation.handler;
+package eu.etaxonomy.taxeditor.navigation.navigator.handler;
 // $Id$
 /**
 * Copyright (C) 2007 EDIT
@@ -19,7 +19,7 @@ import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.ui.handlers.HandlerUtil;
 
 import eu.etaxonomy.taxeditor.navigation.NavigationUtil;
-import eu.etaxonomy.taxeditor.wizard.NewTaxonNodeWizard;
+import eu.etaxonomy.taxeditor.newWizard.NewTaxonNodeWizard;
 
 /**
  * <p>NewTaxonNodeHandler class.</p>
@@ -35,14 +35,14 @@ public class NewTaxonNodeHandler extends AbstractHandler implements IHandler {
         */
        /** {@inheritDoc} */
        public Object execute(ExecutionEvent event) throws ExecutionException {
-               
                NewTaxonNodeWizard wizard = new NewTaxonNodeWizard();
+               wizard.init(null, null);
                WizardDialog dialog = new WizardDialog(HandlerUtil.getActiveShell(event), wizard);
                int status = dialog.open();
                
                if(status == IStatus.OK && wizard.openInEditor()){
                        if(wizard.openEmpty()){
-                               NavigationUtil.openEmpty(wizard.getParent().getUuid());
+                               NavigationUtil.openEmpty(wizard.getParentTreeNode().getUuid());
                        }else{
                                NavigationUtil.openEditor(wizard.getTaxonNode());
                        }