svn commit: r656705 - /cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/EntityTreeModel.java

[mg...@apache.org]

Author: mgentry
Date: Thu May 15 08:40:31 2008
New Revision: 656705

URL: http://svn.apache.org/viewvc?rev=656705&view=rev
Log:
Added generics to eliminate warnings.

Modified:
    cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/EntityTreeModel.java

Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/EntityTreeModel.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/EntityTreeModel.java?rev=656705&r1=656704&r2=656705&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/EntityTreeModel.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/EntityTreeModel.java Thu May 15 08:40:31 2008
@@ -42,7 +42,7 @@
  */
 public class EntityTreeModel implements TreeModel {
     protected Entity root;
-    protected Map sortedChildren;
+    protected Map<String, Object[]> sortedChildren;
 
     // TODO: in the future replace with a more generic filter 
     // to allow arbitrary tree customization
@@ -50,7 +50,7 @@
 
     public EntityTreeModel(Entity root) {
         this.root = root;
-        sortedChildren = Collections.synchronizedMap(new HashMap());
+        sortedChildren = Collections.synchronizedMap(new HashMap<String, Object[]>());
     }
 
     public Object getRoot() {
@@ -115,8 +115,8 @@
             Object[] sortedForNode = (Object[]) sortedChildren.get(key);
 
             if (sortedForNode == null) {
-                Collection attributes = entity.getAttributes();
-                Collection relationships = entity.getRelationships();
+                Collection<? extends Attribute> attributes = entity.getAttributes();
+                Collection<? extends Relationship> relationships = entity.getRelationships();
 
                 // combine two collections in an array
                 int alen = (hideAttributes) ? 0 : attributes.size();
@@ -124,13 +124,13 @@
                 sortedForNode = new Object[alen + rlen];
 
                 if (!hideAttributes) {
-                    Iterator ait = attributes.iterator();
+                    Iterator<? extends Attribute> ait = attributes.iterator();
                     for (int i = 0; i < alen; i++) {
                         sortedForNode[i] = ait.next();
                     }
                 }
 
-                Iterator rit = relationships.iterator();
+                Iterator<? extends Relationship> rit = relationships.iterator();
                 for (int i = 0; i < rlen; i++) {
                     sortedForNode[alen + i] = rit.next();
                 }