svn commit: r606885 - /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLTranslationContext.java

[aa...@apache.org]

Author: aadamchik
Date: Wed Dec 26 03:31:24 2007
New Revision: 606885

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

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

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLTranslationContext.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLTranslationContext.java?rev=606885&r1=606884&r2=606885&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLTranslationContext.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLTranslationContext.java Wed Dec 26 03:31:24 2007
@@ -36,15 +36,15 @@
  */
 public class EJBQLTranslationContext {
 
-    private Map tableAliases;
+    private Map<String, String> tableAliases;
     private Map boundParameters;
     private StringBuilder mainBuffer;
     private StringBuilder currentBuffer;
     private EJBQLCompiledExpression compiledExpression;
-    private Map attributes;
-    private Map reusableJoins;
+    private Map<String, Object> attributes;
+    private Map<String, String> reusableJoins;
     private Map parameters;
-    private Map idAliases;
+    private Map<String, String> idAliases;
     private int columnAliasPosition;
     private EJBQLTranslatorFactory translatorFactory;
     private boolean usingAliases;
@@ -77,7 +77,7 @@
             return id;
         }
 
-        String resolvedAlias = (String) idAliases.get(id);
+        String resolvedAlias = idAliases.get(id);
         if (resolvedAlias != null) {
             return resolvedAlias;
         }
@@ -107,7 +107,7 @@
     String createIdAlias(String id) {
 
         if (idAliases == null) {
-            idAliases = new HashMap();
+            idAliases = new HashMap<String, String>();
         }
 
         for (int i = 0; i < 1000; i++) {
@@ -203,7 +203,7 @@
      */
     void setAttribute(String var, Object value) {
         if (attributes == null) {
-            attributes = new HashMap();
+            attributes = new HashMap<String, Object>();
         }
 
         attributes.put(var, value);
@@ -287,12 +287,12 @@
      */
     String registerReusableJoin(String sourceIdPath, String relationship, String targetId) {
         if (reusableJoins == null) {
-            reusableJoins = new HashMap();
+            reusableJoins = new HashMap<String, String>();
         }
 
         String key = sourceIdPath + ":" + relationship;
 
-        String oldId = (String) reusableJoins.put(key, targetId);
+        String oldId = reusableJoins.put(key, targetId);
         if (oldId != null) {
             // revert back to old id
             reusableJoins.put(key, oldId);
@@ -331,10 +331,10 @@
         String alias;
 
         if (tableAliases != null) {
-            alias = (String) tableAliases.get(key);
+            alias = tableAliases.get(key);
         }
         else {
-            tableAliases = new HashMap();
+            tableAliases = new HashMap<String, String>();
             alias = null;
         }
 
@@ -357,7 +357,7 @@
                     "No result set mapping exists for expression, can't map column aliases");
         }
 
-        return (String) resultSetMapping.getColumnResults().get(columnAliasPosition++);
+        return resultSetMapping.getColumnResults().get(columnAliasPosition++);
     }
 
     boolean isAppendingResultColumns() {