[portal-commits] JBoss Portal SVN: r11152 - in branches/JBoss_Portal_Branch_2_7: core/src/main/org/jboss/portal/test/core/model/instance and 2 other directories.

Author: chris.laprun(a)jboss.com Date: 2008-06-25 17:52:26 -0400 (Wed, 25 Jun 2008) New Revision: 11152 Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/model/instance/PortletInvokerSupport.java branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/invocation/JBossPortletInterceptorStackFactory.java Log: - More generification and clean-ups. Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java 2008-06-25 21:51:06 UTC (rev 11151) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java 2008-06-25 21:52:26 UTC (rev 11152) @@ -22,24 +22,11 @@ ******************************************************************************/ package org.jboss.portal.core.deployment.jboss; -import java.io.File; -import java.io.InputStream; -import java.net.URL; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import javax.management.MBeanServer; -import javax.management.ObjectName; -import javax.xml.parsers.DocumentBuilder; - import org.jboss.deployment.DeploymentException; import org.jboss.mx.util.MBeanProxyExt; import org.jboss.portal.common.io.IOTools; import org.jboss.portal.common.net.URLNavigator; import org.jboss.portal.common.net.URLVisitor; -import org.jboss.portal.common.value.StringValue; -import org.jboss.portal.common.value.Value; import org.jboss.portal.common.xml.NullEntityResolver; import org.jboss.portal.common.xml.XMLTools; import org.jboss.portal.core.metadata.ServiceMetaData; @@ -66,6 +53,16 @@ import org.w3c.dom.Element; import org.xml.sax.EntityResolver; +import javax.management.MBeanServer; +import javax.management.ObjectName; +import javax.xml.parsers.DocumentBuilder; +import java.io.File; +import java.io.InputStream; +import java.net.URL; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision$ @@ -118,7 +115,7 @@ String serviceClass = serviceMD.getClassName(); String serviceRef = serviceMD.getRef(); log.debug("Trying to inject service '" + serviceName + "' (ref: '" + serviceRef + "' class: " + serviceClass + - ") in the servlet context of " + pwa.getURL()); + ") in the servlet context of " + pwa.getURL()); // if (serviceRef.startsWith(":")) @@ -345,14 +342,14 @@ catch (NoSuchPortletException e) { String msg = "Failed to create instance " + metaDataCtx.metaData.getId() + " of portlet " + e.getPortletId() + - " because portlet " + e.getPortletId() + " is not available"; + " because portlet " + e.getPortletId() + " is not available"; log.warn(msg); log.debug(msg, e); } catch (InvalidPortletIdException e) { String msg = "Failed to create instance " + metaDataCtx.metaData.getId() + " of portlet " + e.getPortletId() + - " because portlet id " + e.getPortletId() + " is invalid"; + " because portlet id " + e.getPortletId() + " is invalid"; log.warn(msg); log.debug(msg, e); } @@ -399,16 +396,15 @@ private void configureInstance(Instance instance, InstanceMetaData metaData) throws PortletInvokerException, SecurityConfigurationException { - List changes = new ArrayList(); + List<PropertyChange> changes = new ArrayList<PropertyChange>(); // Reset all preferences that are not overridden PortletPreferencesMetaData preferencesMetaData = metaData.getPreferences(); PropertyMap propertyMap = instance.getProperties(); if (propertyMap != null && propertyMap.size() > 0) { - for (Iterator i = propertyMap.keySet().iterator(); i.hasNext();) + for (String key : propertyMap.keySet()) { - String key = (String)i.next(); if (preferencesMetaData == null || preferencesMetaData.getPortletPreferences() == null || preferencesMetaData.getPortletPreferences().get(key) == null) { changes.add(PropertyChange.newReset(key)); @@ -419,17 +415,16 @@ // Configure preferences only if needed if (preferencesMetaData != null && preferencesMetaData.getPortletPreferences() != null && preferencesMetaData.getPortletPreferences().size() > 0) { - for (Iterator i = preferencesMetaData.getPortletPreferences().values().iterator(); i.hasNext();) + for (PortletPreferenceMetaData preference : preferencesMetaData.getPortletPreferences().values()) { - PortletPreferenceMetaData preference = (PortletPreferenceMetaData)i.next(); - Value value = new StringValue(preference.getValue()); - changes.add(PropertyChange.newUpdate(preference.getName(), value.asStringArray())); + List<String> preferenceValues = preference.getValue(); + changes.add(PropertyChange.newUpdate(preference.getName(), preferenceValues.toArray(new String[preferenceValues.size()]))); } } if (changes.size() > 0) { - instance.setProperties((PropertyChange[])changes.toArray(new PropertyChange[changes.size()])); + instance.setProperties(changes.toArray(new PropertyChange[changes.size()])); } // Configure security @@ -457,8 +452,8 @@ // Configure configureInstance(instance, metaData); } - - + + private String resolvePortletRef(String ref) { return "local." + getAppId() + "." + ref; Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/model/instance/PortletInvokerSupport.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/model/instance/PortletInvokerSupport.java 2008-06-25 21:51:06 UTC (rev 11151) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/model/instance/PortletInvokerSupport.java 2008-06-25 21:52:26 UTC (rev 11152) @@ -32,13 +32,13 @@ import org.jboss.portal.portlet.info.PortletInfo; import org.jboss.portal.portlet.invocation.PortletInvocation; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.state.DestroyCloneFailure; import org.jboss.portal.portlet.state.PropertyChange; import org.jboss.portal.portlet.state.PropertyMap; import org.jboss.portal.portlet.state.SimplePropertyMap; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -51,11 +51,11 @@ { /** . */ - private Map portlets; + private Map<String, Portlet> portlets; public PortletInvokerSupport() { - this.portlets = new HashMap(); + this.portlets = new HashMap<String, Portlet>(); } public void setValid(String portletId, boolean valid) @@ -109,9 +109,9 @@ return portlet; } - public Set getPortlets() + public Set<Portlet> getPortlets() { - return new HashSet(portlets.values()); + return new HashSet<Portlet>(portlets.values()); } public Portlet getPortlet(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException @@ -138,7 +138,7 @@ { throw new NoSuchPortletException(portletId); } - if (portlet.isValid() == false) + if (!portlet.isValid()) { throw new InvalidPortletIdException(portletId); } @@ -158,7 +158,7 @@ private boolean valid; /** . */ - private Map state; + private Map<String, List<String>> state; public InternalPortlet(String portletId, PortletSupport support) { @@ -173,7 +173,7 @@ this.portletContext = PortletContext.createPortletContext(portletId); this.support = support; this.valid = true; - this.state = new HashMap(); + this.state = new HashMap<String, List<String>>(); } public void addPreference(String key, List<String> value) @@ -213,10 +213,10 @@ { InternalPortlet internalPortlet = internalGetPortlet(portletContext); PropertyMap props = new SimplePropertyMap(); - for (Iterator i = keys.iterator(); i.hasNext();) + for (Object object : keys) { - String key = (String)i.next(); - List<String> value = (List<String>)internalPortlet.state.get(key); + String key = (String)object; + List<String> value = internalPortlet.state.get(key); if (value != null) { props.put(key, value); @@ -229,10 +229,9 @@ { InternalPortlet internalPortlet = internalGetPortlet(portletContext); PropertyMap props = new SimplePropertyMap(); - for (Iterator i = internalPortlet.state.keySet().iterator(); i.hasNext();) + for (String key : internalPortlet.state.keySet()) { - String key = (String)i.next(); - List<String> value = (List<String>)internalPortlet.state.get(key); + List<String> value = internalPortlet.state.get(key); if (value != null) { props.put(key, value); @@ -246,7 +245,7 @@ throw new UnsupportedOperationException(); } - public List destroyClones(List portletContexts) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException + public List<DestroyCloneFailure> destroyClones(List portletContexts) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException { throw new UnsupportedOperationException(); } Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2008-06-25 21:51:06 UTC (rev 11151) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2008-06-25 21:52:26 UTC (rev 11152) @@ -48,7 +48,6 @@ import java.util.Collections; import java.util.Comparator; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -101,7 +100,7 @@ private Instance selectedInstance; /** . */ - private List instances; + private List<InstanceDefinition> instances; /** . */ private AuthorizationBean auth = new InstanceAuthorizationBean(); @@ -181,7 +180,7 @@ int index = getInstances().indexOf(getSelectedInstance()); if (index != -1) { - selectedRow = new Integer(index); + selectedRow = index; selectedFrom = (index / paginationSize) * paginationSize; } } @@ -222,9 +221,9 @@ PreferencesInfo prefsInfo = selectedInstance.getPortlet().getInfo().getPreferences(); Set keys = prefsInfo.getKeys(); PropertyMap props = selectedInstance.getProperties(); - for (Iterator i = keys.iterator(); i.hasNext();) + for (Object o : keys) { - String key = (String)i.next(); + String key = (String)o; PreferenceInfo prefInfo = prefsInfo.getPreference(key); List<String> value = props.getProperty(key); selectedPrefs.addEntry(prefInfo, value); @@ -245,26 +244,23 @@ return auth; } - private List getInstances() + private List<InstanceDefinition> getInstances() { if (instances == null) { // Remove content editors - List tmpInstances = new ArrayList(); + List<InstanceDefinition> tmpInstances = new ArrayList<InstanceDefinition>(); nextInstance: - for (Iterator i = instanceContainer.getDefinitions().iterator(); i.hasNext();) + for (InstanceDefinition instance : instanceContainer.getDefinitions()) { - Instance instance = (Instance)i.next(); - // try { // Filter portlets that are editors Portlet portlet = instance.getPortlet(); PortletInfo info = portlet.getInfo(); - for (Iterator j = info.getCapabilities().getAllModes().iterator(); j.hasNext();) + for (ModeInfo modeInfo : info.getCapabilities().getAllModes()) { - ModeInfo modeInfo = (ModeInfo)j.next(); if (modeInfo.getMode().equals(INTERNAL_EDIT_CONTENT)) { continue nextInstance; @@ -284,9 +280,9 @@ return instances; } - public Collection getSelectedInstances() + public Collection<InstanceDefinition> getSelectedInstances() { - List list = getInstances(); + List<InstanceDefinition> list = getInstances(); // int to = Math.min(selectedFrom + paginationSize, list.size()); @@ -297,13 +293,12 @@ public Map getSelectedInstancesPrefs() { - Map map = new HashMap(); - Collection instances = getSelectedInstances(); - Iterator it = instances.iterator(); + Map<String, PropertyMap> map = new HashMap<String, PropertyMap>(); + Collection<InstanceDefinition> instances = getSelectedInstances(); - while (it.hasNext()) + for (Instance instance : instances) { - InstanceDefinition instanceDef = (InstanceDefinition)it.next(); + InstanceDefinition instanceDef = (InstanceDefinition)instance; try { map.put(instanceDef.getId(), instanceDef.getProperties()); @@ -394,18 +389,18 @@ { try { - List tmp = new ArrayList(); + List<PropertyChange> tmp = new ArrayList<PropertyChange>(); List entries = selectedPrefs.getEntries(); - for (int i = 0; i < entries.size(); i++) + for (Object entry1 : entries) { - PreferenceBean entry = (PreferenceBean)entries.get(i); + PreferenceBean entry = (PreferenceBean)entry1; if (entry.isStale()) { PropertyChange change = PropertyChange.newUpdate(entry.getName(), entry.getValue()); tmp.add(change); } } - PropertyChange[] changes = (PropertyChange[])tmp.toArray(new PropertyChange[tmp.size()]); + PropertyChange[] changes = tmp.toArray(new PropertyChange[tmp.size()]); getSelectedInstance().setProperties(changes); // Todo handle that change was ok in the UI @@ -430,12 +425,10 @@ } /** A comparator for portlets. */ - static final Comparator INSTANCE_COMPARATOR = new Comparator() + static final Comparator<Instance> INSTANCE_COMPARATOR = new Comparator<Instance>() { - public int compare(Object o1, Object o2) + public int compare(Instance i1, Instance i2) { - Instance i1 = (Instance)o1; - Instance i2 = (Instance)o2; return i1.getId().compareToIgnoreCase(i2.getId()); } }; Modified: branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/invocation/JBossPortletInterceptorStackFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/invocation/JBossPortletInterceptorStackFactory.java 2008-06-25 21:51:06 UTC (rev 11151) +++ branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/invocation/JBossPortletInterceptorStackFactory.java 2008-06-25 21:52:26 UTC (rev 11152) @@ -113,17 +113,17 @@ PortletInvokerInterceptor[] interceptors = new PortletInvokerInterceptor[names.size()]; if (names.size() == 1) { - ObjectName name = (ObjectName)names.get(0); + ObjectName name = names.get(0); log.debug("Adding interceptor " + name + " to the stack"); PortletInvokerInterceptor a = (PortletInvokerInterceptor)server.getAttribute(name, "ManagedResource"); interceptors[0] = a; } for (int i = 0; i < names.size()-1; i++) { - ObjectName name = (ObjectName)names.get(i); + ObjectName name = names.get(i); log.debug("Adding interceptor " + name + " to the stack"); PortletInvokerInterceptor a = (PortletInvokerInterceptor)server.getAttribute(name, "ManagedResource"); - name = (ObjectName)names.get(i+1); + name = names.get(i+1); log.debug("Adding interceptor " + name + " to the stack"); PortletInvokerInterceptor b = (PortletInvokerInterceptor)server.getAttribute(name, "ManagedResource"); a.setNext(b);