Use MessageGenerator with resourced messages

bwreg-webapp/src/main/java/edu/kit/scc/webreg/bean/SetServicePasswordBean.java

@@ -12,10 +12,8 @@ package edu.kit.scc.webreg.bean;
 
 import java.io.Serializable;
 
-import javax.faces.application.FacesMessage;
 import javax.faces.bean.ManagedBean;
 import javax.faces.bean.ViewScoped;
-import javax.faces.context.FacesContext;
 import javax.faces.event.ComponentSystemEvent;
 import javax.inject.Inject;
 
@@ -89,7 +87,7 @@ public class SetServicePasswordBean implements Serializable {
 	public String save() {
 		if (! (RegistryStatus.ACTIVE.equals(registryEntity.getRegistryStatus()) || 
 				RegistryStatus.LOST_ACCESS.equals(registryEntity.getRegistryStatus()))) {
-			FacesContext.getCurrentInstance().addMessage("pw_error", new FacesMessage(FacesMessage.SEVERITY_FATAL, "Fehler:", "Servicepasswort kann für diesen Dienst nicht gesetzt werden"));			
+			messageGenerator.addResolvedErrorMessage("pw_error", "error", "service_password_cannot_be_set", true);
 			return null;
 		}
 		
@@ -110,13 +108,13 @@ public class SetServicePasswordBean implements Serializable {
 				registerUserService.setPassword(userEntity, serviceEntity, registryEntity, password1, "user-self");
 				password1 = null;
 				password2 = null;
-				FacesContext.getCurrentInstance().addMessage("pw_error", new FacesMessage(FacesMessage.SEVERITY_INFO, "Passwort geändert:", "Das Passwort wurde bei dem Dienst geändert"));
+				messageGenerator.addResolvedInfoMessage("pw_error", "service_password_changed", "service_password_changed_detail", true);
 			} catch (RegisterException e) {
-				FacesContext.getCurrentInstance().addMessage("pw_error", new FacesMessage(FacesMessage.SEVERITY_ERROR, "Konnte das Passwort nicht setzen:", e.getMessage()));
+				messageGenerator.addResolvedErrorMessage("pw_error", "service_password_cannot_be_set", e.getMessage(), false);
 			}
 		}
 		else
-			FacesContext.getCurrentInstance().addMessage("pw_error", new FacesMessage(FacesMessage.SEVERITY_FATAL, "Fehler:", "Servicepasswort kann für diesen Dienst nicht gesetzt werden"));
+			messageGenerator.addResolvedErrorMessage("pw_error", "error", "service_password_cannot_be_set", true);
 
 		return null;
 	}
@@ -124,7 +122,7 @@ public class SetServicePasswordBean implements Serializable {
 	public String deleteServicePassword() {
 		if (! (RegistryStatus.ACTIVE.equals(registryEntity.getRegistryStatus()) || 
 				RegistryStatus.LOST_ACCESS.equals(registryEntity.getRegistryStatus()))) {
-			FacesContext.getCurrentInstance().addMessage("pw_error", new FacesMessage(FacesMessage.SEVERITY_FATAL, "Fehler:", "Servicepasswort kann für diesen Dienst nicht gelöscht werden"));			
+			messageGenerator.addResolvedErrorMessage("pw_error", "error", "service_password_cannot_be_deleted", true);
 			return null;
 		}
 
@@ -132,12 +130,13 @@ public class SetServicePasswordBean implements Serializable {
 		if (registerUserWorkflow instanceof SetPasswordCapable) {
 			try {
 				registerUserService.deletePassword(userEntity, serviceEntity, registryEntity, "user-self");
+				messageGenerator.addResolvedInfoMessage("pw_error", "service_password_deleted", "service_password_deleted_detail", true);
 			} catch (RegisterException e) {
-				FacesContext.getCurrentInstance().addMessage("pw_error", new FacesMessage(FacesMessage.SEVERITY_ERROR, "Konnte das Passwort nicht löschen:", e.getMessage()));
+				messageGenerator.addResolvedErrorMessage("pw_error", "service_password_cannot_be_deleted", e.getMessage(), false);
 			}
 		}
 		else
-			FacesContext.getCurrentInstance().addMessage("pw_error", new FacesMessage(FacesMessage.SEVERITY_FATAL, "Fehler:", "Servicepasswort kann für diesen Dienst nicht geslöscht werden"));
+			messageGenerator.addResolvedErrorMessage("pw_error", "error", "service_password_cannot_be_set", true);
 		
 		return null;
 	}

bwreg-webapp/src/main/resources/msg/messages_de.properties

@@ -316,3 +316,9 @@ schedule_reload=Reload einplanen
 tools=Werkzeuge
 fire_job=Job starten
 parent=Parent
+service_password_cannot_be_set=Dienstpasswort kann f\u00FCr diesen Dienst nicht gesetzt werden
+service_password_changed=Passwort ge\u00E4ndert
+service_password_changed_detail=Das Passwort wurde bei dem Dienst ge\u00E4ndert
+service_password_cannot_be_deleted=Dienstpasswort kann f\u00FCr diesen Dienst nicht gel\u00F6scht werden
+service_password_deleted=Passwort gel\u00F6scht
+service_password_deleted_detail=Das Passwort wurde bei dem Dienst gel\u00F6scht

bwreg-webapp/src/main/resources/msg/messages_en.properties

@@ -315,4 +315,10 @@ version=Version
 schedule_reload=Reload einplanen
 tools=Werkzeuge
 fire_job=Job starten
-parent=Parent
\ No newline at end of file
+parent=Parent
+service_password_cannot_be_set=Servicepassword can not be set for this service
+service_password_changed=Password changed
+service_password_changed_detail=Password has been changed for this service
+service_password_cannot_be_deleted=Servicepassword can not be deleted for this service
+service_password_deleted=Password deleted
+service_password_deleted_detail=Password has been deleted for this service