diff options
Diffstat (limited to 'id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ListOAsAction.java')
-rw-r--r-- | id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ListOAsAction.java | 64 |
1 files changed, 21 insertions, 43 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ListOAsAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ListOAsAction.java index 4beb29343..e51ee7ca6 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ListOAsAction.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ListOAsAction.java @@ -42,26 +42,20 @@ import at.gv.egovernment.moa.id.commons.db.dao.config.UserDatabase; 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.OAListElement; +import at.gv.egovernment.moa.id.configuration.exception.BasicActionException; import at.gv.egovernment.moa.id.configuration.exception.ConfigurationException; import at.gv.egovernment.moa.id.configuration.helper.FormDataHelper; import at.gv.egovernment.moa.id.configuration.helper.LanguageHelper; import at.gv.egovernment.moa.id.configuration.validation.ValidationHelper; import at.gv.egovernment.moa.util.MiscUtil; -public class ListOAsAction extends ActionSupport implements ServletRequestAware, - ServletResponseAware { +public class ListOAsAction extends BasicAction { private final Logger log = Logger.getLogger(ListOAsAction.class); private static final long serialVersionUID = 1L; - - private HttpServletRequest request; - -// private HttpServletResponse response; -// private ConfigurationProvider configuration; - - private List<OAListElement> formOAs; - private AuthenticatedUser authUser; + + private List<OAListElement> formOAs; private String friendlyname; public ListOAsAction() throws ConfigurationException { @@ -70,16 +64,14 @@ public class ListOAsAction extends ActionSupport implements ServletRequestAware, public String listAllOnlineAppliactions() { - 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; - List<OnlineApplication> dbOAs = null; if (authUser.isAdmin()) { @@ -109,9 +101,13 @@ public class ListOAsAction extends ActionSupport implements ServletRequestAware, public String searchOAInit() { - Object authUserObj = request.getSession().getAttribute(Constants.SESSION_AUTH); - - authUser = (AuthenticatedUser) authUserObj; + try { + populateBasicInformations(); + + } catch (BasicActionException e) { + return Constants.STRUTS_ERROR; + + } formOAs = null; friendlyname = ""; @@ -121,16 +117,14 @@ public class ListOAsAction extends ActionSupport implements ServletRequestAware, } public String searchOA() { - 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 (MiscUtil.isEmpty(friendlyname)) { log.info("SearchOA textfield is empty"); addActionError(LanguageHelper.getErrorString("validation.general.oafriendlyname.empty", request)); @@ -182,22 +176,6 @@ public class ListOAsAction extends ActionSupport implements ServletRequestAware, 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; - } - - /** * @return the formOAs */ |