Menu
▾
▴
[jboss-cvs] jboss-portal/portlet/src/main/org/jboss/portal/portlet/impl/jsr168 ...
|
From: Julien V. <ju...@jb...> - 2006-07-09 12:04:18
|
User: julien
Date: 06/07/09 08:04:16
Modified: portlet/src/main/org/jboss/portal/portlet/impl/jsr168
ActionResponseImpl.java PortalContextImpl.java
PortletRequestImpl.java PortletURLImpl.java
Log:
move Mode and WindowState to org.jboss.portal.portlet instead of org.jboss.portal
Revision Changes Path
1.8 +3 -3 jboss-portal/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/ActionResponseImpl.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ActionResponseImpl.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/ActionResponseImpl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- ActionResponseImpl.java 26 May 2006 19:59:24 -0000 1.7
+++ ActionResponseImpl.java 9 Jul 2006 12:04:16 -0000 1.8
@@ -22,7 +22,7 @@
package org.jboss.portal.portlet.impl.jsr168;
import org.apache.log4j.Logger;
-import org.jboss.portal.Mode;
+import org.jboss.portal.portlet.Mode;
import org.jboss.portal.server.util.Properties;
import org.jboss.portal.portlet.invocation.ActionInvocation;
import org.jboss.portal.portlet.result.HTTPRedirectionResult;
@@ -41,7 +41,7 @@
/**
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
*/
public class ActionResponseImpl extends PortletResponseImpl implements ActionResponse
{
@@ -82,7 +82,7 @@
{
throw new WindowStateException("Not supported", windowState);
}
- ((RenderResult)result).setWindowState(org.jboss.portal.WindowState.create(windowState.toString()));
+ ((RenderResult)result).setWindowState(org.jboss.portal.portlet.WindowState.create(windowState.toString()));
decision = WANT_RENDER;
}
else
1.7 +3 -3 jboss-portal/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortalContextImpl.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PortalContextImpl.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortalContextImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- PortalContextImpl.java 7 Jun 2006 17:34:19 -0000 1.6
+++ PortalContextImpl.java 9 Jul 2006 12:04:16 -0000 1.7
@@ -21,7 +21,7 @@
*/
package org.jboss.portal.portlet.impl.jsr168;
-import org.jboss.portal.Mode;
+import org.jboss.portal.portlet.Mode;
import org.jboss.portal.common.util.Tools;
import org.jboss.portal.portlet.spi.PortalContext;
import org.jboss.portal.server.PortalConstants;
@@ -36,7 +36,7 @@
* todo : does not provide customizable values for portlet modes and window states.
*
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
public class PortalContextImpl implements javax.portlet.PortalContext
{
@@ -98,7 +98,7 @@
supportedWindowStates = new HashSet(tmp.size());
for (Iterator i = tmp.iterator(); i.hasNext();)
{
- org.jboss.portal.WindowState windowState = (org.jboss.portal.WindowState)i.next();
+ org.jboss.portal.portlet.WindowState windowState = (org.jboss.portal.portlet.WindowState)i.next();
supportedWindowStates.add(PortletURLImpl.decodeWindowState(windowState.toString()));
}
}
1.31 +3 -3 jboss-portal/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletRequestImpl.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PortletRequestImpl.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletRequestImpl.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- PortletRequestImpl.java 6 Jul 2006 12:50:17 -0000 1.30
+++ PortletRequestImpl.java 9 Jul 2006 12:04:16 -0000 1.31
@@ -63,7 +63,7 @@
*
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
* @author <a href="mailto:bol...@jb...">Boleslaw Dawidowicz</a>
- * @version $Revision: 1.30 $
+ * @version $Revision: 1.31 $
*/
public abstract class PortletRequestImpl implements PortletRequest
{
@@ -413,7 +413,7 @@
}
else
{
- return invocation.getSupportedModes().contains(org.jboss.portal.Mode.create(portletMode.toString()));
+ return invocation.getSupportedModes().contains(org.jboss.portal.portlet.Mode.create(portletMode.toString()));
}
}
@@ -421,7 +421,7 @@
public boolean isWindowStateAllowed(WindowState windowState)
{
- return invocation.getSupportedWindowStates().contains(org.jboss.portal.WindowState.create(windowState.toString()));
+ return invocation.getSupportedWindowStates().contains(org.jboss.portal.portlet.WindowState.create(windowState.toString()));
}
//
1.9 +4 -4 jboss-portal/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletURLImpl.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PortletURLImpl.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletURLImpl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- PortletURLImpl.java 7 Jun 2006 17:34:19 -0000 1.8
+++ PortletURLImpl.java 9 Jul 2006 12:04:16 -0000 1.9
@@ -38,11 +38,11 @@
import org.jboss.portal.portlet.invocation.PortletInvocation;
import org.jboss.portal.portlet.spi.InvocationContext;
import org.jboss.portal.portlet.StateString;
-import org.jboss.portal.Mode;
+import org.jboss.portal.portlet.Mode;
/**
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
public class PortletURLImpl implements PortletURL
{
@@ -221,11 +221,11 @@
return null;
}
- public org.jboss.portal.WindowState getWindowState()
+ public org.jboss.portal.portlet.WindowState getWindowState()
{
if (windowState != null)
{
- return org.jboss.portal.WindowState.create(windowState.toString());
+ return org.jboss.portal.portlet.WindowState.create(windowState.toString());
}
return null;
}
|
