Author: thomas.heute(a)jboss.com
Date: 2008-03-17 08:49:18 -0400 (Mon, 17 Mar 2008)
New Revision: 10290
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/PortalObject.java
Log:
Header list can be null.
More generification
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java 2008-03-17
12:18:09 UTC (rev 10289)
+++
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java 2008-03-17
12:49:18 UTC (rev 10290)
@@ -184,7 +184,7 @@
}
//
- Map windowProps = new HashMap(window.getProperties());
+ Map<String, String> windowProps = new HashMap<String,
String>(window.getProperties());
Mode mode = windowNS.getMode();
WindowState windowState = windowNS.getWindowState();
@@ -303,12 +303,15 @@
// header handling
MultiValuedPropertyMap<Element> headers =
properties.getMarkupHeaders();
List<Element> headElements =
headers.getValues(MimeResponse.MARKUP_HEAD_ELEMENT);
- StringBuffer buffer = new StringBuffer(124 * headElements.size());
- for (Element element : headElements)
+ if (headElements != null)
{
- buffer.append(element);
+ StringBuffer buffer = new StringBuffer(124 * headElements.size());
+ for (Element element : headElements)
+ {
+ buffer.append(element);
+ }
+ header = buffer.toString();
}
- header = buffer.toString();
// deal with partial refresh
MultiValuedPropertyMap<String> transport =
properties.getTransportHeaders();
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/PortalObject.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/PortalObject.java 2008-03-17
12:18:09 UTC (rev 10289)
+++
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/PortalObject.java 2008-03-17
12:49:18 UTC (rev 10290)
@@ -120,14 +120,14 @@
*
* @return the children
*/
- Collection getChildren();
+ Collection<PortalObject> getChildren();
/**
* Return all the children of this object filtered with a particular mask.
*
* @return the children
*/
- Collection getChildren(int mask);
+ Collection<PortalObject> getChildren(int mask);
/**
* Return the parent object.
@@ -177,7 +177,7 @@
*
* @return a map of the object properties
*/
- Map getProperties();
+ Map<String, String> getProperties();
/**
* Return a property declared on that object.
@@ -201,7 +201,7 @@
*
* @return a map of the properties declared by the object
*/
- Map getDeclaredProperties();
+ Map<String, String> getDeclaredProperties();
// /**
// * Return true if the portal object is part of a dashboard.
Show replies by date