[jboss-svn-commits] JBoss Common SVN: r2667 - jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling.

[jboss-svn-commits at lists.jboss.org]

Author: alex.loubyansky at jboss.com
Date: 2007-11-01 07:02:02 -0400 (Thu, 01 Nov 2007)
New Revision: 2667

Modified:
   jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/SchemaBinding.java
Log:
infer generic type args

Modified: jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/SchemaBinding.java
===================================================================
--- jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/SchemaBinding.java	2007-10-31 20:36:06 UTC (rev 2666)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/SchemaBinding.java	2007-11-01 11:02:02 UTC (rev 2667)
@@ -62,13 +62,13 @@
    /** The namespaces Set<String> */
    private Set namespaces = Collections.EMPTY_SET;
    /** namespace to prefix map, used in xb builder during binding */
-   private Map nsByPrefix = Collections.EMPTY_MAP;
+   private Map<String, String> nsByPrefix = Collections.emptyMap();
    /** Map<QName, TypeBinding> for simple/complex types */
-   private Map types = new HashMap();
+   private Map<QName, TypeBinding> types = new HashMap<QName, TypeBinding>();
    /** Map<QName, ParticleBinding> for */
-   private Map elements = new HashMap();
+   private Map<QName, ParticleBinding> elements = new HashMap<QName, ParticleBinding>();
    /** Map<QName, ModelGroupBinding> for */
-   private Map groups = new HashMap();
+   private Map<QName, ModelGroupBinding> groups = new HashMap<QName, ModelGroupBinding>();
    /** The default package information */
    private PackageMetaData packageMetaData;
    /** Schema resolver to use for foreign namespaces */
@@ -157,7 +157,7 @@
       {
          if(nsByPrefix.size() == 1)
          {
-            nsByPrefix = new HashMap(nsByPrefix);
+            nsByPrefix = new HashMap<String, String>(nsByPrefix);
          }
          nsByPrefix.put(prefix, ns);
       }
@@ -165,7 +165,7 @@
    
    public String getNamespace(String prefix)
    {
-      return (String) nsByPrefix.get(prefix);
+      return nsByPrefix.get(prefix);
    }
    
    /**
@@ -193,7 +193,7 @@
 
    public TypeBinding getType(QName qName)
    {
-      return (TypeBinding)types.get(qName);
+      return types.get(qName);
    }
 
    public void addType(TypeBinding type)
@@ -208,14 +208,14 @@
 
    public ElementBinding getElement(QName name)
    {
-      ParticleBinding particle = (ParticleBinding)elements.get(name);
+      ParticleBinding particle = elements.get(name);
       ElementBinding element = (ElementBinding)(particle == null ? null : particle.getTerm());
       return element;
    }
 
    public ParticleBinding getElementParticle(QName name)
    {
-      return (ParticleBinding)elements.get(name);
+      return elements.get(name);
    }
 
    public void addElement(ElementBinding element)
@@ -235,7 +235,7 @@
    {
       return new Iterator()
       {
-         private Iterator particleIterator = elements.values().iterator();
+         private Iterator<ParticleBinding> particleIterator = elements.values().iterator();
 
          public boolean hasNext()
          {
@@ -244,7 +244,7 @@
 
          public Object next()
          {
-            ParticleBinding particle = (ParticleBinding)particleIterator.next();
+            ParticleBinding particle = particleIterator.next();
             return particle.getTerm();
          }
 
@@ -255,19 +255,19 @@
       };
    }
 
-   public Iterator getElementParticles()
+   public Iterator<ParticleBinding> getElementParticles()
    {
       return elements.values().iterator();
    }
 
-   public Iterator getTypes()
+   public Iterator<TypeBinding> getTypes()
    {
       return Collections.unmodifiableCollection(types.values()).iterator();
    }
 
    public ModelGroupBinding getGroup(QName name)
    {
-      return (ModelGroupBinding) groups.get(name);
+      return groups.get(name);
    }
 
    public void addGroup(QName name, ModelGroupBinding group)
@@ -275,7 +275,7 @@
       groups.put(name, group);
    }
 
-   public Iterator getGroups()
+   public Iterator<ModelGroupBinding> getGroups()
    {
       return groups.values().iterator();
    }