1 files changed, 14 insertions, 46 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/MainAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/MainAction.java
index bc5f3049f..ea6f17fc7 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/MainAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/MainAction.java
@@ -22,35 +22,16 @@
  *******************************************************************************/
 package at.gv.egovernment.moa.id.configuration.struts.action;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
 import org.apache.log4j.Logger;
-import org.apache.struts2.interceptor.ServletRequestAware;
-import org.apache.struts2.interceptor.ServletResponseAware;
 
 import at.gv.egovernment.moa.id.configuration.Constants;
-import at.gv.egovernment.moa.id.configuration.auth.AuthenticatedUser;
-import at.gv.egovernment.moa.id.configuration.exception.ConfigurationException;
+import at.gv.egovernment.moa.id.configuration.exception.BasicActionException;
 
-public class MainAction implements ServletRequestAware,
-	ServletResponseAware {
-	
-	private static final Logger log = Logger.getLogger(MainAction.class);
-	
-	private HttpServletRequest request;
-	
-//	private HttpServletResponse response;
-//	private ConfigurationProvider configuration;
+public class MainAction extends BasicAction {
 	
+	private static final long serialVersionUID = 221178766809263908L;
 
-	private AuthenticatedUser authUser; 
-	
-	
-	public MainAction() throws ConfigurationException {
-//		configuration = ConfigurationProvider.getInstance();
-	}
+	private static final Logger log = Logger.getLogger(MainAction.class);
 	
 	public String changeLanguage() {
 		
@@ -59,36 +40,23 @@ public class MainAction implements ServletRequestAware,
 	
 	public String generateMainFrame() {
 		
-		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 (hasActionMessages())
+			setActionMessages(getActionMessages());
+		
+		if (hasActionErrors())
+			setActionErrors(getActionErrors());
 		
 		session.setAttribute(Constants.SESSION_RETURNAREA, null);
 		
 		return Constants.STRUTS_SUCCESS;
 	}
 	
-	
-	public void setServletResponse(HttpServletResponse arg0) {
-//		this.response = arg0;
-	}
-	public void setServletRequest(HttpServletRequest arg0) {
-		this.request =  arg0;
-	}
-
-
-	/**
-	 * @return the authUser
-	 */
-	public AuthenticatedUser getAuthUser() {
-		return authUser;
-	}
-	
-	
-
 }