taxeditor part of fix for #4121 (Changing password does not work)

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / handler / OpenPasswordWizzardHandler.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/OpenPasswordWizzardHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/OpenPasswordWizzardHandler.java
index e61f23cdee1065997a8f856d48daddf29f51285a..05273d42d92cf3b0626b33993ca0ee522c0451d7 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/OpenPasswordWizzardHandler.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/OpenPasswordWizzardHandler.java
@@ -16,7 +16,6 @@ import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.commands.IHandler;
 import org.eclipse.jface.wizard.WizardDialog;
 
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.common.User;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.store.CdmStore;
@@ -41,17 +40,12 @@ public class OpenPasswordWizzardHandler extends AbstractHandler implements IHand
            Object principal = CdmStore.getCurrentAuthentiation().getPrincipal();
 
            if(principal instanceof User){
-               ConversationHolder conversation = CdmStore.createConversation();
 
-               PasswordWizard wizard = new PasswordWizard(conversation, (User)principal);
+               PasswordWizard wizard = new PasswordWizard((User)principal, null);
                WizardDialog dialog = new WizardDialog(AbstractUtility.getShell(), wizard);
 
                dialog.open();
 
-               // clean up
-               conversation.commit();
-               conversation.unbind();
-               conversation.close();
            } else {
                // should never happen, log an error
                AbstractUtility.error(OpenPasswordWizzardHandler.class, "The principal currently authenticated is not a eu.etaxonomy.cdm.model.common.User", null);