[gatein-commits] gatein SVN: r6632 - portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax.
Author: hoang_to
Date: 2011-06-10 03:01:14 -0400 (Fri, 10 Jun 2011)
New Revision: 6632
Modified:
portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/ContainerStAXParser.java
Log:
GTNPORTAL-1905: Support optional attribute in Container
Modified:
portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/ContainerStAXParser.java
===================================================================
---
portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/ContainerStAXParser.java 2011-06-10
06:45:04 UTC (rev 6631)
+++
portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/ContainerStAXParser.java 2011-06-10
07:01:14 UTC (rev 6632)
@@ -43,22 +43,29 @@
{
Container container = new Container();
- String templateName = elementNavigator.getAttribute("template");
+ String containerId, templateName, decorator, width, height;
+
+ containerId = elementNavigator.getAttribute("id");
+ templateName = elementNavigator.getAttribute("template");
+ decorator = elementNavigator.getAttribute("decorator");
+ width = elementNavigator.getAttribute("width");
+ height = elementNavigator.getAttribute("height");
+
+ container.setId(containerId);
+ container.setName(getContent(elementNavigator, StAXElement.name));
+ container.setTitle(getContent(elementNavigator, StAXElement.title));
+ container.setIcon(getContent(elementNavigator, StAXElement.icon));
if(templateName != null)
{
container.setTemplate(templateName);
}
-
- container.setId(elementNavigator.getAttribute("id"));
- container.setWidth(elementNavigator.getAttribute("width"));
- container.setHeight(elementNavigator.getAttribute("height"));
-
- container.setTitle(getContent(elementNavigator, StAXElement.title));
- container.setIcon(getContent(elementNavigator, StAXElement.icon));
container.setAccessPermissions(Utils.split(";",
getContent(elementNavigator, StAXElement.access_permissions)));
container.setFactoryId(getContent(elementNavigator, StAXElement.factory_id));
+ container.setDecorator(decorator);
+ container.setDescription(getContent(elementNavigator, StAXElement.description));
+ container.setWidth(width);
+ container.setHeight(height);
-
final Set<StAXElement> childElementSet = new HashSet<StAXElement>();
childElementSet.add(StAXElement.portlet_application);
childElementSet.add(StAXElement.gadget_application);
@@ -85,10 +92,12 @@
{
switch(staxElement)
{
+ case name:
case access_permissions:
case title:
case icon:
case factory_id:
+ case description:
return true;
default:
return false;