[jboss-cvs] JBossCache/src/org/jboss/cache/factories ...

[Manik Surtani]

  User: msurtani
  Date: 07/06/11 08:58:17

  Modified:    src/org/jboss/cache/factories  XmlConfigurationParser.java
  Log:
  Reduce Java5 related ide generated warnings
  
  Revision  Changes    Path
  1.23      +27 -30    JBossCache/src/org/jboss/cache/factories/XmlConfigurationParser.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: XmlConfigurationParser.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/factories/XmlConfigurationParser.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -b -r1.22 -r1.23
  --- XmlConfigurationParser.java	8 Jun 2007 09:46:53 -0000	1.22
  +++ XmlConfigurationParser.java	11 Jun 2007 12:58:17 -0000	1.23
  @@ -36,7 +36,6 @@
   import java.lang.reflect.Method;
   import java.util.ArrayList;
   import java.util.HashMap;
  -import java.util.Iterator;
   import java.util.List;
   import java.util.Locale;
   import java.util.Map;
  @@ -207,14 +206,13 @@
         return element;
      }
   
  -   protected static void setValues(Object target, Map attribs, boolean isXmlAttribs)
  +   protected static void setValues(Object target, Map<?, ?> attribs, boolean isXmlAttribs)
      {
         Class objectClass = target.getClass();
   
         // go thru simple string setters first.
  -      for (Iterator iter = attribs.entrySet().iterator(); iter.hasNext();)
  +      for (Entry entry : attribs.entrySet())
         {
  -         Map.Entry entry = (Map.Entry) iter.next();
            String propName = (String) entry.getKey();
            String setter = getSetterName(propName);
            Method method = null;
  @@ -282,31 +280,30 @@
   
      protected void setXmlValues(Configuration conf, Map<String, Element> attribs)
      {
  -      for (Iterator it = attribs.entrySet().iterator(); it.hasNext();)
  +      for (Entry<String, Element> entry : attribs.entrySet())
         {
  -         Map.Entry entry = (Entry) it.next();
  -         String propname = (String) entry.getKey();
  +         String propname = entry.getKey();
            if ("BuddyReplicationConfiguration".equals(propname)
                || "BuddyReplicationConfig".equals(propname))
            {
  -            BuddyReplicationConfig brc = parseBuddyReplicationConfig((Element) entry.getValue());
  +            BuddyReplicationConfig brc = parseBuddyReplicationConfig(entry.getValue());
               conf.setBuddyReplicationConfig(brc);
            }
            else if ("CacheLoaderConfiguration".equals(propname)
                     || "CacheLoaderConfig".equals(propname))
            {
  -            CacheLoaderConfig clc = parseCacheLoaderConfig((Element) entry.getValue());
  +            CacheLoaderConfig clc = parseCacheLoaderConfig(entry.getValue());
               conf.setCacheLoaderConfig(clc);
            }
            else if ("EvictionPolicyConfiguration".equals(propname)
                     || "EvictionPolicyConfig".equals(propname))
            {
  -            EvictionConfig ec = parseEvictionConfig((Element) entry.getValue());
  +            EvictionConfig ec = parseEvictionConfig(entry.getValue());
               conf.setEvictionConfig(ec);
            }
            else if ("ClusterConfig".equals(propname))
            {
  -            String jgc = parseClusterConfigXml((Element) entry.getValue());
  +            String jgc = parseClusterConfigXml(entry.getValue());
               conf.setClusterConfig(jgc);
            }
            else