refactor Struts action classes

1 files changed, 21 insertions, 40 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
index 5bb3f5143..b2bf58f1a 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
@@ -69,6 +69,7 @@ import at.gv.egovernment.moa.id.configuration.Constants;
 import at.gv.egovernment.moa.id.configuration.auth.AuthenticatedUser;
 import at.gv.egovernment.moa.id.configuration.data.GeneralMOAIDConfig;
 import at.gv.egovernment.moa.id.configuration.data.GeneralStorkConfig;
+import at.gv.egovernment.moa.id.configuration.exception.BasicActionException;
 import at.gv.egovernment.moa.id.configuration.helper.LanguageHelper;
 import at.gv.egovernment.moa.id.configuration.helper.StringHelper;
 import at.gv.egovernment.moa.id.configuration.validation.ValidationHelper;
@@ -79,30 +80,24 @@ import at.gv.egovernment.moa.util.MiscUtil;
 
 import com.opensymphony.xwork2.ActionSupport;
 
-public class EditGeneralConfigAction extends ActionSupport 
-	implements ServletRequestAware, ServletResponseAware {
-	
-	private static final Logger log = Logger.getLogger(EditGeneralConfigAction.class);
+public class EditGeneralConfigAction extends BasicAction {
 	
+	private static final Logger log = Logger.getLogger(EditGeneralConfigAction.class);	
 	private static final long serialVersionUID = 1L;
-	private HttpServletRequest request;
-	
-	private AuthenticatedUser authUser; 
+
 	private GeneralMOAIDConfig moaconfig;
 	private GeneralStorkConfig storkconfig;
 
 	private String formID;
 	
 	public String loadConfig() {
-
-        HttpSession session = request.getSession();
-		if (session == null) {
-			log.info("No http Session found.");
+		try {
+			populateBasicInformations();
+			
+		} catch (BasicActionException e) {
 			return Constants.STRUTS_ERROR;
+			
 		}
-		
-		Object authUserObj = session.getAttribute(Constants.SESSION_AUTH);
-		authUser = (AuthenticatedUser) authUserObj;
 			
 		if (authUser.isAdmin()) {
 			
@@ -135,14 +130,13 @@ public class EditGeneralConfigAction extends ActionSupport
 	}
 	
 	public String saveConfig() {
-		HttpSession session = request.getSession();
-		if (session == null) {
-			log.info("No http Session found.");
+		try {
+			populateBasicInformations();
+			
+		} catch (BasicActionException e) {
 			return Constants.STRUTS_ERROR;
+			
 		}
-
-		Object authUserObj = session.getAttribute(Constants.SESSION_AUTH);
-		authUser = (AuthenticatedUser) authUserObj;
 		
 		Object formidobj = session.getAttribute(Constants.SESSION_FORMID);
 		if (formidobj != null && formidobj instanceof String) {
@@ -196,10 +190,13 @@ public class EditGeneralConfigAction extends ActionSupport
 	}
 	
 	public String back() {
-		
-		Object authUserObj = request.getSession().getAttribute(Constants.SESSION_AUTH);
-		
-		authUser = (AuthenticatedUser) authUserObj;
+		try {
+			populateBasicInformations();
+			
+		} catch (BasicActionException e) {
+			return Constants.STRUTS_ERROR;
+			
+		}
 		
 		return Constants.STRUTS_SUCCESS;
 	}
@@ -657,22 +654,6 @@ public class EditGeneralConfigAction extends ActionSupport
 		
 		return null;
 	}
-	
-	public void setServletResponse(HttpServletResponse response) {
-//		this.response = response;
-	}
-
-	public void setServletRequest(HttpServletRequest request) {
-		this.request = request;
-		
-	}
-
-	/**
-	 * @return the authUser
-	 */
-	public AuthenticatedUser getAuthUser() {
-		return authUser;
-	}
 
 	/**
 	 * @return the moaconfig