[jboss-svn-commits] JBoss Portal SVN: r5340 - in trunk/core/src: main/org/jboss/portal/core/aspects/controller main/org/jboss/portal/core/controller/command main/org/jboss/portal/core/impl/model/portal main/org/jboss/portal/core/model/portal main/org/jboss/portal/core/portlet/management resources/portal-core-sar/conf/hibernate/portal
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Oct 6 12:49:28 EDT 2006
Author: julien at jboss.com
Date: 2006-10-06 12:49:13 -0400 (Fri, 06 Oct 2006)
New Revision: 5340
Modified:
trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageNavigationInterceptor.java
trunk/core/src/main/org/jboss/portal/core/controller/command/MarkupCommand.java
trunk/core/src/main/org/jboss/portal/core/controller/command/RenderPageCommand.java
trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java
trunk/core/src/main/org/jboss/portal/core/model/portal/PortalContextImpl.java
trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObject.java
trunk/core/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java
trunk/core/src/resources/portal-core-sar/conf/hibernate/portal/domain.hbm.xml
Log:
more consistent naming of the declared property map on the PortalObject interface
Modified: trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageNavigationInterceptor.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageNavigationInterceptor.java 2006-10-06 09:30:56 UTC (rev 5339)
+++ trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageNavigationInterceptor.java 2006-10-06 16:49:13 UTC (rev 5340)
@@ -130,8 +130,8 @@
{
String defaultStrategyName = "default";
Portal portal = page.getPortal();
- Map portalProperties = portal.getDeclaredPropertyMap();
- Map pageProperties = page.getDeclaredPropertyMap();
+ Map portalProperties = portal.getDeclaredProperties();
+ Map pageProperties = page.getDeclaredProperties();
// not specified for this layout -> get it from portal
String strategyName = getStrategyNameFromProperties(pageProperties);
Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/MarkupCommand.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/command/MarkupCommand.java 2006-10-06 09:30:56 UTC (rev 5339)
+++ trunk/core/src/main/org/jboss/portal/core/controller/command/MarkupCommand.java 2006-10-06 16:49:13 UTC (rev 5340)
@@ -432,7 +432,7 @@
String headerChars = null;
Map actionMap = new HashMap();
Properties responseProps;
- Map windowProps = window.getDeclaredPropertyMap();
+ Map windowProps = window.getDeclaredProperties();
WindowNavigationalState windowNavState = (WindowNavigationalState)this.context.getAttribute(ControllerCommand.NAVIGATIONAL_STATE_SCOPE, window.getId() + "_window");
try
Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/RenderPageCommand.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/command/RenderPageCommand.java 2006-10-06 09:30:56 UTC (rev 5339)
+++ trunk/core/src/main/org/jboss/portal/core/controller/command/RenderPageCommand.java 2006-10-06 16:49:13 UTC (rev 5340)
@@ -59,7 +59,7 @@
public MarkupResult renderFragments(ServerConfig cfg, AttributeResolver navCtx) throws ControllerException
{
PageNavigationalState pageNavState = (PageNavigationalState)navCtx.getAttribute(getPage().getId());
- ModifiablePageResult pageResult = new ModifiablePageResult(getPage().getName(), getPage().getDeclaredPropertyMap(), getPage().getPortal().getDeclaredPropertyMap());
+ ModifiablePageResult pageResult = new ModifiablePageResult(getPage().getName(), getPage().getDeclaredProperties(), getPage().getPortal().getDeclaredProperties());
// all windows on the page
Collection windows = getPage().getChildren();
Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java 2006-10-06 09:30:56 UTC (rev 5339)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java 2006-10-06 16:49:13 UTC (rev 5340)
@@ -56,7 +56,7 @@
protected Long key;
/** . */
- protected Map declaredProperties;
+ protected Map declaredPropertyMap;
/** . */
protected String listener;
@@ -77,7 +77,7 @@
public PortalObjectImpl(boolean hibernate)
{
- this.declaredProperties = hibernate ? null : new HashMap();
+ this.declaredPropertyMap = hibernate ? null : new HashMap();
this.listener = null;
}
@@ -266,7 +266,7 @@
ObjectNode node = objectNode;
while (node != null)
{
- properties.putAll(node.getObject().declaredProperties);
+ properties.putAll(node.getObject().declaredPropertyMap);
node = node.getParent();
}
this.properties = Collections.unmodifiableMap(properties);
@@ -274,19 +274,19 @@
return properties;
}
- public Map getDeclaredProperties()
+ public Map getDeclaredPropertyMap()
{
- return declaredProperties;
+ return declaredPropertyMap;
}
- public void setDeclaredProperties(Map properties)
+ public void setDeclaredPropertyMap(Map properties)
{
- this.declaredProperties = properties;
+ this.declaredPropertyMap = properties;
}
- public Map getDeclaredPropertyMap()
+ public Map getDeclaredProperties()
{
- return Collections.unmodifiableMap(declaredProperties);
+ return Collections.unmodifiableMap(declaredPropertyMap);
}
public String getDeclaredProperty(String name)
@@ -295,7 +295,7 @@
{
throw new IllegalArgumentException();
}
- return (String)declaredProperties.get(name);
+ return (String)declaredPropertyMap.get(name);
}
public void setDeclaredProperty(String name, String value)
@@ -306,11 +306,11 @@
}
if (value == null)
{
- declaredProperties.remove(name);
+ declaredPropertyMap.remove(name);
}
else
{
- declaredProperties.put(name, value);
+ declaredPropertyMap.put(name, value);
}
}
Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/PortalContextImpl.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/model/portal/PortalContextImpl.java 2006-10-06 09:30:56 UTC (rev 5339)
+++ trunk/core/src/main/org/jboss/portal/core/model/portal/PortalContextImpl.java 2006-10-06 16:49:13 UTC (rev 5340)
@@ -58,6 +58,6 @@
public Map getProperties()
{
// This should be filtered somehow
- return portal.getDeclaredPropertyMap();
+ return portal.getDeclaredProperties();
}
}
Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObject.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObject.java 2006-10-06 09:30:56 UTC (rev 5339)
+++ trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObject.java 2006-10-06 16:49:13 UTC (rev 5340)
@@ -112,7 +112,7 @@
void destroyChild(String name) throws NoSuchPortalObjectException, IllegalArgumentException;
/**
- *
+ * Return a property of that object.
*/
String getProperty(String name);
@@ -122,17 +122,17 @@
Map getProperties();
/**
- *
+ * Return a map that contains the object declared properties.
*/
- Map getDeclaredPropertyMap();
+ Map getDeclaredProperties();
/**
- *
+ * Return a property declared on that object.
*/
String getDeclaredProperty(String name);
/**
- *
+ * Update a property declared on that object.
*/
void setDeclaredProperty(String name, String value);
Modified: trunk/core/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java 2006-10-06 09:30:56 UTC (rev 5339)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java 2006-10-06 16:49:13 UTC (rev 5340)
@@ -344,7 +344,7 @@
//return selectedProperties;
PortalObject object = getSelectedObject();
List properties = new ArrayList();
- for (Iterator i = object.getDeclaredPropertyMap().entrySet().iterator(); i.hasNext();)
+ for (Iterator i = object.getDeclaredProperties().entrySet().iterator(); i.hasNext();)
{
Map.Entry entry = (Map.Entry)i.next();
properties.add(new String[]{(String)entry.getKey(), (String)entry.getValue()});
@@ -392,7 +392,7 @@
if (object != null)
{
List properties = new ArrayList();
- for (Iterator i = object.getDeclaredPropertyMap().entrySet().iterator(); i.hasNext();)
+ for (Iterator i = object.getDeclaredProperties().entrySet().iterator(); i.hasNext();)
{
Map.Entry entry = (Map.Entry)i.next();
properties.add(new String[]{(String)entry.getKey(), (String)entry.getValue()});
Modified: trunk/core/src/resources/portal-core-sar/conf/hibernate/portal/domain.hbm.xml
===================================================================
--- trunk/core/src/resources/portal-core-sar/conf/hibernate/portal/domain.hbm.xml 2006-10-06 09:30:56 UTC (rev 5339)
+++ trunk/core/src/resources/portal-core-sar/conf/hibernate/portal/domain.hbm.xml 2006-10-06 16:49:13 UTC (rev 5340)
@@ -78,7 +78,7 @@
name="listener"
column="LISTENER"/>
<map
- name="declaredProperties"
+ name="declaredPropertyMap"
cascade="all-delete-orphan"
table="JBP_PORTAL_OBJECT_PROPS"
fetch="join">
More information about the jboss-svn-commits
mailing list