[gatein-commits] gatein SVN: r4671 - in components/pc/trunk: portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api and 1 other directory.

[do-not-reply at jboss.org]

Author: chris.laprun at jboss.com
Date: 2010-10-14 15:54:25 -0400 (Thu, 14 Oct 2010)
New Revision: 4671

Modified:
   components/pc/trunk/api/src/main/java/org/gatein/pc/api/Mode.java
   components/pc/trunk/api/src/main/java/org/gatein/pc/api/WindowState.java
   components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/StateAwareResponseImpl.java
Log:
- Made constructors private so that clients use the factory methods instead.
- Improved code a little.

Modified: components/pc/trunk/api/src/main/java/org/gatein/pc/api/Mode.java
===================================================================
--- components/pc/trunk/api/src/main/java/org/gatein/pc/api/Mode.java	2010-10-14 19:51:38 UTC (rev 4670)
+++ components/pc/trunk/api/src/main/java/org/gatein/pc/api/Mode.java	2010-10-14 19:54:25 UTC (rev 4671)
@@ -53,7 +53,7 @@
    /** . */
    private String name;
 
-   public Mode(String name)
+   private Mode(String name)
    {
       this(name, false);
    }
@@ -99,22 +99,12 @@
 
    private Object readResolve()
    {
-      if (VIEW.name.equals(name))
+      Mode standardMode = isStandardMode(name);
+
+      if (standardMode != null)
       {
-         return VIEW;
+         return standardMode;
       }
-      else if (EDIT.name.equals(name))
-      {
-         return EDIT;
-      }
-      else if (HELP.name.equals(name))
-      {
-         return HELP;
-      }
-      else if (EDIT_DEFAULTS.name.equals(name))
-      {
-         return EDIT_DEFAULTS;
-      }
       else
       {
          return this;
@@ -134,6 +124,19 @@
     */
    public static Mode create(String name, boolean preserveCase)
    {
+      Mode standardMode = isStandardMode(name);
+      if (standardMode != null)
+      {
+         return standardMode;
+      }
+      else
+      {
+         return new Mode(name, preserveCase);
+      }
+   }
+
+   private static Mode isStandardMode(String name)
+   {
       if (Mode.VIEW.name.equals(name))
       {
          return Mode.VIEW;
@@ -156,7 +159,7 @@
       }
       else
       {
-         return new Mode(name, preserveCase);
+         return null;
       }
    }
 }
\ No newline at end of file

Modified: components/pc/trunk/api/src/main/java/org/gatein/pc/api/WindowState.java
===================================================================
--- components/pc/trunk/api/src/main/java/org/gatein/pc/api/WindowState.java	2010-10-14 19:51:38 UTC (rev 4670)
+++ components/pc/trunk/api/src/main/java/org/gatein/pc/api/WindowState.java	2010-10-14 19:54:25 UTC (rev 4671)
@@ -47,7 +47,7 @@
    /** . */
    private String name;
 
-   public WindowState(String name)
+   private WindowState(String name)
    {
       this(name, false);
    }
@@ -93,6 +93,19 @@
 
    private Object readResolve()
    {
+      WindowState standardWindowState = isStandardWindowState(name);
+      if (standardWindowState != null)
+      {
+         return standardWindowState;
+      }
+      else
+      {
+         return this;
+      }
+   }
+
+   private static WindowState isStandardWindowState(String name)
+   {
       if (NORMAL.name.equals(name))
       {
          return NORMAL;
@@ -107,7 +120,7 @@
       }
       else
       {
-         return this;
+         return null;
       }
    }
 
@@ -124,18 +137,11 @@
     */
    public static WindowState create(String name, boolean preserveCase)
    {
-      if (WindowState.NORMAL.name.equals(name))
+      WindowState standardWindowState = isStandardWindowState(name);
+      if (standardWindowState != null)
       {
-         return WindowState.NORMAL;
+         return standardWindowState;
       }
-      else if (WindowState.MINIMIZED.name.equals(name))
-      {
-         return WindowState.MINIMIZED;
-      }
-      else if (WindowState.MAXIMIZED.name.equals(name))
-      {
-         return WindowState.MAXIMIZED;
-      }
       else
       {
          return new WindowState(name, preserveCase);

Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/StateAwareResponseImpl.java
===================================================================
--- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/StateAwareResponseImpl.java	2010-10-14 19:51:38 UTC (rev 4670)
+++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/StateAwareResponseImpl.java	2010-10-14 19:54:25 UTC (rev 4671)
@@ -22,20 +22,20 @@
  ******************************************************************************/
 package org.gatein.pc.portlet.impl.jsr168.api;
 
+import org.gatein.common.NotYetImplemented;
 import org.gatein.common.logging.Logger;
-import org.gatein.common.NotYetImplemented;
 import org.gatein.common.logging.LoggerFactory;
 import org.gatein.common.util.Tools;
 import org.gatein.pc.api.ParametersStateString;
+import org.gatein.pc.api.invocation.PortletInvocation;
+import org.gatein.pc.api.invocation.response.HTTPRedirectionResponse;
+import org.gatein.pc.api.invocation.response.PortletInvocationResponse;
+import org.gatein.pc.api.invocation.response.UpdateNavigationalStateResponse;
 import org.gatein.pc.portlet.impl.info.ContainerEventInfo;
 import org.gatein.pc.portlet.impl.info.ContainerPortletApplicationInfo;
 import org.gatein.pc.portlet.impl.info.ContainerTypeInfo;
 import org.gatein.pc.portlet.impl.jsr168.PortletApplicationImpl;
 import org.gatein.pc.portlet.impl.jsr168.PortletParameterMap;
-import org.gatein.pc.api.invocation.PortletInvocation;
-import org.gatein.pc.api.invocation.response.HTTPRedirectionResponse;
-import org.gatein.pc.api.invocation.response.PortletInvocationResponse;
-import org.gatein.pc.api.invocation.response.UpdateNavigationalStateResponse;
 
 import javax.portlet.PortletMode;
 import javax.portlet.PortletModeException;
@@ -362,10 +362,10 @@
       protected PortletParameterMap navigationalState = new PortletParameterMap(preq.navigationInfo);
 
       /** The new window state requested. */
-      protected org.gatein.pc.api.WindowState windowState = new org.gatein.pc.api.WindowState(preq.getWindowState().toString());
+      protected org.gatein.pc.api.WindowState windowState = org.gatein.pc.api.WindowState.create(preq.getWindowState().toString());
 
       /** The new mode requested. */
-      protected org.gatein.pc.api.Mode mode = new org.gatein.pc.api.Mode(preq.getPortletMode().toString());
+      protected org.gatein.pc.api.Mode mode = org.gatein.pc.api.Mode.create(preq.getPortletMode().toString());
 
       protected PortletInvocationResponse getResponse()
       {