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

[Gavin King]

  User: gavin   
  Date: 06/11/26 22:28:03

  Modified:    src/main/org/jboss/seam/core   Page.java Pages.java
  Log:
  oops
  
  Revision  Changes    Path
  1.6       +16 -8     jboss-seam/src/main/org/jboss/seam/core/Page.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Page.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Page.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- Page.java	27 Nov 2006 03:00:15 -0000	1.5
  +++ Page.java	27 Nov 2006 03:28:03 -0000	1.6
  @@ -120,10 +120,17 @@
      
      java.util.ResourceBundle getResourceBundle()
      {
  +      String resourceBundleName = getResourceBundleName();
  +      if (resourceBundleName==null)
  +      {
  +         return null;
  +      }
  +      else
  +      {
         try
         {
            return java.util.ResourceBundle.getBundle(
  -               getResourceBundleName(), 
  +                  resourceBundleName, 
                  Locale.instance(), 
                  Thread.currentThread().getContextClassLoader()
               );
  @@ -133,6 +140,7 @@
            return null;
         }
      }
  +   }
      
      @Override
      public String toString()
  
  
  
  1.56      +3 -3      jboss-seam/src/main/org/jboss/seam/core/Pages.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Pages.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Pages.java,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -b -r1.55 -r1.56
  --- Pages.java	27 Nov 2006 03:09:35 -0000	1.55
  +++ Pages.java	27 Nov 2006 03:28:03 -0000	1.56
  @@ -409,7 +409,7 @@
      {
         List<ResourceBundle> result = new ArrayList<ResourceBundle>(1);
         List<Page> stack = getPageStack(viewId);
  -      for (int i=stack.size()-1; i>=0; i++)
  +      for (int i=stack.size()-1; i>=0; i--)
         {
            Page page = stack.get(i);
            ResourceBundle bundle = page.getResourceBundle();
  @@ -569,7 +569,7 @@
      public String getNoConversationViewId(String viewId)
      {
         List<Page> stack = getPageStack(viewId);
  -      for (int i=stack.size()-1; i>=0; i++)
  +      for (int i=stack.size()-1; i>=0; i--)
         {
            Page page = stack.get(i);
            String noConversationViewId = page.getNoConversationViewId();
  @@ -589,7 +589,7 @@
      public Integer getTimeout(String viewId)
      {
         List<Page> stack = getPageStack(viewId);
  -      for (int i=stack.size()-1; i>=0; i++)
  +      for (int i=stack.size()-1; i>=0; i--)
         {
            Page page = stack.get(i);
            Integer timeout = page.getTimeout();