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

[aa...@apache.org]

Author: aadamchik
Date: Mon Jun 11 05:04:30 2007
New Revision: 546114

URL: http://svn.apache.org/viewvc?view=rev&rev=546114
Log:
renaming context methods for more clarity

Modified:
    cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLSelectColumnsTranslator.java
    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/EJBQLSelectColumnsTranslator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLSelectColumnsTranslator.java?view=diff&rev=546114&r1=546113&r2=546114
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLSelectColumnsTranslator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLSelectColumnsTranslator.java Mon Jun 11 05:04:30 2007
@@ -149,11 +149,11 @@
     private Set getColumns() {
 
         String columnsKey = getClass().getName() + ":columns";
-        Set columns = (Set) context.getTranslationValue(columnsKey);
+        Set columns = (Set) context.getAttribute(columnsKey);
 
         if (columns == null) {
             columns = new HashSet();
-            context.putTranslationVariable(columnsKey, columns);
+            context.setAttribute(columnsKey, columns);
         }
 
         return columns;

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=546114&r1=546113&r2=546114
==============================================================================
--- 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 11 05:04:30 2007
@@ -36,7 +36,7 @@
     private Map bindingVariables;
     private StringBuffer buffer;
     private EJBQLCompiledExpression compiledExpression;
-    private Map translationVariables;
+    private Map attributes;
 
     EJBQLTranslationContext(EJBQLCompiledExpression compiledExpression) {
         this.compiledExpression = compiledExpression;
@@ -52,16 +52,24 @@
         return query;
     }
 
-    void putTranslationVariable(String var, Object value) {
-        if (translationVariables == null) {
-            translationVariables = new HashMap();
-        }
-
-        translationVariables.put(var, value);
+    /**
+     * Returns a context "attribute" stored for the given name. Attributes is a state
+     * preservation mechanism used by translators and have the same scope as the context.
+     */
+    Object getAttribute(String name) {
+        return attributes != null ? attributes.get(name) : null;
     }
 
-    Object getTranslationValue(String var) {
-        return translationVariables != null ? translationVariables.get(var) : null;
+    /**
+     * Sets a context "attribute". Attributes is a state preservation mechanism used by
+     * translators and have the same scope as the context.
+     */
+    void setAttribute(String var, Object value) {
+        if (attributes == null) {
+            attributes = new HashMap();
+        }
+
+        attributes.put(var, value);
     }
 
     /**
@@ -75,7 +83,6 @@
     /**
      * Appends a piece of SQL to the internal buffer.
      */
-
     EJBQLTranslationContext append(char chunk) {
         buffer.append(chunk);
         return this;