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

[aa...@apache.org]

Author: aadamchik
Date: Mon Jun 18 07:56:15 2007
New Revision: 548372

URL: http://svn.apache.org/viewvc?view=rev&rev=548372
Log:
reafctoring/cleanup

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

Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLTranslationContext.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLTranslationContext.java?view=diff&rev=548372&r1=548371&r2=548372
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLTranslationContext.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLTranslationContext.java Mon Jun 18 07:56:15 2007
@@ -35,7 +35,7 @@
     static final String FROM_TAIL_MARKER = "FROM_TAIL_MARKER";
 
     private Map aliases;
-    private Map bindingVariables;
+    private Map boundParameters;
     private StringBuffer mainBuffer;
     private StringBuffer currentBuffer;
     private EJBQLCompiledExpression compiledExpression;
@@ -55,7 +55,7 @@
         SQLTemplate query = new SQLTemplate(compiledExpression
                 .getRootDescriptor()
                 .getObjectClass(), sql);
-        query.setParameters(bindingVariables);
+        query.setParameters(boundParameters);
         return query;
     }
 
@@ -86,7 +86,7 @@
             throw new IllegalArgumentException("Invalid marker: " + marker);
         }
 
-        Object object = bindingVariables.get(internalMarker);
+        Object object = boundParameters.get(internalMarker);
         if (!(object instanceof StringBuffer)) {
             throw new IllegalArgumentException("Invalid or missing buffer for marker: "
                     + marker);
@@ -159,12 +159,12 @@
      * to it.
      */
     String bindParameter(Object value, String prefix) {
-        if (bindingVariables == null) {
-            bindingVariables = new HashMap();
+        if (boundParameters == null) {
+            boundParameters = new HashMap();
         }
 
-        String var = prefix + bindingVariables.size();
-        bindingVariables.put(var, value);
+        String var = prefix + boundParameters.size();
+        boundParameters.put(var, value);
         return var;
     }