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

[Gavin King]

  User: gavin   
  Date: 06/07/25 00:40:43

  Modified:    src/main/org/jboss/seam/util  Conversions.java
  Log:
  improvements to parameter handling and EL configuration
  
  Revision  Changes    Path
  1.4       +12 -12    jboss-seam/src/main/org/jboss/seam/util/Conversions.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Conversions.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/util/Conversions.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- Conversions.java	2 Jul 2006 19:33:05 -0000	1.3
  +++ Conversions.java	25 Jul 2006 04:40:43 -0000	1.4
  @@ -8,7 +8,6 @@
   import java.util.HashSet;
   import java.util.List;
   import java.util.Map;
  -import java.util.Properties;
   import java.util.Set;
   
   public class Conversions
  @@ -31,6 +30,7 @@
         put(String[].class, new StringArrayConverter());
         put(Set.class, new SetConverter());
         put(List.class, new ListConverter());
  +      put(Map.class, new MapConverter());
         //put(Date.class, new DateTimeConverter());
         //put(Short.class, new ShortConverter());
         //put(Byte.class, new ByteConverter());
  @@ -177,14 +177,14 @@
      {
         public Map toObject(PropertyValue values, Type type)
         {
  -         Properties keyedValues = values.getKeyedValues();
  +         Map<String, String> keyedValues = values.getKeyedValues();
            Class elementType = Reflections.getCollectionElementType(type);
            Map map = new HashMap( keyedValues.size() );
            Converter elementConverter = converters.get(elementType);
  -         for (Map.Entry me: keyedValues.entrySet())
  +         for (Map.Entry<String, String> me: keyedValues.entrySet())
            {
  -            String key = (String) me.getKey();
  -            Object element = elementConverter.toObject( new FlatPropertyValue( (String) me.getValue() ), elementType );
  +            String key = me.getKey();
  +            Object element = elementConverter.toObject( new FlatPropertyValue( me.getValue() ), elementType );
               map.put(key, element);
            }
            return map;
  @@ -193,7 +193,7 @@
      
      public static interface PropertyValue extends Serializable
      {
  -      Properties getKeyedValues();
  +      Map<String, String> getKeyedValues();
         String[] getMultiValues();
         String getSingleValue();
         boolean isExpression();
  @@ -224,7 +224,7 @@
            return string.startsWith("#{");
         }
   
  -      public Properties getKeyedValues()
  +      public Map<String, String> getKeyedValues()
         {
            throw new UnsupportedOperationException("not a keyed property value");
         }
  @@ -256,7 +256,7 @@
            throw new UnsupportedOperationException("not a flat property value");
         }
         
  -      public Properties getKeyedValues()
  +      public Map<String, String> getKeyedValues()
         {
            throw new UnsupportedOperationException("not a keyed property value");
         }
  @@ -276,9 +276,9 @@
      public static class AssociativePropertyValue implements PropertyValue
      {
         
  -      private Properties keyedValues;
  +      private Map<String, String> keyedValues;
   
  -      public AssociativePropertyValue(Properties keyedValues)
  +      public AssociativePropertyValue(Map<String, String> keyedValues)
         {
            this.keyedValues = keyedValues;
         }
  @@ -293,7 +293,7 @@
            throw new UnsupportedOperationException("not a flat property value");
         }
         
  -      public Properties getKeyedValues()
  +      public Map<String, String> getKeyedValues()
         {
            return keyedValues;
         }