[portal-commits] JBoss Portal SVN: r9755 - in modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test: controller and 2 other directories.

Author: julien(a)jboss.com Date: 2008-02-04 19:22:45 -0500 (Mon, 04 Feb 2008) New Revision: 9755 Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/WindowNavigationalState.java Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletURLRenderer.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/MutablePageNavigationalState.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PageNavigationalState.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletRequestHandler.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletResourceRequestHandler.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PageScopedFullPortletResourceRequest.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PortletActionRequest.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PortletRenderRequest.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PortletRequest.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PortletScopedPortletResourceRequest.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/PageUpdateRenderer.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/PortletControllerContextImpl.java Log: move WindowNavigationalState to controller package Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletURLRenderer.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletURLRenderer.java 2008-02-04 23:43:59 UTC (rev 9754) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletURLRenderer.java 2008-02-05 00:22:45 UTC (rev 9755) @@ -36,6 +36,7 @@ import org.jboss.portal.portlet.cache.CacheLevel; import static org.jboss.portal.portlet.test.URLParameterConstants.*; import org.jboss.portal.portlet.test.controller.PageNavigationalState; +import org.jboss.portal.portlet.test.controller.WindowNavigationalState; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/MutablePageNavigationalState.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/MutablePageNavigationalState.java 2008-02-04 23:43:59 UTC (rev 9754) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/MutablePageNavigationalState.java 2008-02-05 00:22:45 UTC (rev 9755) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.test.controller; -import org.jboss.portal.portlet.test.WindowNavigationalState; +import org.jboss.portal.portlet.test.controller.WindowNavigationalState; import javax.xml.namespace.QName; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PageNavigationalState.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PageNavigationalState.java 2008-02-04 23:43:59 UTC (rev 9754) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PageNavigationalState.java 2008-02-05 00:22:45 UTC (rev 9755) @@ -24,7 +24,7 @@ import org.jboss.portal.common.util.ParameterMap; import org.jboss.portal.portlet.Portlet; -import org.jboss.portal.portlet.test.WindowNavigationalState; +import org.jboss.portal.portlet.test.controller.WindowNavigationalState; import org.jboss.portal.portlet.info.ParameterInfo; import javax.xml.namespace.QName; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletRequestHandler.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletRequestHandler.java 2008-02-04 23:43:59 UTC (rev 9754) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletRequestHandler.java 2008-02-05 00:22:45 UTC (rev 9755) @@ -29,7 +29,7 @@ import org.jboss.portal.portlet.test.PortletURLRenderer; import org.jboss.portal.portlet.test.TestPortletInvocationContext; import org.jboss.portal.portlet.test.TestInstanceContext; -import org.jboss.portal.portlet.test.WindowNavigationalState; +import org.jboss.portal.portlet.test.controller.WindowNavigationalState; import org.jboss.portal.portlet.test.TestPortalContext; import static org.jboss.portal.portlet.test.controller.PortletController.*; import org.jboss.portal.portlet.test.controller.event.Event; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletResourceRequestHandler.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletResourceRequestHandler.java 2008-02-04 23:43:59 UTC (rev 9754) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletResourceRequestHandler.java 2008-02-05 00:22:45 UTC (rev 9755) @@ -42,7 +42,7 @@ import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.test.PortletURLRenderer; import org.jboss.portal.portlet.test.TestInstanceContext; -import org.jboss.portal.portlet.test.WindowNavigationalState; +import org.jboss.portal.portlet.test.controller.WindowNavigationalState; import org.jboss.portal.portlet.test.TestPortalContext; import org.jboss.portal.portlet.test.TestPortletInvocationContext; import static org.jboss.portal.portlet.test.controller.PortletController.*; Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/WindowNavigationalState.java (from rev 9754, modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/WindowNavigationalState.java) =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/WindowNavigationalState.java (rev 0) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/WindowNavigationalState.java 2008-02-05 00:22:45 UTC (rev 9755) @@ -0,0 +1,75 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.test.controller; + +import org.jboss.portal.Mode; +import org.jboss.portal.WindowState; +import org.jboss.portal.portlet.StateString; + +import java.io.Serializable; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class WindowNavigationalState implements Serializable +{ + + /** . */ + private final StateString portletNavigationalState; + + /** . */ + private final Mode mode; + + /** . */ + private final WindowState windowState; + + public WindowNavigationalState() + { + this.portletNavigationalState = null; + this.mode = Mode.VIEW; + this.windowState = WindowState.NORMAL; + } + + public WindowNavigationalState(StateString portletNavigationalState, Mode mode, WindowState windowState) + { + this.portletNavigationalState = portletNavigationalState; + this.mode = mode; + this.windowState = windowState; + } + + public StateString getPortletNavigationalState() + { + return portletNavigationalState; + } + + public Mode getMode() + { + return mode; + } + + public WindowState getWindowState() + { + return windowState; + } +} Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PageScopedFullPortletResourceRequest.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PageScopedFullPortletResourceRequest.java 2008-02-04 23:43:59 UTC (rev 9754) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PageScopedFullPortletResourceRequest.java 2008-02-05 00:22:45 UTC (rev 9755) @@ -23,7 +23,7 @@ package org.jboss.portal.portlet.test.controller.request; import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.test.WindowNavigationalState; +import org.jboss.portal.portlet.test.controller.WindowNavigationalState; import org.jboss.portal.portlet.test.controller.PageNavigationalState; import org.jboss.portal.portlet.test.controller.PortletControllerContext; import org.jboss.portal.common.util.ParameterMap; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PortletActionRequest.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PortletActionRequest.java 2008-02-04 23:43:59 UTC (rev 9754) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PortletActionRequest.java 2008-02-05 00:22:45 UTC (rev 9755) @@ -23,7 +23,7 @@ package org.jboss.portal.portlet.test.controller.request; import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.test.WindowNavigationalState; +import org.jboss.portal.portlet.test.controller.WindowNavigationalState; import org.jboss.portal.portlet.test.controller.PortletControllerContext; import org.jboss.portal.portlet.test.controller.PageNavigationalState; import org.jboss.portal.common.util.ParameterMap; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PortletRenderRequest.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PortletRenderRequest.java 2008-02-04 23:43:59 UTC (rev 9754) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PortletRenderRequest.java 2008-02-05 00:22:45 UTC (rev 9755) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.test.controller.request; -import org.jboss.portal.portlet.test.WindowNavigationalState; +import org.jboss.portal.portlet.test.controller.WindowNavigationalState; import org.jboss.portal.portlet.test.controller.PortletControllerContext; import org.jboss.portal.portlet.test.controller.PageNavigationalState; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PortletRequest.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PortletRequest.java 2008-02-04 23:43:59 UTC (rev 9754) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PortletRequest.java 2008-02-05 00:22:45 UTC (rev 9755) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.test.controller.request; -import org.jboss.portal.portlet.test.WindowNavigationalState; +import org.jboss.portal.portlet.test.controller.WindowNavigationalState; import org.jboss.portal.portlet.test.controller.PageNavigationalState; import org.jboss.portal.portlet.test.controller.PortletControllerContext; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PortletScopedPortletResourceRequest.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PortletScopedPortletResourceRequest.java 2008-02-04 23:43:59 UTC (rev 9754) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PortletScopedPortletResourceRequest.java 2008-02-05 00:22:45 UTC (rev 9755) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.test.controller.request; -import org.jboss.portal.portlet.test.WindowNavigationalState; +import org.jboss.portal.portlet.test.controller.WindowNavigationalState; import org.jboss.portal.portlet.test.controller.PortletControllerContext; import org.jboss.portal.portlet.StateString; import org.jboss.portal.common.util.ParameterMap; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/PageUpdateRenderer.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/PageUpdateRenderer.java 2008-02-04 23:43:59 UTC (rev 9754) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/PageUpdateRenderer.java 2008-02-05 00:22:45 UTC (rev 9755) @@ -43,7 +43,7 @@ import org.jboss.portal.portlet.invocation.response.ResponseProperties; import org.jboss.portal.portlet.test.PortletURLRenderer; import org.jboss.portal.portlet.test.TestInstanceContext; -import org.jboss.portal.portlet.test.WindowNavigationalState; +import org.jboss.portal.portlet.test.controller.WindowNavigationalState; import org.jboss.portal.portlet.test.TestPortalContext; import org.jboss.portal.portlet.test.TestPortletInvocationContext; import org.jboss.portal.portlet.test.controller.PageNavigationalState; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/PortletControllerContextImpl.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/PortletControllerContextImpl.java 2008-02-04 23:43:59 UTC (rev 9754) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/PortletControllerContextImpl.java 2008-02-05 00:22:45 UTC (rev 9755) @@ -38,7 +38,7 @@ import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.test.StringCodec; import static org.jboss.portal.portlet.test.URLParameterConstants.*; -import org.jboss.portal.portlet.test.WindowNavigationalState; +import org.jboss.portal.portlet.test.controller.WindowNavigationalState; import org.jboss.portal.portlet.test.controller.PortletControllerContext; import org.jboss.portal.portlet.test.controller.PageNavigationalState; import org.jboss.portal.portlet.test.controller.request.PortletRenderRequest;