[jboss-cvs] jboss-portal/core/src/main/org/jboss/portal/core/portlet/role ...
Chris Laprun
chris.laprun at jboss.com
Fri Jul 14 16:50:57 EDT 2006
User: claprun
Date: 06/07/14 16:50:57
Modified: core/src/main/org/jboss/portal/core/portlet/role
RolePortlet.java
Log:
Fixed masking of actions by processAction...
Revision Changes Path
1.26 +100 -117 jboss-portal/core/src/main/org/jboss/portal/core/portlet/role/RolePortlet.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: RolePortlet.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/portlet/role/RolePortlet.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- RolePortlet.java 11 Jun 2006 23:12:19 -0000 1.25
+++ RolePortlet.java 14 Jul 2006 20:50:56 -0000 1.26
@@ -37,8 +37,6 @@
import org.jboss.portlet.JBossRenderRequest;
import org.jboss.portlet.JBossRenderResponse;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
import javax.portlet.PortletException;
import javax.portlet.PortletRequestDispatcher;
import javax.portlet.PortletSecurityException;
@@ -59,7 +57,7 @@
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
* @author <a href="mailto:theute at jboss.org">Thomas Heute </a>
* @author Roy Russo : roy at jboss dot org
- * @version $Revision: 1.25 $
+ * @version $Revision: 1.26 $
*/
public class RolePortlet
extends JBossPortlet
@@ -96,20 +94,21 @@
private RoleModule roleModule;
private UserModule userModule;
+ private static final String ADMIN_ROLE = "Admin";
public void init() throws PortletException
{
super.init();
- userModule = (UserModule) getPortletContext().getAttribute("UserModule");
- roleModule = (RoleModule) getPortletContext().getAttribute("RoleModule");
+ userModule = (UserModule)getPortletContext().getAttribute("UserModule");
+ roleModule = (RoleModule)getPortletContext().getAttribute("RoleModule");
portletHelper = new PortletHelper(this);
//
- if(userModule == null)
+ if (userModule == null)
{
throw new PortletException("No user module");
}
- if(roleModule == null)
+ if (roleModule == null)
{
throw new PortletException("No role module");
}
@@ -130,31 +129,16 @@
return OP_SHOWSUMMARY;
}
- public void processAction(ActionRequest actionRequest, ActionResponse actionResponse) throws PortletException, PortletSecurityException, IOException
- {
- String op = actionRequest.getParameter("op");
- if(OP_SHOWLISTROLEMEMBERS.equals(op))
- {
- if(actionRequest.isUserInRole("Admin"))
- {
- actionResponse.setRenderParameter("roleid", actionRequest.getParameter("roleid"));
- actionResponse.setRenderParameter("usernamefilter", actionRequest.getParameter("usernamefilter"));
- actionResponse.setRenderParameter("usersperpage", actionRequest.getParameter("usersperpage"));
- actionResponse.setRenderParameter("op", OP_SHOWLISTROLEMEMBERS);
- }
- }
- }
-
protected void doView(JBossRenderRequest req, JBossRenderResponse resp)
throws PortletException, PortletSecurityException, IOException
{
- if(req.isUserInRole("Admin"))
+ if (req.isUserInRole(ADMIN_ROLE))
{
resp.setContentType("text/html");
PrintWriter writer = resp.getWriter();
String op;
- if(req.getWindowState() != WindowState.MAXIMIZED)
+ if (req.getWindowState() != WindowState.MAXIMIZED)
{
op = getDefaultOperation();
}
@@ -166,9 +150,9 @@
Locale locale = req.getLocale();
ResourceBundle bundle = getResourceBundle(locale);
- if(OP_SHOWSUMMARY.equals(op))
+ if (OP_SHOWSUMMARY.equals(op))
{
- if(req.isUserInRole("Admin"))
+ if (req.isUserInRole(ADMIN_ROLE))
{
DelegateContext ctx = new DelegateContext();
ctx.put("nbRoles", getNbRolesString(bundle));
@@ -178,18 +162,18 @@
rd.include(req, resp);
}
}
- else if(OP_SHOWCREATEROLE.equals(op))
+ else if (OP_SHOWCREATEROLE.equals(op))
{
- if(req.isUserInRole("Admin"))
+ if (req.isUserInRole(ADMIN_ROLE))
{
PortletRequestDispatcher rd = getPortletContext()
.getRequestDispatcher("/WEB-INF/jsp/role/createRole.jsp");
rd.include(req, resp);
}
}
- else if(OP_SHOWEDITROLE.equals(op))
+ else if (OP_SHOWEDITROLE.equals(op))
{
- if(req.isUserInRole("Admin"))
+ if (req.isUserInRole(ADMIN_ROLE))
{
try
{
@@ -197,22 +181,22 @@
DelegateContext ctx = new DelegateContext();
Iterator i = roles.iterator();
DelegateContext roleCtx = null;
- while(i.hasNext())
+ while (i.hasNext())
{
- Role role = (Role) i.next();
+ Role role = (Role)i.next();
roleCtx = ctx.next("role");
String roleId = role.getId().toString();
roleCtx.put("id", roleId);
roleCtx.put("displayname", role.getDisplayName());
String selectedRoleId = req.getParameter("roleid");
- if(roleId.equals(selectedRoleId))
+ if (roleId.equals(selectedRoleId))
{
roleCtx.put("selected", "selected");
}
}
req.setAttribute(PortalJsp.CTX_REQUEST, ctx);
}
- catch(IdentityException e)
+ catch (IdentityException e)
{
// TODO Auto-generated catch block
e.printStackTrace();
@@ -222,9 +206,9 @@
rd.include(req, resp);
}
}
- else if(OP_SHOWMAINROLEMEMBERS.equals(op))
+ else if (OP_SHOWMAINROLEMEMBERS.equals(op))
{
- if(req.isUserInRole("Admin"))
+ if (req.isUserInRole(ADMIN_ROLE))
{
try
{
@@ -232,22 +216,22 @@
DelegateContext ctx = new DelegateContext();
Iterator i = roles.iterator();
DelegateContext roleCtx = null;
- while(i.hasNext())
+ while (i.hasNext())
{
- Role role = (Role) i.next();
+ Role role = (Role)i.next();
roleCtx = ctx.next("role");
String roleId = role.getId().toString();
roleCtx.put("id", roleId);
roleCtx.put("displayname", role.getDisplayName());
String selectedRoleId = req.getParameter("roleid");
- if(roleId.equals(selectedRoleId))
+ if (roleId.equals(selectedRoleId))
{
roleCtx.put("selected", "selected");
}
}
req.setAttribute(PortalJsp.CTX_REQUEST, ctx);
}
- catch(IdentityException e)
+ catch (IdentityException e)
{
// TODO Auto-generated catch block
e.printStackTrace();
@@ -257,9 +241,9 @@
rd.include(req, resp);
}
}
- else if(OP_SHOWLISTROLEMEMBERS.equals(op))
+ else if (OP_SHOWLISTROLEMEMBERS.equals(op))
{
- if(req.isUserInRole("Admin"))
+ if (req.isUserInRole(ADMIN_ROLE))
{
try
{
@@ -280,14 +264,14 @@
users = roleModule.findRoleMembers(role.getName(), offset, usersPerPage + 1, usernameFilter.trim());
User[] usersArray = new User[users.size()];
- usersArray = (User[]) users.toArray(usersArray);
+ usersArray = (User[])users.toArray(usersArray);
DelegateContext rowCtx = null;
- for(int i = 0; i < Math.min(usersArray.length, usersPerPage); i++)
+ for (int i = 0; i < Math.min(usersArray.length, usersPerPage); i++)
{
int oddeven = i % 2;
User user = usersArray[i];
- if(oddeven == 0)
+ if (oddeven == 0)
{
rowCtx = ctx.next("row");
}
@@ -297,10 +281,10 @@
//
Iterator itRoles = roleModule.getRoles(user).iterator();
- while(itRoles.hasNext())
+ while (itRoles.hasNext())
{
DelegateContext rolesCtx = rowCtx.next("roles" + oddeven);
- rolesCtx.put("name", ((Role) itRoles.next()).getDisplayName());
+ rolesCtx.put("name", ((Role)itRoles.next()).getDisplayName());
}
PortletURL editURL = resp.createRenderURL();
@@ -310,7 +294,7 @@
rowCtx.put("editURL" + oddeven, editURL.toString());
}
- if(offset != 0)
+ if (offset != 0)
{
PortletURL previousPageLink = resp.createRenderURL();
previousPageLink.setParameter(getOperationName(), OP_SHOWLISTROLEMEMBERS);
@@ -322,7 +306,7 @@
previousCtx.put("link", previousPageLink.toString());
}
- if(usersArray.length > usersPerPage)
+ if (usersArray.length > usersPerPage)
{
PortletURL nextPageLink = resp.createRenderURL();
nextPageLink.setParameter(getOperationName(), OP_SHOWLISTROLEMEMBERS);
@@ -337,7 +321,7 @@
ctx.put("usernamefilter", usernameFilter);
req.setAttribute(PortalJsp.CTX_REQUEST, ctx);
}
- catch(IdentityException e)
+ catch (IdentityException e)
{
// TODO Auto-generated catch block
e.printStackTrace();
@@ -347,9 +331,9 @@
rd.include(req, resp);
}
}
- else if(OP_SHOWADDROLESTOUSER.equals(op))
+ else if (OP_SHOWADDROLESTOUSER.equals(op))
{
- if(req.isUserInRole("Admin"))
+ if (req.isUserInRole(ADMIN_ROLE))
{
DelegateContext ctx = new DelegateContext();
@@ -363,20 +347,20 @@
Set roles = roleModule.findRoles();
Role[] rolesArray = new Role[roles.size()];
- rolesArray = (Role[]) roles.toArray(rolesArray);
+ rolesArray = (Role[])roles.toArray(rolesArray);
Role role = null;
DelegateContext rowCtx = null;
- for(int i = 0; i < rolesArray.length; i++)
+ for (int i = 0; i < rolesArray.length; i++)
{
int oddeven = i % 3;
role = rolesArray[i];
- if(oddeven == 0)
+ if (oddeven == 0)
{
rowCtx = ctx.next("row");
}
DelegateContext colCtx = rowCtx.next("col");
- if(userRoles.contains(role))
+ if (userRoles.contains(role))
{
colCtx.put("ischecked", "checked");
}
@@ -385,12 +369,12 @@
colCtx.put("displayname", role.getDisplayName());
}
}
- catch(IllegalArgumentException e)
+ catch (IllegalArgumentException e)
{
// TODO Auto-generated catch block
e.printStackTrace();
}
- catch(IdentityException e)
+ catch (IdentityException e)
{
// TODO Auto-generated catch block
e.printStackTrace();
@@ -431,15 +415,15 @@
public void createRole(JBossActionRequest req, JBossActionResponse resp)
{
- if(req.isUserInRole("Admin"))
+ if (req.isUserInRole(ADMIN_ROLE))
{
String roleName = req.getParameter("rolename");
String roleDisplayName = req.getParameter("roledisplayname");
- if((roleName != null) && (roleDisplayName != null)
+ if ((roleName != null) && (roleDisplayName != null)
&& (roleName.length() != 0) && (roleDisplayName.length() != 0))
{
- if(roleByDisplayNameAvailable(roleDisplayName)
+ if (roleByDisplayNameAvailable(roleDisplayName)
&& roleByNameAvailable(roleName))
{
try
@@ -451,17 +435,17 @@
getDefaultOperation());
resp.setWindowState(WindowState.NORMAL);
}
- catch(WindowStateException e1)
+ catch (WindowStateException e1)
{
log.error("Couldn't put the window in normal state");
}
}
- catch(IllegalArgumentException e)
+ catch (IllegalArgumentException e)
{
log.error("Cannot create role, rolename is null");
e.printStackTrace();
}
- catch(IdentityException e)
+ catch (IdentityException e)
{
log.error("Cannot create role \"" + roleName
+ "\", unexpected error");
@@ -470,7 +454,7 @@
}
else
{
- if(!roleByDisplayNameAvailable(roleDisplayName))
+ if (!roleByDisplayNameAvailable(roleDisplayName))
{
// Role with that display name already exists !
portletHelper.setRenderParameter(resp, "rolename", roleName);
@@ -482,7 +466,7 @@
.setRenderParameter(getOperationName(),
OP_SHOWCREATEROLE);
}
- else if(!roleByNameAvailable(roleName))
+ else if (!roleByNameAvailable(roleName))
{
// Role with that name already exists !
portletHelper.setRenderParameter(resp, "rolename", roleName);
@@ -502,13 +486,13 @@
portletHelper.setRenderParameter(resp, "rolename", roleName);
portletHelper.setRenderParameter(resp, "roledisplayname",
roleDisplayName);
- if(roleName == null || roleName.length() == 0)
+ if (roleName == null || roleName.length() == 0)
{
resp
.setRenderParameter("rolename_error",
"ROLE_ERROR_NAMEEMPTY");
}
- if(roleDisplayName == null || roleDisplayName.length() == 0)
+ if (roleDisplayName == null || roleDisplayName.length() == 0)
{
resp.setRenderParameter("roledisplayname_error",
"ROLE_ERROR_DISPLAYNAMEEMPTY");
@@ -526,7 +510,7 @@
*/
public void editRole(JBossActionRequest req, JBossActionResponse resp)
{
- if(req.isUserInRole("Admin"))
+ if (req.isUserInRole(ADMIN_ROLE))
{
String roleID = req.getParameters().getParameter("roleid");
String newDisplayName = req.getParameter("roledisplayname");
@@ -535,7 +519,7 @@
{
role = roleModule.findRoleById(roleID);
// Check that the new display name is available
- if(roleByDisplayNameAvailable(newDisplayName))
+ if (roleByDisplayNameAvailable(newDisplayName))
{
role.setDisplayName(newDisplayName);
}
@@ -544,19 +528,18 @@
{
portletHelper.setRenderParameter(resp, "roledisplayname",
newDisplayName);
- portletHelper.setRenderParameter(resp, "roleid", roleID
- .toString());
+ portletHelper.setRenderParameter(resp, "roleid", roleID);
resp.setRenderParameter("roledisplayname_error",
"ROLE_ERROR_DISPLAYNAMEALREADYEXISTS");
resp.setRenderParameter(getOperationName(), OP_SHOWEDITROLE);
}
}
- catch(IllegalArgumentException e)
+ catch (IllegalArgumentException e)
{
log.error("Cannot update role: roleID is null");
e.printStackTrace();
}
- catch(IdentityException e)
+ catch (IdentityException e)
{
log.error("Cannot update role, unexpected error");
e.printStackTrace();
@@ -572,7 +555,7 @@
*/
public void addRolesToUser(JBossActionRequest request, JBossActionResponse response)
{
- if(request.isUserInRole("Admin"))
+ if (request.isUserInRole(ADMIN_ROLE))
{
String[] selectedRoles = request.getParameterValues("roles");
String userId = request.getParameters().getParameter("userid");
@@ -582,12 +565,12 @@
Set roles = roleModule.findRolesByNames(selectedRoles);
roleModule.setRoles(user, roles);
}
- catch(IllegalArgumentException e)
+ catch (IllegalArgumentException e)
{
// TODO Auto-generated catch block
e.printStackTrace();
}
- catch(IdentityException e)
+ catch (IdentityException e)
{
// TODO Auto-generated catch block
e.printStackTrace();
@@ -603,7 +586,7 @@
*/
public void removeRole(JBossActionRequest req, JBossActionResponse resp)
{
- if(req.isUserInRole("Admin"))
+ if (req.isUserInRole(ADMIN_ROLE))
{
String roleId = req.getParameters().getParameter("roleid");
try
@@ -613,7 +596,7 @@
resp.setRenderParameter("roledelete_error", "ROLE_DELETED");
resp.setRenderParameter(getOperationName(), OP_SHOWEDITROLE);
}
- catch(IdentityException e)
+ catch (IdentityException e)
{
log.error("Cannot remove role, unexpected error", e);
portletHelper.setRenderParameter(resp, "roleid", roleId);
@@ -633,17 +616,17 @@
{
try
{
- for(Iterator i = roleModule.findRoles().iterator(); i.hasNext();)
+ for (Iterator i = roleModule.findRoles().iterator(); i.hasNext();)
{
- Role role = (Role) i.next();
- if(role.getDisplayName() != null && role.getDisplayName().equals(name))
+ Role role = (Role)i.next();
+ if (role.getDisplayName() != null && role.getDisplayName().equals(name))
{
return false;
}
}
;
}
- catch(IdentityException e)
+ catch (IdentityException e)
{
return false;
}
@@ -660,11 +643,11 @@
{
role = roleModule.findRoleByName(name);
}
- catch(IllegalArgumentException e)
+ catch (IllegalArgumentException e)
{
e.printStackTrace();
}
- catch(IdentityException e)
+ catch (IdentityException e)
{
return true;
}
@@ -682,18 +665,18 @@
{
nbRoles = roleModule.getRolesCount();
}
- catch(IllegalArgumentException e)
+ catch (IllegalArgumentException e)
{
e.printStackTrace();
}
- catch(IdentityException e)
+ catch (IdentityException e)
{
e.printStackTrace();
}
- if(nbRoles <= 1)
+ if (nbRoles <= 1)
{
buffer.append(bundle.getString("ROLE_THEREIS")).append(" ");
- if(nbRoles == 0)
+ if (nbRoles == 0)
{
buffer.append("no");
}
@@ -721,9 +704,9 @@
private String getFullName(ResourceBundle bundle,
User user)
{
- if((user.getGivenName() != null) && (user.getGivenName().trim().length() != 0))
+ if ((user.getGivenName() != null) && (user.getGivenName().trim().length() != 0))
{
- if((user.getFamilyName() != null) && (user.getFamilyName().trim().length() != 0))
+ if ((user.getFamilyName() != null) && (user.getFamilyName().trim().length() != 0))
{
return user.getGivenName() + " " + user.getFamilyName();
}
@@ -734,7 +717,7 @@
}
else
{
- if((user.getFamilyName() != null) && (user.getFamilyName().trim().length() != 0))
+ if ((user.getFamilyName() != null) && (user.getFamilyName().trim().length() != 0))
{
return user.getFamilyName().trim();
}
More information about the jboss-cvs-commits
mailing list