Author: julien(a)jboss.com Date: 2007-04-04 08:25:59 -0400 (Wed, 04 Apr 2007) New Revision: 6916 Modified: trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxController.java trunk/core/src/main/org/jboss/portal/core/model/instance/command/InvokePortletInstanceRenderCommand.java trunk/core/src/main/org/jboss/portal/core/model/portal/command/RenderPageCommand.java trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml trunk/theme/src/bin/portal-ajax-war/js/portal/dyna.js trunk/theme/src/main/org/jboss/portal/test/theme/render/TestRenderedMarkup.java trunk/theme/src/main/org/jboss/portal/test/theme/servlet/TestThemeServlet.java trunk/theme/src/main/org/jboss/portal/theme/PageRendition.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaWindowRenderer.java trunk/theme/src/main/org/jboss/portal/theme/page/DecorationRenderContextImpl.java trunk/theme/src/main/org/jboss/portal/theme/page/PageResult.java trunk/theme/src/main/org/jboss/portal/theme/page/PortletRenderContextImpl.java trunk/theme/src/main/org/jboss/portal/theme/page/Region.java trunk/theme/src/main/org/jboss/portal/theme/page/WindowContext.java trunk/theme/src/main/org/jboss/portal/theme/page/WindowRenderContextImpl.java trunk/theme/src/main/org/jboss/portal/theme/tag/HeaderContentTagHandler.java Log: - make a real 1-1 relationship between windowresult and windowcontext for the sake of simplicity - fix the window DnD partially 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-04 11:38:41 UTC (rev 6915) +++ trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java 2007-04-04 12:25:59 UTC (rev 6916) @@ -119,9 +119,8 @@ windowProps.put(ThemeConstants.PORTAL_PROP_DECORATION_RENDERER, "emptyRenderer"); windowProps.put(ThemeConstants.PORTAL_PROP_PORTLET_RENDERER, "emptyRenderer"); WindowResult res = new WindowResult("", tabbedNav.toString(), Collections.EMPTY_MAP, windowProps, null, null, WindowState.NORMAL, Mode.VIEW); - WindowContext blah = new WindowContext("BLAH", "BLAH", "navigation", 0); + WindowContext blah = new WindowContext("BLAH", "BLAH", "navigation", 0, res); rendition.getPageResult().addWindowContext(blah); - rendition.getPageResult().addWindowResult("BLAH", res); // Region region = rendition.getPageResult().getRegion2("navigation"); @@ -138,9 +137,8 @@ windowProps.put(ThemeConstants.PORTAL_PROP_DECORATION_RENDERER, "emptyRenderer"); windowProps.put(ThemeConstants.PORTAL_PROP_PORTLET_RENDERER, "emptyRenderer"); WindowResult res = new WindowResult("", dashboardNav.toString(), Collections.EMPTY_MAP, windowProps, null, null, WindowState.NORMAL, Mode.VIEW); - WindowContext bluh = new WindowContext("BLUH", "BLUH", "dashboardnav", 0); + WindowContext bluh = new WindowContext("BLUH", "BLUH", "dashboardnav", 0, res); rendition.getPageResult().addWindowContext(bluh); - rendition.getPageResult().addWindowResult("BLUH", res); // Region region = rendition.getPageResult().getRegion2("dashboardnav"); Modified: trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxController.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxController.java 2007-04-04 11:38:41 UTC (rev 6915) +++ trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxController.java 2007-04-04 12:25:59 UTC (rev 6916) @@ -128,7 +128,7 @@ int toPosInt = Integer.parseInt(toPos); // - PortalObjectId tmp = PortalObjectId.parse(windowId, PortalObjectId.CANONICAL_FORMAT); + PortalObjectId tmp = PortalObjectId.parse(windowId, PortalObjectId.LEGACY_BASE64_FORMAT); // try Modified: trunk/core/src/main/org/jboss/portal/core/model/instance/command/InvokePortletInstanceRenderCommand.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/model/instance/command/InvokePortletInstanceRenderCommand.java 2007-04-04 11:38:41 UTC (rev 6915) +++ trunk/core/src/main/org/jboss/portal/core/model/instance/command/InvokePortletInstanceRenderCommand.java 2007-04-04 12:25:59 UTC (rev 6916) @@ -109,9 +109,8 @@ // WindowResult res = new WindowResult("", content, Collections.EMPTY_MAP, windowProps, null, null, WindowState.NORMAL, Mode.VIEW); - WindowContext blah = new WindowContext("BILTO", "BILTO", "maximized", 0); + WindowContext blah = new WindowContext("BILTO", "BILTO", "maximized", 0, res); result.addWindowContext(blah); - result.addWindowResult("BILTO", res); // result.setLayoutState("maximized"); Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/command/RenderPageCommand.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/model/portal/command/RenderPageCommand.java 2007-04-04 11:38:41 UTC (rev 6915) +++ trunk/core/src/main/org/jboss/portal/core/model/portal/command/RenderPageCommand.java 2007-04-04 12:25:59 UTC (rev 6916) @@ -234,9 +234,13 @@ WindowResult result = (WindowResult)res; String region = window.getDeclaredProperty(ThemeConstants.PORTAL_PROP_REGION); String order = window.getDeclaredProperty(ThemeConstants.PORTAL_PROP_ORDER); - WindowContext wc = new WindowContext(window.getName(), window.getName(), region, Integer.parseInt(order)); + WindowContext wc = new WindowContext( + window.getName(), + window.getId().toString(PortalObjectId.LEGACY_BASE64_FORMAT), + region, + Integer.parseInt(order), + result); pageResult.addWindowContext(wc); - pageResult.addWindowResult(window.getName(), result); } else { Modified: trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml =================================================================== --- trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2007-04-04 11:38:41 UTC (rev 6915) +++ trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2007-04-04 12:25:59 UTC (rev 6916) @@ -902,7 +902,7 @@ <!-- The core controller --> <mbean code="org.jboss.portal.core.controller.classic.ClassicController" - name="portal:controller=Core" + name="portal:controller=Classic" xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> @@ -980,7 +980,7 @@ <xmbean/> <depends optional-attribute-name="ClassicController" - proxy-type="attribute">portal:controller=Core</depends> + proxy-type="attribute">portal:controller=Classic</depends> <depends optional-attribute-name="AjaxController" proxy-type="attribute">portal:controller=Ajax</depends> Modified: trunk/theme/src/bin/portal-ajax-war/js/portal/dyna.js =================================================================== --- trunk/theme/src/bin/portal-ajax-war/js/portal/dyna.js 2007-04-04 11:38:41 UTC (rev 6915) +++ trunk/theme/src/bin/portal-ajax-war/js/portal/dyna.js 2007-04-04 12:25:59 UTC (rev 6916) @@ -1,5 +1,6 @@ function sendData(action, windowId, fromPos, fromRegionId, toPos, toRegionId) { var options = { + requestHeaders: ["ajax","true"], method: "post", postBody: "action=" + action + "&windowId=" + windowId + "&fromPos=" + fromPos + "&fromRegion=" + fromRegionId + "&toPos=" + toPos + "&toRegion=" + toRegionId, onSuccess: function(t) Modified: trunk/theme/src/main/org/jboss/portal/test/theme/render/TestRenderedMarkup.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/test/theme/render/TestRenderedMarkup.java 2007-04-04 11:38:41 UTC (rev 6915) +++ trunk/theme/src/main/org/jboss/portal/test/theme/render/TestRenderedMarkup.java 2007-04-04 12:25:59 UTC (rev 6916) @@ -150,11 +150,10 @@ String title = "WindowA_" + i + " Title"; String content = "<p>WindowA_" + i + " Content</p>"; - WindowContext wCtx = new WindowContext("WindowA_" + i + "_Name", "WindowA_" + i, "left", i); + WindowContext wCtx = new WindowContext("WindowA_" + i + "_Name", "WindowA_" + i, "left", i, createWindowMarkup(title, content)); pageResult.addWindowContext(wCtx); - pageResult.addWindowResult(wCtx.getId(), createWindowMarkup(title, content, wCtx, portalProps, pageProps)); - markupResult = createWindowMarkup(title, content, wCtx, portalProps, pageProps); + markupResult = createWindowMarkup(title, content); assertEquals(markupResult.getContent(), content); assertEquals(markupResult.getTitle(), title); @@ -164,11 +163,10 @@ String title = "WindowB_" + i + " Title"; String content = "<p>WindowB_" + i + " Content</p>"; - WindowContext wCtx = new WindowContext("WindowB_" + i + "_Name", "WindowB_" + i, "center", i); + WindowContext wCtx = new WindowContext("WindowB_" + i + "_Name", "WindowB_" + i, "center", i, createWindowMarkup(title, content)); pageResult.addWindowContext(wCtx); - pageResult.addWindowResult(wCtx.getId(), createWindowMarkup(title, content, wCtx, portalProps, pageProps)); - markupResult = createWindowMarkup(title, content, wCtx, portalProps, pageProps); + markupResult = createWindowMarkup(title, content); assertEquals(markupResult.getContent(), content); assertEquals(markupResult.getTitle(), title); @@ -203,10 +201,9 @@ * * @param sTitle * @param sContent - * @param wCtx * @return window markup result */ - private WindowResult createWindowMarkup(String sTitle, String sContent, WindowContext wCtx, Map portalProps, Map pageProps) + private WindowResult createWindowMarkup(String sTitle, String sContent) { return new WindowResult(sTitle, sContent, Collections.EMPTY_MAP, new HashMap(), null, null, null, null); } Modified: trunk/theme/src/main/org/jboss/portal/test/theme/servlet/TestThemeServlet.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/test/theme/servlet/TestThemeServlet.java 2007-04-04 11:38:41 UTC (rev 6915) +++ trunk/theme/src/main/org/jboss/portal/test/theme/servlet/TestThemeServlet.java 2007-04-04 12:25:59 UTC (rev 6916) @@ -117,15 +117,13 @@ // create window ctx/results and add to page result for (int i = 0; i < LEFT_WINDOWS; i++) { - WindowContext wCtx = new WindowContext("WindowA_" + i, "WindowA_" + i, "left", i); + WindowContext wCtx = new WindowContext("WindowA_" + i, "WindowA_" + i, "left", i, createWindowMarkup("WindowA_" + i + " Title", "<p>WindowA_" + i + " Content</p>")); pageResult.addWindowContext(wCtx); - pageResult.addWindowResult(wCtx.getId(), createWindowMarkup("WindowA_" + i + " Title", "<p>WindowA_" + i + " Content</p>", wCtx, portalProps, pageProps)); } for (int i = 0; i < CENTER_WINDOWS; i++) { - WindowContext wCtx = new WindowContext("WindowB_" + i, "WindowB_" + i, "center", i); + WindowContext wCtx = new WindowContext("WindowB_" + i, "WindowB_" + i, "center", i, createWindowMarkup("WindowB_" + i + " Title", "<p>WindowB_" + i + " Content</p>")); pageResult.addWindowContext(wCtx); - pageResult.addWindowResult(wCtx.getId(), createWindowMarkup("WindowB_" + i + " Title", "<p>WindowB_" + i + " Content</p>", wCtx, portalProps, pageProps)); } // set the renderctx and req/res attr @@ -146,10 +144,9 @@ * * @param sTitle * @param sContent - * @param wCtx * @return window markup result */ - private WindowResult createWindowMarkup(String sTitle, String sContent, WindowContext wCtx, Map portalProps, Map pageProps) + private WindowResult createWindowMarkup(String sTitle, String sContent) { return new WindowResult(sTitle, sContent, Collections.EMPTY_MAP, new HashMap(), null, null, null, null); } Modified: trunk/theme/src/main/org/jboss/portal/theme/PageRendition.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/PageRendition.java 2007-04-04 11:38:41 UTC (rev 6915) +++ trunk/theme/src/main/org/jboss/portal/theme/PageRendition.java 2007-04-04 12:25:59 UTC (rev 6916) @@ -34,8 +34,6 @@ import java.io.IOException; import java.util.Collection; import java.util.Iterator; -import java.util.Map; -import java.util.Set; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -72,7 +70,8 @@ for (Iterator i = pageResult.getWindowIds().iterator();i.hasNext();) { Object windowId = i.next(); - WindowResult res = pageResult.getWindowResult(windowId); + WindowContext wc = pageResult.getWindowContext(windowId); + WindowResult res = wc.getResult(); if (WindowState.MAXIMIZED.equals(res.getWindowState())) { // TODO: Deep clone instead ? @@ -88,14 +87,7 @@ WindowContext windowContext = (WindowContext)setIterator.next(); newRes.addWindowContext(windowContext); } - Map map = pageResult.getWindowResultMap(); - Iterator keyIterator = map.keySet().iterator(); - while (keyIterator.hasNext()) - { - Object key = keyIterator.next(); - newRes.addWindowResult(key, (WindowResult)map.get(key)); - } - + // WindowContext ctx = pageResult.getWindowContext(windowId); @@ -109,7 +101,6 @@ // newRes.addWindowContext(ctx); - newRes.addWindowResult(windowId, res); // pageResult = newRes; Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaWindowRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaWindowRenderer.java 2007-04-04 11:38:41 UTC (rev 6915) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaWindowRenderer.java 2007-04-04 12:25:59 UTC (rev 6916) @@ -61,7 +61,7 @@ // StringBuffer out = renderContext.getMarkupFragment(); - out.append("<div class=\"dyna-window").append("\"><div class=\"").append(wrc.getId()).append("\"/>\n"); + out.append("<div id=\"").append(wrc.getId()).append("\" class=\"dyna-window\"><div class=\"").append(wrc.getId()).append("\"/>\n"); delegate.render(renderContext, wrc); out.append("</div></div>\n"); Modified: trunk/theme/src/main/org/jboss/portal/theme/page/DecorationRenderContextImpl.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/page/DecorationRenderContextImpl.java 2007-04-04 11:38:41 UTC (rev 6915) +++ trunk/theme/src/main/org/jboss/portal/theme/page/DecorationRenderContextImpl.java 2007-04-04 12:25:59 UTC (rev 6916) @@ -47,12 +47,12 @@ public String getTitle() { - return wrc.result.getTitle(); + return wrc.context.result.getTitle(); } public Collection getTriggerableActions(String familyName) { - return wrc.result.getTriggerableActions(familyName); + return wrc.context.result.getTriggerableActions(familyName); } public String getProperty(String name) 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-04 11:38:41 UTC (rev 6915) +++ trunk/theme/src/main/org/jboss/portal/theme/page/PageResult.java 2007-04-04 12:25:59 UTC (rev 6916) @@ -181,26 +181,26 @@ return windowContexts.keySet(); } - /** - * Get the <code>WindowResult</code> for a specific portlet window. - * - * @param windowId the window id identifying the portlet window to get the window result for - * @return the window result for the provided window id - */ - public WindowResult getWindowResult(Object windowId) - { - return (WindowResult)results.get(windowId); - } +// /** +// * Get the <code>WindowResult</code> for a specific portlet window. +// * +// * @param windowId the window id identifying the portlet window to get the window result for +// * @return the window result for the provided window id +// */ +// public WindowResult getWindowResult(Object windowId) +// { +// return (WindowResult)results.get(windowId); +// } - /** - * Get a map of <code>WindowResult</code>s keyed by window id - * - * @return a map of window results - */ - public Map getWindowResultMap() - { - return results; - } +// /** +// * Get a map of <code>WindowResult</code>s keyed by window id +// * +// * @return a map of window results +// */ +// public Map getWindowResultMap() +// { +// return results; +// } /** * Get the <code>WindowContext</code> for the provided window id. @@ -233,14 +233,14 @@ this.layoutState = layoutState; } - public void addWindowResult(Object windowId, WindowResult result) - { - if (!windowContexts.keySet().contains(windowId)) - { - throw new IllegalArgumentException("there was no window added for this window:" + windowId); - } - results.put(windowId, result); - } +// public void addWindowResult(Object windowId, WindowResult result) +// { +// if (!windowContexts.keySet().contains(windowId)) +// { +// throw new IllegalArgumentException("there was no window added for this window:" + windowId); +// } +// results.put(windowId, result); +// } public void addWindowContext(WindowContext windowContext) { Modified: trunk/theme/src/main/org/jboss/portal/theme/page/PortletRenderContextImpl.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/page/PortletRenderContextImpl.java 2007-04-04 11:38:41 UTC (rev 6915) +++ trunk/theme/src/main/org/jboss/portal/theme/page/PortletRenderContextImpl.java 2007-04-04 12:25:59 UTC (rev 6916) @@ -41,7 +41,7 @@ public String getMarkup() { - return wrc.result.getContent(); + return wrc.context.result.getContent(); } public String getProperty(String name) 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-04 11:38:41 UTC (rev 6915) +++ trunk/theme/src/main/org/jboss/portal/theme/page/Region.java 2007-04-04 12:25:59 UTC (rev 6916) @@ -150,8 +150,7 @@ for (Iterator i = windows.iterator(); i.hasNext();) { WindowContext wc = (WindowContext)i.next(); - WindowResult wr = page.getWindowResult(wc.getId()); - WindowRenderContext wrc = new WindowRenderContextImpl(this, wc, wr); + WindowRenderContext wrc = new WindowRenderContextImpl(this, wc); wrcs.add(wrc); } return wrcs; Modified: trunk/theme/src/main/org/jboss/portal/theme/page/WindowContext.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/page/WindowContext.java 2007-04-04 11:38:41 UTC (rev 6915) +++ trunk/theme/src/main/org/jboss/portal/theme/page/WindowContext.java 2007-04-04 12:25:59 UTC (rev 6916) @@ -40,10 +40,10 @@ private static final long serialVersionUID = -225656969004976637L; /** . */ - private final Object windowId; + private final String id; /** . */ - private final String windowName; + private final String name; // Mutable properties @@ -53,22 +53,26 @@ /** . */ private int order; - public WindowContext(String windowName, String windowId, String regionName, int order) + /** . */ + final WindowResult result; + + public WindowContext(String name, String id, String regionName, int order, WindowResult result) { - this.windowName = windowName; - this.windowId = windowId; + this.name = name; + this.id = id; this.regionName = regionName; this.order = order; + this.result = result; } - public String getWindowName() + public String getName() { - return windowName; + return name; } public Object getId() { - return windowId; + return id; } public String getRegionName() @@ -91,6 +95,11 @@ this.order = order; } + public WindowResult getResult() + { + return result; + } + public int compareTo(Object o) { return order - ((WindowContext)o).order; @@ -109,16 +118,16 @@ final WindowContext that = (WindowContext)o; - return windowId.equals(that.windowId); + return id.equals(that.id); } public int hashCode() { - return windowId.hashCode(); + return id.hashCode(); } public String toString() { - return windowName + " " + windowId + " " + regionName + " " + order; + return name + " " + id + " " + regionName + " " + order; } } Modified: trunk/theme/src/main/org/jboss/portal/theme/page/WindowRenderContextImpl.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/page/WindowRenderContextImpl.java 2007-04-04 11:38:41 UTC (rev 6915) +++ trunk/theme/src/main/org/jboss/portal/theme/page/WindowRenderContextImpl.java 2007-04-04 12:25:59 UTC (rev 6916) @@ -37,15 +37,13 @@ final Region region; final WindowContext context; - final WindowResult result; private final DecorationRenderContextImpl drc = new DecorationRenderContextImpl(this); private final PortletRenderContextImpl prc = new PortletRenderContextImpl(this); - public WindowRenderContextImpl(Region region, WindowContext context, WindowResult result) + public WindowRenderContextImpl(Region region, WindowContext context) { this.region = region; this.context = context; - this.result = result; } public String getId() @@ -60,12 +58,12 @@ public WindowState getWindowState() { - return result.getWindowState(); + return context.result.getWindowState(); } public Mode getMode() { - return result.getMode(); + return context.result.getMode(); } public DecorationRenderContext getDecoration() @@ -80,6 +78,6 @@ public String getProperty(String name) { - return (String)result.getWindowProperties().get(name); + return (String)context.result.getWindowProperties().get(name); } } Modified: trunk/theme/src/main/org/jboss/portal/theme/tag/HeaderContentTagHandler.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/tag/HeaderContentTagHandler.java 2007-04-04 11:38:41 UTC (rev 6915) +++ trunk/theme/src/main/org/jboss/portal/theme/tag/HeaderContentTagHandler.java 2007-04-04 12:25:59 UTC (rev 6916) @@ -26,6 +26,7 @@ import org.jboss.portal.theme.LayoutConstants; import org.jboss.portal.theme.page.PageResult; import org.jboss.portal.theme.page.WindowResult; +import org.jboss.portal.theme.page.WindowContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.jsp.JspException; @@ -64,11 +65,11 @@ return; } - Map results = page.getWindowResultMap(); - for (Iterator i = results.keySet().iterator(); i.hasNext();) + Map results = page.getWindowContextMap(); + for (Iterator i = results.values().iterator(); i.hasNext();) { - Object windowId = i.next(); - WindowResult result = page.getWindowResult(windowId); + WindowContext wc = (WindowContext)i.next(); + WindowResult result = wc.getResult(); Properties responseProperties = result.getResponseProperties(); if (responseProperties != null)