Author: chris.laprun(a)jboss.com
Date: 2008-04-21 18:26:06 -0400 (Mon, 21 Apr 2008)
New Revision: 10684
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceContainerContext.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceContainerImpl.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/instance/persistent/PersistentInstanceContainerContext.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/instance/InstanceContainer.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/ui/content/portlet/PortletContentEditorPortlet.java
Log:
- Generification
- Why is InstanceContainerContext referencing an abstract class instead of the
InstanceDefinition interface?
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceContainerContext.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceContainerContext.java 2008-04-21
22:23:21 UTC (rev 10683)
+++
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceContainerContext.java 2008-04-21
22:26:06 UTC (rev 10684)
@@ -23,6 +23,7 @@
package org.jboss.portal.core.impl.model.instance;
import org.jboss.portal.core.model.instance.DuplicateInstanceException;
+import org.jboss.portal.core.model.instance.InstanceDefinition;
import org.jboss.portal.core.model.instance.InstancePermission;
import org.jboss.portal.core.model.instance.metadata.InstanceMetaData;
import org.jboss.portal.portlet.PortletContext;
@@ -37,7 +38,7 @@
public interface InstanceContainerContext
{
- Collection getInstanceDefinitions();
+ Collection<InstanceDefinition> getInstanceDefinitions();
AbstractInstanceDefinition getInstanceDefinition(String id);
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceContainerImpl.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceContainerImpl.java 2008-04-21
22:23:21 UTC (rev 10683)
+++
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceContainerImpl.java 2008-04-21
22:26:06 UTC (rev 10684)
@@ -393,9 +393,9 @@
containerContext.destroyInstanceDefinition(definition);
}
- public Collection getDefinitions()
+ public Collection<InstanceDefinition> getDefinitions()
{
- Collection list = containerContext.getInstanceDefinitions();
+ Collection<InstanceDefinition> list =
containerContext.getInstanceDefinitions();
// Filter the list
if (performSecurityChecks)
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/instance/persistent/PersistentInstanceContainerContext.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/instance/persistent/PersistentInstanceContainerContext.java 2008-04-21
22:23:21 UTC (rev 10683)
+++
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/instance/persistent/PersistentInstanceContainerContext.java 2008-04-21
22:26:06 UTC (rev 10684)
@@ -35,6 +35,7 @@
import org.jboss.portal.core.impl.model.instance.InstanceContainerImpl;
import org.jboss.portal.core.impl.model.instance.JBossInstanceContainerContext;
import org.jboss.portal.core.model.instance.DuplicateInstanceException;
+import org.jboss.portal.core.model.instance.InstanceDefinition;
import org.jboss.portal.core.model.instance.InstancePermission;
import org.jboss.portal.core.model.instance.metadata.InstanceMetaData;
import org.jboss.portal.jems.hibernate.ObjectContextualizer;
@@ -142,7 +143,7 @@
sessionFactory = null;
}
- public Collection getInstanceDefinitions()
+ public Collection<InstanceDefinition> getInstanceDefinitions()
{
Session session = sessionFactory.getCurrentSession();
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/instance/InstanceContainer.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/instance/InstanceContainer.java 2008-04-21
22:23:21 UTC (rev 10683)
+++
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/instance/InstanceContainer.java 2008-04-21
22:26:06 UTC (rev 10684)
@@ -99,7 +99,7 @@
*
* @return a collection containing the instances in the container
*/
- Collection getDefinitions();
+ Collection<InstanceDefinition> getDefinitions();
/**
* Return the AuthorizationDomain
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/ui/content/portlet/PortletContentEditorPortlet.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/ui/content/portlet/PortletContentEditorPortlet.java 2008-04-21
22:23:21 UTC (rev 10683)
+++
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/ui/content/portlet/PortletContentEditorPortlet.java 2008-04-21
22:26:06 UTC (rev 10684)
@@ -37,7 +37,6 @@
import javax.portlet.PortletMode;
import javax.portlet.PortletRequestDispatcher;
import javax.portlet.PortletSecurityException;
-import javax.portlet.PortletURL;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
import java.io.IOException;
@@ -45,7 +44,6 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
-import java.util.Iterator;
import java.util.List;
/**
@@ -105,30 +103,24 @@
String selectedURI = req.getParameter("content.uri");
//
- PortletURL actionURL = resp.createActionURL();
-
- //
resp.setContentType("text/html");
PrintWriter writer = resp.getWriter();
// load instances this user has access to.
// Remove content editors
- List available_instances = new ArrayList();
+ List<Instance> available_instances = new ArrayList<Instance>();
nextInstance:
- for (Iterator i = instanceContainer.getDefinitions().iterator(); i.hasNext();)
+ for (Instance 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;
@@ -144,12 +136,10 @@
}
// Sort alphabetically
- Comparator simpleComparator = new Comparator()
+ Comparator<Instance> simpleComparator = 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());
}
};
@@ -157,9 +147,8 @@
//
Instance selectedInstance = null;
- for (int i = 0; i < available_instances.size(); i++)
+ for (Instance instance : available_instances)
{
- Instance instance = (Instance)available_instances.get(i);
if (instance.getId().equals(selectedURI))
{
selectedInstance = instance;
@@ -169,7 +158,7 @@
//
req.setAttribute("INSTANCES", available_instances);
req.setAttribute("SELECTED_INSTANCE", selectedInstance);
- req.setAttribute("NEW_CONTENT", Boolean.valueOf(newContent));
+ req.setAttribute("NEW_CONTENT", newContent);
//
PortletRequestDispatcher dispatcher =
getPortletContext().getRequestDispatcher("/WEB-INF/jsp/content/portlet_editor.jsp");
Show replies by date