[portal-commits] JBoss Portal SVN: r11788 - branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui.

[portal-commits at lists.jboss.org]

Author: chris.laprun at jboss.com
Date: 2008-09-02 17:24:58 -0400 (Tue, 02 Sep 2008)
New Revision: 11788

Modified:
   branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
Log:
- Improved getSelectedPortalObjectId to be more useful.
- Made selectObject(PortalObjectId) public.
- Generification.

Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java	2008-09-02 18:55:16 UTC (rev 11787)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java	2008-09-02 21:24:58 UTC (rev 11788)
@@ -67,7 +67,6 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -192,12 +191,12 @@
 
    public List getAvailableContentTypes()
    {
-      LinkedList types = new LinkedList();
+      LinkedList<SelectItem> types = new LinkedList<SelectItem>();
 
       //
-      for (Iterator i = ContentProviderRegistryService.getInstance().getContentTypes().iterator(); i.hasNext();)
+      for (Object o : ContentProviderRegistryService.getInstance().getContentTypes())
       {
-         ContentType contentType = (ContentType)i.next();
+         ContentType contentType = (ContentType)o;
          SelectItem item = new SelectItem();
          item.setValue(contentType);
          item.setLabel(contentType.toString());
@@ -434,7 +433,7 @@
       }
    }
 
-   private void selectObject(PortalObjectId id)
+   public void selectObject(PortalObjectId id)
    {
       if (id == null)
       {
@@ -510,7 +509,7 @@
          PortalObjectId poid = getSelectedPortalObjectId();
 
          Map<String, String> pmap = getRequestParameterMap();
-         maximizedStateExists = Boolean.valueOf((String)pmap.get("maximizedStateExists"));
+         maximizedStateExists = Boolean.valueOf(pmap.get("maximizedStateExists"));
 
          PortalObject object = portalObjectContainer.getObject(poid);
 
@@ -563,17 +562,24 @@
    {
       // Get id
       Map<String, String> pmap = getRequestParameterMap();
-      String id = (String)pmap.get("id");
+      String id = pmap.get("id");
 
-      // Set the state from the id
-      return PortalObjectId.parse(id, PortalObjectPath.LEGACY_BASE64_FORMAT);
+      // set the state from the id
+      PortalObjectId portalObjectId = null;
+      if(id != null)
+      {
+         portalObjectId = PortalObjectId.parse(id, PortalObjectPath.LEGACY_BASE64_FORMAT);
+      }
+      selectObject(portalObjectId);
+
+      return selectedId;
    }
 
    public void selectPlugin()
    {
       // Get plugin
       Map<String, String> pmap = getRequestParameterMap();
-      selectedPlugin = (String)pmap.get("plugin");
+      selectedPlugin = pmap.get("plugin");
    }
 
    public Map<String, String> getRequestParameterMap()
@@ -689,32 +695,29 @@
       theme = new ThemeBean(selectedObject);
 
       //
-      Collection portals = getSelectedObject().getChildren(PortalObject.PORTAL_MASK);
-      ArrayList portalList = new ArrayList(portals.size() + 1);
-      for (Iterator iterator = portals.iterator(); iterator.hasNext();)
+      Collection<PortalObject> portals = getSelectedObject().getChildren(PortalObject.PORTAL_MASK);
+      ArrayList<SelectItem> portalList = new ArrayList<SelectItem>(portals.size() + 1);
+      for (PortalObject portal : portals)
       {
-         PortalObject o = (PortalObject)iterator.next();
-         SelectItem item = new SelectItem(o.getName());
-         portalList.add(item);
+         portalList.add(new SelectItem(portal.getName()));
       }
       portalList.add(new SelectItem("", "no selection"));
-      portalItems = (SelectItem[])portalList.toArray(new SelectItem[portalList.size()]);
+      portalItems = portalList.toArray(new SelectItem[portalList.size()]);
 
       //
-      Collection pages = getSelectedObject().getChildren(PortalObject.PAGE_MASK);
-      ArrayList list = new ArrayList(pages.size() + 1);
-      for (Iterator iterator = pages.iterator(); iterator.hasNext();)
+      Collection<PortalObject> pages = getSelectedObject().getChildren(PortalObject.PAGE_MASK);
+      ArrayList<SelectItem> list = new ArrayList<SelectItem>(pages.size() + 1);
+      for (PortalObject page : pages)
       {
-         PortalObject o = (PortalObject)iterator.next();
-         SelectItem item = new SelectItem(o.getName());
+         SelectItem item = new SelectItem(page.getName());
          list.add(item);
       }
       list.add(new SelectItem("", "no selection"));
-      portalPageItems = (SelectItem[])list.toArray(new SelectItem[list.size()]);
+      portalPageItems = list.toArray(new SelectItem[list.size()]);
 
       //
       PortalObject o = getSelectedObject();
-      ArrayList path = new ArrayList();
+      ArrayList<PortalObject> path = new ArrayList<PortalObject>();
       while (o != null)
       {
          path.add(o);
@@ -723,7 +726,7 @@
       Collections.reverse(path);
       selectedObjectPath = path;
 
-      //
+      // rather dirty code...
       List tmp = new ArrayList(instanceContainer.getDefinitions());
       Collections.sort(tmp, InstanceManagerBean.INSTANCE_COMPARATOR);
       for (int i = 0; i < tmp.size(); i++)
@@ -925,9 +928,9 @@
          int i = 1;
          ResourceBundle rb = ResourceBundle.getBundle("Resource", FacesContext.getCurrentInstance().getExternalContext().getRequestLocale());
          result[0] = new SelectItem("", rb.getString("NO_BOUND_LISTENER"));
-         for (Iterator idsIt = ids.iterator(); idsIt.hasNext();)
+         for (Object id : ids)
          {
-            result[i++] = new SelectItem(idsIt.next());
+            result[i++] = new SelectItem(id);
          }
 
          return result;