[jboss-svn-commits] JBoss Portal SVN: r5301 - in trunk: core/src/main/org/jboss/portal/core/controller/command theme/src/main/org/jboss/portal/test/theme theme/src/main/org/jboss/portal/test/theme/render theme/src/main/org/jboss/portal/theme/impl/render/div theme/src/main/org/jboss/portal/theme/impl/render/empty theme/src/main/org/jboss/portal/theme/page theme/src/main/org/jboss/portal/theme/render
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Sep 30 10:03:35 EDT 2006
Author: julien at jboss.com
Date: 2006-09-30 10:03:19 -0400 (Sat, 30 Sep 2006)
New Revision: 5301
Modified:
trunk/core/src/main/org/jboss/portal/core/controller/command/MarkupCommand.java
trunk/core/src/main/org/jboss/portal/core/controller/command/RenderPageCommand.java
trunk/theme/src/main/org/jboss/portal/test/theme/TestHelper.java
trunk/theme/src/main/org/jboss/portal/test/theme/render/TestRenderContext.java
trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivWindowRenderer.java
trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyWindowRenderer.java
trunk/theme/src/main/org/jboss/portal/theme/page/ModifiablePageResult.java
trunk/theme/src/main/org/jboss/portal/theme/page/ModifiableRegionResult.java
trunk/theme/src/main/org/jboss/portal/theme/page/ModifiableWindowResult.java
trunk/theme/src/main/org/jboss/portal/theme/page/PageResult.java
trunk/theme/src/main/org/jboss/portal/theme/page/RegionResult.java
trunk/theme/src/main/org/jboss/portal/theme/page/WindowResult.java
trunk/theme/src/main/org/jboss/portal/theme/render/MarkupResult.java
trunk/theme/src/main/org/jboss/portal/theme/render/RenderContext.java
Log:
simplify theme stuff
Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/MarkupCommand.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/command/MarkupCommand.java 2006-09-30 00:02:11 UTC (rev 5300)
+++ trunk/core/src/main/org/jboss/portal/core/controller/command/MarkupCommand.java 2006-09-30 14:03:19 UTC (rev 5301)
@@ -433,6 +433,7 @@
Map actionMap = new HashMap();
Properties responseProps;
Map windowProps = window.getDeclaredPropertyMap();
+ WindowNavigationalState windowNavState = (WindowNavigationalState)this.context.getAttribute(ControllerCommand.NAVIGATIONAL_STATE_SCOPE, window.getId() + "_window");
try
{
@@ -440,8 +441,6 @@
//
context.execute(renderCmd);
-
- // The result should be a fragment result
Result result = renderCmd.getResult();
//
@@ -450,12 +449,6 @@
throw new InsufficientTransportGuaranteeException();
}
- // Compute actions
-// ControllerPortletInvocationContext invCtx = (ControllerPortletInvocationContext)renderCmd.getInvocation().getContext();
-
- // Get window navigational state
- WindowNavigationalState windowNavState = (WindowNavigationalState)this.context.getAttribute(ControllerCommand.NAVIGATIONAL_STATE_SCOPE, window.getId() + "_window");
-
//
if (result instanceof FragmentResult)
{
@@ -469,7 +462,6 @@
responseProps = fragment.getProperties();
//
-// PortalContext ctx = renderCmd.getInvocation().getPortalContext();
Instance instance = renderCmd.getInstance();
//
@@ -523,7 +515,7 @@
// Do nothing, the contentChars is already empty string
break;
}
- return new ModifiableWindowResult(windowTitle, contentChars, actionMap, windowProps, responseProps, headerChars);
+ return new ModifiableWindowResult(windowTitle, contentChars, actionMap, windowProps, responseProps, headerChars, windowNavState.getWindowState(), windowNavState.getMode());
}
else if (result instanceof ErrorResult)
{
@@ -541,7 +533,7 @@
{
contentChars = Exceptions.toHTML(t, true);
}
- return new ModifiableWindowResult(windowTitle, contentChars, actionMap, windowProps, responseProps, headerChars);
+ return new ModifiableWindowResult(windowTitle, contentChars, actionMap, windowProps, responseProps, headerChars, windowNavState.getWindowState(), windowNavState.getMode());
}
}
else if (result instanceof UnavailableResult)
@@ -554,7 +546,7 @@
actionMap.put(WindowResult.MODES_KEY, Collections.EMPTY_LIST);
actionMap.put(WindowResult.WINDOWSTATES_KEY, Collections.EMPTY_LIST);
responseProps = new Properties();
- return new ModifiableWindowResult(windowTitle, contentChars, actionMap, windowProps, responseProps, headerChars);
+ return new ModifiableWindowResult(windowTitle, contentChars, actionMap, windowProps, responseProps, headerChars, windowNavState.getWindowState(), windowNavState.getMode());
}
}
else if (result instanceof InsufficientPrivilegesResult)
@@ -581,7 +573,7 @@
windowTitle = "Access denied";
contentChars = "Access denied";
responseProps = new Properties();
- return new ModifiableWindowResult(windowTitle, contentChars, actionMap, windowProps, responseProps, headerChars);
+ return new ModifiableWindowResult(windowTitle, contentChars, actionMap, windowProps, responseProps, headerChars, windowNavState.getWindowState(), windowNavState.getMode());
}
}
catch (ResourceNotFoundException e)
@@ -597,7 +589,7 @@
windowTitle = "Cannot render";
contentChars = "Object not found " + e.getRef();
responseProps = new Properties();
- return new ModifiableWindowResult(windowTitle, contentChars, actionMap, windowProps, responseProps, headerChars);
+ return new ModifiableWindowResult(windowTitle, contentChars, actionMap, windowProps, responseProps, headerChars, windowNavState.getWindowState(), windowNavState.getMode());
}
}
catch (ControllerException e)
@@ -614,7 +606,7 @@
windowTitle = "An internal error occured while rendering window '" + window + "'";
responseProps = new Properties();
contentChars = Exceptions.toHTML(e, true);
- return new ModifiableWindowResult(windowTitle, contentChars, actionMap, windowProps, responseProps, headerChars);
+ return new ModifiableWindowResult(windowTitle, contentChars, actionMap, windowProps, responseProps, headerChars, windowNavState.getWindowState(), windowNavState.getMode());
}
}
Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/RenderPageCommand.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/command/RenderPageCommand.java 2006-09-30 00:02:11 UTC (rev 5300)
+++ trunk/core/src/main/org/jboss/portal/core/controller/command/RenderPageCommand.java 2006-09-30 14:03:19 UTC (rev 5301)
@@ -59,7 +59,7 @@
public MarkupResult renderFragments(ServerConfig cfg, AttributeResolver navCtx) throws ControllerException
{
PageNavigationalState pageNavState = (PageNavigationalState)navCtx.getAttribute(getPage().getId());
- ModifiablePageResult pageResult = new ModifiablePageResult(navCtx, getPage().getName(), getPage().getDeclaredPropertyMap(), getPage().getPortal().getDeclaredPropertyMap());
+ ModifiablePageResult pageResult = new ModifiablePageResult(getPage().getName(), getPage().getDeclaredPropertyMap(), getPage().getPortal().getDeclaredPropertyMap());
// all windows on the page
Collection windows = getPage().getChildren();
Modified: trunk/theme/src/main/org/jboss/portal/test/theme/TestHelper.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/test/theme/TestHelper.java 2006-09-30 00:02:11 UTC (rev 5300)
+++ trunk/theme/src/main/org/jboss/portal/test/theme/TestHelper.java 2006-09-30 14:03:19 UTC (rev 5301)
@@ -129,7 +129,7 @@
Map actionsMap = Collections.EMPTY_MAP;
Properties responseProps = null;
String headerChars = null;
- return new ModifiableWindowResult(title, content, actionsMap, windowProps, responseProps, headerChars);
+ return new ModifiableWindowResult(title, content, actionsMap, windowProps, responseProps, headerChars, null, null);
}
public static WindowNavigationalState createWindowNavigationalState()
@@ -200,7 +200,7 @@
public static PageResult createPageResult(AttributeResolver navCtx, String pageName,
Map pageProperties, Map portalProperties, WindowContext[] windows)
{
- ModifiablePageResult pageResult = new ModifiablePageResult(navCtx, pageName, pageProperties, portalProperties);
+ ModifiablePageResult pageResult = new ModifiablePageResult(pageName, pageProperties, portalProperties);
for (int i = 0; i < windows.length; i++)
{
pageResult.addWindowContext(windows[i]);
Modified: trunk/theme/src/main/org/jboss/portal/test/theme/render/TestRenderContext.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/test/theme/render/TestRenderContext.java 2006-09-30 00:02:11 UTC (rev 5300)
+++ trunk/theme/src/main/org/jboss/portal/test/theme/render/TestRenderContext.java 2006-09-30 14:03:19 UTC (rev 5301)
@@ -1,8 +1,6 @@
package org.jboss.portal.test.theme.render;
import junit.framework.TestCase;
-import org.jboss.portal.Mode;
-import org.jboss.portal.WindowState;
import org.jboss.portal.common.MediaType;
import org.jboss.portal.common.invocation.AttributeResolver;
import org.jboss.portal.server.ServerRequest;
@@ -74,7 +72,6 @@
};
navCtx.setAttribute(windowID + "_window", windowNavigationalState);
- markupResult.setNavigationalStateContext(navCtx);
markupResult.addWindowContext(windowContext);
streamInfo = new HTTPStreamInfo(MediaType.HTML, "utf-8");
// markupResult.setStreamInfo(streamInfo);
@@ -157,10 +154,10 @@
assertNotNull(ctx.getMarkupFragment());
assertNotNull(ctx.getPageProperties());
assertTrue(ctx.getPageProperties().isEmpty());
- Mode portletMode = ctx.getPortletMode(windowContext);
- assertNotNull(portletMode);
+// Mode portletMode = ctx.getPortletMode(windowContext);
+// assertNotNull(portletMode);
assertNull(ctx.getRegionID());
- assertEquals(WindowState.NORMAL, ctx.getWindowState(windowContext));
+// assertEquals(WindowState.NORMAL, ctx.getWindowState(windowContext));
assertEquals(ctx.getWindowRenderer(), ctx.getWindowRenderer(markupResult));
assertEquals(ctx.getPortletRenderer(), ctx.getPortletRenderer(markupResult));
assertEquals(ctx.getDecorationRenderer(), ctx.getDecorationRenderer(markupResult));
@@ -239,7 +236,7 @@
public void testRenderContext5()
{
- ModifiablePageResult pageResult = new ModifiablePageResult(navCtx, "testPage", pageProps, new HashMap());
+ ModifiablePageResult pageResult = new ModifiablePageResult("testPage", pageProps, new HashMap());
ModifiableWindowResult markupResult = TestHelper.createWindowResult(windowContext.getWindowName(), "content", new HashMap());
pageResult.addWindowContext(windowContext);
pageResult.addWindowResult(windowContext.getId(), markupResult);
Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivWindowRenderer.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivWindowRenderer.java 2006-09-30 00:02:11 UTC (rev 5300)
+++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivWindowRenderer.java 2006-09-30 14:03:19 UTC (rev 5301)
@@ -58,7 +58,7 @@
decorationRenderer.render(renderContext, portletContext, result);
}
- WindowState windowState = renderContext.getWindowState(portletContext);
+ WindowState windowState = result.getWindowState();
if (!WindowState.MINIMIZED.equals(windowState))
{
PortletRenderer portletRenderer = renderContext.getPortletRenderer(result);
Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyWindowRenderer.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyWindowRenderer.java 2006-09-30 00:02:11 UTC (rev 5300)
+++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyWindowRenderer.java 2006-09-30 14:03:19 UTC (rev 5301)
@@ -50,7 +50,7 @@
// try
// {
- WindowState windowState = renderContext.getWindowState(portletContext);
+ WindowState windowState = result.getWindowState();
renderContext.getDecorationRenderer(result).render(renderContext, portletContext, result);
if (!WindowState.MINIMIZED.equals(windowState))
{
Modified: trunk/theme/src/main/org/jboss/portal/theme/page/ModifiablePageResult.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/page/ModifiablePageResult.java 2006-09-30 00:02:11 UTC (rev 5300)
+++ trunk/theme/src/main/org/jboss/portal/theme/page/ModifiablePageResult.java 2006-09-30 14:03:19 UTC (rev 5301)
@@ -22,7 +22,6 @@
package org.jboss.portal.theme.page;
import org.jboss.portal.theme.render.ModifiableMarkupResult;
-import org.jboss.portal.common.invocation.AttributeResolver;
import java.util.Map;
@@ -33,9 +32,9 @@
*/
public final class ModifiablePageResult extends PageResult implements ModifiableMarkupResult
{
- public ModifiablePageResult(AttributeResolver navCtx, String pageName, Map pageProperties, Map portalProperties)
+ public ModifiablePageResult(String pageName, Map pageProperties, Map portalProperties)
{
- super(navCtx, pageName, pageProperties, portalProperties);
+ super(pageName, pageProperties, portalProperties);
}
public void setLayoutURI(String uri)
Modified: trunk/theme/src/main/org/jboss/portal/theme/page/ModifiableRegionResult.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/page/ModifiableRegionResult.java 2006-09-30 00:02:11 UTC (rev 5300)
+++ trunk/theme/src/main/org/jboss/portal/theme/page/ModifiableRegionResult.java 2006-09-30 14:03:19 UTC (rev 5301)
@@ -35,7 +35,7 @@
public ModifiableRegionResult(AttributeResolver navCtx, String pageName,
Region region, Map pageProperties, Map portalProperties)
{
- super(navCtx, pageName, region, pageProperties, portalProperties);
+ super(pageName, region, pageProperties, portalProperties);
}
public void setLayoutURI(String uri)
Modified: trunk/theme/src/main/org/jboss/portal/theme/page/ModifiableWindowResult.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/page/ModifiableWindowResult.java 2006-09-30 00:02:11 UTC (rev 5300)
+++ trunk/theme/src/main/org/jboss/portal/theme/page/ModifiableWindowResult.java 2006-09-30 14:03:19 UTC (rev 5301)
@@ -24,6 +24,8 @@
import org.jboss.portal.portlet.Properties;
import org.jboss.portal.theme.render.ModifiableMarkupResult;
import org.jboss.portal.common.invocation.AttributeResolver;
+import org.jboss.portal.WindowState;
+import org.jboss.portal.Mode;
import java.util.Map;
@@ -46,9 +48,9 @@
* @param headerChars content that needs to be injected into the header
* @see org.jboss.portal.theme.page.WindowResult.Action
*/
- public ModifiableWindowResult(String title, String content, Map actions, Map windowProperties, Properties responseProperties, String headerChars)
+ public ModifiableWindowResult(String title, String content, Map actions, Map windowProperties, Properties responseProperties, String headerChars, WindowState windowState, Mode mode)
{
- super(title, content, actions, windowProperties, responseProperties, headerChars);
+ super(title, content, actions, windowProperties, responseProperties, headerChars, windowState, mode);
}
public void setLayoutURI(String uri)
@@ -71,11 +73,6 @@
throw new UnsupportedOperationException();
}
- public void setNavigationalStateContext(AttributeResolver navCtx)
- {
- this.navigationalStateContext = navCtx;
- }
-
public void setPageName(String pageName)
{
this.pageName = pageName;
Modified: trunk/theme/src/main/org/jboss/portal/theme/page/PageResult.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/page/PageResult.java 2006-09-30 00:02:11 UTC (rev 5300)
+++ trunk/theme/src/main/org/jboss/portal/theme/page/PageResult.java 2006-09-30 14:03:19 UTC (rev 5301)
@@ -38,9 +38,9 @@
{
protected final Map portletRegions;
- public PageResult(AttributeResolver navCtx, String pageName, Map pageProperties, Map portalProperties)
+ public PageResult(String pageName, Map pageProperties, Map portalProperties)
{
- super(navCtx, pageName, pageProperties, portalProperties);
+ super(pageName, pageProperties, portalProperties);
portletRegions = new HashMap(5);
}
Modified: trunk/theme/src/main/org/jboss/portal/theme/page/RegionResult.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/page/RegionResult.java 2006-09-30 00:02:11 UTC (rev 5300)
+++ trunk/theme/src/main/org/jboss/portal/theme/page/RegionResult.java 2006-09-30 14:03:19 UTC (rev 5301)
@@ -34,9 +34,9 @@
{
protected final Region region;
- public RegionResult(AttributeResolver navCtx, String pageName, Region region, Map pageProperties, Map portalProperties)
+ public RegionResult(String pageName, Region region, Map pageProperties, Map portalProperties)
{
- super(navCtx, pageName, pageProperties, portalProperties);
+ super(pageName, pageProperties, portalProperties);
this.region = region;
}
Modified: trunk/theme/src/main/org/jboss/portal/theme/page/WindowResult.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/page/WindowResult.java 2006-09-30 00:02:11 UTC (rev 5300)
+++ trunk/theme/src/main/org/jboss/portal/theme/page/WindowResult.java 2006-09-30 14:03:19 UTC (rev 5301)
@@ -49,6 +49,8 @@
private final Properties properties;
private final String headerContent;
private final Map windowProperties;
+ private final WindowState windowState;
+ private final Mode mode;
public static final String MODES_KEY = "mode";
public static final String WINDOWSTATES_KEY = "windowstate";
@@ -65,16 +67,16 @@
* @param headerChars content that needs to be injected into the header
* @see WindowResult.Action
*/
- public WindowResult(String title, String content, Map actions, Map windowProperties, Properties responseProperties, String headerChars)
+ public WindowResult(String title, String content, Map actions, Map windowProperties, Properties responseProperties, String headerChars, WindowState windowState, Mode mode)
{
- super();
-
this.properties = responseProperties;
this.title = title;
this.content = content;
this.actions = actions;
this.headerContent = headerChars;
this.windowProperties = windowProperties;
+ this.windowState = windowState;
+ this.mode = mode;
}
public String getTitle()
@@ -92,6 +94,16 @@
return headerContent;
}
+ public Mode getMode()
+ {
+ return mode;
+ }
+
+ public WindowState getWindowState()
+ {
+ return windowState;
+ }
+
/**
* @param familyName
* @return a collection of triggerable actions for this portlet
Modified: trunk/theme/src/main/org/jboss/portal/theme/render/MarkupResult.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/render/MarkupResult.java 2006-09-30 00:02:11 UTC (rev 5300)
+++ trunk/theme/src/main/org/jboss/portal/theme/render/MarkupResult.java 2006-09-30 14:03:19 UTC (rev 5301)
@@ -21,10 +21,6 @@
*/
package org.jboss.portal.theme.render;
-import org.jboss.portal.Mode;
-import org.jboss.portal.WindowState;
-import org.jboss.portal.common.invocation.AttributeResolver;
-import org.jboss.portal.theme.navigation.WindowNavigationalState;
import org.jboss.portal.theme.page.WindowContext;
import org.jboss.portal.theme.page.WindowResult;
import org.jboss.portal.theme.ThemeResult;
@@ -48,7 +44,6 @@
protected String pageName;
protected Map portalProperties;
protected Map pageProperties;
- protected AttributeResolver navigationalStateContext;
protected String layoutURI;
protected String layoutState;
protected PortalRenderSet renderSet;
@@ -78,15 +73,14 @@
public MarkupResult()
{
- this(null, null, null, null);
+ this(null, null, null);
}
- public MarkupResult(AttributeResolver navCtx, String pageName, Map pageProperties, Map portalProperties)
+ public MarkupResult(String pageName, Map pageProperties, Map portalProperties)
{
this.pageName = pageName;
this.pageProperties = pageProperties == null ? new HashMap() : pageProperties;
this.portalProperties = portalProperties == null ? new HashMap() : portalProperties;
- this.navigationalStateContext = navCtx;
results = new HashMap(5);
portlets = new HashMap(5);
@@ -196,41 +190,4 @@
{
return Collections.unmodifiableMap(portlets);
}
-
- /**
- * Get the window state of a window
- *
- * @param windowId the identifier of the window on the page
- * @return the window state of the provided window
- * @throws IllegalStateException if no navigational state context was provided for this markup result
- * @see WindowNavigationalState
- */
- public WindowState getWindowState(String windowId)
- {
- if (navigationalStateContext == null)
- {
- throw new IllegalStateException("No navigational state context available");
- }
- WindowNavigationalState navState = (WindowNavigationalState)navigationalStateContext.getAttribute(windowId + "_window");
- return navState.getWindowState();
- }
-
- /**
- * Get the portlet mode of a window
- *
- * @param windowId the identifier of the window on the page
- * @return the portlet mode of the provided window
- * @throws IllegalStateException if no navigational state context was provided for this markup result
- * @see Mode
- * @see WindowNavigationalState
- */
- public Mode getPortletMode(String windowId)
- {
- if (navigationalStateContext == null)
- {
- throw new IllegalStateException("No navigational state context available");
- }
- WindowNavigationalState navState = (WindowNavigationalState)navigationalStateContext.getAttribute(windowId + "_window");
- return navState.getMode();
- }
}
Modified: trunk/theme/src/main/org/jboss/portal/theme/render/RenderContext.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/render/RenderContext.java 2006-09-30 00:02:11 UTC (rev 5300)
+++ trunk/theme/src/main/org/jboss/portal/theme/render/RenderContext.java 2006-09-30 14:03:19 UTC (rev 5301)
@@ -21,8 +21,6 @@
*/
package org.jboss.portal.theme.render;
-import org.jboss.portal.Mode;
-import org.jboss.portal.WindowState;
import org.jboss.portal.common.MediaType;
import org.jboss.portal.server.ServerRequest;
import org.jboss.portal.server.util.HTTPStreamInfo;
@@ -448,24 +446,6 @@
}
/**
- * @param portletWindow
- * @return the window state of the window
- */
- public WindowState getWindowState(WindowContext portletWindow)
- {
- return result.getWindowState(portletWindow.getId());
- }
-
- /**
- * @param portletWindow
- * @return the portlet mode of the window
- */
- public Mode getPortletMode(WindowContext portletWindow)
- {
- return result.getPortletMode(portletWindow.getId());
- }
-
- /**
* Render this context and it's children (i.e. create the markup of this context and write it to the markup fragment
* of this context)
* <p>Currently this context only knows how to render fragments of a page (i.e. region,window), not the entire page.</p>
More information about the jboss-svn-commits
mailing list