[jboss-cvs] jboss-seam/src/main/org/jboss/seam/theme ...

[Gavin King]

  User: gavin   
  Date: 07/06/28 20:41:37

  Modified:    src/main/org/jboss/seam/theme  ThemeSelector.java
  Log:
  JBSEAM-1571
  
  Revision  Changes    Path
  1.21      +16 -1     jboss-seam/src/main/org/jboss/seam/theme/ThemeSelector.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ThemeSelector.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/theme/ThemeSelector.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -b -r1.20 -r1.21
  --- ThemeSelector.java	20 Jun 2007 17:45:57 -0000	1.20
  +++ ThemeSelector.java	29 Jun 2007 00:41:37 -0000	1.21
  @@ -4,6 +4,8 @@
   
   import java.util.ArrayList;
   import java.util.Arrays;
  +import java.util.Collections;
  +import java.util.Enumeration;
   import java.util.List;
   import java.util.MissingResourceException;
   import java.util.ResourceBundle;
  @@ -29,6 +31,7 @@
   import org.jboss.seam.log.LogProvider;
   import org.jboss.seam.log.Logging;
   import org.jboss.seam.navigation.Pages;
  +import org.jboss.seam.util.IteratorEnumeration;
   
   /**
    * Selects the current user's theme
  @@ -156,8 +159,20 @@
         catch (MissingResourceException mre)
         {
            log.debug("resource bundle missing: " + theme);
  +         return new ResourceBundle()
  +         {
  +            @Override
  +            public Enumeration<String> getKeys()
  +            {
  +               return new IteratorEnumeration( Collections.EMPTY_LIST.iterator() );
  +            }
  +            @Override
  +            protected Object handleGetObject(String key)
  +            {
            return null;
         }
  +         };
  +      }
      }
   
      /**