[jboss-svn-commits] JBoss Portal SVN: r5209 - in trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168: . taglib
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Sep 15 13:17:42 EDT 2006
Author: julien at jboss.com
Date: 2006-09-15 13:17:35 -0400 (Fri, 15 Sep 2006)
New Revision: 5209
Modified:
trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortalContextImpl.java
trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletRequestImpl.java
trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletURLImpl.java
trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletUtils.java
trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/RenderResponseImpl.java
trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/GenerateURLTag.java
Log:
moved util method from PortletURLImpl to PortletUtils
Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortalContextImpl.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortalContextImpl.java 2006-09-15 17:12:48 UTC (rev 5208)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortalContextImpl.java 2006-09-15 17:17:35 UTC (rev 5209)
@@ -84,7 +84,7 @@
for (Iterator i = tmp.iterator(); i.hasNext();)
{
Mode mode = (Mode)i.next();
- supportedPortletModes.add(PortletURLImpl.decodePortletMode(mode.toString()));
+ supportedPortletModes.add(PortletUtils.decodePortletMode(mode.toString()));
}
}
return Tools.toEnumeration(supportedPortletModes.iterator());
@@ -99,7 +99,7 @@
for (Iterator i = tmp.iterator(); i.hasNext();)
{
org.jboss.portal.WindowState windowState = (org.jboss.portal.WindowState)i.next();
- supportedWindowStates.add(PortletURLImpl.decodeWindowState(windowState.toString()));
+ supportedWindowStates.add(PortletUtils.decodeWindowState(windowState.toString()));
}
}
return Tools.toEnumeration(supportedWindowStates.iterator());
Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletRequestImpl.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletRequestImpl.java 2006-09-15 17:12:48 UTC (rev 5208)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletRequestImpl.java 2006-09-15 17:17:35 UTC (rev 5209)
@@ -176,13 +176,13 @@
public WindowState getWindowState()
{
String s = invocation.getPortletContext().getWindowState().toString();
- return PortletURLImpl.decodeWindowState(s);
+ return PortletUtils.decodeWindowState(s);
}
public PortletMode getPortletMode()
{
String s = invocation.getPortletContext().getMode().toString();
- return PortletURLImpl.decodePortletMode(s);
+ return PortletUtils.decodePortletMode(s);
}
// PLT.11.1.3
Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletURLImpl.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletURLImpl.java 2006-09-15 17:12:48 UTC (rev 5208)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletURLImpl.java 2006-09-15 17:17:35 UTC (rev 5209)
@@ -129,79 +129,9 @@
return s;
}
- /**
- * Creates an action URL.
- */
- public static PortletURL createActionURL(PortletInvocation invocation, PortletRequest preq)
+ static abstract class InternalPortletURL implements org.jboss.portal.portlet.PortletURL
{
- return new PortletURLImpl(invocation, preq, new InternalActionURL());
- }
- /**
- * Creates an render URL.
- */
- public static PortletURL createRenderURL(PortletInvocation invocation, PortletRequest preq)
- {
- return new PortletURLImpl(invocation, preq, new InternalRenderURL());
- }
-
- /**
- * Creates a <code>WindowState</code> object based on the specified name.
- *
- * @param windowStateName the name of the window state
- * @return one of the standard WindowStates if the specified name matches one of them or a new WindowState.
- * @see javax.portlet.WindowState
- */
- public static WindowState decodeWindowState(String windowStateName)
- {
- if (WindowState.NORMAL.toString().equalsIgnoreCase(windowStateName))
- {
- return WindowState.NORMAL;
- }
- else if (WindowState.MINIMIZED.toString().equalsIgnoreCase(windowStateName))
- {
- return WindowState.MINIMIZED;
- }
- else if (WindowState.MAXIMIZED.toString().equalsIgnoreCase(windowStateName))
- {
- return WindowState.MAXIMIZED;
- }
- else
- {
- return new WindowState(windowStateName);
- }
- }
-
- /**
- * Creates a <code>PortletMode</code> object based on the specified name.
- *
- * @param portletModeName the name of the portlet mode
- * @return one of the standard PortletModes if the specified name matches one of them or a new PortletMode.
- * @see javax.portlet.PortletMode
- */
- public static PortletMode decodePortletMode(String portletModeName)
- {
- if (PortletMode.EDIT.toString().equalsIgnoreCase(portletModeName))
- {
- return PortletMode.EDIT;
- }
- else if (PortletMode.HELP.toString().equalsIgnoreCase(portletModeName))
- {
- return PortletMode.HELP;
- }
- else if (PortletMode.VIEW.toString().equalsIgnoreCase(portletModeName))
- {
- return PortletMode.VIEW;
- }
- else
- {
- return new PortletMode(portletModeName);
- }
- }
-
- private static abstract class InternalPortletURL implements org.jboss.portal.portlet.PortletURL
- {
-
/** . */
private WindowState windowState;
@@ -229,7 +159,7 @@
protected abstract Parameters getInternalParameters();
}
- private static class InternalActionURL extends InternalPortletURL implements ActionURL
+ static class InternalActionURL extends InternalPortletURL implements ActionURL
{
/** . */
@@ -254,7 +184,7 @@
}
}
- private static class InternalRenderURL extends InternalPortletURL implements RenderURL
+ static class InternalRenderURL extends InternalPortletURL implements RenderURL
{
/** . */
Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletUtils.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletUtils.java 2006-09-15 17:12:48 UTC (rev 5208)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletUtils.java 2006-09-15 17:17:35 UTC (rev 5209)
@@ -21,6 +21,12 @@
*/
package org.jboss.portal.portlet.impl.jsr168;
+import org.jboss.portal.portlet.invocation.PortletInvocation;
+
+import javax.portlet.PortletURL;
+import javax.portlet.PortletRequest;
+import javax.portlet.WindowState;
+import javax.portlet.PortletMode;
import java.util.Iterator;
import java.util.Map;
@@ -83,4 +89,74 @@
throw new IllegalArgumentException("Values cannot be null");
}
}
+
+ /**
+ * Creates an action URL.
+ */
+ public static PortletURL createActionURL(PortletInvocation invocation, PortletRequest preq)
+ {
+ return new PortletURLImpl(invocation, preq, new PortletURLImpl.InternalActionURL());
+ }
+
+ /**
+ * Creates an render URL.
+ */
+ public static PortletURL createRenderURL(PortletInvocation invocation, PortletRequest preq)
+ {
+ return new PortletURLImpl(invocation, preq, new PortletURLImpl.InternalRenderURL());
+ }
+
+ /**
+ * Creates a <code>WindowState</code> object based on the specified name.
+ *
+ * @param windowStateName the name of the window state
+ * @return one of the standard WindowStates if the specified name matches one of them or a new WindowState.
+ * @see javax.portlet.WindowState
+ */
+ public static WindowState decodeWindowState(String windowStateName)
+ {
+ if (WindowState.NORMAL.toString().equalsIgnoreCase(windowStateName))
+ {
+ return WindowState.NORMAL;
+ }
+ else if (WindowState.MINIMIZED.toString().equalsIgnoreCase(windowStateName))
+ {
+ return WindowState.MINIMIZED;
+ }
+ else if (WindowState.MAXIMIZED.toString().equalsIgnoreCase(windowStateName))
+ {
+ return WindowState.MAXIMIZED;
+ }
+ else
+ {
+ return new WindowState(windowStateName);
+ }
+ }
+
+ /**
+ * Creates a <code>PortletMode</code> object based on the specified name.
+ *
+ * @param portletModeName the name of the portlet mode
+ * @return one of the standard PortletModes if the specified name matches one of them or a new PortletMode.
+ * @see javax.portlet.PortletMode
+ */
+ public static PortletMode decodePortletMode(String portletModeName)
+ {
+ if (PortletMode.EDIT.toString().equalsIgnoreCase(portletModeName))
+ {
+ return PortletMode.EDIT;
+ }
+ else if (PortletMode.HELP.toString().equalsIgnoreCase(portletModeName))
+ {
+ return PortletMode.HELP;
+ }
+ else if (PortletMode.VIEW.toString().equalsIgnoreCase(portletModeName))
+ {
+ return PortletMode.VIEW;
+ }
+ else
+ {
+ return new PortletMode(portletModeName);
+ }
+ }
}
Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/RenderResponseImpl.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/RenderResponseImpl.java 2006-09-15 17:12:48 UTC (rev 5208)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/RenderResponseImpl.java 2006-09-15 17:17:35 UTC (rev 5209)
@@ -117,12 +117,12 @@
public PortletURL createRenderURL()
{
- return PortletURLImpl.createRenderURL(invocation, preq);
+ return PortletUtils.createRenderURL(invocation, preq);
}
public PortletURL createActionURL()
{
- return PortletURLImpl.createActionURL(invocation, preq);
+ return PortletUtils.createActionURL(invocation, preq);
}
public String getNamespace()
Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/GenerateURLTag.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/GenerateURLTag.java 2006-09-15 17:12:48 UTC (rev 5208)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/GenerateURLTag.java 2006-09-15 17:17:35 UTC (rev 5209)
@@ -36,7 +36,7 @@
import javax.portlet.RenderRequest;
import javax.servlet.jsp.JspException;
-import org.jboss.portal.portlet.impl.jsr168.PortletURLImpl;
+import org.jboss.portal.portlet.impl.jsr168.PortletUtils;
/**
* Superclass of the actionURL and renderURL tags for the JSR 168
@@ -216,11 +216,11 @@
// Create the URL
if ("action".equals(getTypeValue()))
{
- return PortletURLImpl.createActionURL(getInvocation(), preq);
+ return PortletUtils.createActionURL(getInvocation(), preq);
}
else if ("render".equals(getTypeValue()))
{
- return PortletURLImpl.createRenderURL(getInvocation(), preq);
+ return PortletUtils.createRenderURL(getInvocation(), preq);
}
else
{
More information about the jboss-svn-commits
mailing list