[jboss-cvs] jboss-portal/core/src/main/org/jboss/portal/core/portlet/management ...

[Boleslaw Dawidowicz]

  User: bdaw    
  Date: 06/07/26 05:43:32

  Modified:    core/src/main/org/jboss/portal/core/portlet/management   
                        InstanceManagerBean.java
                        PortalObjectManagerBean.java
                        PortletManagerBean.java
  Log:
  management portlet - sort instances in drop down lists
  
  Revision  Changes    Path
  1.32      +3 -6      jboss-portal/core/src/main/org/jboss/portal/core/portlet/management/InstanceManagerBean.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: InstanceManagerBean.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/portlet/management/InstanceManagerBean.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -b -r1.31 -r1.32
  --- InstanceManagerBean.java	25 Jul 2006 20:54:01 -0000	1.31
  +++ InstanceManagerBean.java	26 Jul 2006 09:43:32 -0000	1.32
  @@ -60,7 +60,7 @@
   /**
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
    * @author <a href="mailto:boleslaw dot dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
  - * @version $Revision: 1.31 $
  + * @version $Revision: 1.32 $
    */
   public class InstanceManagerBean
   {
  @@ -264,8 +264,7 @@
         }
         catch (Exception e)
         {
  -         log.info("Error during sorting instances: ");
  -         e.printStackTrace();
  +         log.warn("Error during sorting instances list");
         }
   
         return instances;
  @@ -401,8 +400,6 @@
         {
            public int compare(Object o1, Object o2)
            {
  -
  -
               if (column == null)
               {
                  return 0;
  
  
  
  1.40      +50 -1     jboss-portal/core/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PortalObjectManagerBean.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -b -r1.39 -r1.40
  --- PortalObjectManagerBean.java	24 Jun 2006 04:22:30 -0000	1.39
  +++ PortalObjectManagerBean.java	26 Jul 2006 09:43:32 -0000	1.40
  @@ -56,6 +56,7 @@
   import org.jboss.portal.theme.ThemeService;
   import org.jboss.portal.theme.render.PortalRenderSet;
   import org.jboss.portal.theme.strategy.LayoutStrategy;
  +import org.jboss.logging.Logger;
   
   import javax.faces.application.FacesMessage;
   import javax.faces.component.UIComponent;
  @@ -76,6 +77,7 @@
   import java.util.Set;
   import java.util.SortedSet;
   import java.util.TreeSet;
  +import java.util.LinkedList;
   
   /**
    * The portal object manager bean.
  @@ -83,6 +85,8 @@
   public class PortalObjectManagerBean implements Serializable
   {
   
  +   private Logger log = Logger.getLogger(getClass());
  +
      /**
       * The serialVersionUID
       */
  @@ -410,16 +414,61 @@
      public SelectItem[] getInstanceItems()
      {
         Collection instances = instanceContainer.getInstances();
  -      ArrayList list = new ArrayList(instances.size());
  +
  +      //sort instances by id
  +      List sortedInstances = new LinkedList();
         for (Iterator i = instances.iterator(); i.hasNext();)
         {
            Instance instance = (Instance)i.next();
  +         sortedInstances.add(instance);
  +      }
  +      try
  +      {
  +         sortInstances(sortedInstances, "id", true);
  +      }
  +      catch (Exception e)
  +      {
  +         log.warn("Error while sorting instances list");
  +      }
  +
  +      ArrayList list = new ArrayList(instances.size());
  +      for (Iterator i = sortedInstances.iterator(); i.hasNext();)
  +      {
  +         Instance instance = (Instance)i.next();
            SelectItem item = new SelectItem(instance.getId());
            list.add(item);
         }
         return (SelectItem[])list.toArray(new SelectItem[list.size()]);
      }
   
  +
  +   public static void sortInstances(List instances, final String column, final boolean ascending)
  +   {
  +      Comparator comparator = new Comparator()
  +      {
  +         public int compare(Object o1, Object o2)
  +         {
  +            Instance i1 = (Instance)o1;
  +            Instance i2 = (Instance)o2;
  +
  +            if (column == null )
  +            {
  +               return 0;
  +            }
  +            if (column.equals("id"))
  +            {
  +               return ascending ? i1.getId().compareToIgnoreCase(i2.getId()) : i2.getId()
  +                  .compareToIgnoreCase(i1.getId());
  +            }
  +            else
  +            {
  +               return 0;
  +            }
  +         }
  +      };
  +      Collections.sort(instances, comparator);
  +   }
  +
      private static int getOrder(Window w)
      {
         try
  
  
  
  1.31      +2 -3      jboss-portal/core/src/main/org/jboss/portal/core/portlet/management/PortletManagerBean.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PortletManagerBean.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/portlet/management/PortletManagerBean.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -b -r1.30 -r1.31
  --- PortletManagerBean.java	25 Jul 2006 20:54:01 -0000	1.30
  +++ PortletManagerBean.java	26 Jul 2006 09:43:32 -0000	1.31
  @@ -60,7 +60,7 @@
   /**
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
    * @author <a href="mailto:boleslaw dot dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
  - * @version $Revision: 1.30 $
  + * @version $Revision: 1.31 $
    */
   public class PortletManagerBean
   {
  @@ -238,8 +238,7 @@
         }
         catch (Exception e)
         {
  -         log.info("Error during sorting portlets: ");
  -         e.printStackTrace();
  +         log.warn("Error during sorting portlets list");
         }
   
         return portlets;