Author: chris.laprun(a)jboss.com Date: 2007-03-19 13:44:14 -0400 (Mon, 19 Mar 2007) New Revision: 6750 Modified: branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/Mode.java branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/WindowState.java branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/WSRPTypeFactory.java Log: - JBPORTAL-1322: Backported fix. Modified: branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/Mode.java =================================================================== --- branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/Mode.java 2007-03-19 17:34:55 UTC (rev 6749) +++ branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/Mode.java 2007-03-19 17:44:14 UTC (rev 6750) @@ -52,13 +52,24 @@ public Mode(String name) { + this(name, false); + } + + /** + * @param name + * @param preserveCase + * @since 2.4.2 + */ + private Mode(String name, boolean preserveCase) + { if (name == null) { throw new IllegalArgumentException("Mode cannot be null"); } - this.name = name.toLowerCase(Locale.ENGLISH); + this.name = (preserveCase ? name : name.toLowerCase(Locale.ENGLISH)); } + public boolean equals(Object o) { if (o == this) @@ -107,27 +118,38 @@ } } - public static Mode create(String s) + public static Mode create(String name) { - if (Mode.VIEW.name.equals(s)) + return create(name, false); + } + + /** + * @param name + * @param preserveCase + * @return + * @since 2.4.2 + */ + public static Mode create(String name, boolean preserveCase) + { + if (Mode.VIEW.name.equals(name)) { return Mode.VIEW; } - else if (Mode.EDIT.name.equals(s)) + else if (Mode.EDIT.name.equals(name)) { return Mode.EDIT; } - else if (Mode.HELP.name.equals(s)) + else if (Mode.HELP.name.equals(name)) { return Mode.HELP; } - else if (Mode.EDIT_DEFAULTS.name.equals(s)) + else if (Mode.EDIT_DEFAULTS.name.equals(name)) { return Mode.VIEW; } else { - return new Mode(s); + return new Mode(name, preserveCase); } } } Modified: branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/WindowState.java =================================================================== --- branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/WindowState.java 2007-03-19 17:34:55 UTC (rev 6749) +++ branches/JBoss_Portal_Branch_2_4/api/src/main/org/jboss/portal/WindowState.java 2007-03-19 17:44:14 UTC (rev 6750) @@ -49,11 +49,22 @@ public WindowState(String name) { + this(name, false); + } + + /** + * @param name + * @param preserveCase + * @since 2.4.2 + */ + private WindowState(String name, boolean preserveCase) + { if (name == null) { throw new IllegalArgumentException("Window state name cannot be null"); } - this.name = name.toLowerCase(Locale.ENGLISH); + + this.name = (preserveCase ? name : name.toLowerCase(Locale.ENGLISH)); } public boolean equals(Object o) @@ -100,23 +111,34 @@ } } - public static WindowState create(String s) + public static WindowState create(String name) { - if (WindowState.NORMAL.name.equals(s)) + return create(name, false); + } + + /** + * @param name + * @param preserveCase + * @return + * @since 2.4.2 + */ + public static WindowState create(String name, boolean preserveCase) + { + if (WindowState.NORMAL.name.equals(name)) { return WindowState.NORMAL; } - else if (WindowState.MINIMIZED.name.equals(s)) + else if (WindowState.MINIMIZED.name.equals(name)) { return WindowState.MINIMIZED; } - else if (WindowState.MAXIMIZED.name.equals(s)) + else if (WindowState.MAXIMIZED.name.equals(name)) { return WindowState.MAXIMIZED; } else { - return new WindowState(s); + return new WindowState(name, preserveCase); } } } Modified: branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/WSRPTypeFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/WSRPTypeFactory.java 2007-03-19 17:34:55 UTC (rev 6749) +++ branches/JBoss_Portal_Branch_2_4/wsrp/src/main/org/jboss/portal/wsrp/WSRPTypeFactory.java 2007-03-19 17:44:14 UTC (rev 6750) @@ -525,12 +525,12 @@ public Mode getMode() { - return Mode.create(WSRPRewritingConstants.REWRITE_PARAMETER_OPEN + WSRPRewritingConstants.MODE + WSRPRewritingConstants.REWRITE_PARAMETER_CLOSE); + return Mode.create(WSRPRewritingConstants.REWRITE_PARAMETER_OPEN + WSRPRewritingConstants.MODE + WSRPRewritingConstants.REWRITE_PARAMETER_CLOSE, true); } public WindowState getWindowState() { - return WindowState.create(WSRPRewritingConstants.REWRITE_PARAMETER_OPEN + WSRPRewritingConstants.WINDOW_STATE + WSRPRewritingConstants.REWRITE_PARAMETER_CLOSE); + return WindowState.create(WSRPRewritingConstants.REWRITE_PARAMETER_OPEN + WSRPRewritingConstants.WINDOW_STATE + WSRPRewritingConstants.REWRITE_PARAMETER_CLOSE, true); } }; @@ -543,12 +543,12 @@ public Mode getMode() { - return Mode.create(WSRPRewritingConstants.REWRITE_PARAMETER_OPEN + WSRPRewritingConstants.MODE + WSRPRewritingConstants.REWRITE_PARAMETER_CLOSE); + return Mode.create(WSRPRewritingConstants.REWRITE_PARAMETER_OPEN + WSRPRewritingConstants.MODE + WSRPRewritingConstants.REWRITE_PARAMETER_CLOSE, true); } public WindowState getWindowState() { - return WindowState.create(WSRPRewritingConstants.REWRITE_PARAMETER_OPEN + WSRPRewritingConstants.WINDOW_STATE + WSRPRewritingConstants.REWRITE_PARAMETER_CLOSE); + return WindowState.create(WSRPRewritingConstants.REWRITE_PARAMETER_OPEN + WSRPRewritingConstants.WINDOW_STATE + WSRPRewritingConstants.REWRITE_PARAMETER_CLOSE, true); } };