Author: julien(a)jboss.com Date: 2007-04-19 08:36:17 -0400 (Thu, 19 Apr 2007) New Revision: 7013 Modified: trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaConstants.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRenderOptions.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaWindowRenderer.java Log: renamed async window option to partial refresh Modified: trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js =================================================================== --- trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js 2007-04-19 11:49:34 UTC (rev 7012) +++ trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js 2007-04-19 12:36:17 UTC (rev 7013) @@ -282,7 +282,7 @@ snapshot(); // Find the dyna portlets - var portlets_on_page = document.getElementsByClassName("async-window"); + var portlets_on_page = document.getElementsByClassName("partial-refresh-window"); // Add listener for the dyna windows on the dyna-window element // and not async-window as this one will have its markup replaced Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaConstants.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaConstants.java 2007-04-19 11:49:34 UTC (rev 7012) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaConstants.java 2007-04-19 12:36:17 UTC (rev 7013) @@ -44,9 +44,6 @@ /** The id for view state. */ public static final String VIEW_STATE = "theme.dyna.view_state"; - /** The id for view state. */ - public static final String BLOCKING_RENDER = "theme.dyna.blocking_render"; - /** . */ public static final String RENDER_OPTIONS = "dyna_render_options"; Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRenderOptions.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRenderOptions.java 2007-04-19 11:49:34 UTC (rev 7012) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRenderOptions.java 2007-04-19 12:36:17 UTC (rev 7013) @@ -33,12 +33,15 @@ public class DynaRenderOptions { - /** . */ + /** Drag and drop. */ public static final String DND_ENABLED = "theme.dyna.dnd_enabled"; - /** . */ + /** Partial refreshing. */ public static final String PARTIAL_REFRESH_ENABLED = "theme.dyna.partial_refresh_enabled"; + /** Whether or not gets are async. */ + public static final String ASYNC_ASYNC_GET = "theme.dyna.async_get_enabled"; + /** * Flyweight pattern. */ @@ -57,25 +60,25 @@ new DynaRenderOptions(Boolean.FALSE, Boolean.FALSE), }; - public static DynaRenderOptions getOptions(Boolean dnd, Boolean asyncWindow) + public static DynaRenderOptions getOptions(Boolean dnd, Boolean partialRefresh) { int index = dnd == null ? 0 : dnd.booleanValue() ? 1 : 2; - index += asyncWindow == null ? 0 : asyncWindow.booleanValue() ? 4 : 8; + index += partialRefresh == null ? 0 : partialRefresh.booleanValue() ? 4 : 8; return FLYWEIGHTS[index]; } - public static DynaRenderOptions getOptions(String dndValue, String asyncWindowValue) + public static DynaRenderOptions getOptions(String dndValue, String partialRefreshValue) { Boolean dnd = dndValue == null ? null : Boolean.valueOf(dndValue); - Boolean asyncValue = asyncWindowValue == null ? null : Boolean.valueOf(asyncWindowValue); - return getOptions(dnd, asyncValue); + Boolean partialRefresh = partialRefreshValue == null ? null : Boolean.valueOf(partialRefreshValue); + return getOptions(dnd, partialRefresh); } public static DynaRenderOptions getOptions(Map propertyMap) { String dndValue = (String)propertyMap.get(DND_ENABLED); - String asyncWindowValue = (String)propertyMap.get(PARTIAL_REFRESH_ENABLED); - return getOptions(dndValue, asyncWindowValue); + String partialRefreshValue = (String)propertyMap.get(PARTIAL_REFRESH_ENABLED); + return getOptions(dndValue, partialRefreshValue); } /** @@ -109,10 +112,13 @@ /** . */ private final Boolean partialRefresh; - private DynaRenderOptions(Boolean dnd, Boolean asyncWindow) + /** . */ +// private final Boolean asyncGet; + + private DynaRenderOptions(Boolean dnd, Boolean partialRefresh) { this.dnd = dnd; - this.partialRefresh = asyncWindow; + this.partialRefresh = partialRefresh; } public Boolean getDnD() @@ -130,7 +136,7 @@ return partialRefresh; } - public boolean isAsyncWindowEnabled() + public boolean isPartialRefreshEnabled() { return partialRefresh != null && partialRefresh.booleanValue(); } 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-19 11:49:34 UTC (rev 7012) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaWindowRenderer.java 2007-04-19 12:36:17 UTC (rev 7013) @@ -71,9 +71,9 @@ out.print(wrc.getId()); if (regionOptions.isDnDEnabled()) { - if (windowOptions.isAsyncWindowEnabled()) + if (windowOptions.isPartialRefreshEnabled()) { - out.print("\" class=\"dnd-window async-window\">\n"); + out.print("\" class=\"dnd-window partial-refresh-window\">\n"); } else { @@ -82,9 +82,9 @@ } else { - if (windowOptions.isAsyncWindowEnabled()) + if (windowOptions.isPartialRefreshEnabled()) { - out.print("\" class=\"async-window\">\n"); + out.print("\" class=\"portal-window\">\n"); } else {