Author: chris.laprun(a)jboss.com
Date: 2008-08-29 11:22:32 -0400 (Fri, 29 Aug 2008)
New Revision: 11767
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeployment.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/ContextMetaData.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalObjectMetaData.java
Log:
- Generification.
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeployment.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeployment.java 2008-08-28
23:16:33 UTC (rev 11766)
+++
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeployment.java 2008-08-29
15:22:32 UTC (rev 11767)
@@ -27,6 +27,7 @@
import org.jboss.portal.common.io.IOTools;
import org.jboss.portal.common.xml.NullEntityResolver;
import org.jboss.portal.common.xml.XMLTools;
+import org.jboss.portal.core.controller.coordination.CoordinationConfigurator;
import org.jboss.portal.core.model.content.ContentType;
import org.jboss.portal.core.model.content.spi.ContentProvider;
import org.jboss.portal.core.model.content.spi.handler.ContentHandler;
@@ -34,7 +35,6 @@
import org.jboss.portal.core.model.portal.PortalObjectContainer;
import org.jboss.portal.core.model.portal.PortalObjectId;
import org.jboss.portal.core.model.portal.PortalObjectPath;
-import org.jboss.portal.core.controller.coordination.CoordinationConfigurator;
import org.jboss.portal.core.model.portal.metadata.BuildContext;
import org.jboss.portal.core.model.portal.metadata.PortalObjectMetaData;
import org.jboss.portal.server.deployment.PortalWebApp;
@@ -78,7 +78,7 @@
protected ObjectDeploymentFactory factory;
/** What we have deployed. */
- protected ArrayList units;
+ protected ArrayList<Unit> units;
public ObjectDeployment(URL url,
MBeanServer mbeanServer,
@@ -129,13 +129,12 @@
Element deploymentsElt = doc.getDocumentElement();
// Build the list of deployment units
- List deploymentElts = XMLTools.getChildren(deploymentsElt,
"deployment");
- units = new ArrayList(deploymentElts.size());
- for (int i = 0; i < deploymentElts.size(); i++)
+ List<Element> deploymentElts = XMLTools.getChildren(deploymentsElt,
"deployment");
+ units = new ArrayList<Unit>(deploymentElts.size());
+ for (Element deploymentElt : deploymentElts)
{
- Element deploymentElt = (Element)deploymentElts.get(i);
Unit unit = new Unit();
-
+
//
Element parentRefElt = XMLTools.getUniqueChild(deploymentElt,
"parent-ref", false);
unit.parentRef = parentRefElt == null ? null :
PortalObjectId.parse(XMLTools.asString(parentRefElt), PortalObjectPath.LEGACY_FORMAT);
@@ -216,9 +215,8 @@
};
// Create all objects
- for (int i = 0; i < units.size(); i++)
+ for (Unit unit : units)
{
- Unit unit = (Unit)units.get(i);
if (isTrace)
{
log.trace(unit);
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/ContextMetaData.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/ContextMetaData.java 2008-08-28
23:16:33 UTC (rev 11766)
+++
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/ContextMetaData.java 2008-08-29
15:22:32 UTC (rev 11767)
@@ -28,8 +28,6 @@
import org.jboss.portal.core.model.portal.PortalObjectContainer;
import org.w3c.dom.Element;
-import java.util.List;
-
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision$
@@ -75,10 +73,8 @@
}
//
- List pageElts = XMLTools.getChildren(contextElt, "portal");
- for (int i = 0; i < pageElts.size(); i++)
+ for (Element portalElt : XMLTools.getChildren(contextElt, "portal"))
{
- Element portalElt = (Element)pageElts.get(i);
PortalMetaData pageMD =
(PortalMetaData)PortalObjectMetaData.buildMetaData(contentProviderRegistry, portalElt);
contextMD.getChildren().put(pageMD.getName(), pageMD);
}
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalObjectMetaData.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalObjectMetaData.java 2008-08-28
23:16:33 UTC (rev 11766)
+++
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalObjectMetaData.java 2008-08-29
15:22:32 UTC (rev 11767)
@@ -22,13 +22,6 @@
******************************************************************************/
package org.jboss.portal.core.model.portal.metadata;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
import org.jboss.logging.Logger;
import org.jboss.portal.common.i18n.LocaleFormat;
import org.jboss.portal.common.i18n.LocalizedString;
@@ -42,7 +35,6 @@
import org.jboss.portal.core.model.portal.PortalObjectContainer;
import org.jboss.portal.core.model.portal.PortalObjectPath;
import org.jboss.portal.core.model.portal.PortalObjectPermission;
-import org.jboss.portal.core.model.portal.Portal;
import org.jboss.portal.core.model.portal.metadata.coordination.CoordinationMetaData;
import org.jboss.portal.security.RoleSecurityBinding;
import org.jboss.portal.security.SecurityConstants;
@@ -51,6 +43,13 @@
import org.jboss.portal.security.spi.provider.SecurityConfigurationException;
import org.w3c.dom.Element;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot
com">Boleslaw Dawidowicz</a>
@@ -63,8 +62,8 @@
private String name;
private String listener;
- private Map properties;
- private Map children;
+ private Map<String,String> properties;
+ private Map<String,PortalObjectMetaData> children;
private SecurityConstraintsMetaData securityConstraints;
private LocalizedString displayName;
private String resourceBundle;
@@ -72,8 +71,8 @@
public PortalObjectMetaData()
{
- properties = new HashMap();
- children = new HashMap();
+ properties = new HashMap<String, String>();
+ children = new HashMap<String, PortalObjectMetaData>();
}
public String getName()
@@ -96,7 +95,7 @@
this.listener = listener;
}
- public Map getProperties()
+ public Map<String,String> getProperties()
{
return properties;
}
@@ -106,7 +105,7 @@
this.properties = properties;
}
- public Map getChildren()
+ public Map<String, PortalObjectMetaData> getChildren()
{
return children;
}
@@ -153,9 +152,8 @@
configure(buildContext, object);
// Build children recursively
- for (Iterator i = getChildren().values().iterator(); i.hasNext();)
+ for (PortalObjectMetaData portalObjectMD : getChildren().values())
{
- PortalObjectMetaData portalObjectMD = (PortalObjectMetaData)i.next();
portalObjectMD.create(buildContext, object);
}
@@ -191,12 +189,9 @@
private void configure(BuildContext buildContext, PortalObject object) throws
SecurityConfigurationException
{
// Configure properties
- for (Iterator i = properties.entrySet().iterator(); i.hasNext();)
+ for (Map.Entry<String,String> entry : properties.entrySet())
{
- Map.Entry entry = (Map.Entry)i.next();
- String name = (String)entry.getKey();
- String value = (String)entry.getValue();
- object.setDeclaredProperty(name, value);
+ object.setDeclaredProperty(entry.getKey(), entry.getValue());
}
// Configure listener
@@ -317,10 +312,8 @@
public static void buildPropertiesMetaData(PortalObjectMetaData portalObjectMD,
Element propertiesElt)
{
- List propertyElts = XMLTools.getChildren(propertiesElt, "property");
- for (int i = 0; i < propertyElts.size(); i++)
+ for (Element propertyElt : XMLTools.getChildren(propertiesElt,
"property"))
{
- Element propertyElt = (Element)propertyElts.get(i);
Element nameElt = XMLTools.getUniqueChild(propertyElt, "name", true);
Element valueElt = XMLTools.getUniqueChild(propertyElt, "value",
true);
String name = XMLTools.asString(nameElt);