Author: cbegin
Date: Sun Feb 14 01:05:48 2010
New Revision: 909945

URL: http://svn.apache.org/viewvc?rev=909945&view=rev
Log:
extracted tokenhandler from generictokenparser, updated docs with namespace 
resolution info

Added:
    
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/TokenHandler.java
Modified:
    ibatis/java/ibatis-3/trunk/doc/en/iBATIS-3-User-Guide.doc
    ibatis/java/ibatis-3/trunk/doc/en/iBATIS-3-User-Guide.pdf
    
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SqlSourceBuilder.java
    
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/ForEachSqlNode.java
    
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/TextSqlNode.java
    
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/GenericTokenParser.java
    
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/PropertyParser.java
    
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/parsing/GenericTokenParserTest.java

Modified: ibatis/java/ibatis-3/trunk/doc/en/iBATIS-3-User-Guide.doc
URL: 
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/doc/en/iBATIS-3-User-Guide.doc?rev=909945&r1=909944&r2=909945&view=diff
==============================================================================
Binary files - no diff available.

Modified: ibatis/java/ibatis-3/trunk/doc/en/iBATIS-3-User-Guide.pdf
URL: 
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/doc/en/iBATIS-3-User-Guide.pdf?rev=909945&r1=909944&r2=909945&view=diff
==============================================================================
Binary files - no diff available.

Modified: 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SqlSourceBuilder.java
URL: 
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SqlSourceBuilder.java?rev=909945&r1=909944&r2=909945&view=diff
==============================================================================
--- 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SqlSourceBuilder.java
 (original)
+++ 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SqlSourceBuilder.java
 Sun Feb 14 01:05:48 2010
@@ -3,6 +3,7 @@
 import org.apache.ibatis.mapping.ParameterMapping;
 import org.apache.ibatis.mapping.SqlSource;
 import org.apache.ibatis.parsing.GenericTokenParser;
+import org.apache.ibatis.parsing.TokenHandler;
 import org.apache.ibatis.reflection.MetaClass;
 import org.apache.ibatis.session.Configuration;
 import org.apache.ibatis.type.TypeHandler;
@@ -24,7 +25,7 @@
     return new StaticSqlSource(configuration, sql, 
handler.getParameterMappings());
   }
 
-  private static class ParameterMappingTokenHandler extends BaseBuilder 
implements GenericTokenParser.TokenHandler {
+  private static class ParameterMappingTokenHandler extends BaseBuilder 
implements TokenHandler {
 
     private List<ParameterMapping> parameterMappings = new 
ArrayList<ParameterMapping>();
     private Class parameterType;

Modified: 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/ForEachSqlNode.java
URL: 
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/ForEachSqlNode.java?rev=909945&r1=909944&r2=909945&view=diff
==============================================================================
--- 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/ForEachSqlNode.java
 (original)
+++ 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/ForEachSqlNode.java
 Sun Feb 14 01:05:48 2010
@@ -1,6 +1,7 @@
 package org.apache.ibatis.builder.xml.dynamic;
 
 import org.apache.ibatis.parsing.GenericTokenParser;
+import org.apache.ibatis.parsing.TokenHandler;
 import org.apache.ibatis.session.Configuration;
 
 import java.util.Map;
@@ -114,7 +115,7 @@
     }
 
     public void appendSql(String sql) {
-      GenericTokenParser parser = new GenericTokenParser("#{", "}", new 
GenericTokenParser.TokenHandler() {
+      GenericTokenParser parser = new GenericTokenParser("#{", "}", new 
TokenHandler() {
         public String handleToken(String content) {
           String newContent = content.replaceFirst(item, itemizeItem(item, 
index));
           return new 
StringBuilder("#{").append(newContent).append("}").toString();

Modified: 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/TextSqlNode.java
URL: 
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/TextSqlNode.java?rev=909945&r1=909944&r2=909945&view=diff
==============================================================================
--- 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/TextSqlNode.java
 (original)
+++ 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/TextSqlNode.java
 Sun Feb 14 01:05:48 2010
@@ -4,6 +4,7 @@
 import org.apache.ibatis.ognl.Ognl;
 import org.apache.ibatis.ognl.OgnlException;
 import org.apache.ibatis.parsing.GenericTokenParser;
+import org.apache.ibatis.parsing.TokenHandler;
 import org.apache.ibatis.type.SimpleTypeRegistry;
 
 public class TextSqlNode implements SqlNode {
@@ -19,7 +20,7 @@
     return true;
   }
 
-  private static class BindingTokenParser implements 
GenericTokenParser.TokenHandler {
+  private static class BindingTokenParser implements TokenHandler {
 
     private DynamicContext context;
 

Modified: 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/GenericTokenParser.java
URL: 
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/GenericTokenParser.java?rev=909945&r1=909944&r2=909945&view=diff
==============================================================================
--- 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/GenericTokenParser.java
 (original)
+++ 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/GenericTokenParser.java
 Sun Feb 14 01:05:48 2010
@@ -12,10 +12,6 @@
     this.handler = handler;
   }
 
-  public static interface TokenHandler {
-    String handleToken(String content);
-  }
-
   public String parse(String text) {
     StringBuilder builder = new StringBuilder();
     if (text != null) {

Modified: 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/PropertyParser.java
URL: 
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/PropertyParser.java?rev=909945&r1=909944&r2=909945&view=diff
==============================================================================
--- 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/PropertyParser.java
 (original)
+++ 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/PropertyParser.java
 Sun Feb 14 01:05:48 2010
@@ -10,7 +10,7 @@
     return parser.parse(string);
   }
 
-  private static class VariableTokenHandler implements 
GenericTokenParser.TokenHandler {
+  private static class VariableTokenHandler implements TokenHandler {
     private Properties variables;
 
     public VariableTokenHandler(Properties variables) {

Added: 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/TokenHandler.java
URL: 
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/TokenHandler.java?rev=909945&view=auto
==============================================================================
--- 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/TokenHandler.java
 (added)
+++ 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/TokenHandler.java
 Sun Feb 14 01:05:48 2010
@@ -0,0 +1,6 @@
+package org.apache.ibatis.parsing;
+
+public interface TokenHandler {
+  String handleToken(String content);
+}
+

Modified: 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/parsing/GenericTokenParserTest.java
URL: 
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/parsing/GenericTokenParserTest.java?rev=909945&r1=909944&r2=909945&view=diff
==============================================================================
--- 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/parsing/GenericTokenParserTest.java
 (original)
+++ 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/parsing/GenericTokenParserTest.java
 Sun Feb 14 01:05:48 2010
@@ -8,7 +8,7 @@
 
 public class GenericTokenParserTest {
 
-  public static class VariableTokenHandler implements 
GenericTokenParser.TokenHandler {
+  public static class VariableTokenHandler implements TokenHandler {
     private Map<String, String> variables = new HashMap<String, String>();
 
     public VariableTokenHandler(Map<String, String> variables) {


Reply via email to