Author: cbegin
Date: Sat Apr 11 07:10:32 2009
New Revision: 764175
URL: http://svn.apache.org/viewvc?rev=764175&view=rev
Log:
renamed context parameters
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/xml/dynamic/ChooseSqlNode.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/xml/dynamic/ForEachSqlNode.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/xml/dynamic/IfSqlNode.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/xml/dynamic/MixedSqlNode.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/xml/dynamic/SqlNode.java
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/xml/dynamic/ChooseSqlNode.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/xml/dynamic/ChooseSqlNode.java?rev=764175&r1=764174&r2=764175&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/xml/dynamic/ChooseSqlNode.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/xml/dynamic/ChooseSqlNode.java
Sat Apr 11 07:10:32 2009
@@ -11,14 +11,14 @@
this.defaultSqlNode = defaultSqlNode;
}
- public boolean apply(DynamicContext builder) {
+ public boolean apply(DynamicContext context) {
for (SqlNode sqlNode : ifSqlNodes) {
- if (sqlNode.apply(builder)) {
+ if (sqlNode.apply(context)) {
return true;
}
}
if (defaultSqlNode != null) {
- defaultSqlNode.apply(builder);
+ defaultSqlNode.apply(context);
return true;
}
return false;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/xml/dynamic/ForEachSqlNode.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/xml/dynamic/ForEachSqlNode.java?rev=764175&r1=764174&r2=764175&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/xml/dynamic/ForEachSqlNode.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/xml/dynamic/ForEachSqlNode.java
Sat Apr 11 07:10:32 2009
@@ -21,54 +21,54 @@
this.item = item;
}
- public boolean apply(DynamicContext builder) {
- final Iterable iterable = evaluator.evaluateIterable(collectionExpression,
builder.getBindings());
+ public boolean apply(DynamicContext context) {
+ final Iterable iterable = evaluator.evaluateIterable(collectionExpression,
context.getBindings());
boolean first = true;
- applyOpen(builder);
+ applyOpen(context);
int i = 0;
for (Object o : iterable) {
- first = applySeparator(builder, first);
- i = applyIndex(builder, i);
- applyItem(builder, o);
- contents.apply(builder);
+ first = applySeparator(context, first);
+ i = applyIndex(context, i);
+ applyItem(context, o);
+ contents.apply(context);
}
- applyClose(builder);
+ applyClose(context);
return true;
}
- private int applyIndex(DynamicContext builder, int i) {
+ private int applyIndex(DynamicContext context, int i) {
if (index != null) {
- builder.bind(index, i++);
+ context.bind(index, i++);
}
return i;
}
- private void applyItem(DynamicContext builder, Object o) {
+ private void applyItem(DynamicContext context, Object o) {
if (item != null) {
- builder.bind(item, o);
+ context.bind(item, o);
}
}
- private void applyOpen(DynamicContext builder) {
+ private void applyOpen(DynamicContext context) {
if (open != null) {
- builder.appendSql(open);
+ context.appendSql(open);
}
}
- private boolean applySeparator(DynamicContext builder, boolean first) {
+ private boolean applySeparator(DynamicContext context, boolean first) {
if (first) {
first = false;
} else {
if (separator != null) {
- builder.appendSql(separator);
+ context.appendSql(separator);
}
}
return first;
}
- private void applyClose(DynamicContext builder) {
+ private void applyClose(DynamicContext context) {
if (close != null) {
- builder.appendSql(close);
+ context.appendSql(close);
}
}
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/xml/dynamic/IfSqlNode.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/xml/dynamic/IfSqlNode.java?rev=764175&r1=764174&r2=764175&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/xml/dynamic/IfSqlNode.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/xml/dynamic/IfSqlNode.java
Sat Apr 11 07:10:32 2009
@@ -11,9 +11,9 @@
this.evaluator = new ExpressionEvaluator();
}
- public boolean apply(DynamicContext builder) {
- if (evaluator.evaluateBoolean(test, builder.getBindings())) {
- contents.apply(builder);
+ public boolean apply(DynamicContext context) {
+ if (evaluator.evaluateBoolean(test, context.getBindings())) {
+ contents.apply(context);
return true;
}
return false;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/xml/dynamic/MixedSqlNode.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/xml/dynamic/MixedSqlNode.java?rev=764175&r1=764174&r2=764175&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/xml/dynamic/MixedSqlNode.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/xml/dynamic/MixedSqlNode.java
Sat Apr 11 07:10:32 2009
@@ -9,9 +9,9 @@
this.contents = contents;
}
- public boolean apply(DynamicContext builder) {
+ public boolean apply(DynamicContext context) {
for (SqlNode sqlNode : contents) {
- sqlNode.apply(builder);
+ sqlNode.apply(context);
}
return true;
}
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/xml/dynamic/SqlNode.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/xml/dynamic/SqlNode.java?rev=764175&r1=764174&r2=764175&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/xml/dynamic/SqlNode.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/xml/dynamic/SqlNode.java
Sat Apr 11 07:10:32 2009
@@ -1,5 +1,5 @@
package org.apache.ibatis.parser.xml.dynamic;
public interface SqlNode {
- boolean apply(DynamicContext builder);
+ boolean apply(DynamicContext context);
}
