Merged refactoring from development branch.

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

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/NewClassificationHandler.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/NewClassificationHandler.java
similarity index 79%
rename from taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/NewClassificationHandler.java
rename to taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/NewClassificationHandler.java
index ba7783e6f6f0ff0b99913e744c64b331727ad86b..4d8e79a9f2db8660c63081cd56ed64174e92e834 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/NewClassificationHandler.java
+++ b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/NewClassificationHandler.java
@@ -8,9 +8,8 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.navigation.handler;
+package eu.etaxonomy.taxeditor.navigation.navigator.handler;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
@@ -18,7 +17,7 @@ import org.eclipse.core.commands.IHandler;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.ui.handlers.HandlerUtil;
 
-import eu.etaxonomy.taxeditor.wizard.ClassificationWizard;
+import eu.etaxonomy.taxeditor.newWizard.NewClassificationWizard;
 
 /**
  * <p>NewClassificationHandler class.</p>
@@ -29,16 +28,15 @@ import eu.etaxonomy.taxeditor.wizard.ClassificationWizard;
  */
 public class NewClassificationHandler extends AbstractHandler implements
                IHandler {
-       private static final Logger logger = Logger
-                       .getLogger(NewClassificationHandler.class);
 
        /* (non-Javadoc)
         * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
         */
        /** {@inheritDoc} */
        public Object execute(ExecutionEvent event) throws ExecutionException {
-               
-               WizardDialog dialog = new WizardDialog(HandlerUtil.getActiveShell(event), new ClassificationWizard());
+               NewClassificationWizard wizard = new NewClassificationWizard();
+               wizard.init(null, null);
+               WizardDialog dialog = new WizardDialog(HandlerUtil.getActiveShell(event), wizard);
                dialog.open();
                
                return null;