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

[Gavin King]

  User: gavin   
  Date: 07/06/08 12:57:07

  Modified:    src/main/org/jboss/seam/core  Messages.java
  Log:
  JBSEAM-1366
  
  Revision  Changes    Path
  1.12      +17 -29    jboss-seam/src/main/org/jboss/seam/core/Messages.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Messages.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Messages.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -b -r1.11 -r1.12
  --- Messages.java	10 Feb 2007 00:45:59 -0000	1.11
  +++ Messages.java	8 Jun 2007 16:57:06 -0000	1.12
  @@ -28,7 +28,8 @@
   @Intercept(NEVER)
   @Name("org.jboss.seam.core.messages")
   @Install(precedence=BUILT_IN)
  -public class Messages implements Serializable {
  +public class Messages implements Serializable 
  +{
      private static final long serialVersionUID = 1292464253307553295L;
      
      private transient Map<String, String> messages;
  @@ -38,16 +39,13 @@
         messages = new AbstractMap<String, String>()
         {
            private java.util.ResourceBundle bundle = ResourceBundle.instance();
  -         //private Map<String, String> cache = new HashMap<String, String>();
   
            @Override
  -         public String get(Object key) {
  +         public String get(Object key) 
  +         {
               if (key instanceof String)
               {
                  String resourceKey = (String) key;
  -               /*String cachedValue = cache.get(key);
  -               if (cachedValue==null)
  -               {*/
                     String resource=null;
                     if (bundle!=null)
                     {
  @@ -60,20 +58,9 @@
                           //Just swallow
                        }
                     }
  -                  if (resource==null)
  -                  {
  -                     return resourceKey;
  -                  }
  -                  else
  -                  {
  -                     //cache.put(resourceKey, resource);
  -                     return Interpolator.instance().interpolate(resource);
  -                  }
  -               /*}
  -               else
  -               {
  -                  return Interpolator.instance().interpolate(cachedValue);
  -               }*/
  +               return resource==null ?
  +                     resourceKey :
  +                     Interpolator.instance().interpolate(resource);
               }
               else
               {
  @@ -82,7 +69,8 @@
            }
            
            @Override
  -         public Set<Map.Entry<String, String>> entrySet() {
  +         public Set<Map.Entry<String, String>> entrySet() 
  +         {
               Enumeration<String> keys = bundle.getKeys();
               Map<String, String> map = new HashMap<String, String>();
               while ( keys.hasMoreElements() )