You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2007/12/26 12:55:07 UTC
svn commit: r606892 -
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLIdentifierColumnsTranslator.java
Author: aadamchik
Date: Wed Dec 26 03:55:07 2007
New Revision: 606892
URL: http://svn.apache.org/viewvc?rev=606892&view=rev
Log:
generics
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLIdentifierColumnsTranslator.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLIdentifierColumnsTranslator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLIdentifierColumnsTranslator.java?rev=606892&r1=606891&r2=606892&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLIdentifierColumnsTranslator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLIdentifierColumnsTranslator.java Wed Dec 26 03:55:07 2007
@@ -20,7 +20,6 @@
import java.util.HashSet;
import java.util.Iterator;
-import java.util.List;
import java.util.Set;
import org.apache.cayenne.CayenneRuntimeException;
@@ -47,7 +46,7 @@
class EJBQLIdentifierColumnsTranslator extends EJBQLBaseVisitor {
private EJBQLTranslationContext context;
- private Set columns;
+ private Set<String> columns;
EJBQLIdentifierColumnsTranslator(EJBQLTranslationContext context) {
this.context = context;
@@ -64,7 +63,7 @@
public boolean visitAttribute(AttributeProperty property) {
ObjAttribute oa = property.getAttribute();
- Iterator dbPathIterator = oa.getDbPathIterator();
+ Iterator<?> dbPathIterator = oa.getDbPathIterator();
while (dbPathIterator.hasNext()) {
Object pathPart = dbPathIterator.next();
@@ -100,12 +99,8 @@
ObjRelationship rel = property.getRelationship();
DbRelationship dbRel = rel.getDbRelationships().get(0);
- List joins = dbRel.getJoins();
- int len = joins.size();
- for (int i = 0; i < len; i++) {
- DbJoin join = (DbJoin) joins.get(i);
+ for (DbJoin join : dbRel.getJoins()) {
DbAttribute src = join.getSource();
-
appendColumn(idVar, src);
}
}
@@ -118,9 +113,7 @@
// append id columns ... (some may have been appended already via relationships)
DbEntity table = descriptor.getEntity().getDbEntity();
- Iterator it = table.getPrimaryKeys().iterator();
- while (it.hasNext()) {
- DbAttribute pk = (DbAttribute) it.next();
+ for (DbAttribute pk : table.getPrimaryKeys()) {
appendColumn(idVar, pk);
}
@@ -136,7 +129,7 @@
String alias = context.getTableAlias(identifier, table.getFullyQualifiedName());
String columnName = alias + "." + column.getName();
- Set columns = getColumns();
+ Set<String> columns = getColumns();
if (columns.add(columnName)) {
@@ -162,10 +155,10 @@
}
}
- private Set getColumns() {
+ private Set<String> getColumns() {
if (columns == null) {
- columns = new HashSet();
+ columns = new HashSet<String>();
}
return columns;