[jboss-cvs] jboss-portal/portlet/src/main/org/jboss/portal/portlet/container/info ...

[Chris Laprun]

  User: claprun 
  Date: 06/08/11 19:19:50

  Modified:    portlet/src/main/org/jboss/portal/portlet/container/info 
                        ContainerCapabilities.java
  Log:
  - Fixed implementation of getWindowStates(String mimeType).
  - Improved implementation of getWindowStates().
  
  Revision  Changes    Path
  1.5       +17 -9     jboss-portal/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerCapabilities.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ContainerCapabilities.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerCapabilities.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- ContainerCapabilities.java	31 Jul 2006 19:29:52 -0000	1.4
  +++ ContainerCapabilities.java	11 Aug 2006 23:19:50 -0000	1.5
  @@ -25,6 +25,7 @@
   import org.jboss.portal.WindowState;
   import org.jboss.portal.portlet.info.CapabilitiesInfo;
   
  +import java.util.Collections;
   import java.util.HashSet;
   import java.util.Iterator;
   import java.util.Set;
  @@ -32,10 +33,19 @@
   /**
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
    * @author <a href="mailto:chris.laprun at jboss.com">Chris Laprun</a>
  - * @version $Revision: 1.4 $
  + * @version $Revision: 1.5 $
    */
   public class ContainerCapabilities implements CapabilitiesInfo
   {
  +   private static Set WINDOW_STATES = new HashSet(3);
  +
  +   static
  +   {
  +      WINDOW_STATES.add(new ContainerWindowStateInfo(WindowState.MAXIMIZED));
  +      WINDOW_STATES.add(new ContainerWindowStateInfo(WindowState.MINIMIZED));
  +      WINDOW_STATES.add(new ContainerWindowStateInfo(WindowState.NORMAL));
  +      WINDOW_STATES = Collections.unmodifiableSet(WINDOW_STATES);
  +   }
   
      private Set supportedLocales;
      private ContentTypes contentTypes;
  @@ -75,19 +85,17 @@
   
      public Set getAllWindowStates()
      {
  -      WindowState[] windowStates = {WindowState.MAXIMIZED, WindowState.MINIMIZED, WindowState.NORMAL};
  -      Set infos = new HashSet();
  -      for (int i = 0; i < windowStates.length; i++)
  -      {
  -         infos.add(new ContainerWindowStateInfo(windowStates[i]));
  -      }
  -      return infos;
  +      return WINDOW_STATES;
      }
   
      public Set getWindowStates(String mimeType)
      {
  +      if (contentTypes.isContentTypeSupported(mimeType))
  +      {
         return getAllWindowStates();
      }
  +      return Collections.EMPTY_SET;
  +   }
   
      public Set getAllLocales()
      {