From 7cdc8387e99b2e2a968362edb0dfca87807b2d1e Mon Sep 17 00:00:00 2001 From: Felix Schumacher Date: Thu, 26 Aug 2010 18:56:35 +0200 Subject: [PATCH] changed userbean to UserBean and made valid a private field --- WebContent/main.jsp | 2 +- WebContent/menu.jsp | 34 +++++++++++----------- .../mcb/services/{userbean.java => UserBean.java} | 4 +-- src/org/mcb/services/loginmanager.java | 2 +- src/org/mcb/services/udac.java | 2 +- 5 files changed, 22 insertions(+), 22 deletions(-) rename src/org/mcb/services/{userbean.java => UserBean.java} (96%) diff --git a/WebContent/main.jsp b/WebContent/main.jsp index b09c176..de4881a 100644 --- a/WebContent/main.jsp +++ b/WebContent/main.jsp @@ -18,7 +18,7 @@ <% - userbean usr = (userbean) session.getAttribute("user"); + UserBean usr = (UserBean) session.getAttribute("user"); String login_path = request.getContextPath() + "/index.jsp"; if (usr == null) { session.invalidate(); diff --git a/WebContent/menu.jsp b/WebContent/menu.jsp index ea01ca0..4bce7e5 100644 --- a/WebContent/menu.jsp +++ b/WebContent/menu.jsp @@ -21,23 +21,23 @@ -<% - userbean usr = (userbean) session.getAttribute("user"); - //if( (session.getAttribute("user_id") == null) | (session.getAttribute("user_id") == "" ) ){ - if (usr == null) { - session.invalidate(); //request.getContextPath()+"/Index.jsp" - // response.sendRedirect(login_path); - response.sendRedirect(response.encodeRedirectURL(login_path)); - } else { - /* String user_id = (String) session.getAttribute("user_id"); - String user_name = (String) session.getAttribute("user_name"); - //String user_pass = (String) session.getAttribute("user_pass"); - String role_id = (String) session.getAttribute("role_id"); - String role_name = (String) session.getAttribute("role_desc"); - String last_login = (String) session.getAttribute("last_login"); - // userbean usr = (userbean) session.getAttribute("user"); - //out.println("object value: "+usr.getName()); - */ +<% + UserBean usr = (UserBean) session.getAttribute("user"); + //if( (session.getAttribute("user_id") == null) | (session.getAttribute("user_id") == "" ) ){ + if (usr == null) { + session.invalidate(); //request.getContextPath()+"/Index.jsp" + // response.sendRedirect(login_path); + response.sendRedirect(response.encodeRedirectURL(login_path)); + } else { + /* String user_id = (String) session.getAttribute("user_id"); + String user_name = (String) session.getAttribute("user_name"); + //String user_pass = (String) session.getAttribute("user_pass"); + String role_id = (String) session.getAttribute("role_id"); + String role_name = (String) session.getAttribute("role_desc"); + String last_login = (String) session.getAttribute("last_login"); + // userbean usr = (userbean) session.getAttribute("user"); + //out.println("object value: "+usr.getName()); + */ %> diff --git a/src/org/mcb/services/userbean.java b/src/org/mcb/services/UserBean.java similarity index 96% rename from src/org/mcb/services/userbean.java rename to src/org/mcb/services/UserBean.java index d692a66..117db99 100644 --- a/src/org/mcb/services/userbean.java +++ b/src/org/mcb/services/UserBean.java @@ -9,7 +9,7 @@ package org.mcb.services; * * @author yawar.saeed */ -public class userbean { +public class UserBean { private String userid; private String password; private String RoleDesc; @@ -17,7 +17,7 @@ public class userbean { private String Name; private String Branch; private String RoleId; - public boolean valid; + private boolean valid; public String getName() { return Name; diff --git a/src/org/mcb/services/loginmanager.java b/src/org/mcb/services/loginmanager.java index d7745d1..f861411 100644 --- a/src/org/mcb/services/loginmanager.java +++ b/src/org/mcb/services/loginmanager.java @@ -40,7 +40,7 @@ public class loginmanager extends HttpServlet { */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - userbean user = new userbean(); + UserBean user = new UserBean(); user.setUserId(request.getParameter("txt_userid")); user.setPassword(request.getParameter("txt_pass")); user = udac.login(user); diff --git a/src/org/mcb/services/udac.java b/src/org/mcb/services/udac.java index fd79b9d..c4b4369 100644 --- a/src/org/mcb/services/udac.java +++ b/src/org/mcb/services/udac.java @@ -16,7 +16,7 @@ public class udac { this.passwordservice = passwordservice; } - public userbean login(userbean user) { + public UserBean login(UserBean user) { // preparing some objects for connection Connection currentCon = null; ResultSet rs = null; -- 2.11.0