ref #6925 Set conversation and cdmEntitySession to null for dispose

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / password / EditPasswordElement.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/password/EditPasswordElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/password/EditPasswordElement.java
index e6010ddfca59f3ca7aede683471cbbcf2e3fe462..c26c709590b77eb82e6dca1cd438e1a533528f1e 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/password/EditPasswordElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/password/EditPasswordElement.java
@@ -1,4 +1,3 @@
-// $Id$
 /**
 * Copyright (C) 2007 EDIT
 * European Distributed Institute of Taxonomy
@@ -22,6 +21,7 @@ import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
 import eu.etaxonomy.cdm.api.service.IUserService;
 import eu.etaxonomy.cdm.model.common.User;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
+import eu.etaxonomy.taxeditor.l10n.Messages;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.ui.element.AbstractCdmFormElement;
@@ -51,7 +51,7 @@ public class EditPasswordElement extends AbstractCdmFormElement implements Selec
                Label label = formFactory.createLabel(getLayoutComposite(), null);
                addControl(label);
 
-               String buttonLabelString = (labelString != null) ? labelString : "Change Password";
+               String buttonLabelString = (labelString != null) ? labelString : Messages.PasswordWizardPage_CHANGE_PASSWORD;
 
                button = formFactory.createButton(getLayoutComposite(), buttonLabelString, SWT.PUSH);
                button.setLayoutData(LayoutConstants.RIGHT());
@@ -63,7 +63,7 @@ public class EditPasswordElement extends AbstractCdmFormElement implements Selec
        @Override
        public void widgetSelected(SelectionEvent e) {
                if(!CdmStore.getService(IUserService.class).userExists(user.getUsername())) {
-                       MessagingUtils.warningDialog("Username does not exist", this, "Please create or save user '" + user.getUsername() + "' before changing password");
+                       MessagingUtils.warningDialog(Messages.EditPasswordElement_USERNAME_DOES_NOT_EXIST, this, String.format(Messages.EditPasswordElement_PLEASE_CREATE_OR_SAVE_USER, user.getUsername()));
                } else {
                        PasswordWizard wizard = new PasswordWizard(user, conversation);
                        WizardDialog dialog = new WizardDialog(getLayoutComposite().getShell(), wizard);