[portal-commits] JBoss Portal SVN: r6912 - in trunk: core/src/main/org/jboss/portal/core/controller/command/info and 2 other directories.

Author: julien(a)jboss.com Date: 2007-04-03 11:21:57 -0400 (Tue, 03 Apr 2007) New Revision: 6912 Modified: trunk/core-cms/src/main/org/jboss/portal/core/cms/command/StreamContentCommand.java trunk/core/src/main/org/jboss/portal/core/controller/command/SignOutCommand.java trunk/core/src/main/org/jboss/portal/core/controller/command/info/ActionCommandInfo.java trunk/core/src/main/org/jboss/portal/core/controller/command/info/CommandInfo.java trunk/core/src/main/org/jboss/portal/core/controller/command/info/ViewCommandInfo.java trunk/core/src/main/org/jboss/portal/core/model/portal/command/ImportPageToDashboardCommand.java trunk/core/src/main/org/jboss/portal/core/model/portal/command/InvokePortletWindowActionCommand.java trunk/core/src/main/org/jboss/portal/core/model/portal/command/InvokePortletWindowRenderCommand.java trunk/core/src/main/org/jboss/portal/core/model/portal/command/MoveWindowCommand.java trunk/core/src/main/org/jboss/portal/core/model/portal/command/RenderPageCommand.java trunk/core/src/main/org/jboss/portal/core/model/portal/command/RenderWindowCommand.java trunk/core/src/main/org/jboss/portal/core/model/portal/command/ViewDashboardCommand.java Log: - remove obsolete command info fields Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/SignOutCommand.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/controller/command/SignOutCommand.java 2007-04-03 15:18:26 UTC (rev 6911) +++ trunk/core/src/main/org/jboss/portal/core/controller/command/SignOutCommand.java 2007-04-03 15:21:57 UTC (rev 6912) @@ -38,7 +38,7 @@ { /** . */ - private static final CommandInfo info = new ActionCommandInfo(false, "view", false); + private static final CommandInfo info = new ActionCommandInfo(false); /** . */ private String location; Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/info/ActionCommandInfo.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/controller/command/info/ActionCommandInfo.java 2007-04-03 15:18:26 UTC (rev 6911) +++ trunk/core/src/main/org/jboss/portal/core/controller/command/info/ActionCommandInfo.java 2007-04-03 15:21:57 UTC (rev 6912) @@ -32,13 +32,16 @@ /** . */ private final boolean idempotent; - public ActionCommandInfo(boolean secured, String action, boolean idempotent) + public ActionCommandInfo(boolean idempotent) { - super(secured, action); this.idempotent = idempotent; } - /** Return true if the command is idempotent, i.e it can be reinvoked again safely. */ + /** + * Return true if the command is idempotent, i.e it can be reinvoked again safely. + * + * @return the idempotency of the command + */ public boolean isIdempotent() { return idempotent; Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/info/CommandInfo.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/controller/command/info/CommandInfo.java 2007-04-03 15:18:26 UTC (rev 6911) +++ trunk/core/src/main/org/jboss/portal/core/controller/command/info/CommandInfo.java 2007-04-03 15:21:57 UTC (rev 6912) @@ -31,33 +31,7 @@ public abstract class CommandInfo { - /** . */ - private final boolean secured; - - /** . */ - private final String action; - - public CommandInfo(boolean secured, String action) + public CommandInfo() { - this.secured = secured; - this.action = action; } - - /** - * Is this command a secured command? If so, access rights to this command will be enforced via a security policy. - * <p>The default returns false. Extending command classes need to set the <code>isSecured</code> member variable to - * true in the command's constructor if they want to enforce access right checks for the command.</p> - * - * @return true if this command requires security checks - */ - public boolean isSecured() - { - return secured; - } - - /** @return the associated action of this command for security checks (is the user allowed to call this action...). */ - public String getAction() - { - return action; - } } Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/info/ViewCommandInfo.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/controller/command/info/ViewCommandInfo.java 2007-04-03 15:18:26 UTC (rev 6911) +++ trunk/core/src/main/org/jboss/portal/core/controller/command/info/ViewCommandInfo.java 2007-04-03 15:21:57 UTC (rev 6912) @@ -28,8 +28,8 @@ */ public class ViewCommandInfo extends CommandInfo { - public ViewCommandInfo(boolean secured, String action) + public ViewCommandInfo() { - super(secured, action); + super(); } } Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/command/ImportPageToDashboardCommand.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/model/portal/command/ImportPageToDashboardCommand.java 2007-04-03 15:18:26 UTC (rev 6911) +++ trunk/core/src/main/org/jboss/portal/core/model/portal/command/ImportPageToDashboardCommand.java 2007-04-03 15:21:57 UTC (rev 6912) @@ -43,7 +43,7 @@ { /** . */ - private static final CommandInfo info = new ActionCommandInfo(true, "view", false); + private static final CommandInfo info = new ActionCommandInfo(false); /** . */ private Portal dashboardPortal; Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/command/InvokePortletWindowActionCommand.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/model/portal/command/InvokePortletWindowActionCommand.java 2007-04-03 15:18:26 UTC (rev 6911) +++ trunk/core/src/main/org/jboss/portal/core/model/portal/command/InvokePortletWindowActionCommand.java 2007-04-03 15:21:57 UTC (rev 6912) @@ -53,7 +53,7 @@ private static final Logger log = Logger.getLogger(InvokePortletWindowActionCommand.class); /** . */ - private static final CommandInfo info = new ActionCommandInfo(false, "view", false); + private static final CommandInfo info = new ActionCommandInfo(false); /** . */ private StateString navigationalState; Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/command/InvokePortletWindowRenderCommand.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/model/portal/command/InvokePortletWindowRenderCommand.java 2007-04-03 15:18:26 UTC (rev 6911) +++ trunk/core/src/main/org/jboss/portal/core/model/portal/command/InvokePortletWindowRenderCommand.java 2007-04-03 15:21:57 UTC (rev 6912) @@ -43,7 +43,7 @@ public class InvokePortletWindowRenderCommand extends InvokeWindowCommand { - private static final CommandInfo info = new ViewCommandInfo(false, "view"); + private static final CommandInfo info = new ViewCommandInfo(); /** . */ protected final StateString navigationalState; Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/command/MoveWindowCommand.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/model/portal/command/MoveWindowCommand.java 2007-04-03 15:18:26 UTC (rev 6911) +++ trunk/core/src/main/org/jboss/portal/core/model/portal/command/MoveWindowCommand.java 2007-04-03 15:21:57 UTC (rev 6912) @@ -40,7 +40,7 @@ { /** . */ - private static final CommandInfo info = new ActionCommandInfo(false, "view", false); + private static final CommandInfo info = new ActionCommandInfo(false); /** . */ private int fromPos; Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/command/RenderPageCommand.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/model/portal/command/RenderPageCommand.java 2007-04-03 15:18:26 UTC (rev 6911) +++ trunk/core/src/main/org/jboss/portal/core/model/portal/command/RenderPageCommand.java 2007-04-03 15:21:57 UTC (rev 6912) @@ -71,7 +71,7 @@ { /** . */ - private static final CommandInfo info = new ViewCommandInfo(false, "view"); + private static final CommandInfo info = new ViewCommandInfo(); /** The windows to render. */ private Collection windows; Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/command/RenderWindowCommand.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/model/portal/command/RenderWindowCommand.java 2007-04-03 15:18:26 UTC (rev 6911) +++ trunk/core/src/main/org/jboss/portal/core/model/portal/command/RenderWindowCommand.java 2007-04-03 15:21:57 UTC (rev 6912) @@ -59,7 +59,7 @@ public static final String SHOW = "show"; /** . */ - private static final CommandInfo info = new ViewCommandInfo(true, "view"); + private static final CommandInfo info = new ViewCommandInfo(); public RenderWindowCommand(PortalObjectId windowId) throws IllegalArgumentException Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/command/ViewDashboardCommand.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/model/portal/command/ViewDashboardCommand.java 2007-04-03 15:18:26 UTC (rev 6911) +++ trunk/core/src/main/org/jboss/portal/core/model/portal/command/ViewDashboardCommand.java 2007-04-03 15:21:57 UTC (rev 6912) @@ -42,7 +42,7 @@ { /** . */ - private static final CommandInfo info = new ViewCommandInfo(false, "view"); + private static final CommandInfo info = new ViewCommandInfo(); /** . */ private Portal dashboardPortal; Modified: trunk/core-cms/src/main/org/jboss/portal/core/cms/command/StreamContentCommand.java =================================================================== --- trunk/core-cms/src/main/org/jboss/portal/core/cms/command/StreamContentCommand.java 2007-04-03 15:18:26 UTC (rev 6911) +++ trunk/core-cms/src/main/org/jboss/portal/core/cms/command/StreamContentCommand.java 2007-04-03 15:21:57 UTC (rev 6912) @@ -49,7 +49,7 @@ public class StreamContentCommand extends ControllerCommand { - private static final CommandInfo info = new ViewCommandInfo(false, null); + private static final CommandInfo info = new ViewCommandInfo(); private String path;