Author: julien(a)jboss.com
Date: 2008-02-10 08:49:29 -0500 (Sun, 10 Feb 2008)
New Revision: 9919
Added:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/WindowResult.java
Removed:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletResult.java
Modified:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/PortalRenderResponse.java
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletTag.java
Log:
rename
Modified:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/PortalRenderResponse.java
===================================================================
---
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/PortalRenderResponse.java 2008-02-10
13:47:05 UTC (rev 9918)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/PortalRenderResponse.java 2008-02-10
13:49:29 UTC (rev 9919)
@@ -24,7 +24,7 @@
import org.jboss.portal.portlet.test.controller.TestInstanceContext;
import org.jboss.portal.portlet.test.controller.TestPortalContext;
-import org.jboss.portal.portlet.test.jsp.PortletResult;
+import org.jboss.portal.portlet.test.jsp.WindowResult;
import org.jboss.portal.portlet.controller.state.PageNavigationalState;
import org.jboss.portal.portlet.controller.state.WindowNavigationalState;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
@@ -62,7 +62,7 @@
private PagePortletControllerContext portletControllerContext;
/** . */
- private Map<String, PortletResult> windowResults;
+ private Map<String, WindowResult> windowResults;
public PortalRenderResponse(
HttpServletResponse response,
@@ -93,7 +93,7 @@
//
this.portletControllerContext = portletControllerContext;
- this.windowResults = new HashMap<String, PortletResult>();
+ this.windowResults = new HashMap<String, WindowResult>();
this.pageState = pageState;
//
@@ -110,7 +110,7 @@
return pageState;
}
- public PortletResult getWindowResult(String windowId)
+ public WindowResult getWindowResult(String windowId)
{
return windowResults.get(windowId);
}
@@ -194,7 +194,7 @@
PortletInvocationResponse portletResponse = render(portlet, windowId);
//
- PortletResult result = new PortletResult(windowDef, portletResponse);
+ WindowResult result = new WindowResult(windowDef, portletResponse);
//
windowResults.put(windowId, result);
Copied:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/WindowResult.java
(from rev 9918,
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/PortletResult.java)
===================================================================
---
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/WindowResult.java
(rev 0)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/WindowResult.java 2008-02-10
13:49:29 UTC (rev 9919)
@@ -0,0 +1,59 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, 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.jsp;
+
+import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
+import org.jboss.portal.portlet.test.jsp.WindowDef;
+
+/**
+ * Combines the invocation of a portlet and the info on the portlet JSP tag. It does
+ * not need to be exposed out of this package.
+ *
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class WindowResult
+{
+
+ /** . */
+ private final WindowDef windowDef;
+
+ /** . */
+ private final PortletInvocationResponse response;
+
+ public WindowResult(WindowDef windowDef, PortletInvocationResponse response)
+ {
+ this.windowDef = windowDef;
+ this.response = response;
+ }
+
+ public WindowDef getWindowDef()
+ {
+ return windowDef;
+ }
+
+ public PortletInvocationResponse getResponse()
+ {
+ return response;
+ }
+}
Deleted:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletResult.java
===================================================================
---
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletResult.java 2008-02-10
13:47:05 UTC (rev 9918)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletResult.java 2008-02-10
13:49:29 UTC (rev 9919)
@@ -1,114 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2008, 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.jsp.taglib;
-
-import org.jboss.portal.Mode;
-import org.jboss.portal.WindowState;
-import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
-
-import java.util.Set;
-
-/**
- * Combines the invocation of a portlet and the info on the portlet JSP tag. It does
- * not need to be exposed out of this package.
- *
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 630 $
- */
-class PortletResult
-{
-
- /** . */
- private final String portletName;
-
- /** . */
- private final String applicationName;
-
- /** . */
- private final String windowId;
-
- /** . */
- private final PortletInvocationResponse response;
-
- /** . */
- private final Mode initialMode;
-
- /** . */
- private final Set<Mode> supportedModes;
-
- /** . */
- private final Set<WindowState> supportedWindowStates;
-
- public PortletResult(
- String portletName,
- String applicationName,
- String windowId,
- PortletInvocationResponse response,
- Mode initialMode,
- Set<Mode> supportedModes,
- Set<WindowState> supportedWindowStates)
- {
- this.portletName = portletName;
- this.applicationName = applicationName;
- this.windowId = windowId;
- this.response = response;
- this.initialMode = initialMode;
- this.supportedModes = supportedModes;
- this.supportedWindowStates = supportedWindowStates;
- }
-
- public String getPortletName()
- {
- return portletName;
- }
-
- public String getApplicationName()
- {
- return applicationName;
- }
-
- public String getWindowId()
- {
- return windowId;
- }
-
- public PortletInvocationResponse getResponse()
- {
- return response;
- }
-
- public Mode getInitialMode()
- {
- return initialMode;
- }
-
- public Set<Mode> getSupportedModes()
- {
- return supportedModes;
- }
-
- public Set<WindowState> getSupportedWindowStates()
- {
- return supportedWindowStates;
- }
-}
Modified:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletTag.java
===================================================================
---
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletTag.java 2008-02-10
13:47:05 UTC (rev 9918)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletTag.java 2008-02-10
13:49:29 UTC (rev 9919)
@@ -26,7 +26,7 @@
import org.jboss.portal.portlet.test.jsp.PortalPrepareResponse;
import org.jboss.portal.portlet.test.jsp.PortalResponse;
import org.jboss.portal.portlet.test.jsp.WindowDef;
-import org.jboss.portal.portlet.test.jsp.PortletResult;
+import org.jboss.portal.portlet.test.jsp.WindowResult;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
import org.jboss.portal.portlet.invocation.response.FragmentResponse;
import org.jboss.portal.portlet.invocation.response.ErrorResponse;
@@ -81,7 +81,7 @@
private PageTag pageTag;
private String windowId;
- PortletResult result;
+ WindowResult result;
public String getName()
{
@@ -229,7 +229,7 @@
initState(renderResponse);
//
- PortletResult result = renderResponse.getWindowResult(windowId);
+ WindowResult result = renderResponse.getWindowResult(windowId);
//
if (result == null || result.getResponse() == null)
@@ -273,7 +273,7 @@
return EVAL_PAGE;
}
- public int render(PortalRenderResponse renderResponse, PortletResult result, int rt)
+ public int render(PortalRenderResponse renderResponse, WindowResult result, int rt)
{
PortletInvocationResponse portletResponse = result.getResponse();