[jboss-svn-commits] JBoss Portal SVN: r5368 - in trunk/theme/src/main/org/jboss/portal/theme: . impl/render/div impl/render/dynamic render

[jboss-svn-commits at lists.jboss.org]

Author: julien at jboss.com
Date: 2006-10-09 04:20:10 -0400 (Mon, 09 Oct 2006)
New Revision: 5368

Removed:
   trunk/theme/src/main/org/jboss/portal/theme/render/region/
Modified:
   trunk/theme/src/main/org/jboss/portal/theme/PageRendition.java
   trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivRegionRenderer.java
   trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java
Log:
inline specific ajax regions into the DynaRegionRenderer

Modified: trunk/theme/src/main/org/jboss/portal/theme/PageRendition.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/PageRendition.java	2006-10-09 07:57:29 UTC (rev 5367)
+++ trunk/theme/src/main/org/jboss/portal/theme/PageRendition.java	2006-10-09 08:20:10 UTC (rev 5368)
@@ -64,9 +64,8 @@
    public void render(ServerInvocation invocation) throws IOException, ServletException
    {
       // If possible and needed, propagate the navigational state of the page into the result
-      ModifiableMarkupResult modResult = pageResult;
-      modResult.setLayoutURI(pageNavState.getLayoutURI());
-      modResult.setLayoutState(pageNavState.getLayoutState());
+      pageResult.setLayoutURI(pageNavState.getLayoutURI());
+      pageResult.setLayoutState(pageNavState.getLayoutState());
 
       //
       HttpServletRequest clientRequest = invocation.getServerContext().getClientRequest();

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	2006-10-09 07:57:29 UTC (rev 5367)
+++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivRegionRenderer.java	2006-10-09 08:20:10 UTC (rev 5368)
@@ -67,36 +67,19 @@
          }
       }
 
-      if(region.getWindows().size() == 0) // non-window display of content
+      //
+      for(Iterator i = region.getWindows().iterator(); i.hasNext();)
       {
-         try
+         WindowContext window = (WindowContext) i.next();
+         WindowContext portletContext = (WindowContext) portletContexts.get(window.getId());
+         WindowResult result = (WindowResult) windowResults.get(window.getId());
+
+         // The result may be null if it has not been added to the page for some reason
+         if(result != null)
          {
-            Class regionClass = Thread.currentThread().getContextClassLoader().loadClass("org.jboss.portal.theme.render.region." + region.getId());
-            Class[] argTypes = {RenderContext.class};
-            Method m = regionClass.getMethod("render", argTypes);
-            String fragment = (String) m.invoke(regionClass.newInstance(), new Object[]{renderContext});
-            markup.append(fragment);
+            renderContext.getWindowRenderer(result).render(renderContext, portletContext, result);
          }
-         catch(Exception e)
-         {
-            log.debug("No region class found for: " + "org.jboss.portal.theme.render.region." + region.getId());
-         }
       }
-      else // process window fragments
-      {
-         for(Iterator i = region.getWindows().iterator(); i.hasNext();)
-         {
-            WindowContext window = (WindowContext) i.next();
-            WindowContext portletContext = (WindowContext) portletContexts.get(window.getId());
-            WindowResult result = (WindowResult) windowResults.get(window.getId());
-
-            // The result may be null if it has not been added to the page for some reason
-            if(result != null)
-            {
-               renderContext.getWindowRenderer(result).render(renderContext, portletContext, result);
-            }
-         }
-      }
       markup.append("</div>");
    }
 

Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java	2006-10-09 07:57:29 UTC (rev 5367)
+++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java	2006-10-09 08:20:10 UTC (rev 5368)
@@ -61,6 +61,25 @@
    public void render(RenderContext renderContext, Region region,
                       Map portletContexts, Map windowResults) throws RenderException
    {
+      // Handle special ajax region here
+      if ("AJAXFooter".equals(region.getId()))
+      {
+         StringBuffer markup = renderContext.getMarkupFragment();
+         String ctx = "/portal-ajax";
+         markup.append("\n\n<script type='text/javascript' src='").append(ctx).append("/js/portal/event.js'></script>\n\n");
+      }
+      else if ("AJAXScripts".equals(region.getId()))
+      {
+         StringBuffer markup = renderContext.getMarkupFragment();
+         String ctx = "/portal-ajax";
+         markup.append("\n\n\n");
+         markup.append("<script type='text/javascript' src='").append(ctx).append("/js/portal/prototype.js'></script>\n");
+         markup.append("<script type='text/javascript' src='").append(ctx).append("/js/portal/scriptaculous.js'></script>\n");
+         markup.append("<script type='text/javascript' src='").append(ctx).append("/js/portal/effects.js'></script>\n");
+         markup.append("<script type='text/javascript' src='").append(ctx).append("/js/portal/dragdrop.js'></script>\n");
+         markup.append("\n\n\n");
+      }
+      
       delegate.render(renderContext, region, portletContexts, windowResults);
 
       if(portletPos.get(renderContext.getRegionID()) != null