[portal-commits] JBoss Portal SVN: r6905 - in trunk: core/src/main/org/jboss/portal/core/impl and 7 other directories.

Author: julien(a)jboss.com Date: 2007-04-03 08:18:06 -0400 (Tue, 03 Apr 2007) New Revision: 6905 Added: trunk/core/src/main/org/jboss/portal/core/impl/theme/ trunk/theme/src/main/org/jboss/portal/theme/render/ActionRenderContext.java Modified: trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java trunk/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivRegionRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyRegionRenderer.java trunk/theme/src/main/org/jboss/portal/theme/page/PageResult.java trunk/theme/src/main/org/jboss/portal/theme/page/Region.java trunk/theme/src/main/org/jboss/portal/theme/page/WindowResult.java trunk/theme/src/main/org/jboss/portal/theme/render/PageRenderContext.java trunk/theme/src/main/org/jboss/portal/theme/render/RegionRenderContext.java trunk/theme/src/main/org/jboss/portal/theme/tag/RegionTagHandler.java trunk/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachActionInWindowTag.java trunk/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachWindowInRegionTag.java trunk/theme/src/main/org/jboss/portal/theme/tag/basic/IfRegionExistsTag.java trunk/theme/src/main/org/jboss/portal/theme/tag/basic/IfRegionIsEmptyTag.java Log: introduced ActionRenderContext to decouple totally XXXRender from the implementations since it was still using WindowResult.Action Modified: trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java 2007-04-03 11:57:22 UTC (rev 6904) +++ trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java 2007-04-03 12:18:06 UTC (rev 6905) @@ -124,7 +124,7 @@ rendition.getPageResult().addWindowResult("BLAH", res); // - Region region = rendition.getPageResult().getRegion("navigation"); + Region region = rendition.getPageResult().getRegion2("navigation"); region.setProperty(DynaConstants.OBJECT_ENABLED, "false"); } } @@ -143,7 +143,7 @@ rendition.getPageResult().addWindowResult("BLUH", res); // - Region region = rendition.getPageResult().getRegion("dashboardnav"); + Region region = rendition.getPageResult().getRegion2("dashboardnav"); region.setProperty(DynaConstants.OBJECT_ENABLED, "false"); } } Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java 2007-04-03 11:57:22 UTC (rev 6904) +++ trunk/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java 2007-04-03 12:18:06 UTC (rev 6905) @@ -57,6 +57,7 @@ import org.jboss.portal.portlet.invocation.response.UnavailableResponse; import org.jboss.portal.portlet.invocation.response.InsufficientPrivilegesResponse; import org.jboss.portal.theme.page.WindowResult; +import org.jboss.portal.theme.render.ActionRenderContext; import org.jboss.portal.Mode; import org.jboss.portal.WindowState; import org.jboss.portal.common.util.Exceptions; @@ -309,8 +310,8 @@ windowTitle = "Portlet unavailable"; contentChars = "Portlet unavailable"; actionMap = new HashMap(); - actionMap.put(WindowResult.MODES_KEY, Collections.EMPTY_LIST); - actionMap.put(WindowResult.WINDOWSTATES_KEY, Collections.EMPTY_LIST); + actionMap.put(ActionRenderContext.MODES_KEY, Collections.EMPTY_LIST); + actionMap.put(ActionRenderContext.WINDOWSTATES_KEY, Collections.EMPTY_LIST); return new WindowResult(windowTitle, contentChars, actionMap, windowProps, new Properties(), headerChars, windowNS.getWindowState(), windowNS.getMode()); } } @@ -332,8 +333,8 @@ } if (RenderWindowCommand.SHOW.equals(cfg.getProperty(RenderWindowCommand.WINDOW_ACCESS_DENIED))) { - actionMap.put(WindowResult.MODES_KEY, Collections.EMPTY_LIST); - actionMap.put(WindowResult.WINDOWSTATES_KEY, Collections.EMPTY_LIST); + actionMap.put(ActionRenderContext.MODES_KEY, Collections.EMPTY_LIST); + actionMap.put(ActionRenderContext.WINDOWSTATES_KEY, Collections.EMPTY_LIST); windowTitle = "Access denied"; contentChars = "Access denied"; return new WindowResult(windowTitle, contentChars, actionMap, windowProps, new Properties(), headerChars, windowNS.getWindowState(), windowNS.getMode()); @@ -347,8 +348,8 @@ } if (RenderWindowCommand.SHOW.equals(cfg.getProperty(RenderWindowCommand.WINDOW_NOT_FOUND))) { - actionMap.put(WindowResult.MODES_KEY, Collections.EMPTY_LIST); - actionMap.put(WindowResult.WINDOWSTATES_KEY, Collections.EMPTY_LIST); + actionMap.put(ActionRenderContext.MODES_KEY, Collections.EMPTY_LIST); + actionMap.put(ActionRenderContext.WINDOWSTATES_KEY, Collections.EMPTY_LIST); windowTitle = "Cannot render"; contentChars = "Object not found " + e.getRef(); return new WindowResult(windowTitle, contentChars, actionMap, windowProps, new Properties(), headerChars, windowNS.getWindowState(), windowNS.getMode()); @@ -392,10 +393,10 @@ WindowState windowState = (WindowState)j.next(); String url = createUpdateNavigationalStateURL(context, window, null, windowState); boolean disabled = windowState.equals(currentWindowState); - WindowResult.Action action = new WindowResult.Action(windowState, url, !disabled); + WindowResult.Action action = new WindowResult.Action(windowState.toString(), url, !disabled); windowStates.add(action); } - actionMap.put(WindowResult.WINDOWSTATES_KEY, windowStates); + actionMap.put(ActionRenderContext.WINDOWSTATES_KEY, windowStates); } /** @@ -410,10 +411,10 @@ Mode mode = (Mode)j.next(); String url = createUpdateNavigationalStateURL(context, window, mode, null); boolean disabled = mode.equals(currentMode); - WindowResult.Action action = new WindowResult.Action(mode, url, !disabled); + WindowResult.Action action = new WindowResult.Action(mode.toString(), url, !disabled); modes.add(action); } - actionMap.put(WindowResult.MODES_KEY, modes); + actionMap.put(ActionRenderContext.MODES_KEY, modes); } private String createUpdateNavigationalStateURL(ControllerContext context, Window window, Mode mode, WindowState windowState) Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java 2007-04-03 11:57:22 UTC (rev 6904) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java 2007-04-03 12:18:06 UTC (rev 6905) @@ -24,11 +24,11 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; -import org.jboss.portal.theme.page.WindowResult; import org.jboss.portal.theme.render.DecorationRenderer; import org.jboss.portal.theme.render.RenderContext; import org.jboss.portal.theme.render.RenderException; import org.jboss.portal.theme.render.DecorationRenderContext; +import org.jboss.portal.theme.render.ActionRenderContext; import java.util.Collection; import java.util.Collections; @@ -54,8 +54,8 @@ StringBuffer markup = renderContext.getMarkupFragment(); renderTitle(renderContext, drc); markup.append("<div class=\"portlet-mode-container\">"); - renderModeAndStateLinks(renderContext, drc, WindowResult.MODES_KEY); - renderModeAndStateLinks(renderContext, drc, WindowResult.WINDOWSTATES_KEY); + renderModeAndStateLinks(renderContext, drc, ActionRenderContext.MODES_KEY); + renderModeAndStateLinks(renderContext, drc, ActionRenderContext.WINDOWSTATES_KEY); markup.append("</div>"); } @@ -85,7 +85,7 @@ for (Iterator i = modesOrStates.iterator(); i.hasNext();) { - WindowResult.Action action = (WindowResult.Action)i.next(); + ActionRenderContext action = (ActionRenderContext)i.next(); if (action.isEnabled()) { StringBuffer out = ctx.getMarkupFragment(); @@ -115,11 +115,11 @@ public int compare(Object o1, Object o2) { - WindowResult.Action action1 = (WindowResult.Action)o1; - WindowResult.Action action2 = (WindowResult.Action)o2; + ActionRenderContext action1 = (ActionRenderContext)o1; + ActionRenderContext action2 = (ActionRenderContext)o2; - Object origin1 = action1.getOrigin(); - Object origin2 = action2.getOrigin(); + Object origin1 = action1.getFamily(); + Object origin2 = action2.getFamily(); if (origin1.equals(origin2)) { Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivRegionRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivRegionRenderer.java 2007-04-03 11:57:22 UTC (rev 6904) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivRegionRenderer.java 2007-04-03 12:18:06 UTC (rev 6905) @@ -59,7 +59,7 @@ public void renderBody(RenderContext renderContext, RegionRenderContext rrc) throws RenderException { - for (Iterator i = rrc.getWindowRenderContexts().iterator(); i.hasNext();) + for (Iterator i = rrc.getWindows().iterator(); i.hasNext();) { WindowRenderContext wrc = (WindowRenderContext)i.next(); renderContext.render(wrc); Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyRegionRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyRegionRenderer.java 2007-04-03 11:57:22 UTC (rev 6904) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyRegionRenderer.java 2007-04-03 12:18:06 UTC (rev 6905) @@ -63,7 +63,7 @@ Map orderedItems = new TreeMap(); // - for (Iterator i = rrc.getWindowRenderContexts().iterator(); i.hasNext();) + for (Iterator i = rrc.getWindows().iterator(); i.hasNext();) { WindowRenderContext window = (WindowRenderContext)i.next(); orderedItems.put(new Integer(window.getOrder()), window); Modified: trunk/theme/src/main/org/jboss/portal/theme/page/PageResult.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/page/PageResult.java 2007-04-03 11:57:22 UTC (rev 6904) +++ trunk/theme/src/main/org/jboss/portal/theme/page/PageResult.java 2007-04-03 12:18:06 UTC (rev 6905) @@ -113,7 +113,7 @@ * @param regionName the name of the region to get * @return the region for the provided region name */ - public Region getRegion(String regionName) + public Region getRegion2(String regionName) { return (Region)regions.get(regionName); } @@ -273,12 +273,12 @@ } - public Collection getRegionRenderContexts() + public Collection getRegions() { return regions.values(); } - public RegionRenderContext getRegionRenderContext(String regionName) + public RegionRenderContext getRegion(String regionName) { return (RegionRenderContext)regions.get(regionName); } Modified: trunk/theme/src/main/org/jboss/portal/theme/page/Region.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/page/Region.java 2007-04-03 11:57:22 UTC (rev 6904) +++ trunk/theme/src/main/org/jboss/portal/theme/page/Region.java 2007-04-03 12:18:06 UTC (rev 6905) @@ -123,7 +123,7 @@ * * @return a sorted list of <code>org.jboss.portal.theme.page.WindowContext</code> items */ - public List getWindows() + public List getWindows2() { if (windows == null) { @@ -144,7 +144,7 @@ // RegionRenderContext implementation ******************************************************************************* - public Collection getWindowRenderContexts() + public Collection getWindows() { ArrayList wrcs = new ArrayList(windows.size()); for (Iterator i = windows.iterator(); i.hasNext();) Modified: trunk/theme/src/main/org/jboss/portal/theme/page/WindowResult.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/page/WindowResult.java 2007-04-03 11:57:22 UTC (rev 6904) +++ trunk/theme/src/main/org/jboss/portal/theme/page/WindowResult.java 2007-04-03 12:18:06 UTC (rev 6905) @@ -24,6 +24,7 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; +import org.jboss.portal.theme.render.ActionRenderContext; import org.jboss.portal.portlet.Properties; import java.util.Collection; @@ -40,12 +41,6 @@ { /** . */ - public static final String MODES_KEY = "mode"; - - /** . */ - public static final String WINDOWSTATES_KEY = "windowstate"; - - /** . */ private String title; /** . */ @@ -162,10 +157,10 @@ * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> */ - public static class Action + public static class Action implements ActionRenderContext { /** The origin of the action. */ - private final Object origin; + private final String family; /** The action url. */ private final String url; @@ -173,28 +168,21 @@ /** Enabled or not. */ private final boolean enabled; - public Action(Object origin, String url, boolean enabled) + public Action(String family, String url, boolean enabled) { - if (origin instanceof WindowState || origin instanceof Mode) - { - this.origin = origin; - } - else - { - throw new IllegalArgumentException("Action can only have a WindowState or Mode for origin. Was: " + origin); - } + this.family = family; this.url = url; this.enabled = enabled; } public String getName() { - return origin.toString(); + return family; } - public Object getOrigin() + public String getFamily() { - return origin; + return family; } public String getURL() @@ -206,5 +194,10 @@ { return enabled; } + + public String getProperty(String name) + { + return null; + } } } Added: trunk/theme/src/main/org/jboss/portal/theme/render/ActionRenderContext.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/ActionRenderContext.java (rev 0) +++ trunk/theme/src/main/org/jboss/portal/theme/render/ActionRenderContext.java 2007-04-03 12:18:06 UTC (rev 6905) @@ -0,0 +1,44 @@ +/****************************************************************************** + * 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.theme.render; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public interface ActionRenderContext extends ObjectRenderContext +{ + /** . */ + String MODES_KEY = "mode"; + /** . */ + String WINDOWSTATES_KEY = "windowstate"; + + String getName(); + + String getFamily(); + + String getURL(); + + boolean isEnabled(); + +} Modified: trunk/theme/src/main/org/jboss/portal/theme/render/PageRenderContext.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/PageRenderContext.java 2007-04-03 11:57:22 UTC (rev 6904) +++ trunk/theme/src/main/org/jboss/portal/theme/render/PageRenderContext.java 2007-04-03 12:18:06 UTC (rev 6905) @@ -30,7 +30,7 @@ */ public interface PageRenderContext extends ObjectRenderContext { - Collection getRegionRenderContexts(); + Collection getRegions(); - RegionRenderContext getRegionRenderContext(String regionName); + RegionRenderContext getRegion(String regionName); } Modified: trunk/theme/src/main/org/jboss/portal/theme/render/RegionRenderContext.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/RegionRenderContext.java 2007-04-03 11:57:22 UTC (rev 6904) +++ trunk/theme/src/main/org/jboss/portal/theme/render/RegionRenderContext.java 2007-04-03 12:18:06 UTC (rev 6905) @@ -35,7 +35,7 @@ String getId(); - Collection getWindowRenderContexts(); + Collection getWindows(); Orientation getOrientation(); Modified: trunk/theme/src/main/org/jboss/portal/theme/tag/RegionTagHandler.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/tag/RegionTagHandler.java 2007-04-03 11:57:22 UTC (rev 6904) +++ trunk/theme/src/main/org/jboss/portal/theme/tag/RegionTagHandler.java 2007-04-03 12:18:06 UTC (rev 6905) @@ -91,7 +91,7 @@ final String cssId = regionCssId == null ? regionName : regionCssId; final Orientation orientation = this.regionOrientation == null ? Orientation.DEFAULT : this.regionOrientation; - if (page.getRegionRenderContext(regionName) == null) // non-window display of content + if (page.getRegion(regionName) == null) // non-window display of content { // Create a dummy region obj, based on region name RegionRenderContext rrc = new RegionRenderContext() @@ -100,7 +100,7 @@ { return regionName; } - public Collection getWindowRenderContexts() + public Collection getWindows() { return Collections.EMPTY_LIST; } @@ -148,7 +148,7 @@ return; } - final RegionRenderContext region = page.getRegionRenderContext(regionName); + final RegionRenderContext region = page.getRegion(regionName); RegionRenderContext rrc = new RegionRenderContext() { public String getId() @@ -156,9 +156,9 @@ return region.getId(); } - public Collection getWindowRenderContexts() + public Collection getWindows() { - return region.getWindowRenderContexts(); + return region.getWindows(); } public Orientation getOrientation() Modified: trunk/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachActionInWindowTag.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachActionInWindowTag.java 2007-04-03 11:57:22 UTC (rev 6904) +++ trunk/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachActionInWindowTag.java 2007-04-03 12:18:06 UTC (rev 6905) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.theme.tag.basic; -import org.jboss.portal.theme.page.WindowResult; +import org.jboss.portal.theme.render.ActionRenderContext; import javax.servlet.jsp.JspException; import javax.servlet.jsp.tagext.BodyTagSupport; @@ -63,7 +63,7 @@ { if (iterator.hasNext()) { - WindowResult.Action action = (WindowResult.Action)iterator.next(); + ActionRenderContext action = (ActionRenderContext)iterator.next(); pageContext.setAttribute(ForEachActionInWindowTEI.IMPLICIT_NAME, action.getName()); pageContext.setAttribute(ForEachActionInWindowTEI.IMPLICIT_URL, action.getURL()); pageContext.setAttribute(ForEachActionInWindowTEI.IMPLICIT_ENABLED, Boolean.valueOf(action.isEnabled())); Modified: trunk/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachWindowInRegionTag.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachWindowInRegionTag.java 2007-04-03 11:57:22 UTC (rev 6904) +++ trunk/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachWindowInRegionTag.java 2007-04-03 12:18:06 UTC (rev 6905) @@ -26,7 +26,6 @@ import org.jboss.portal.theme.render.PageRenderContext; import org.jboss.portal.theme.render.RegionRenderContext; import org.jboss.portal.theme.render.WindowRenderContext; -import org.jboss.portal.theme.page.PageResult; import javax.servlet.jsp.JspException; import javax.servlet.jsp.tagext.BodyTagSupport; @@ -101,17 +100,17 @@ public int doStartTag() throws JspException { // Get the aggrehated page result from the request - pageRenderContext = (PageResult)pageContext.getRequest().getAttribute(LayoutConstants.ATTR_PAGE); + pageRenderContext = (PageRenderContext)pageContext.getRequest().getAttribute(LayoutConstants.ATTR_PAGE); // Aggregate the regions parameterized in the region attribute List windows = new ArrayList(10); for (StringTokenizer tokenizer = new StringTokenizer(this.region, ","); tokenizer.hasMoreTokens();) { String token = tokenizer.nextToken().trim(); - RegionRenderContext region = pageRenderContext.getRegionRenderContext(token); + RegionRenderContext region = pageRenderContext.getRegion(token); if (region != null) { - for (Iterator i = region.getWindowRenderContexts().iterator(); i.hasNext();) + for (Iterator i = region.getWindows().iterator(); i.hasNext();) { WindowRenderContext window = (WindowRenderContext)i.next(); windows.add(window); Modified: trunk/theme/src/main/org/jboss/portal/theme/tag/basic/IfRegionExistsTag.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/tag/basic/IfRegionExistsTag.java 2007-04-03 11:57:22 UTC (rev 6904) +++ trunk/theme/src/main/org/jboss/portal/theme/tag/basic/IfRegionExistsTag.java 2007-04-03 12:18:06 UTC (rev 6905) @@ -56,7 +56,7 @@ { HttpServletRequest request = (HttpServletRequest)pageContext.getRequest(); PageRenderContext page = (PageRenderContext)request.getAttribute(LayoutConstants.ATTR_PAGE); - RegionRenderContext region = page.getRegionRenderContext(this.region); + RegionRenderContext region = page.getRegion(this.region); if (region != null) { return Tag.EVAL_BODY_INCLUDE; Modified: trunk/theme/src/main/org/jboss/portal/theme/tag/basic/IfRegionIsEmptyTag.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/tag/basic/IfRegionIsEmptyTag.java 2007-04-03 11:57:22 UTC (rev 6904) +++ trunk/theme/src/main/org/jboss/portal/theme/tag/basic/IfRegionIsEmptyTag.java 2007-04-03 12:18:06 UTC (rev 6905) @@ -56,8 +56,8 @@ { HttpServletRequest request = (HttpServletRequest)pageContext.getRequest(); PageResult page = (PageResult)request.getAttribute(LayoutConstants.ATTR_PAGE); - Region region = page.getRegion(this.region); - if (region != null && region.getWindows().iterator().hasNext()) + Region region = page.getRegion2(this.region); + if (region != null && region.getWindows2().iterator().hasNext()) { return Tag.SKIP_BODY; }