Author: thomas.heute(a)jboss.com
Date: 2007-03-19 04:44:14 -0400 (Mon, 19 Mar 2007)
New Revision: 6738
Modified:
trunk/theme/src/main/org/jboss/portal/theme/tag/PortletTagHandler.java
Log:
If the window doesn't exist, display nothing instead of the latest of the list.
Patch contribution from Antoine Herzog.
Modified: trunk/theme/src/main/org/jboss/portal/theme/tag/PortletTagHandler.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/tag/PortletTagHandler.java 2007-03-19
05:00:52 UTC (rev 6737)
+++ trunk/theme/src/main/org/jboss/portal/theme/tag/PortletTagHandler.java 2007-03-19
08:44:14 UTC (rev 6738)
@@ -97,55 +97,54 @@
}
String windowID = null;
+ boolean wIdFound = false;
// we have the windowName (which is the window name), but we need the
// window id
Map portletContexts = page.getWindowContextMap();
- for (Iterator i = portletContexts.keySet().iterator(); i.hasNext();)
- {
- windowID = (String) i.next();
- WindowContext portletContext = (WindowContext) portletContexts.get(windowID);
- if (windowName.equals(portletContext.getWindowName()))
- {
- if (log.isDebugEnabled())
- {
- log.debug("found the portlet to render: " + windowName);
- }
- break;
- }
+ for (Iterator i = portletContexts.keySet().iterator(); i.hasNext();) {
+ windowID = (String) i.next();
+ WindowContext portletContext = (WindowContext) portletContexts
+ .get(windowID);
+ if (windowName.equals(portletContext.getWindowName())) {
+ wIdFound = true;
+ if (log.isDebugEnabled()) {
+ log.debug("found the portlet to render: " + windowName);
+ }
+ break;
+ }
}
- if (windowID == null)
- {
- log.warn("can't find the window id of the window name on this page.
Page [" + page.getPageName()
- + "] Window [" + windowName + "]. This window won't be
shown in page.");
- return;
+ if (!wIdFound) {
+ log
+ .warn("can't find the window id of the window name on this page.
Page=["
+ + page.getPageName()
+ + "] and Window=["
+ + windowName
+ + "]. This window won't be shown in page.");
+ return;
}
-
- if (page.getWindowContext(windowID) == null)
- {
- log.warn("no such window on this page. Page [" + page.getPageName() +
"] Window name [" + windowName + "]"
- + "] Window Id [" + windowID + "]");
- return;
+ if (page.getWindowContext(windowID) == null) {
+ log.warn("no such window on this page. Page [" + page.getPageName()
+ + "] Window name [" + windowName + "]" + "] Window Id
["
+ + windowID + "]");
+ return;
}
WindowContext windowContext = page.getWindowContext(windowID);
- RenderContext renderContext = (RenderContext)
request.getAttribute(LayoutConstants.ATTR_RENDERCONTEXT);
+ RenderContext renderContext = (RenderContext) request
+ .getAttribute(LayoutConstants.ATTR_RENDERCONTEXT);
renderContext = renderContext.getContext(windowContext);
- try
- {
- renderContext.render();
- out.write(renderContext.getMarkupFragment().toString());
- out.flush();
+ try {
+ renderContext.render();
+ out.write(renderContext.getMarkupFragment().toString());
+ out.flush();
+ } catch (RenderException e) {
+ throw new JspException(e);
}
- catch (RenderException e)
- {
- throw new JspException(e);
- }
+ }
- }
-
public String getWindowName()
{
return windowName;
Show replies by date