[portal-commits] JBoss Portal SVN: r7012 - in trunk: core-samples/src/resources/portal-samples-war/WEB-INF and 1 other directories.

Author: julien(a)jboss.com Date: 2007-04-19 07:49:34 -0400 (Thu, 19 Apr 2007) New Revision: 7012 Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesFilter.java trunk/core-samples/src/resources/portal-samples-war/WEB-INF/default-object.xml trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaConstants.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/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/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2007-04-19 09:59:07 UTC (rev 7011) +++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2007-04-19 11:49:34 UTC (rev 7012) @@ -539,7 +539,7 @@ { List items = new ArrayList(); // items.add(new SelectItem(DynaRenderOptions.DND_ENABLED, "DnD enabled")); - items.add(new SelectItem(DynaRenderOptions.ASYNC_WINDOW_ENABLED, "Asynchronous Windows Enabled")); + items.add(new SelectItem(DynaRenderOptions.PARTIAL_REFRESH_ENABLED, "Partail Refresh Enabled")); items.add(new SelectItem(ThemeConstants.PORTAL_PROP_ORDER, "Order")); items.add(new SelectItem(PortalObject.PORTAL_PROP_DEFAULT_OBJECT_NAME, "Default child name")); items.add(new SelectItem("other", "Other")); Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesFilter.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesFilter.java 2007-04-19 09:59:07 UTC (rev 7011) +++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesFilter.java 2007-04-19 11:49:34 UTC (rev 7012) @@ -41,9 +41,9 @@ { propertyBean.setDisplayName(new LocalizedString("Default child name", Locale.ENGLISH)); } - else if (propertyBean.getName().equals(DynaRenderOptions.ASYNC_WINDOW_ENABLED)) + else if (propertyBean.getName().equals(DynaRenderOptions.PARTIAL_REFRESH_ENABLED)) { - propertyBean.setDisplayName(new LocalizedString("Asynchronous Windows Enabled", Locale.ENGLISH)); + propertyBean.setDisplayName(new LocalizedString("Partial Refresh Enabled", Locale.ENGLISH)); propertyBean.setType("java.lang.Boolean"); } } Modified: trunk/core-samples/src/resources/portal-samples-war/WEB-INF/default-object.xml =================================================================== --- trunk/core-samples/src/resources/portal-samples-war/WEB-INF/default-object.xml 2007-04-19 09:59:07 UTC (rev 7011) +++ trunk/core-samples/src/resources/portal-samples-war/WEB-INF/default-object.xml 2007-04-19 11:49:34 UTC (rev 7012) @@ -314,7 +314,7 @@ <page-name>TestWithAjax</page-name> <properties> <property> - <name>theme.dyna.async_window_enabled</name> + <name>theme.dyna.partial_refresh_enabled</name> <value>true</value> </property> <property> 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 09:59:07 UTC (rev 7011) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaConstants.java 2007-04-19 11:49:34 UTC (rev 7012) @@ -44,6 +44,9 @@ /** 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/DynaRegionRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java 2007-04-19 09:59:07 UTC (rev 7011) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java 2007-04-19 11:49:34 UTC (rev 7012) @@ -86,7 +86,7 @@ else { String dndValue = rendererContext.getProperty(DynaRenderOptions.DND_ENABLED); - String asyncWindowValue = rendererContext.getProperty(DynaRenderOptions.ASYNC_WINDOW_ENABLED); + String asyncWindowValue = rendererContext.getProperty(DynaRenderOptions.PARTIAL_REFRESH_ENABLED); DynaRenderOptions options = DynaRenderOptions.getOptions(dndValue, asyncWindowValue); // 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 09:59:07 UTC (rev 7011) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRenderOptions.java 2007-04-19 11:49:34 UTC (rev 7012) @@ -37,7 +37,7 @@ public static final String DND_ENABLED = "theme.dyna.dnd_enabled"; /** . */ - public static final String ASYNC_WINDOW_ENABLED = "theme.dyna.async_window_enabled"; + public static final String PARTIAL_REFRESH_ENABLED = "theme.dyna.partial_refresh_enabled"; /** * Flyweight pattern. @@ -74,7 +74,7 @@ public static DynaRenderOptions getOptions(Map propertyMap) { String dndValue = (String)propertyMap.get(DND_ENABLED); - String asyncWindowValue = (String)propertyMap.get(ASYNC_WINDOW_ENABLED); + String asyncWindowValue = (String)propertyMap.get(PARTIAL_REFRESH_ENABLED); return getOptions(dndValue, asyncWindowValue); } @@ -93,13 +93,13 @@ { propertyMap.remove(DND_ENABLED); } - if (asyncWindow != null) + if (partialRefresh != null) { - propertyMap.put(ASYNC_WINDOW_ENABLED, asyncWindow.toString()); + propertyMap.put(PARTIAL_REFRESH_ENABLED, partialRefresh.toString()); } else { - propertyMap.remove(ASYNC_WINDOW_ENABLED); + propertyMap.remove(PARTIAL_REFRESH_ENABLED); } } @@ -107,12 +107,12 @@ private final Boolean dnd; /** . */ - private final Boolean asyncWindow; + private final Boolean partialRefresh; private DynaRenderOptions(Boolean dnd, Boolean asyncWindow) { this.dnd = dnd; - this.asyncWindow = asyncWindow; + this.partialRefresh = asyncWindow; } public Boolean getDnD() @@ -125,13 +125,13 @@ return dnd != null && dnd.booleanValue(); } - public Boolean getAsyncWindow() + public Boolean getPartialRefresh() { - return asyncWindow; + return partialRefresh; } public boolean isAsyncWindowEnabled() { - return asyncWindow != null && asyncWindow.booleanValue(); + 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 09:59:07 UTC (rev 7011) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaWindowRenderer.java 2007-04-19 11:49:34 UTC (rev 7012) @@ -61,8 +61,8 @@ // String dndValue = rendererContext.getProperty(DynaRenderOptions.DND_ENABLED); - String asyncWindowValue = rendererContext.getProperty(DynaRenderOptions.ASYNC_WINDOW_ENABLED); - DynaRenderOptions windowOptions = DynaRenderOptions.getOptions(dndValue, asyncWindowValue); + String partialRefreshValue = rendererContext.getProperty(DynaRenderOptions.PARTIAL_REFRESH_ENABLED); + DynaRenderOptions windowOptions = DynaRenderOptions.getOptions(dndValue, partialRefreshValue); // PrintWriter out = rendererContext.getWriter();