March 2007 - portal-commits - Jboss List Archives

JBoss Portal SVN: r6886 - in trunk/theme/src/main/org/jboss/portal/theme: impl/render/dynamic and 2 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-03-30 13:20:07 -0400 (Fri, 30 Mar 2007) New Revision: 6886 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/DivPortletRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivRegionRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivWindowRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyDecorationRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyRegionRenderer.java trunk/theme/src/main/org/jboss/portal/theme/render/DecorationRenderer.java trunk/theme/src/main/org/jboss/portal/theme/render/RegionRenderer.java trunk/theme/src/main/org/jboss/portal/theme/render/RenderContext.java trunk/theme/src/main/org/jboss/portal/theme/render/WindowRenderer.java Log: create more correct markup from the renderers 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-03-30 16:46:59 UTC (rev 6885) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java 2007-03-30 17:20:07 UTC (rev 6886) @@ -49,19 +49,6 @@ implements DecorationRenderer { - public void preRender(RenderContext renderContext, DecorationRenderContext drc) - { - StringBuffer markup = renderContext.getMarkupFragment(); - markup.append("<tr><td class=\"portlet-titlebar-left\"></td>"); - markup.append("<td class=\"portlet-titlebar-center\">"); - } - - public void postRender(RenderContext renderContext, DecorationRenderContext drc) - { - StringBuffer markup = renderContext.getMarkupFragment(); - markup.append("</td><td class=\"portlet-titlebar-right\"></td></tr>"); - } - public void render(RenderContext renderContext, DecorationRenderContext drc) throws RenderException { StringBuffer markup = renderContext.getMarkupFragment(); Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivPortletRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivPortletRenderer.java 2007-03-30 16:46:59 UTC (rev 6885) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivPortletRenderer.java 2007-03-30 17:20:07 UTC (rev 6886) @@ -34,15 +34,11 @@ * @version $LastChangedRevision$, $LastChangedDate$ * @see org.jboss.portal.theme.render.PortletRenderer */ -public class DivPortletRenderer - implements PortletRenderer +public class DivPortletRenderer implements PortletRenderer { public void render(RenderContext renderContext, PortletRenderContext prc) throws RenderException { StringBuffer out = renderContext.getMarkupFragment(); - out.append("<tr><td class=\"portlet-content-left\"></td>"); - out.append("<td class=\"portlet-body\"><div class=\"portlet-content-center\">"); out.append(prc.getMarkup()); - out.append("</div></td><td class=\"portlet-content-right\"></td></tr>"); } } 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-03-30 16:46:59 UTC (rev 6885) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivRegionRenderer.java 2007-03-30 17:20:07 UTC (rev 6886) @@ -42,7 +42,7 @@ implements RegionRenderer { - public void preRender(RenderContext renderContext, RegionRenderContext rrc) throws RenderException + public void renderHeader(RenderContext renderContext, RegionRenderContext rrc) throws RenderException { StringBuffer markup = renderContext.getMarkupFragment(); markup.append("<div"); @@ -57,7 +57,7 @@ } } - public void render(RenderContext renderContext, RegionRenderContext rrc) throws RenderException + public void renderBody(RenderContext renderContext, RegionRenderContext rrc) throws RenderException { for (Iterator i = rrc.getWindowRenderContexts().iterator(); i.hasNext();) { @@ -66,7 +66,7 @@ } } - public void postRender(RenderContext renderContext, RegionRenderContext rrc) throws RenderException + public void renderFooter(RenderContext renderContext, RegionRenderContext rrc) throws RenderException { StringBuffer markup = renderContext.getMarkupFragment(); markup.append("</div>"); 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 2007-03-30 16:46:59 UTC (rev 6885) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivWindowRenderer.java 2007-03-30 17:20:07 UTC (rev 6886) @@ -42,8 +42,20 @@ StringBuffer out = renderContext.getMarkupFragment(); out.append("<div class=\"portlet-container\">"); out.append("<table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">"); + + // + out.append("<tr><td class=\"portlet-titlebar-left\"></td>"); + out.append("<td class=\"portlet-titlebar-center\">"); renderContext.render(wrc.getDecoration()); + out.append("</td><td class=\"portlet-titlebar-right\"></td></tr>"); + + // + out.append("<tr><td class=\"portlet-content-left\"></td>"); + out.append("<td class=\"portlet-body\"><div class=\"portlet-content-center\">"); renderContext.render(wrc.getPortlet()); + out.append("</div></td><td class=\"portlet-content-right\"></td></tr>"); + + // out.append("<tr><td class=\"portlet-footer-left\"></td>"); out.append("<td class=\"portlet-footer-center\"></td>"); out.append("<td class=\"portlet-footer-right\"></td></tr>"); Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java 2007-03-30 16:46:59 UTC (rev 6885) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java 2007-03-30 17:20:07 UTC (rev 6886) @@ -22,7 +22,6 @@ ******************************************************************************/ package org.jboss.portal.theme.impl.render.dynamic; -import org.jboss.logging.Logger; import org.jboss.portal.theme.render.DecorationRenderer; import org.jboss.portal.theme.render.RenderContext; import org.jboss.portal.theme.render.RenderException; @@ -38,8 +37,8 @@ */ public class DynaDecorationRenderer implements DecorationRenderer { - private static Logger log = Logger.getLogger(DynaDecorationRenderer.class); + /** . */ private DecorationRenderer delegate; public DynaDecorationRenderer(DecorationRenderer decorationRenderer) @@ -48,16 +47,6 @@ delegate = decorationRenderer; } - public void preRender(RenderContext renderContext, DecorationRenderContext drc) - { - delegate.preRender(renderContext, drc); - } - - public void postRender(RenderContext renderContext, DecorationRenderContext drc) - { - delegate.postRender(renderContext, drc); - } - public void render(RenderContext renderContext, DecorationRenderContext drc) throws RenderException { if (DynaRegionRenderer.isEnabled()) Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java 2007-03-30 16:46:59 UTC (rev 6885) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java 2007-03-30 17:20:07 UTC (rev 6886) @@ -23,7 +23,6 @@ package org.jboss.portal.theme.impl.render.dynamic; -import org.jboss.portal.theme.impl.render.empty.EmptyPortletRenderer; import org.jboss.portal.theme.render.PortletRenderer; import org.jboss.portal.theme.render.RenderContext; import org.jboss.portal.theme.render.RenderException; @@ -68,7 +67,7 @@ // // StringBuffer out = renderContext.getMarkupFragment(); // out.append("<span class=\"handle\">"); - delegate.render(renderContext, prc); + doCatchClicks(renderContext, prc); // out.append("</span>"); } else @@ -84,9 +83,16 @@ private void doCatchClicks(RenderContext renderContext, PortletRenderContext prc) throws RenderException { - StringBuffer out = renderContext.getMarkupFragment(); - out.append("<div class=\"dyna-portlet\">"); - delegate.render(renderContext, prc); - out.append("</div>"); + if (DynaRegionRenderer.isEnabled()) + { + StringBuffer out = renderContext.getMarkupFragment(); + out.append("<div class=\"dyna-portlet\">"); + delegate.render(renderContext, prc); + out.append("</div>"); + } + else + { + delegate.render(renderContext, prc); + } } } 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 2007-03-30 16:46:59 UTC (rev 6885) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java 2007-03-30 17:20:07 UTC (rev 6886) @@ -84,7 +84,7 @@ } - public void preRender(RenderContext renderContext, RegionRenderContext rrc) throws RenderException + public void renderHeader(RenderContext renderContext, RegionRenderContext rrc) throws RenderException { StringBuffer markup = renderContext.getMarkupFragment(); String jsBase = renderContext.getProperty(ThemeConstants.PORTAL_AJAX_JAVASCRIPT_BASE); @@ -189,9 +189,18 @@ " //removeElement(effectElement);\n" + "\n" + " sendData('windowremove', elementId);\n" + - "}"; + "}\n"; markup.append(u); + String v = "" + + "function bilto(event)\n" + + "{\n" + + " var source = Event.element(event);\n" + + " alert(source.id);\n" + + " Event.stop(event);;\n" + + "}\n"; + markup.append(v); + markup.append("</script>\n"); markup.append("\n\n\n"); } @@ -202,21 +211,26 @@ // Find the draggable regions "var regions_on_page = document.getElementsByClassName(\"dyna-region\");\n" + - // + // Create draggable regions "for(var i = 0;i < regions_on_page.length;i++) {\n" + - " var region = regions_on_page[i];" + - " Sortable.create(region, {dropOnEmpty:true,handle:'handle',tag:'div',containment:regions_on_page,constraint:false" + - " });\n" + - "}\n"); + " var region = regions_on_page[i];\n" + + " Sortable.create(region, {dropOnEmpty:true,handle:'handle',tag:'div',containment:regions_on_page,constraint:false});\n" + + "}\n" + - // - markup.append("Draggables.addObserver(new WindowMoveObserver());\n"); + // + "Draggables.addObserver(new WindowMoveObserver());\n" + + "snapshot();\n" + - // Make a snap of the state - markup.append("snapshot();\n"); + // Find the dyna portlets + "var portlets_on_page = document.getElementsByClassName(\"dyna-portlet\");\n" + - // - markup.append("</script>\n"); + // Add listener for those portlets +// "for(var i = 0;i < portlets_on_page.length;i++) {\n" + +// " var portlet = portlets_on_page[i];\n" + +// " Event.observe(portlet, 'click', bilto);\n" + +// "}\n" + + + "</script>\n"); } else { @@ -232,18 +246,18 @@ if (regionEnabled) { // - delegate.preRender(renderContext, rrc); + delegate.renderHeader(renderContext, rrc); // We need height and width otherwise the region will not be usable when empty markup.append("<div class=\"dyna-region\" style=\"height:200px;width=200px\" id=\"").append(rrc.getId()).append("\">"); } else { - delegate.preRender(renderContext, rrc); + delegate.renderHeader(renderContext, rrc); } } - public void postRender(RenderContext renderContext, RegionRenderContext rrc) throws RenderException + public void renderFooter(RenderContext renderContext, RegionRenderContext rrc) throws RenderException { // if (isEnabled()) @@ -255,17 +269,17 @@ } // - delegate.postRender(renderContext, rrc); + delegate.renderFooter(renderContext, rrc); // enabledLocal.set(null); } /** - * @see RegionRenderer#render + * @see RegionRenderer#renderBody */ - public void render(RenderContext renderContext, final RegionRenderContext rrc) throws RenderException + public void renderBody(RenderContext renderContext, final RegionRenderContext rrc) throws RenderException { - delegate.render(renderContext, rrc); + delegate.renderBody(renderContext, rrc); } } Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyDecorationRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyDecorationRenderer.java 2007-03-30 16:46:59 UTC (rev 6885) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyDecorationRenderer.java 2007-03-30 17:20:07 UTC (rev 6886) @@ -37,16 +37,6 @@ public class EmptyDecorationRenderer implements DecorationRenderer { - - - public void preRender(RenderContext renderContext, DecorationRenderContext drc) - { - } - - public void postRender(RenderContext renderContext, DecorationRenderContext drc) - { - } - public void render(RenderContext renderContext, DecorationRenderContext drc) throws RenderException { } 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-03-30 16:46:59 UTC (rev 6885) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyRegionRenderer.java 2007-03-30 17:20:07 UTC (rev 6886) @@ -47,18 +47,18 @@ private static Logger log = Logger.getLogger(EmptyRegionRenderer.class); - public void preRender(RenderContext renderContext, RegionRenderContext rrc) throws RenderException + public void renderHeader(RenderContext renderContext, RegionRenderContext rrc) throws RenderException { } - public void postRender(RenderContext renderContext, RegionRenderContext rrc) throws RenderException + public void renderFooter(RenderContext renderContext, RegionRenderContext rrc) throws RenderException { } - /** @see RegionRenderer#render */ - public void render(RenderContext renderContext, RegionRenderContext rrc) throws RenderException + /** @see RegionRenderer#renderBody */ + public void renderBody(RenderContext renderContext, RegionRenderContext rrc) throws RenderException { Map orderedItems = new TreeMap(); Modified: trunk/theme/src/main/org/jboss/portal/theme/render/DecorationRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/DecorationRenderer.java 2007-03-30 16:46:59 UTC (rev 6885) +++ trunk/theme/src/main/org/jboss/portal/theme/render/DecorationRenderer.java 2007-03-30 17:20:07 UTC (rev 6886) @@ -35,8 +35,7 @@ * @see WindowRenderer * @see PortletRenderer */ -public interface DecorationRenderer - extends ObjectRenderer +public interface DecorationRenderer extends ObjectRenderer { /** * Create the markup for the portlet decoration @@ -47,8 +46,4 @@ */ void render(RenderContext renderContext, DecorationRenderContext drc) throws RenderException; - void preRender(RenderContext renderContext, DecorationRenderContext drc); - - void postRender(RenderContext renderContext, DecorationRenderContext drc); - } Modified: trunk/theme/src/main/org/jboss/portal/theme/render/RegionRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/RegionRenderer.java 2007-03-30 16:46:59 UTC (rev 6885) +++ trunk/theme/src/main/org/jboss/portal/theme/render/RegionRenderer.java 2007-03-30 17:20:07 UTC (rev 6886) @@ -37,9 +37,9 @@ public interface RegionRenderer extends ObjectRenderer { - void render(RenderContext renderContext, RegionRenderContext rrc) throws RenderException; + void renderBody(RenderContext renderContext, RegionRenderContext rrc) throws RenderException; - void preRender(RenderContext renderContext, RegionRenderContext rrc) throws RenderException; + void renderHeader(RenderContext renderContext, RegionRenderContext rrc) throws RenderException; - void postRender(RenderContext renderContext, RegionRenderContext rrc) throws RenderException; + void renderFooter(RenderContext renderContext, RegionRenderContext rrc) throws RenderException; } Modified: trunk/theme/src/main/org/jboss/portal/theme/render/RenderContext.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/RenderContext.java 2007-03-30 16:46:59 UTC (rev 6885) +++ trunk/theme/src/main/org/jboss/portal/theme/render/RenderContext.java 2007-03-30 17:20:07 UTC (rev 6886) @@ -410,9 +410,9 @@ RegionRenderer renderer = getRegionRenderer(); // - renderer.preRender(this, rrc); - renderer.render(this, rrc); - renderer.postRender(this, rrc); + renderer.renderHeader(this, rrc); + renderer.renderBody(this, rrc); + renderer.renderFooter(this, rrc); } else if (ctx instanceof PortletRenderContext) { @@ -426,9 +426,7 @@ DecorationRenderer renderer = getDecorationRenderer(drc); // - renderer.preRender(this, drc); renderer.render(this, drc); - renderer.postRender(this, drc); } } finally Modified: trunk/theme/src/main/org/jboss/portal/theme/render/WindowRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/WindowRenderer.java 2007-03-30 16:46:59 UTC (rev 6885) +++ trunk/theme/src/main/org/jboss/portal/theme/render/WindowRenderer.java 2007-03-30 17:20:07 UTC (rev 6886) @@ -50,7 +50,7 @@ * @param renderContext the state holder to provide information about the region, it's portlets, and the render set, * which allows access to the other renderer interfaces of the render set. * @throws RenderException - * @see RegionRenderer#render + * @see RegionRenderer#renderBody * @see PortletRenderer#render * @see DecorationRenderer#render * @see WindowContext

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6885 - trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-03-30 12:46:59 -0400 (Fri, 30 Mar 2007) New Revision: 6885 Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java Log: changed name draggable-region to dyna-region as it is from dyna renderer Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java 2007-03-30 16:43:32 UTC (rev 6884) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java 2007-03-30 16:46:59 UTC (rev 6885) @@ -84,9 +84,9 @@ private void doCatchClicks(RenderContext renderContext, PortletRenderContext prc) throws RenderException { -// StringBuffer out = renderContext.getMarkupFragment(); -// out.append("<div class=\"portlet-bilto\">"); + StringBuffer out = renderContext.getMarkupFragment(); + out.append("<div class=\"dyna-portlet\">"); delegate.render(renderContext, prc); -// out.append("</div>"); + out.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 2007-03-30 16:43:32 UTC (rev 6884) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java 2007-03-30 16:46:59 UTC (rev 6885) @@ -20,6 +20,28 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * ******************************************************************************/ +/****dr************************************************************************** + * 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.impl.render.dynamic; @@ -119,7 +141,7 @@ "function snapshot() {\n" + // Find draggable regions - " var regions_on_page = document.getElementsByClassName(\"draggable-region\");\n" + + " var regions_on_page = document.getElementsByClassName(\"dyna-region\");\n" + // Save current state in the DOM itself " for(var i = 0;i < regions_on_page.length;i++) {\n" + @@ -178,7 +200,7 @@ markup.append("<script>\n" + // Find the draggable regions - "var regions_on_page = document.getElementsByClassName(\"draggable-region\");\n" + + "var regions_on_page = document.getElementsByClassName(\"dyna-region\");\n" + // "for(var i = 0;i < regions_on_page.length;i++) {\n" + @@ -213,7 +235,7 @@ delegate.preRender(renderContext, rrc); // We need height and width otherwise the region will not be usable when empty - markup.append("<div class=\"draggable-region\" style=\"height:200px;width=200px\" id=\"").append(rrc.getId()).append("\">"); + markup.append("<div class=\"dyna-region\" style=\"height:200px;width=200px\" id=\"").append(rrc.getId()).append("\">"); } else {

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6884 - trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-03-30 12:43:32 -0400 (Fri, 30 Mar 2007) New Revision: 6884 Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java Log: removed commented code 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 2007-03-30 16:43:04 UTC (rev 6883) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java 2007-03-30 16:43:32 UTC (rev 6884) @@ -228,8 +228,7 @@ { StringBuffer markup = renderContext.getMarkupFragment(); - // Always content so it can be used as a droppable element -// markup.append("<p style=\"border:1px solid black;\"> </p>"); + // markup.append("</div>"); }

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6883 - trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-03-30 12:43:04 -0400 (Fri, 30 Mar 2007) New Revision: 6883 Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java Log: better handling of empty drop zones Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java 2007-03-30 16:07:35 UTC (rev 6882) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java 2007-03-30 16:43:04 UTC (rev 6883) @@ -66,10 +66,10 @@ DynaWindowRenderer.handleProvided.set(Boolean.TRUE); // - StringBuffer out = renderContext.getMarkupFragment(); - out.append("<span class=\"handle\">"); +// StringBuffer out = renderContext.getMarkupFragment(); +// out.append("<span class=\"handle\">"); delegate.render(renderContext, prc); - out.append("</span>"); +// out.append("</span>"); } else { 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 2007-03-30 16:07:35 UTC (rev 6882) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java 2007-03-30 16:43:04 UTC (rev 6883) @@ -183,13 +183,7 @@ // "for(var i = 0;i < regions_on_page.length;i++) {\n" + " var region = regions_on_page[i];" + - " Sortable.create(region, {dropOnEmpty:true,handle:'handle',tag:'div',containment:regions_on_page,constraint:false, ghosting: false,\n" + - " onChange: function(el)\n" + - " {\n" + - " },\n" + - " onUpdate: function (el)\n" + - " {\n" + - " }\n" + + " Sortable.create(region, {dropOnEmpty:true,handle:'handle',tag:'div',containment:regions_on_page,constraint:false" + " });\n" + "}\n"); @@ -218,8 +212,8 @@ // delegate.preRender(renderContext, rrc); - // - markup.append("<div class=\"draggable-region\" id=\"").append(rrc.getId()).append("\">"); + // We need height and width otherwise the region will not be usable when empty + markup.append("<div class=\"draggable-region\" style=\"height:200px;width=200px\" id=\"").append(rrc.getId()).append("\">"); } else { @@ -235,7 +229,7 @@ StringBuffer markup = renderContext.getMarkupFragment(); // Always content so it can be used as a droppable element - markup.append("<div> </div>"); +// markup.append("<p style=\"border:1px solid black;\"> </p>"); markup.append("</div>"); }

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6882 - trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-03-30 12:07:35 -0400 (Fri, 30 Mar 2007) New Revision: 6882 Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java Log: improved DnD implementation, less javascript Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java 2007-03-30 14:18:57 UTC (rev 6881) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java 2007-03-30 16:07:35 UTC (rev 6882) @@ -52,6 +52,11 @@ /** @see PortletRenderer#render */ public void render(RenderContext renderContext, PortletRenderContext prc) throws RenderException { + doDND(renderContext, prc); + } + + private void doDND(RenderContext renderContext, PortletRenderContext prc) throws RenderException + { if (DynaRegionRenderer.isEnabled()) { // Provide handle on content if needed @@ -61,18 +66,27 @@ DynaWindowRenderer.handleProvided.set(Boolean.TRUE); // - renderContext.getMarkupFragment().append("<span class=\"handle\">"); + StringBuffer out = renderContext.getMarkupFragment(); + out.append("<span class=\"handle\">"); delegate.render(renderContext, prc); - renderContext.getMarkupFragment().append("</span>"); + out.append("</span>"); } else { - delegate.render(renderContext, prc); + doCatchClicks(renderContext, prc); } } else { - delegate.render(renderContext, prc); + doCatchClicks(renderContext, prc); } } + + private void doCatchClicks(RenderContext renderContext, PortletRenderContext prc) throws RenderException + { +// StringBuffer out = renderContext.getMarkupFragment(); +// out.append("<div class=\"portlet-bilto\">"); + delegate.render(renderContext, prc); +// out.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 2007-03-30 14:18:57 UTC (rev 6881) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java 2007-03-30 16:07:35 UTC (rev 6882) @@ -39,10 +39,14 @@ public class DynaRegionRenderer implements RegionRenderer { - /** . */ + /** + * . + */ private static final ThreadLocal enabledLocal = new ThreadLocal(); - /** . */ + /** + * . + */ private RegionRenderer delegate; public static boolean isEnabled() @@ -83,77 +87,79 @@ markup.append("<script type='text/javascript'>\n"); markup.append("remote_server_url=\"").append(remoteURL).append(";\"\n"); - markup.append("regions_on_page = new Object();\n"); - - String sendData = - "function sendData(action, windowId, fromPos, fromRegionId, toPos, toRegionId)\n" + - "{\n" + - " var options = {\n" + - " method: 'post',\n" + - " postBody: 'action=' + action + '&windowId=' + windowId + '&fromPos=' + fromPos + '&fromRegion=' + fromRegionId + '&toPos=' + toPos + '&toRegion=' + toRegionId,\n" + - " onSuccess: function(t)\n" + - " {\n" + - " },\n" + - " onSuccess: function(t)\n" + - " {\n" + - " },\n" + - " on404: function(t)\n" + - " {\n" + - " alert('Error 404: location \"' + t.statusText + '\" was not found.');\n" + - " },\n" + - " onFailure: function(t)\n" + - " {\n" + - " alert('Error ' + t.status + ' -- ' + t.statusText);\n" + - " },\n" + - " onLoading: function(t)\n" + - " {\n" + - " }\n" + - " }\n" + - " new Ajax.Request(remote_server_url, options);\n" + - "}"; + String sendData = "" + + "function sendData(action, windowId, fromPos, fromRegionId, toPos, toRegionId) {\n" + + " var options = {\n" + + " method: 'post',\n" + + " postBody: 'action=' + action + '&windowId=' + windowId + '&fromPos=' + fromPos + '&fromRegion=' + fromRegionId + '&toPos=' + toPos + '&toRegion=' + toRegionId,\n" + + " onSuccess: function(t)\n" + + " {\n" + + " },\n" + + " onSuccess: function(t)\n" + + " {\n" + + " },\n" + + " on404: function(t)\n" + + " {\n" + + " alert('Error 404: location \"' + t.statusText + '\" was not found.');\n" + + " },\n" + + " onFailure: function(t)\n" + + " {\n" + + " alert('Error ' + t.status + ' -- ' + t.statusText);\n" + + " },\n" + + " onLoading: function(t)\n" + + " {\n" + + " }\n" + + " }\n" + + " new Ajax.Request(remote_server_url, options);\n" + + "}"; markup.append(sendData); // - String t = + String t = "" + "function snapshot() {\n" + - "for(region in regions_on_page) {\n" + - "var regionId = regions_on_page[region];\n" + - "var regionDiv = $(region);\n" + - "for (var i = 0;i < regionDiv.childNodes.length;i++) {\n" + - "var child = regionDiv.childNodes[i];\n" + - "child['regionId'] = regionId;\n" + - "child['pos'] = i;\n" + - "}\n" + - "}\n" + - "\n}"; + // Find draggable regions + " var regions_on_page = document.getElementsByClassName(\"draggable-region\");\n" + + + // Save current state in the DOM itself + " for(var i = 0;i < regions_on_page.length;i++) {\n" + + " var regionDiv = regions_on_page[i]\n" + + " for (var j = 0;j < regionDiv.childNodes.length;j++) {\n" + + " var child = regionDiv.childNodes[j];\n" + + " child['regionId'] = regionDiv.id;\n" + + " child['pos'] = j;\n" + + " }\n" + + " }\n" + + "}\n"; + markup.append(t); - String s = - " var WindowMoveObserver = Class.create();\n" + - " WindowMoveObserver.prototype =\n" + - " {\n" + - " initialize: function(element)\n" + - " {\n" + - " this.element = $(element);\n" + - " },\n" + - " onStart: function()\n" + - " {\n" + - " },\n" + - " onEnd: function()\n" + - " {\n" + - " var elt = Draggables.activeDraggable.element;\n" + - " var fromRegionId = elt['regionId'];\n" + - " var fromPos = elt['pos'];\n" + - " snapshot();\n" + - " var toRegionId = elt['regionId'];\n" + - " var toPos = elt['pos'];\n" + - " sendData('windowmove', elt.id, fromPos, fromRegionId, toPos, toRegionId);\n" + - " }\n" + - " };\n"; + String s = "" + + "var WindowMoveObserver = Class.create();\n" + + "WindowMoveObserver.prototype =\n" + + "{\n" + + " initialize: function(element)\n" + + " {\n" + + " this.element = $(element);\n" + + " },\n" + + " onStart: function()\n" + + " {\n" + + " },\n" + + " onEnd: function()\n" + + " {\n" + + " var elt = Draggables.activeDraggable.element;\n" + + " var fromRegionId = elt['regionId'];\n" + + " var fromPos = elt['pos'];\n" + + " snapshot();\n" + + " var toRegionId = elt['regionId'];\n" + + " var toPos = elt['pos'];\n" + + " sendData('windowmove', elt.id, fromPos, fromRegionId, toPos, toRegionId);\n" + + " }\n" + + "};\n"; markup.append(s); - String u = "function removeWindow(elementId)\n" + + String u = "" + + "function removeWindow(elementId)\n" + "{\n" + " var effectElement = document.getElementById(elementId)\n" + " new Effect.BlindUp(effectElement);\n" + @@ -169,24 +175,24 @@ } else if ("AJAXFooter".equals(rrc.getId())) { - markup.append("<script>\n"); - markup.append( - "\n" + - "var toto = new Array();\n" + - "for(region in regions_on_page) {\n" + - " toto.push(region);\n" + - "}\n" + - "for(region in regions_on_page) {\n" + - "Sortable.create(region, {dropOnEmpty:true,handle:'handle',tag:'div',containment:toto,constraint:false, ghosting: false,\n" + - " onChange: function(el)\n" + - " {\n" + - " },\n" + - " onUpdate: function (el)\n" + - " {\n" + - " }\n" + - "});\n" + - "}\n"); + markup.append("<script>\n" + + // Find the draggable regions + "var regions_on_page = document.getElementsByClassName(\"draggable-region\");\n" + + + // + "for(var i = 0;i < regions_on_page.length;i++) {\n" + + " var region = regions_on_page[i];" + + " Sortable.create(region, {dropOnEmpty:true,handle:'handle',tag:'div',containment:regions_on_page,constraint:false, ghosting: false,\n" + + " onChange: function(el)\n" + + " {\n" + + " },\n" + + " onUpdate: function (el)\n" + + " {\n" + + " }\n" + + " });\n" + + "}\n"); + // markup.append("Draggables.addObserver(new WindowMoveObserver());\n"); @@ -209,16 +215,11 @@ // if (regionEnabled) { - // Keep a map of logical regions to div containers - markup.append("<script>"). - append("regions_on_page[\"bilto-").append(rrc.getId()).append("\"]=\"").append(rrc.getId()).append("\";"). - append("</script>"); - // delegate.preRender(renderContext, rrc); // - markup.append("<div id=\"bilto-").append(rrc.getId()).append("\">"); + markup.append("<div class=\"draggable-region\" id=\"").append(rrc.getId()).append("\">"); } else { @@ -237,7 +238,7 @@ markup.append("<div> </div>"); markup.append("</div>"); } - + // delegate.postRender(renderContext, rrc); @@ -245,7 +246,9 @@ enabledLocal.set(null); } - /** @see RegionRenderer#render */ + /** + * @see RegionRenderer#render + */ public void render(RenderContext renderContext, final RegionRenderContext rrc) throws RenderException { delegate.render(renderContext, rrc);

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6881 - trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-03-30 10:18:57 -0400 (Fri, 30 Mar 2007) New Revision: 6881 Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaWindowRenderer.java Log: useless import 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-03-30 14:15:45 UTC (rev 6880) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaWindowRenderer.java 2007-03-30 14:18:57 UTC (rev 6881) @@ -23,7 +23,6 @@ package org.jboss.portal.theme.impl.render.dynamic; -import org.jboss.logging.Logger; import org.jboss.portal.theme.render.RenderContext; import org.jboss.portal.theme.render.RenderException; import org.jboss.portal.theme.render.WindowRenderer;

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6880 - in trunk/theme/src/main/org/jboss/portal/theme: impl/render/dynamic and 2 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-03-30 10:15:45 -0400 (Fri, 30 Mar 2007) New Revision: 6880 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/DivPortletRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivWindowRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaWindowRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyDecorationRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyPortletRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyRegionRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyWindowRenderer.java trunk/theme/src/main/org/jboss/portal/theme/render/DecorationRenderer.java trunk/theme/src/main/org/jboss/portal/theme/render/RenderContext.java Log: better handling of DnD, less dirty hacks, still needs improvements on the window handling part 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-03-30 13:08:12 UTC (rev 6879) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java 2007-03-30 14:15:45 UTC (rev 6880) @@ -22,7 +22,6 @@ ******************************************************************************/ package org.jboss.portal.theme.impl.render.div; -import org.jboss.logging.Logger; import org.jboss.portal.Mode; import org.jboss.portal.WindowState; import org.jboss.portal.theme.page.WindowResult; @@ -49,24 +48,28 @@ public class DivDecorationRenderer implements DecorationRenderer { - private static Logger log = Logger.getLogger(DivDecorationRenderer.class); - /** @see DecorationRenderer#render */ - public void render(RenderContext renderContext, DecorationRenderContext drc) throws RenderException + public void preRender(RenderContext renderContext, DecorationRenderContext drc) { - log.debug("decorate " + drc.getTitle()); - StringBuffer markup = renderContext.getMarkupFragment(); markup.append("<tr><td class=\"portlet-titlebar-left\"></td>"); markup.append("<td class=\"portlet-titlebar-center\">"); + } + + public void postRender(RenderContext renderContext, DecorationRenderContext drc) + { + StringBuffer markup = renderContext.getMarkupFragment(); + markup.append("</td><td class=\"portlet-titlebar-right\"></td></tr>"); + } + + public void render(RenderContext renderContext, DecorationRenderContext drc) throws RenderException + { + 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); - - markup.append("</div></td><td class=\"portlet-titlebar-right\"></td></tr>"); - - log.debug("decoration is done"); + markup.append("</div>"); } private static void renderTitle(RenderContext ctx, DecorationRenderContext drc) @@ -79,7 +82,6 @@ private static void renderModeAndStateLinks(RenderContext ctx, DecorationRenderContext drc, String selector) { - log.debug("render " + selector + "s"); Collection modesOrStates = drc.getTriggerableActions(selector); if (modesOrStates == null) { @@ -98,7 +100,6 @@ WindowResult.Action action = (WindowResult.Action)i.next(); if (action.isEnabled()) { - log.debug("action is enabled: " + action.getName()); ctx.getMarkupFragment().append("<div class=\"portlet-mode-").append(action.getName()); ctx.getMarkupFragment().append("\" onClick=\"location.href='").append(action.getURL()).append("';\" title=\""); ctx.getMarkupFragment().append(action.getName()).append("\"></div>"); Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivPortletRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivPortletRenderer.java 2007-03-30 13:08:12 UTC (rev 6879) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivPortletRenderer.java 2007-03-30 14:15:45 UTC (rev 6880) @@ -37,25 +37,12 @@ public class DivPortletRenderer implements PortletRenderer { - - /** @see PortletRenderer#render */ public void render(RenderContext renderContext, PortletRenderContext prc) throws RenderException { - renderStart(renderContext); - renderContext.getMarkupFragment().append(prc.getMarkup()); - renderEnd(renderContext); + StringBuffer out = renderContext.getMarkupFragment(); + out.append("<tr><td class=\"portlet-content-left\"></td>"); + out.append("<td class=\"portlet-body\"><div class=\"portlet-content-center\">"); + out.append(prc.getMarkup()); + out.append("</div></td><td class=\"portlet-content-right\"></td></tr>"); } - - /** @see org.jboss.portal.theme.render.ObjectRenderer#renderStart */ - public void renderStart(RenderContext ctx) - { - ctx.getMarkupFragment().append("<tr><td class=\"portlet-content-left\"></td>"); - ctx.getMarkupFragment().append("<td class=\"portlet-body\"><div class=\"portlet-content-center\">"); - } - - /** @see org.jboss.portal.theme.render.ObjectRenderer#renderEnd */ - public void renderEnd(RenderContext ctx) - { - ctx.getMarkupFragment().append("</div></td><td class=\"portlet-content-right\"></td></tr>"); - } } 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 2007-03-30 13:08:12 UTC (rev 6879) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivWindowRenderer.java 2007-03-30 14:15:45 UTC (rev 6880) @@ -22,14 +22,10 @@ ******************************************************************************/ package org.jboss.portal.theme.impl.render.div; -import org.jboss.logging.Logger; -import org.jboss.portal.WindowState; import org.jboss.portal.theme.render.RenderContext; import org.jboss.portal.theme.render.RenderException; import org.jboss.portal.theme.render.WindowRenderer; import org.jboss.portal.theme.render.WindowRenderContext; -import org.jboss.portal.theme.render.DecorationRenderContext; -import org.jboss.portal.theme.render.PortletRenderContext; /** * Implementation of a WindowRenderer, based on div tags. @@ -41,59 +37,16 @@ public class DivWindowRenderer implements WindowRenderer { - private static Logger log = Logger.getLogger(DivWindowRenderer.class); - - /** @see WindowRenderer#render */ public void render(RenderContext renderContext, WindowRenderContext wrc) throws RenderException { - renderStart(renderContext); - -// try -// { - DecorationRenderContext decorationRenderer = wrc.getDecoration(); - if (decorationRenderer != null) - { - renderContext.render(decorationRenderer); -// decorationRenderer.render(renderContext, portletContext, result); - } - - WindowState windowState = wrc.getWindowState(); - if (!WindowState.MINIMIZED.equals(windowState)) - { - PortletRenderContext portletRenderer = wrc.getPortlet(); - if (portletRenderer != null) - { - renderContext.render(portletRenderer); -// portletRenderer.render(renderContext, portletContext, result); - } - - renderContext.getMarkupFragment().append("<tr><td class=\"portlet-footer-left\"></td>"); - renderContext.getMarkupFragment().append("<td class=\"portlet-footer-center\"></td>"); - renderContext.getMarkupFragment().append("<td class=\"portlet-footer-right\"></td></tr>"); - } - -// } -// catch (ThemeException e) -// { -// // the portlet state is not known (the portlet registration is gone), handle it -// log.error("", e); -// // +++TODO: the error message should be configurable ...? -// renderContext.getMarkupFragment().append("<p class='portlet-error'><pre>").append(e).append("</pre></p>"); -// } - - renderEnd(renderContext); + StringBuffer out = renderContext.getMarkupFragment(); + out.append("<div class=\"portlet-container\">"); + out.append("<table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">"); + renderContext.render(wrc.getDecoration()); + renderContext.render(wrc.getPortlet()); + out.append("<tr><td class=\"portlet-footer-left\"></td>"); + out.append("<td class=\"portlet-footer-center\"></td>"); + out.append("<td class=\"portlet-footer-right\"></td></tr>"); + out.append("</table></div>"); } - - /** @see org.jboss.portal.theme.render.ObjectRenderer#renderStart(org.jboss.portal.theme.render.RenderContext) */ - public void renderStart(RenderContext ctx) - { - ctx.getMarkupFragment().append("<div class=\"portlet-container\">"); - ctx.getMarkupFragment().append("<table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">"); - } - - /** @see org.jboss.portal.theme.render.ObjectRenderer#renderEnd(org.jboss.portal.theme.render.RenderContext) */ - public void renderEnd(RenderContext ctx) - { - ctx.getMarkupFragment().append("</table></div>"); - } } Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java 2007-03-30 13:08:12 UTC (rev 6879) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java 2007-03-30 14:15:45 UTC (rev 6880) @@ -20,27 +20,14 @@ * 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.impl.render.dynamic; import org.jboss.logging.Logger; -import org.jboss.portal.Mode; -import org.jboss.portal.WindowState; -import org.jboss.portal.theme.impl.render.empty.EmptyDecorationRenderer; -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 java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - /** * Implementation of a drag and drop decoration renderer. * @@ -61,128 +48,32 @@ delegate = decorationRenderer; } - public void render(RenderContext renderContext, DecorationRenderContext drc) throws RenderException + public void preRender(RenderContext renderContext, DecorationRenderContext drc) { - if (DynaRegionRenderer.isEnabled()) - { - // we don't need a title bar on empty renderers, but we want titlebar handles on others. - if (!(delegate instanceof EmptyDecorationRenderer)) - { - StringBuffer markup = renderContext.getMarkupFragment(); - markup.append("<tr><td class=\"portlet-titlebar-left\"></td>"); - markup.append("<td class=\"portlet-titlebar-center handle\">"); - renderTitle(renderContext, drc); - markup.append("<div class=\"portlet-mode-container\">"); - renderModeAndStateLinks(renderContext, drc, WindowResult.MODES_KEY); - renderModeAndStateLinks(renderContext, drc, WindowResult.WINDOWSTATES_KEY); - - boolean removeFeatureEnabled = false; - if (removeFeatureEnabled) - { - renderRemoveLink(renderContext, drc); - } - - markup.append("</div></td><td class=\"portlet-titlebar-right\"></td></tr>"); - } - } - else - { - delegate.render(renderContext, drc); - } + delegate.preRender(renderContext, drc); } - private static void renderRemoveLink(RenderContext renderContext, DecorationRenderContext drc) + public void postRender(RenderContext renderContext, DecorationRenderContext drc) { - renderContext.getMarkupFragment().append("<div class=\"portlet-mode-").append("remove"); - renderContext.getMarkupFragment().append("\" onclick=\"removeWindow('").append(drc.getId()).append("');\" title=\""); - renderContext.getMarkupFragment().append("Remove").append("\"></div>"); + delegate.postRender(renderContext, drc); } - private static void renderTitle(RenderContext ctx, DecorationRenderContext drc) + public void render(RenderContext renderContext, DecorationRenderContext drc) throws RenderException { - ctx.getMarkupFragment().append("<div class=\"portlet-titlebar-decoration\">"); - ctx.getMarkupFragment().append("<span class=\"portlet-titlebar-title\">"); - ctx.getMarkupFragment().append(drc.getTitle()); - ctx.getMarkupFragment().append("</span></div>"); - } - - private static void renderModeAndStateLinks(RenderContext ctx, DecorationRenderContext drc, String selector) - { - log.debug("render " + selector + "s"); - Collection modesOrStates = drc.getTriggerableActions(selector); - if (modesOrStates == null) + if (DynaRegionRenderer.isEnabled()) { - return; - } + // + DynaWindowRenderer.handleProvided.set(Boolean.TRUE); - if (modesOrStates instanceof List) - { - List list = (List)modesOrStates; - Collections.sort(list, COMPARATOR); - modesOrStates = list; + // + StringBuffer markup = renderContext.getMarkupFragment(); + markup.append("<div class=\"handle\">"); + delegate.render(renderContext, drc); + markup.append("</div>"); } - - for (Iterator i = modesOrStates.iterator(); i.hasNext();) + else { - WindowResult.Action action = (WindowResult.Action)i.next(); - if (action.isEnabled()) - { - log.debug("action is enabled: " + action.getName()); - ctx.getMarkupFragment().append("<div class=\"portlet-mode-").append(action.getName()); - ctx.getMarkupFragment().append("\" onClick=\"location.href='").append(action.getURL()).append("';\" title=\""); - ctx.getMarkupFragment().append(action.getName()).append("\"></div>"); - } + delegate.render(renderContext, drc); } } - - private static final Comparator COMPARATOR = new ModeAndStateComparator(); - - private static class ModeAndStateComparator implements Comparator - { - private static final Map modeOrState2Index = new HashMap(); - - static - { - modeOrState2Index.put(Mode.EDIT, new Integer(98)); - modeOrState2Index.put(Mode.HELP, new Integer(99)); - modeOrState2Index.put(Mode.VIEW, new Integer(100)); - modeOrState2Index.put(WindowState.MINIMIZED, new Integer(198)); - modeOrState2Index.put(WindowState.NORMAL, new Integer(199)); - modeOrState2Index.put(WindowState.MAXIMIZED, new Integer(200)); - } - - private static int lastModeIndex = 1; - private static int lastStateIndex = 101; - - public int compare(Object o1, Object o2) - { - WindowResult.Action action1 = (WindowResult.Action)o1; - WindowResult.Action action2 = (WindowResult.Action)o2; - - Object origin1 = action1.getOrigin(); - Object origin2 = action2.getOrigin(); - - if (origin1.equals(origin2)) - { - return 0; - } - - int index1 = getIndexFor(origin1); - int index2 = getIndexFor(origin2); - - return index1 - index2; - } - - private int getIndexFor(Object origin) - { - Integer index = (Integer)modeOrState2Index.get(origin); - if (index == null) - { - index = (origin instanceof Mode) ? new Integer(lastModeIndex++) : new Integer(lastStateIndex++); - modeOrState2Index.put(origin, index); - } - return index.intValue(); - } - } - } \ No newline at end of file Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java 2007-03-30 13:08:12 UTC (rev 6879) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java 2007-03-30 14:15:45 UTC (rev 6880) @@ -54,8 +54,13 @@ { if (DynaRegionRenderer.isEnabled()) { - if (delegate instanceof EmptyPortletRenderer) + // Provide handle on content if needed + if (Boolean.FALSE.equals(DynaWindowRenderer.handleProvided.get())) { + // + DynaWindowRenderer.handleProvided.set(Boolean.TRUE); + + // renderContext.getMarkupFragment().append("<span class=\"handle\">"); delegate.render(renderContext, prc); renderContext.getMarkupFragment().append("</span>"); 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-03-30 13:08:12 UTC (rev 6879) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaWindowRenderer.java 2007-03-30 14:15:45 UTC (rev 6880) @@ -39,10 +39,12 @@ */ public class DynaWindowRenderer implements WindowRenderer { - private static Logger log = Logger.getLogger(DynaWindowRenderer.class); + // private WindowRenderer delegate; + static final ThreadLocal handleProvided = new ThreadLocal(); + public DynaWindowRenderer(WindowRenderer windowRenderer) throws InstantiationException, IllegalAccessException, ClassNotFoundException { @@ -55,23 +57,23 @@ { if (DynaRegionRenderer.isEnabled()) { - // ????? -// int portletNumber = ((DynaRegionRenderer)renderContext -// .getRegionRenderer()).getPortletNumber(renderContext -// .getRegionId()); -// -// ((DynaRegionRenderer)renderContext.getRegionRenderer()).setWindowId( -// "portlet-dnd-" + renderContext.getRegionId() + "-" -// + portletNumber, portletContext.getWindowName()); + // For now we say we have no provided any handle so far for the window + handleProvided.set(Boolean.FALSE); + // renderContext.getMarkupFragment().append("<div id=\"").append(wrc.getId()).append("\">\n"); - delegate.render(renderContext, wrc); + renderContext.getMarkupFragment().append("</div>"); - renderContext.getMarkupFragment().append("</div>"); + // + handleProvided.set(null); } else { + // + handleProvided.set(null); + + // delegate.render(renderContext, wrc); } } Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyDecorationRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyDecorationRenderer.java 2007-03-30 13:08:12 UTC (rev 6879) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyDecorationRenderer.java 2007-03-30 14:15:45 UTC (rev 6880) @@ -38,6 +38,15 @@ implements DecorationRenderer { + + public void preRender(RenderContext renderContext, DecorationRenderContext drc) + { + } + + public void postRender(RenderContext renderContext, DecorationRenderContext drc) + { + } + public void render(RenderContext renderContext, DecorationRenderContext drc) throws RenderException { } Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyPortletRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyPortletRenderer.java 2007-03-30 13:08:12 UTC (rev 6879) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyPortletRenderer.java 2007-03-30 14:15:45 UTC (rev 6880) @@ -22,7 +22,6 @@ ******************************************************************************/ package org.jboss.portal.theme.impl.render.empty; -import org.jboss.logging.Logger; import org.jboss.portal.theme.render.PortletRenderer; import org.jboss.portal.theme.render.RenderContext; import org.jboss.portal.theme.render.RenderException; @@ -38,12 +37,8 @@ public class EmptyPortletRenderer implements PortletRenderer { - private static Logger log = Logger.getLogger(EmptyPortletRenderer.class); - - /** @see PortletRenderer#render */ public void render(RenderContext renderContext, PortletRenderContext prc) throws RenderException { -// log.debug("content of portlet: " + result.getTitle()); renderContext.getMarkupFragment().append(prc.getMarkup()); } } 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-03-30 13:08:12 UTC (rev 6879) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyRegionRenderer.java 2007-03-30 14:15:45 UTC (rev 6880) @@ -60,10 +60,9 @@ /** @see RegionRenderer#render */ public void render(RenderContext renderContext, RegionRenderContext rrc) throws RenderException { - log.debug("render portlets in region : " + rrc.getId()); - Map orderedItems = new TreeMap(); + // for (Iterator i = rrc.getWindowRenderContexts().iterator(); i.hasNext();) { WindowRenderContext window = (WindowRenderContext)i.next(); @@ -71,6 +70,7 @@ log.debug("got window to render: " + window.getId()); } + // for (Iterator i = orderedItems.values().iterator(); i.hasNext();) { WindowRenderContext wrc = (WindowRenderContext)i.next(); 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 2007-03-30 13:08:12 UTC (rev 6879) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyWindowRenderer.java 2007-03-30 14:15:45 UTC (rev 6880) @@ -36,31 +36,10 @@ * @version $LastChangedRevision$, $LastChangedDate$ * @see org.jboss.portal.theme.render.WindowRenderer */ -public class EmptyWindowRenderer - implements WindowRenderer +public class EmptyWindowRenderer implements WindowRenderer { -// private static Logger log = Logger.getLogger(EmptyWindowRenderer.class); - - /** @see WindowRenderer#render */ public void render(RenderContext renderContext, WindowRenderContext wrc) throws RenderException { -// log.debug("render window for portlet : " + portletContext.); - -// try -// { - WindowState windowState = wrc.getWindowState(); -// renderContext.getDecorationRenderer(result).render(renderContext, portletContext, result); - if (!WindowState.MINIMIZED.equals(windowState)) - { - PortletRenderContext prc = wrc.getPortlet(); -// renderContext.getPortletRenderer(result).render(renderContext, portletContext, result); - renderContext.render(prc); - } -// } -// catch (ThemeException e) -// { -// // the portlet state is not known (the portlet registration is gone), handle it -// e.printStackTrace(); //+++TODO -// } + renderContext.render(wrc.getPortlet()); } } Modified: trunk/theme/src/main/org/jboss/portal/theme/render/DecorationRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/DecorationRenderer.java 2007-03-30 13:08:12 UTC (rev 6879) +++ trunk/theme/src/main/org/jboss/portal/theme/render/DecorationRenderer.java 2007-03-30 14:15:45 UTC (rev 6880) @@ -46,4 +46,9 @@ * @throws RenderException */ void render(RenderContext renderContext, DecorationRenderContext drc) throws RenderException; + + void preRender(RenderContext renderContext, DecorationRenderContext drc); + + void postRender(RenderContext renderContext, DecorationRenderContext drc); + } Modified: trunk/theme/src/main/org/jboss/portal/theme/render/RenderContext.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/RenderContext.java 2007-03-30 13:08:12 UTC (rev 6879) +++ trunk/theme/src/main/org/jboss/portal/theme/render/RenderContext.java 2007-03-30 14:15:45 UTC (rev 6880) @@ -424,7 +424,11 @@ { DecorationRenderContext drc = (DecorationRenderContext)ctx; DecorationRenderer renderer = getDecorationRenderer(drc); + + // + renderer.preRender(this, drc); renderer.render(this, drc); + renderer.postRender(this, drc); } } finally

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6879 - trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-03-30 09:08:12 -0400 (Fri, 30 Mar 2007) New Revision: 6879 Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java Log: some minor reformat 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 2007-03-30 13:04:19 UTC (rev 6878) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java 2007-03-30 13:08:12 UTC (rev 6879) @@ -190,7 +190,7 @@ // markup.append("Draggables.addObserver(new WindowMoveObserver());\n"); - // + // Make a snap of the state markup.append("snapshot();\n"); // @@ -211,11 +211,7 @@ { // Keep a map of logical regions to div containers markup.append("<script>"). - append("regions_on_page[\"bilto-"). - append(rrc.getId()). - append("\"]=\""). - append(rrc.getId()). - append("\";"). + append("regions_on_page[\"bilto-").append(rrc.getId()).append("\"]=\"").append(rrc.getId()).append("\";"). append("</script>"); //

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6878 - trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-03-30 09:04:19 -0400 (Fri, 30 Mar 2007) New Revision: 6878 Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java Log: make the DnD ajax do not depend on the renderer implemnetation, still need some fixes, but now basically fixed for empty region. 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 2007-03-30 12:36:17 UTC (rev 6877) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java 2007-03-30 13:04:19 UTC (rev 6878) @@ -60,17 +60,6 @@ public void preRender(RenderContext renderContext, RegionRenderContext rrc) throws RenderException { - delegate.preRender(renderContext, rrc); - } - - public void postRender(RenderContext renderContext, RegionRenderContext rrc) throws RenderException - { - delegate.postRender(renderContext, rrc); - } - - /** @see RegionRenderer#render */ - public void render(RenderContext renderContext, final RegionRenderContext rrc) throws RenderException - { StringBuffer markup = renderContext.getMarkupFragment(); String jsBase = renderContext.getProperty(ThemeConstants.PORTAL_AJAX_JAVASCRIPT_BASE); String remoteURL = renderContext.getProperty(ThemeConstants.PORTAL_AJAX_REMOTE_URL); @@ -84,37 +73,8 @@ if (pageEnabled) { // Handle special ajax region here - if ("AJAXFooter".equals(rrc.getId())) + if ("AJAXScripts".equals(rrc.getId())) { - markup.append("<script>\n"); - markup.append( - "\n" + - "var toto = new Array();\n" + - "for(region in regions_on_page) {\n" + - " toto.push(region);\n" + - "}\n" + - "for(region in regions_on_page) {\n" + - "Sortable.create(region, {dropOnEmpty:true,handle:'handle',tag:'div',containment:toto,constraint:false, ghosting: false,\n" + - " onChange: function(el)\n" + - " {\n" + - " },\n" + - " onUpdate: function (el)\n" + - " {\n" + - " }\n" + - "});\n" + - "}\n"); - - // - markup.append("Draggables.addObserver(new WindowMoveObserver());\n"); - - // - markup.append("snapshot();\n"); - - // - markup.append("</script>\n"); - } - else if ("AJAXScripts".equals(rrc.getId())) - { markup.append("\n\n\n"); markup.append("<script type='text/javascript' src='").append(jsBase).append("/js/portal/prototype.js'></script>\n"); markup.append("<script type='text/javascript' src='").append(jsBase).append("/js/portal/scriptaculous.js'></script>\n"); @@ -207,6 +167,35 @@ markup.append("</script>\n"); markup.append("\n\n\n"); } + else if ("AJAXFooter".equals(rrc.getId())) + { + markup.append("<script>\n"); + markup.append( + "\n" + + "var toto = new Array();\n" + + "for(region in regions_on_page) {\n" + + " toto.push(region);\n" + + "}\n" + + "for(region in regions_on_page) {\n" + + "Sortable.create(region, {dropOnEmpty:true,handle:'handle',tag:'div',containment:toto,constraint:false, ghosting: false,\n" + + " onChange: function(el)\n" + + " {\n" + + " },\n" + + " onUpdate: function (el)\n" + + " {\n" + + " }\n" + + "});\n" + + "}\n"); + + // + markup.append("Draggables.addObserver(new WindowMoveObserver());\n"); + + // + markup.append("snapshot();\n"); + + // + markup.append("</script>\n"); + } else { String onRegion = rrc.getProperty(ThemeConstants.PORTAL_AJAX_OBJECT_ENABLED); @@ -214,30 +203,55 @@ } } + // Set up thread local + enabledLocal.set(Boolean.valueOf(regionEnabled)); + // if (regionEnabled) { // Keep a map of logical regions to div containers markup.append("<script>"). - append("regions_on_page[\""). - append(rrc.getCSSId()). + append("regions_on_page[\"bilto-"). + append(rrc.getId()). append("\"]=\""). append(rrc.getId()). append("\";"). append("</script>"); + + // + delegate.preRender(renderContext, rrc); + + // + markup.append("<div id=\"bilto-").append(rrc.getId()).append("\">"); } + else + { + delegate.preRender(renderContext, rrc); + } + } + public void postRender(RenderContext renderContext, RegionRenderContext rrc) throws RenderException + { // - try + if (isEnabled()) { - enabledLocal.set(Boolean.valueOf(regionEnabled)); + StringBuffer markup = renderContext.getMarkupFragment(); - // - delegate.render(renderContext, rrc); + // Always content so it can be used as a droppable element + markup.append("<div> </div>"); + markup.append("</div>"); } - finally - { - enabledLocal.set(null); - } + + // + delegate.postRender(renderContext, rrc); + + // + enabledLocal.set(null); } + + /** @see RegionRenderer#render */ + public void render(RenderContext renderContext, final RegionRenderContext rrc) throws RenderException + { + delegate.render(renderContext, rrc); + } }

17 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r6877 - in trunk/theme/src/main/org/jboss/portal/theme: impl/render/dynamic and 2 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-03-30 08:36:17 -0400 (Fri, 30 Mar 2007) New Revision: 6877 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/DivRegionRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaWindowRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyDecorationRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyPortletRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyRegionRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyWindowRenderer.java trunk/theme/src/main/org/jboss/portal/theme/render/ObjectRenderer.java trunk/theme/src/main/org/jboss/portal/theme/render/RegionRenderer.java trunk/theme/src/main/org/jboss/portal/theme/render/RenderContext.java Log: removed startRender/stopRender in the ObjectRenderer interface, it was not called by the control flow anyway. - broken down region render callback into 3 callbacks preRender / render / postRender (will probably rename that later to more explicit responsibilities) 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-03-30 12:16:16 UTC (rev 6876) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java 2007-03-30 12:36:17 UTC (rev 6877) @@ -51,16 +51,6 @@ { private static Logger log = Logger.getLogger(DivDecorationRenderer.class); - /** @see org.jboss.portal.theme.render.ObjectRenderer#renderStart */ - public void renderStart(RenderContext ctx) - { - } - - /** @see org.jboss.portal.theme.render.ObjectRenderer#renderEnd */ - public void renderEnd(RenderContext ctx) - { - } - /** @see DecorationRenderer#render */ public void render(RenderContext renderContext, DecorationRenderContext drc) throws RenderException { 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-03-30 12:16:16 UTC (rev 6876) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivRegionRenderer.java 2007-03-30 12:36:17 UTC (rev 6877) @@ -22,7 +22,6 @@ ******************************************************************************/ package org.jboss.portal.theme.impl.render.div; -import org.jboss.logging.Logger; import org.jboss.portal.theme.render.RegionRenderer; import org.jboss.portal.theme.render.RenderContext; import org.jboss.portal.theme.render.RenderException; @@ -42,10 +41,8 @@ public class DivRegionRenderer implements RegionRenderer { - private static Logger log = Logger.getLogger(DivRegionRenderer.class); - /** @see RegionRenderer#render */ - public void render(RenderContext renderContext, RegionRenderContext rrc) throws RenderException + public void preRender(RenderContext renderContext, RegionRenderContext rrc) throws RenderException { StringBuffer markup = renderContext.getMarkupFragment(); markup.append("<div"); @@ -53,35 +50,25 @@ if (rrc == null) // || region.getWindows().size() <= 0) { markup.append(" class='empty-region' />"); - return; } - else + else if (rrc.getCSSId() != null) { - if (rrc.getCSSId() != null) - { - markup.append(" id='").append(rrc.getCSSId()).append("'>"); - } + markup.append(" id='").append(rrc.getCSSId()).append("'>"); } + } - - // + public void render(RenderContext renderContext, RegionRenderContext rrc) throws RenderException + { for (Iterator i = rrc.getWindowRenderContexts().iterator(); i.hasNext();) { WindowRenderContext wrc = (WindowRenderContext)i.next(); renderContext.render(wrc); } - - // - markup.append("</div>"); } - /** @see org.jboss.portal.theme.render.ObjectRenderer#renderStart(org.jboss.portal.theme.render.RenderContext) */ - public void renderStart(RenderContext ctx) + public void postRender(RenderContext renderContext, RegionRenderContext rrc) throws RenderException { + StringBuffer markup = renderContext.getMarkupFragment(); + markup.append("</div>"); } - - /** @see org.jboss.portal.theme.render.ObjectRenderer#renderEnd(org.jboss.portal.theme.render.RenderContext) */ - public void renderEnd(RenderContext ctx) - { - } } Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java 2007-03-30 12:16:16 UTC (rev 6876) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java 2007-03-30 12:36:17 UTC (rev 6877) @@ -61,18 +61,6 @@ delegate = decorationRenderer; } - /** @see org.jboss.portal.theme.render.ObjectRenderer#renderStart */ - public void renderStart(RenderContext ctx) - { - delegate.renderStart(ctx); - } - - /** @see org.jboss.portal.theme.render.ObjectRenderer#renderEnd */ - public void renderEnd(RenderContext ctx) - { - delegate.renderEnd(ctx); - } - public void render(RenderContext renderContext, DecorationRenderContext drc) throws RenderException { if (DynaRegionRenderer.isEnabled()) Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java 2007-03-30 12:16:16 UTC (rev 6876) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java 2007-03-30 12:36:17 UTC (rev 6877) @@ -70,16 +70,4 @@ delegate.render(renderContext, prc); } } - - /** @see org.jboss.portal.theme.render.ObjectRenderer#renderStart */ - public void renderStart(RenderContext ctx) - { - delegate.renderStart(ctx); - } - - /** @see org.jboss.portal.theme.render.ObjectRenderer#renderEnd */ - public void renderEnd(RenderContext ctx) - { - delegate.renderEnd(ctx); - } } 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 2007-03-30 12:16:16 UTC (rev 6876) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java 2007-03-30 12:36:17 UTC (rev 6877) @@ -57,6 +57,17 @@ delegate = regionRenderer; } + + public void preRender(RenderContext renderContext, RegionRenderContext rrc) throws RenderException + { + delegate.preRender(renderContext, rrc); + } + + public void postRender(RenderContext renderContext, RegionRenderContext rrc) throws RenderException + { + delegate.postRender(renderContext, rrc); + } + /** @see RegionRenderer#render */ public void render(RenderContext renderContext, final RegionRenderContext rrc) throws RenderException { @@ -229,16 +240,4 @@ enabledLocal.set(null); } } - - /** @see org.jboss.portal.theme.render.ObjectRenderer#renderStart(org.jboss.portal.theme.render.RenderContext) */ - public void renderStart(RenderContext ctx) - { - delegate.renderStart(ctx); - } - - /** @see org.jboss.portal.theme.render.ObjectRenderer#renderEnd(org.jboss.portal.theme.render.RenderContext) */ - public void renderEnd(RenderContext ctx) - { - delegate.renderEnd(ctx); - } } 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-03-30 12:16:16 UTC (rev 6876) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaWindowRenderer.java 2007-03-30 12:36:17 UTC (rev 6877) @@ -75,16 +75,4 @@ delegate.render(renderContext, wrc); } } - - /** @see org.jboss.portal.theme.render.ObjectRenderer#renderStart(org.jboss.portal.theme.render.RenderContext) */ - public void renderStart(RenderContext ctx) - { - delegate.renderStart(ctx); - } - - /** @see org.jboss.portal.theme.render.ObjectRenderer#renderEnd(org.jboss.portal.theme.render.RenderContext) */ - public void renderEnd(RenderContext ctx) - { - delegate.renderEnd(ctx); - } } Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyDecorationRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyDecorationRenderer.java 2007-03-30 12:16:16 UTC (rev 6876) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyDecorationRenderer.java 2007-03-30 12:36:17 UTC (rev 6877) @@ -41,14 +41,4 @@ public void render(RenderContext renderContext, DecorationRenderContext drc) throws RenderException { } - - /** @see org.jboss.portal.theme.render.ObjectRenderer#renderStart */ - public void renderStart(RenderContext ctx) - { - } - - /** @see org.jboss.portal.theme.render.ObjectRenderer#renderEnd */ - public void renderEnd(RenderContext ctx) - { - } } Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyPortletRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyPortletRenderer.java 2007-03-30 12:16:16 UTC (rev 6876) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyPortletRenderer.java 2007-03-30 12:36:17 UTC (rev 6877) @@ -46,14 +46,4 @@ // log.debug("content of portlet: " + result.getTitle()); renderContext.getMarkupFragment().append(prc.getMarkup()); } - - /** @see org.jboss.portal.theme.render.ObjectRenderer#renderStart */ - public void renderStart(RenderContext ctx) - { - } - - /** @see org.jboss.portal.theme.render.ObjectRenderer#renderEnd */ - public void renderEnd(RenderContext ctx) - { - } } 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-03-30 12:16:16 UTC (rev 6876) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyRegionRenderer.java 2007-03-30 12:36:17 UTC (rev 6877) @@ -46,6 +46,17 @@ { private static Logger log = Logger.getLogger(EmptyRegionRenderer.class); + + public void preRender(RenderContext renderContext, RegionRenderContext rrc) throws RenderException + { + + } + + public void postRender(RenderContext renderContext, RegionRenderContext rrc) throws RenderException + { + + } + /** @see RegionRenderer#render */ public void render(RenderContext renderContext, RegionRenderContext rrc) throws RenderException { @@ -64,20 +75,6 @@ { WindowRenderContext wrc = (WindowRenderContext)i.next(); renderContext.render(wrc); -// WindowContext portletContext = (WindowContext)portletContexts.get(window.getId()); -// WindowResult result = (WindowResult)windowResults.get(window.getId()); -// -// renderContext.getWindowRenderer(result).render(renderContext, portletContext, result); } } - - /** @see org.jboss.portal.theme.render.ObjectRenderer#renderStart */ - public void renderStart(RenderContext renderContext) - { - } - - /** @see org.jboss.portal.theme.render.ObjectRenderer#renderEnd */ - public void renderEnd(RenderContext renderContext) - { - } } 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 2007-03-30 12:16:16 UTC (rev 6876) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyWindowRenderer.java 2007-03-30 12:36:17 UTC (rev 6877) @@ -63,14 +63,4 @@ // e.printStackTrace(); //+++TODO // } } - - /** @see org.jboss.portal.theme.render.ObjectRenderer#renderStart */ - public void renderStart(RenderContext ctx) - { - } - - /** @see org.jboss.portal.theme.render.ObjectRenderer#renderEnd */ - public void renderEnd(RenderContext ctx) - { - } } Modified: trunk/theme/src/main/org/jboss/portal/theme/render/ObjectRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/ObjectRenderer.java 2007-03-30 12:16:16 UTC (rev 6876) +++ trunk/theme/src/main/org/jboss/portal/theme/render/ObjectRenderer.java 2007-03-30 12:36:17 UTC (rev 6877) @@ -31,18 +31,4 @@ */ public interface ObjectRenderer { - /** - * Start the render process for this renderer. <p>This is a convenient way yo open tags, like a table or a div</p> - * - * @param ctx the render context allowing access to state information of the current render process - */ - void renderStart(RenderContext ctx); - - /** - * End the render process for this renderer. <p>This is a convenient way yo close the tags that where opened by - * <code>renderStart</code></p> - * - * @param ctx the render context allowing access to state information of the current render process - */ - void renderEnd(RenderContext ctx); } Modified: trunk/theme/src/main/org/jboss/portal/theme/render/RegionRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/RegionRenderer.java 2007-03-30 12:16:16 UTC (rev 6876) +++ trunk/theme/src/main/org/jboss/portal/theme/render/RegionRenderer.java 2007-03-30 12:36:17 UTC (rev 6877) @@ -37,15 +37,9 @@ public interface RegionRenderer extends ObjectRenderer { - /** - * Render the markup of an entire page region with all the portlets that are assigned to that region. - * - * @param renderContext the state holder to provide information about the region, it's portlets, and the render set, - * which allows access to the other renderer interfaces of the render set. - * @param region the region to be rendered - * @param windowResults - * @throws RenderException - * @see WindowRenderer#render - */ void render(RenderContext renderContext, RegionRenderContext rrc) throws RenderException; + + void preRender(RenderContext renderContext, RegionRenderContext rrc) throws RenderException; + + void postRender(RenderContext renderContext, RegionRenderContext rrc) throws RenderException; } Modified: trunk/theme/src/main/org/jboss/portal/theme/render/RenderContext.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/RenderContext.java 2007-03-30 12:16:16 UTC (rev 6876) +++ trunk/theme/src/main/org/jboss/portal/theme/render/RenderContext.java 2007-03-30 12:36:17 UTC (rev 6877) @@ -408,7 +408,11 @@ { RegionRenderContext rrc = (RegionRenderContext)ctx; RegionRenderer renderer = getRegionRenderer(); + + // + renderer.preRender(this, rrc); renderer.render(this, rrc); + renderer.postRender(this, rrc); } else if (ctx instanceof PortletRenderContext) {

17 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

portal-commits March 2007