cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r609373 - /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/QualifierTranslator.java
Date Sun, 06 Jan 2008 19:03:20 GMT
Author: aadamchik
Date: Sun Jan  6 11:03:19 2008
New Revision: 609373

URL: http://svn.apache.org/viewvc?rev=609373&view=rev
Log:
generics

Modified:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/QualifierTranslator.java

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/QualifierTranslator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/QualifierTranslator.java?rev=609373&r1=609372&r2=609373&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/QualifierTranslator.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/QualifierTranslator.java
Sun Jan  6 11:03:19 2008
@@ -146,7 +146,7 @@
             queryAssembler.dbRelationshipAdded(relationship);
         }
         
-        Iterator it = objectMatchTranslator.keys();
+        Iterator<String> it = objectMatchTranslator.keys();
         while (it.hasNext()) {
             if (first) {
                 first = false;
@@ -155,7 +155,7 @@
                 qualBuf.append(" AND ");
             }
 
-            String key = (String) it.next();
+            String key = it.next();
             DbAttribute attr = objectMatchTranslator.getAttribute(key);
             Object val = objectMatchTranslator.getValue(key);
            
@@ -358,10 +358,10 @@
     }
 
     private final void appendList(Expression listExpr, DbAttribute paramDesc) {
-        Iterator it = null;
+        Iterator<?> it = null;
         Object list = listExpr.getOperand(0);
         if (list instanceof List) {
-            it = ((List) list).iterator();
+            it = ((List<?>) list).iterator();
         }
         else if (list instanceof Object[]) {
             it = IteratorUtils.arrayIterator((Object[]) list);



Mime
View raw message