ibatis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cbe...@apache.org
Subject svn commit: r736963 [15/21] - in /ibatis/trunk/java/ibatis-3: ibatis-3-compat/src/main/java/com/ibatis/common/jdbc/ ibatis-3-compat/src/main/java/com/ibatis/common/resources/ ibatis-3-compat/src/main/java/com/ibatis/common/util/ ibatis-3-compat/src/mai...
Date Fri, 23 Jan 2009 06:32:46 GMT
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/ParseException.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/ParseException.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/ParseException.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/ParseException.java Thu Jan 22 22:32:36 2009
@@ -6,7 +6,7 @@
  * You can explicitly create objects of this exception type by
  * calling the method generateParseException in the generated
  * parser.
- *
+ * <p/>
  * You can modify this class to customize your error reporting
  * mechanisms so long as you retain the public fields.
  */
@@ -22,13 +22,12 @@
    * This constructor calls its super class with the empty string
    * to force the "toString" method of parent class "Throwable" to
    * print the error message in the form:
-   *     ParseException: <result of getMessage>
+   * ParseException: <result of getMessage>
    */
   public ParseException(Token currentTokenVal,
                         int[][] expectedTokenSequencesVal,
                         String[] tokenImageVal
-                       )
-  {
+  ) {
     super("");
     specialConstructor = true;
     currentToken = currentTokenVal;
@@ -121,7 +120,7 @@
         break;
       }
       retval += add_escapes(tok.image);
-      tok = tok.next; 
+      tok = tok.next;
     }
     retval += "\" at line " + currentToken.next.beginLine + ", column " + currentToken.next.beginColumn;
     retval += "." + eol;
@@ -138,55 +137,54 @@
    * The end of line string for this machine.
    */
   protected String eol = System.getProperty("line.separator", "\n");
- 
+
   /**
    * Used to convert raw characters to their escaped version
    * when these raw version cannot be used as part of an ASCII
    * string literal.
    */
   protected String add_escapes(String str) {
-      StringBuffer retval = new StringBuffer();
-      char ch;
-      for (int i = 0; i < str.length(); i++) {
-        switch (str.charAt(i))
-        {
-           case 0 :
-              continue;
-           case '\b':
-              retval.append("\\b");
-              continue;
-           case '\t':
-              retval.append("\\t");
-              continue;
-           case '\n':
-              retval.append("\\n");
-              continue;
-           case '\f':
-              retval.append("\\f");
-              continue;
-           case '\r':
-              retval.append("\\r");
-              continue;
-           case '\"':
-              retval.append("\\\"");
-              continue;
-           case '\'':
-              retval.append("\\\'");
-              continue;
-           case '\\':
-              retval.append("\\\\");
-              continue;
-           default:
-              if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
-                 String s = "0000" + Integer.toString(ch, 16);
-                 retval.append("\\u" + s.substring(s.length() - 4, s.length()));
-              } else {
-                 retval.append(ch);
-              }
-              continue;
-        }
+    StringBuffer retval = new StringBuffer();
+    char ch;
+    for (int i = 0; i < str.length(); i++) {
+      switch (str.charAt(i)) {
+        case 0:
+          continue;
+        case '\b':
+          retval.append("\\b");
+          continue;
+        case '\t':
+          retval.append("\\t");
+          continue;
+        case '\n':
+          retval.append("\\n");
+          continue;
+        case '\f':
+          retval.append("\\f");
+          continue;
+        case '\r':
+          retval.append("\\r");
+          continue;
+        case '\"':
+          retval.append("\\\"");
+          continue;
+        case '\'':
+          retval.append("\\\'");
+          continue;
+        case '\\':
+          retval.append("\\\\");
+          continue;
+        default:
+          if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
+            String s = "0000" + Integer.toString(ch, 16);
+            retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+          } else {
+            retval.append(ch);
+          }
+          continue;
       }
-      return retval.toString();
-   }
+    }
+    return retval.toString();
+  }
 
 }

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/PropertyAccessor.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/PropertyAccessor.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/PropertyAccessor.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/PropertyAccessor.java Thu Jan 22 22:32:36 2009
@@ -40,35 +40,37 @@
  * get and set properties as beans do, by reflection on the target object's class, but
  * other implementations are possible, such as one that uses the property name as a key
  * into a map.
- *
+ * <p/>
  * <p> An implementation of this interface will often require that its target objects all
  * be of some particular type.  For example, the MapPropertyAccessor class requires that
  * its targets all implement the java.util.Map interface.
- *
+ * <p/>
  * <p> Note that the "name" of a property is represented by a generic Object.  Some
  * implementations may require properties' names to be Strings, while others may allow
  * them to be other types---for example, ArrayPropertyAccessor treats Number names as
  * indexes into the target object, which must be an array.
+ *
  * @author Luke Blanshard (blanshlu@netscape.net)
  * @author Drew Davidson (drew@ognl.org)
  */
-public interface PropertyAccessor
-{
-      /**
-       * Extracts and returns the property of the given name from the given target object.
-       * @param target  the object to get the property from
-       * @param name    the name of the property to get
-       * @return        the current value of the given property in the given object
-       * @exception OgnlException if there is an error locating the property in the given object
-       */
-    Object getProperty( Map context, Object target, Object name ) throws OgnlException;
+public interface PropertyAccessor {
+  /**
+   * Extracts and returns the property of the given name from the given target object.
+   *
+   * @param target the object to get the property from
+   * @param name   the name of the property to get
+   * @return the current value of the given property in the given object
+   * @throws OgnlException if there is an error locating the property in the given object
+   */
+  Object getProperty(Map context, Object target, Object name) throws OgnlException;
 
-      /**
-       * Sets the value of the property of the given name in the given target object.
-       * @param target  the object to set the property in
-       * @param name    the name of the property to set
-       * @param value   the new value for the property
-       * @exception OgnlException if there is an error setting the property in the given object
-       */
-    void setProperty( Map context, Object target, Object name, Object value ) throws OgnlException;
+  /**
+   * Sets the value of the property of the given name in the given target object.
+   *
+   * @param target the object to set the property in
+   * @param name   the name of the property to set
+   * @param value  the new value for the property
+   * @throws OgnlException if there is an error setting the property in the given object
+   */
+  void setProperty(Map context, Object target, Object name, Object value ) throws OgnlException;
 }

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/SetPropertyAccessor.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/SetPropertyAccessor.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/SetPropertyAccessor.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/SetPropertyAccessor.java Thu Jan 22 22:32:36 2009
@@ -30,40 +30,41 @@
 //--------------------------------------------------------------------------
 package org.apache.ibatis.ognl;
 
-import java.util.*;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * Implementation of PropertyAccessor that uses numbers and dynamic subscripts as
  * properties to index into Lists.
+ *
  * @author Luke Blanshard (blanshlu@netscape.net)
  * @author Drew Davidson (drew@ognl.org)
  */
 public class SetPropertyAccessor extends ObjectPropertyAccessor
     implements PropertyAccessor // This is here to make javadoc show this class as an implementor
 {
-    public Object getProperty( Map context, Object target, Object name ) throws OgnlException
-    {
-        Set     set = (Set)target;
+  public Object getProperty(Map context, Object target, Object name) throws OgnlException {
+    Set set = (Set) target;
 
-        if ( name instanceof String ) {
-            Object      result;
+    if (name instanceof String) {
+      Object result;
 
-            if (name.equals("size")) {
-                result = new Integer(set.size());
-            } else {
-                if (name.equals("iterator")) {
-                    result = set.iterator();
-                } else {
-                    if (name.equals("isEmpty")) {
-                        result = set.isEmpty() ? Boolean.TRUE : Boolean.FALSE;
-                    } else {
-                        result = super.getProperty( context, target, name );
-                    }
-                }
-            }
-            return result;
+      if (name.equals("size")) {
+        result = new Integer(set.size());
+      } else {
+        if (name.equals("iterator")) {
+          result = set.iterator();
+        } else {
+          if (name.equals("isEmpty")) {
+            result = set.isEmpty() ? Boolean.TRUE : Boolean.FALSE;
+          } else {
+            result = super.getProperty(context, target, name);
+          }
         }
-
-        throw new NoSuchPropertyException( target, name );
+      }
+      return result;
     }
+
+    throw new NoSuchPropertyException(target, name);
+  }
 }

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/SimpleNode.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/SimpleNode.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/SimpleNode.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/SimpleNode.java Thu Jan 22 22:32:36 2009
@@ -30,296 +30,293 @@
 //--------------------------------------------------------------------------
 package org.apache.ibatis.ognl;
 
-import java.io.*;
+import java.io.PrintWriter;
+import java.io.Serializable;
 
 /**
  * @author Luke Blanshard (blanshlu@netscape.net)
  * @author Drew Davidson (drew@ognl.org)
  */
-public abstract class SimpleNode implements Node, Serializable
-{
-    protected Node          parent;
-    protected Node[]        children;
-    protected int           id;
-    protected OgnlParser    parser;
-
-    private boolean         constantValueCalculated;
-    private boolean         hasConstantValue;
-    private Object          constantValue;
-
-    public SimpleNode(int i) {
-        id = i;
-    }
-
-    public SimpleNode(OgnlParser p, int i) {
-        this(i);
-        parser = p;
-    }
-
-    public void jjtOpen() {
-    }
-
-    public void jjtClose() {
-    }
-
-    public void jjtSetParent(Node n) { parent = n; }
-    public Node jjtGetParent() { return parent; }
-
-    public void jjtAddChild(Node n, int i) {
-        if (children == null) {
-            children = new Node[i + 1];
-        } else if (i >= children.length) {
-            Node c[] = new Node[i + 1];
-            System.arraycopy(children, 0, c, 0, children.length);
-            children = c;
-        }
-        children[i] = n;
-    }
-
-    public Node jjtGetChild(int i) {
-        return children[i];
-    }
-
-    public int jjtGetNumChildren() {
-        return (children == null) ? 0 : children.length;
-    }
-
-      /* You can override these two methods in subclasses of SimpleNode to
-         customize the way the node appears when the tree is dumped.  If
-         your output uses more than one line you should override
-         toString(String), otherwise overriding toString() is probably all
-         you need to do. */
-
-    public String toString() { return OgnlParserTreeConstants.jjtNodeName[id]; }
+public abstract class SimpleNode implements Node, Serializable {
+  protected Node parent;
+  protected Node[] children;
+  protected int id;
+  protected OgnlParser parser;
+
+  private boolean constantValueCalculated;
+  private boolean hasConstantValue;
+  private Object constantValue;
+
+  public SimpleNode(int i) {
+    id = i;
+  }
+
+  public SimpleNode(OgnlParser p, int i) {
+    this(i);
+    parser = p;
+  }
+
+  public void jjtOpen() {
+  }
+
+  public void jjtClose() {
+  }
+
+  public void jjtSetParent(Node n) {
+    parent = n;
+  }
+
+  public Node jjtGetParent() {
+    return parent;
+  }
+
+  public void jjtAddChild(Node n, int i) {
+    if (children == null) {
+      children = new Node[i + 1];
+    } else if (i >= children.length) {
+      Node c[] = new Node[i + 1];
+      System.arraycopy(children, 0, c, 0, children.length);
+      children = c;
+    }
+    children[i] = n;
+  }
+
+  public Node jjtGetChild(int i) {
+    return children[i];
+  }
+
+  public int jjtGetNumChildren() {
+    return (children == null) ? 0 : children.length;
+  }
+
+  /* You can override these two methods in subclasses of SimpleNode to
+customize the way the node appears when the tree is dumped.  If
+your output uses more than one line you should override
+toString(String), otherwise overriding toString() is probably all
+you need to do. */
+
+  public String toString() {
+    return OgnlParserTreeConstants.jjtNodeName[id];
+  }
 
 // OGNL additions
 
-    public String toString(String prefix) { return prefix + OgnlParserTreeConstants.jjtNodeName[id] + " " + toString(); }
-
-      /* Override this method if you want to customize how the node dumps
-         out its children. */
-
-    public void dump(PrintWriter writer, String prefix) {
-        writer.println(toString(prefix));
-        if (children != null) {
-            for (int i = 0; i < children.length; ++i) {
-                SimpleNode n = (SimpleNode)children[i];
-                if (n != null) {
-                    n.dump(writer, prefix + "  ");
-                }
-            }
+  public String toString(String prefix) {
+    return prefix + OgnlParserTreeConstants.jjtNodeName[id] + " " + toString();
+  }
+
+  /* Override this method if you want to customize how the node dumps
+out its children. */
+
+  public void dump(PrintWriter writer, String prefix) {
+    writer.println(toString(prefix));
+    if (children != null) {
+      for (int i = 0; i < children.length; ++i) {
+        SimpleNode n = (SimpleNode) children[i];
+        if (n != null) {
+          n.dump(writer, prefix + "  ");
         }
+      }
     }
+  }
 
-    public int getIndexInParent()
-    {
-        int     result = -1;
-
-        if (parent != null) {
-            int     icount = parent.jjtGetNumChildren();
-
-            for (int i = 0; i < icount; i++) {
-                if (parent.jjtGetChild(i) == this) {
-                    result = i;
-                    break;
-                }
-            }
-        }
-        return result;
-    }
+  public int getIndexInParent() {
+    int result = -1;
 
-    public Node getNextSibling()
-    {
-        Node    result = null;
-        int     i = getIndexInParent();
-
-        if (i >= 0) {
-            int     icount = parent.jjtGetNumChildren();
-
-            if (i < icount) {
-                result = parent.jjtGetChild(i + 1);
-            }
-        }
-        return result;
-    }
+    if (parent != null) {
+      int icount = parent.jjtGetNumChildren();
 
-    private static String getDepthString(int depth)
-    {
-        StringBuffer    result = new StringBuffer("");
-
-        while (depth > 0) {
-            depth--;
-            result.append("  ");
+      for (int i = 0; i < icount; i++) {
+        if (parent.jjtGetChild(i) == this) {
+          result = i;
+          break;
         }
-        return new String(result);
+      }
     }
+    return result;
+  }
 
-    protected Object evaluateGetValueBody( OgnlContext context, Object source ) throws OgnlException
-    {
-        Object      result;
-
-        context.setCurrentObject(source);
-        context.setCurrentNode(this);
-        if (!constantValueCalculated) {
-            constantValueCalculated = true;
-            hasConstantValue = isConstant(context);
-            if (hasConstantValue) {
-                constantValue = getValueBody(context, source);
-            }
+  public Node getNextSibling() {
+    Node result = null;
+    int i = getIndexInParent();
+
+    if (i >= 0) {
+      int icount = parent.jjtGetNumChildren();
+
+      if (i < icount) {
+        result = parent.jjtGetChild(i + 1);
+      }
+    }
+    return result;
+  }
+
+  private static String getDepthString(int depth) {
+    StringBuffer result = new StringBuffer("");
+
+    while (depth > 0) {
+      depth--;
+      result.append("  ");
+    }
+    return new String(result);
+  }
+
+  protected Object evaluateGetValueBody(OgnlContext context, Object source) throws OgnlException {
+    Object result;
+
+    context.setCurrentObject(source);
+    context.setCurrentNode(this);
+    if (!constantValueCalculated) {
+      constantValueCalculated = true;
+      hasConstantValue = isConstant(context);
+      if (hasConstantValue) {
+        constantValue = getValueBody(context, source);
+      }
+    }
+    return hasConstantValue ? constantValue : getValueBody(context, source);
+  }
+
+  protected void evaluateSetValueBody(OgnlContext context, Object target, Object value) throws OgnlException {
+    context.setCurrentObject(target);
+    context.setCurrentNode(this);
+    setValueBody(context, target, value);
+  }
+
+  public final Object getValue(OgnlContext context, Object source) throws OgnlException {
+    if (context.getTraceEvaluations()) {
+      EvaluationPool pool = OgnlRuntime.getEvaluationPool();
+      Object result = null;
+      Throwable evalException = null;
+      Evaluation evaluation = pool.create(this, source);
+
+      context.pushEvaluation(evaluation);
+      try {
+        result = evaluateGetValueBody(context, source);
+      } catch (OgnlException ex) {
+        evalException = ex;
+        throw ex;
+      } catch (RuntimeException ex) {
+        evalException = ex;
+        throw ex;
+      } finally {
+        Evaluation eval = context.popEvaluation();
+
+        eval.setResult(result);
+        if (evalException != null) {
+          eval.setException(evalException);
         }
-        return hasConstantValue ? constantValue : getValueBody(context, source);
-    }
-
-    protected void evaluateSetValueBody( OgnlContext context, Object target, Object value ) throws OgnlException
-    {
-        context.setCurrentObject(target);
-        context.setCurrentNode(this);
-        setValueBody(context, target, value);
-    }
-
-    public final Object getValue( OgnlContext context, Object source ) throws OgnlException
-    {
-        if (context.getTraceEvaluations()) {
-            EvaluationPool  pool = OgnlRuntime.getEvaluationPool();
-            Object          result = null;
-            Throwable       evalException = null;
-            Evaluation      evaluation = pool.create(this, source);
-
-            context.pushEvaluation(evaluation);
-            try {
-                result = evaluateGetValueBody(context, source);
-            } catch (OgnlException ex) {
-                evalException = ex;
-                throw ex;
-            } catch (RuntimeException ex) {
-                evalException = ex;
-                throw ex;
-            } finally {
-                Evaluation      eval = context.popEvaluation();
-
-                eval.setResult(result);
-                if (evalException != null) {
-                    eval.setException(evalException);
-                }
-                if ((evalException == null) && (context.getRootEvaluation() == null) && !context.getKeepLastEvaluation()) {
-                    pool.recycleAll(eval);
-                }
-            }
-            return result;
-        } else {
-            return evaluateGetValueBody(context, source);
+        if ((evalException == null) && (context.getRootEvaluation() == null) && !context.getKeepLastEvaluation()) {
+          pool.recycleAll(eval);
         }
-    }
+      }
+      return result;
+    } else {
+      return evaluateGetValueBody(context, source);
+    }
+  }
+
+  /**
+   * Subclasses implement this method to do the actual work of extracting the
+   * appropriate value from the source object.
+   */
+  protected abstract Object getValueBody(OgnlContext context, Object source) throws OgnlException;
+
+  public final void setValue(OgnlContext context, Object target, Object value) throws OgnlException {
+    if (context.getTraceEvaluations()) {
+      EvaluationPool pool = OgnlRuntime.getEvaluationPool();
+      Throwable evalException = null;
+      Evaluation evaluation = pool.create(this, target, true);
+
+      context.pushEvaluation(evaluation);
+      try {
+        evaluateSetValueBody(context, target, value);
+      } catch (OgnlException ex) {
+        evalException = ex;
+        ex.setEvaluation(evaluation);
+        throw ex;
+      } catch (RuntimeException ex) {
+        evalException = ex;
+        throw ex;
+      } finally {
+        Evaluation eval = context.popEvaluation();
 
-      /** Subclasses implement this method to do the actual work of extracting the
-          appropriate value from the source object. */
-    protected abstract Object getValueBody( OgnlContext context, Object source ) throws OgnlException;
-
-    public final void setValue( OgnlContext context, Object target, Object value ) throws OgnlException
-    {
-        if (context.getTraceEvaluations()) {
-            EvaluationPool      pool = OgnlRuntime.getEvaluationPool();
-            Throwable           evalException = null;
-            Evaluation          evaluation = pool.create(this, target, true);
-
-            context.pushEvaluation(evaluation);
-            try {
-                evaluateSetValueBody(context, target, value);
-            } catch (OgnlException ex) {
-                evalException = ex;
-                ex.setEvaluation(evaluation);
-                throw ex;
-            } catch (RuntimeException ex) {
-                evalException = ex;
-                throw ex;
-            } finally {
-                Evaluation      eval = context.popEvaluation();
-
-                if (evalException != null) {
-                    eval.setException(evalException);
-                }
-                if ((evalException == null) && (context.getRootEvaluation() == null) && !context.getKeepLastEvaluation()) {
-                    pool.recycleAll(eval);
-                }
-            }
-        } else {
-            evaluateSetValueBody(context, target, value);
+        if (evalException != null) {
+          eval.setException(evalException);
         }
-    }
-
-    /** Subclasses implement this method to do the actual work of setting the
-        appropriate value in the target object.  The default implementation
-        throws an <code>InappropriateExpressionException</code>, meaning that it
-        cannot be a set expression.
-     */
-    protected void setValueBody( OgnlContext context, Object target, Object value ) throws OgnlException
-    {
-        throw new InappropriateExpressionException( this );
-    }
-
-    /**
-        Returns true iff this node is constant without respect to the children.
-     */
-    public boolean isNodeConstant( OgnlContext context ) throws OgnlException
-    {
-        return false;
-    }
-
-    public boolean isConstant( OgnlContext context ) throws OgnlException
-    {
-        return isNodeConstant(context);
-    }
-
-    public boolean isNodeSimpleProperty( OgnlContext context ) throws OgnlException
-    {
-        return false;
-    }
+        if ((evalException == null) && (context.getRootEvaluation() == null) && !context.getKeepLastEvaluation()) {
+          pool.recycleAll(eval);
+        }
+      }
+    } else {
+      evaluateSetValueBody(context, target, value);
+    }
+  }
+
+  /**
+   * Subclasses implement this method to do the actual work of setting the
+   * appropriate value in the target object.  The default implementation
+   * throws an <code>InappropriateExpressionException</code>, meaning that it
+   * cannot be a set expression.
+   */
+  protected void setValueBody(OgnlContext context, Object target, Object value) throws OgnlException {
+    throw new InappropriateExpressionException(this);
+  }
+
+  /**
+   * Returns true iff this node is constant without respect to the children.
+   */
+  public boolean isNodeConstant(OgnlContext context) throws OgnlException {
+    return false;
+  }
+
+  public boolean isConstant(OgnlContext context) throws OgnlException {
+    return isNodeConstant(context);
+  }
+
+  public boolean isNodeSimpleProperty(OgnlContext context) throws OgnlException {
+    return false;
+  }
+
+  public boolean isSimpleProperty(OgnlContext context) throws OgnlException {
+    return isNodeSimpleProperty(context);
+  }
+
+  public boolean isSimpleNavigationChain(OgnlContext context) throws OgnlException {
+    return isSimpleProperty(context);
+  }
+
+  /**
+   * This method may be called from subclasses' jjtClose methods.  It flattens the
+   * tree under this node by eliminating any children that are of the same class as
+   * this node and copying their children to this node.
+   */
+  protected void flattenTree() {
+    boolean shouldFlatten = false;
+    int newSize = 0;
+
+    for (int i = 0; i < children.length; ++i)
+      if (children[i].getClass() == getClass()) {
+        shouldFlatten = true;
+        newSize += children[i].jjtGetNumChildren();
+      } else
+        ++newSize;
+
+    if (shouldFlatten) {
+      Node[] newChildren = new Node[newSize];
+      int j = 0;
+
+      for (int i = 0; i < children.length; ++i) {
+        Node c = children[i];
+        if (c.getClass() == getClass()) {
+          for (int k = 0; k < c.jjtGetNumChildren(); ++k)
+            newChildren[j++] = c.jjtGetChild(k);
+        } else
+          newChildren[j++] = c;
+      }
 
-    public boolean isSimpleProperty( OgnlContext context ) throws OgnlException
-    {
-        return isNodeSimpleProperty(context);
-    }
+      if (j != newSize)
+        throw new Error("Assertion error: " + j + " != " + newSize);
 
-    public boolean isSimpleNavigationChain( OgnlContext context ) throws OgnlException
-    {
-        return isSimpleProperty(context);
+      this.children = newChildren;
     }
-
-      /** This method may be called from subclasses' jjtClose methods.  It flattens the
-          tree under this node by eliminating any children that are of the same class as
-          this node and copying their children to this node. */
-    protected void flattenTree()
-    {
-        boolean shouldFlatten = false;
-        int newSize = 0;
-
-        for ( int i=0; i < children.length; ++i )
-            if ( children[i].getClass() == getClass() ) {
-                shouldFlatten = true;
-                newSize += children[i].jjtGetNumChildren();
-            }
-            else
-                ++newSize;
-
-        if ( shouldFlatten )
-          {
-            Node[] newChildren = new Node[newSize];
-            int j = 0;
-
-            for ( int i=0; i < children.length; ++i ) {
-                Node c = children[i];
-                if ( c.getClass() == getClass() ) {
-                    for ( int k=0; k < c.jjtGetNumChildren(); ++k )
-                        newChildren[j++] = c.jjtGetChild(k);
-                }
-                else
-                    newChildren[j++] = c;
-            }
-
-            if ( j != newSize )
-                throw new Error( "Assertion error: " + j + " != " + newSize );
-
-            this.children = newChildren;
-          }
     }
 }

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/Token.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/Token.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/Token.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/Token.java Thu Jan 22 22:32:36 2009
@@ -53,9 +53,8 @@
   /**
    * Returns the image.
    */
-  public String toString()
-  {
-     return image;
+  public String toString() {
+    return image;
   }
 
   /**
@@ -64,18 +63,17 @@
    * Simply add the cases to the switch for all those special cases.
    * For example, if you have a subclass of Token called IDToken that
    * you want to create if ofKind is ID, simlpy add something like :
-   *
-   *    case MyParserConstants.ID : return new IDToken();
-   *
+   * <p/>
+   * case MyParserConstants.ID : return new IDToken();
+   * <p/>
    * to the following switch statement. Then you can cast matchedToken
    * variable to the appropriate type and use it in your lexical actions.
    */
-  public static final Token newToken(int ofKind)
-  {
-     switch(ofKind)
-     {
-       default : return new Token();
-     }
+  public static final Token newToken(int ofKind) {
+    switch (ofKind) {
+      default:
+        return new Token();
+    }
   }
 
 }

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/TokenMgrError.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/TokenMgrError.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/TokenMgrError.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/TokenMgrError.java Thu Jan 22 22:32:36 2009
@@ -1,133 +1,131 @@
 /* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 3.0 */
 package org.apache.ibatis.ognl;
 
-public class TokenMgrError extends Error
-{
-   /*
-    * Ordinals for various reasons why an Error of this type can be thrown.
-    */
-
-   /**
-    * Lexical error occured.
-    */
-   static final int LEXICAL_ERROR = 0;
-
-   /**
-    * An attempt wass made to create a second instance of a static token manager.
-    */
-   static final int STATIC_LEXER_ERROR = 1;
-
-   /**
-    * Tried to change to an invalid lexical state.
-    */
-   static final int INVALID_LEXICAL_STATE = 2;
-
-   /**
-    * Detected (and bailed out of) an infinite loop in the token manager.
-    */
-   static final int LOOP_DETECTED = 3;
-
-   /**
-    * Indicates the reason why the exception is thrown. It will have
-    * one of the above 4 values.
-    */
-   int errorCode;
-
-   /**
-    * Replaces unprintable characters by their espaced (or unicode escaped)
-    * equivalents in the given string
-    */
-   protected static final String addEscapes(String str) {
-      StringBuffer retval = new StringBuffer();
-      char ch;
-      for (int i = 0; i < str.length(); i++) {
-        switch (str.charAt(i))
-        {
-           case 0 :
-              continue;
-           case '\b':
-              retval.append("\\b");
-              continue;
-           case '\t':
-              retval.append("\\t");
-              continue;
-           case '\n':
-              retval.append("\\n");
-              continue;
-           case '\f':
-              retval.append("\\f");
-              continue;
-           case '\r':
-              retval.append("\\r");
-              continue;
-           case '\"':
-              retval.append("\\\"");
-              continue;
-           case '\'':
-              retval.append("\\\'");
-              continue;
-           case '\\':
-              retval.append("\\\\");
-              continue;
-           default:
-              if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
-                 String s = "0000" + Integer.toString(ch, 16);
-                 retval.append("\\u" + s.substring(s.length() - 4, s.length()));
-              } else {
-                 retval.append(ch);
-              }
-              continue;
-        }
+public class TokenMgrError extends Error {
+  /*
+  * Ordinals for various reasons why an Error of this type can be thrown.
+  */
+
+  /**
+   * Lexical error occured.
+   */
+  static final int LEXICAL_ERROR = 0;
+
+  /**
+   * An attempt wass made to create a second instance of a static token manager.
+   */
+  static final int STATIC_LEXER_ERROR = 1;
+
+  /**
+   * Tried to change to an invalid lexical state.
+   */
+  static final int INVALID_LEXICAL_STATE = 2;
+
+  /**
+   * Detected (and bailed out of) an infinite loop in the token manager.
+   */
+  static final int LOOP_DETECTED = 3;
+
+  /**
+   * Indicates the reason why the exception is thrown. It will have
+   * one of the above 4 values.
+   */
+  int errorCode;
+
+  /**
+   * Replaces unprintable characters by their espaced (or unicode escaped)
+   * equivalents in the given string
+   */
+  protected static final String addEscapes(String str) {
+    StringBuffer retval = new StringBuffer();
+    char ch;
+    for (int i = 0; i < str.length(); i++) {
+      switch (str.charAt(i)) {
+        case 0:
+          continue;
+        case '\b':
+          retval.append("\\b");
+          continue;
+        case '\t':
+          retval.append("\\t");
+          continue;
+        case '\n':
+          retval.append("\\n");
+          continue;
+        case '\f':
+          retval.append("\\f");
+          continue;
+        case '\r':
+          retval.append("\\r");
+          continue;
+        case '\"':
+          retval.append("\\\"");
+          continue;
+        case '\'':
+          retval.append("\\\'");
+          continue;
+        case '\\':
+          retval.append("\\\\");
+          continue;
+        default:
+          if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
+            String s = "0000" + Integer.toString(ch, 16);
+            retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+          } else {
+            retval.append(ch);
+          }
+          continue;
       }
-      return retval.toString();
-   }
-
-   /**
-    * Returns a detailed message for the Error when it is thrown by the
-    * token manager to indicate a lexical error.
-    * Parameters : 
-    *    EOFSeen     : indicates if EOF caused the lexicl error
-    *    curLexState : lexical state in which this error occured
-    *    errorLine   : line number when the error occured
-    *    errorColumn : column number when the error occured
-    *    errorAfter  : prefix that was seen before this error occured
-    *    curchar     : the offending character
-    * Note: You can customize the lexical error message by modifying this method.
-    */
-   protected static String LexicalError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar) {
-      return("Lexical error at line " +
-           errorLine + ", column " +
-           errorColumn + ".  Encountered: " +
-           (EOFSeen ? "<EOF> " : ("\"" + addEscapes(String.valueOf(curChar)) + "\"") + " (" + (int)curChar + "), ") +
-           "after : \"" + addEscapes(errorAfter) + "\"");
-   }
-
-   /**
-    * You can also modify the body of this method to customize your error messages.
-    * For example, cases like LOOP_DETECTED and INVALID_LEXICAL_STATE are not
-    * of end-users concern, so you can return something like : 
-    *
-    *     "Internal Error : Please file a bug report .... "
-    *
-    * from this method for such cases in the release version of your parser.
-    */
-   public String getMessage() {
-      return super.getMessage();
-   }
-
-   /*
-    * Constructors of various flavors follow.
-    */
-
-   public TokenMgrError() {
-   }
-
-   public TokenMgrError(String message, int reason) {
-      super(message);
-      errorCode = reason;
-   }
-
-   public TokenMgrError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar, int reason) {
-      this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
-   }
+    }
+    return retval.toString();
+  }
+
+  /**
+   * Returns a detailed message for the Error when it is thrown by the
+   * token manager to indicate a lexical error.
+   * Parameters :
+   * EOFSeen     : indicates if EOF caused the lexicl error
+   * curLexState : lexical state in which this error occured
+   * errorLine   : line number when the error occured
+   * errorColumn : column number when the error occured
+   * errorAfter  : prefix that was seen before this error occured
+   * curchar     : the offending character
+   * Note: You can customize the lexical error message by modifying this method.
+   */
+  protected static String LexicalError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar) {
+    return ("Lexical error at line " +
+        errorLine + ", column " +
+        errorColumn + ".  Encountered: " +
+        (EOFSeen ? "<EOF> " : ("\"" + addEscapes(String.valueOf(curChar)) + "\"") + " (" + (int) curChar + "), ") +
+        "after : \"" + addEscapes(errorAfter) + "\"");
+  }
+
+  /**
+   * You can also modify the body of this method to customize your error messages.
+   * For example, cases like LOOP_DETECTED and INVALID_LEXICAL_STATE are not
+   * of end-users concern, so you can return something like :
+   * <p/>
+   * "Internal Error : Please file a bug report .... "
+   * <p/>
+   * from this method for such cases in the release version of your parser.
+   */
+  public String getMessage() {
+    return super.getMessage();
+  }
+
+  /*
+  * Constructors of various flavors follow.
+  */
+
+  public TokenMgrError() {
+  }
+
+  public TokenMgrError(String message, int reason) {
+    super(message);
+    errorCode = reason;
+  }
+
+  public TokenMgrError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar, int reason) {
+    this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
+  }
 }

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/TypeConverter.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/TypeConverter.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/TypeConverter.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/TypeConverter.java Thu Jan 22 22:32:36 2009
@@ -35,24 +35,25 @@
 
 /**
  * Interface for accessing the type conversion facilities within a context.
+ *
  * @author Luke Blanshard (blanshlu@netscape.net)
  * @author Drew Davidson (drew@ognl.org)
  */
-public interface TypeConverter
-{
-    /**
-       * Converts the given value to a given type.  The OGNL context, target, member and
-       * name of property being set are given.  This method should be able to handle
-       * conversion in general without any context, target, member or property name specified.
-       * @param context OGNL context under which the conversion is being done
-       * @param target target object in which the property is being set
-       * @param member member (Constructor, Method or Field) being set
-       * @param propertyName property name being set
-       * @param value value to be converted
-       * @param toType type to which value is converted
-       * @return Converted value of type toType or TypeConverter.NoConversionPossible to indicate that the
-                 conversion was not possible.
-     */
-    public Object convertValue(Map context, Object target, Member member, String propertyName, Object value, Class toType);
+public interface TypeConverter {
+  /**
+   * Converts the given value to a given type.  The OGNL context, target, member and
+   * name of property being set are given.  This method should be able to handle
+   * conversion in general without any context, target, member or property name specified.
+   *
+   * @param context      OGNL context under which the conversion is being done
+   * @param target       target object in which the property is being set
+   * @param member       member (Constructor, Method or Field) being set
+   * @param propertyName property name being set
+   * @param value        value to be converted
+   * @param toType       type to which value is converted
+   * @return Converted value of type toType or TypeConverter.NoConversionPossible to indicate that the
+   *         conversion was not possible.
+   */
+  public Object convertValue(Map context, Object target, Member member, String propertyName, Object value, Class toType);
 }
 

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/package.html
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/package.html?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/package.html (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/package.html Thu Jan 22 22:32:36 2009
@@ -32,21 +32,21 @@
 
 -->
 <head>
-<title>OGNL Overview</title>
+  <title>OGNL Overview</title>
 <body>
-    <p>OGNL stands for Object-Graph Navigation Language; it is an expression language
-    for getting and setting properties of Java objects. You use the same expression
-    for both getting and setting the value of a property.</p>
+<p>OGNL stands for Object-Graph Navigation Language; it is an expression language
+  for getting and setting properties of Java objects. You use the same expression
+  for both getting and setting the value of a property.</p>
 
-    <p>OGNL started out as a way to set up associations between UI
-    components and controllers using property names.  As the desire for
-    more complicated associations grew, Drew Davidson created what he
-    called KVCL, for Key-Value Coding Language, egged on by Luke
-    Blanshard.  Luke then reimplemented the language using ANTLR, came up
-    with the new name, and, egged on by Drew, filled it out to its current
-    state.</p>
+<p>OGNL started out as a way to set up associations between UI
+  components and controllers using property names. As the desire for
+  more complicated associations grew, Drew Davidson created what he
+  called KVCL, for Key-Value Coding Language, egged on by Luke
+  Blanshard. Luke then reimplemented the language using ANTLR, came up
+  with the new name, and, egged on by Drew, filled it out to its current
+  state.</p>
 
-    <p>We pronounce OGNL as a word, like the last syllables of a drunken
-    pronunciation of "orthogonal" or like "ogg-null".</p>
+<p>We pronounce OGNL as a word, like the last syllables of a drunken
+  pronunciation of "orthogonal" or like "ogg-null".</p>
 </body>
 </html>

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/BaseParser.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/BaseParser.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/BaseParser.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/BaseParser.java Thu Jan 22 22:32:36 2009
@@ -1,7 +1,11 @@
 package org.apache.ibatis.parser;
 
-import org.apache.ibatis.type.*;
-import org.apache.ibatis.mapping.*;
+import org.apache.ibatis.mapping.Configuration;
+import org.apache.ibatis.mapping.ParameterMode;
+import org.apache.ibatis.mapping.ResultSetType;
+import org.apache.ibatis.type.JdbcType;
+import org.apache.ibatis.type.TypeAliasRegistry;
+import org.apache.ibatis.type.TypeHandlerRegistry;
 
 public class BaseParser {
   protected Configuration configuration;

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/InlineSqlSource.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/InlineSqlSource.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/InlineSqlSource.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/InlineSqlSource.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,7 @@
 package org.apache.ibatis.parser;
 
-import org.apache.ibatis.mapping.*;
+import org.apache.ibatis.mapping.ParameterMapping;
+import org.apache.ibatis.mapping.SqlSource;
 
 import java.util.List;
 

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperConfigParser.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperConfigParser.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperConfigParser.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperConfigParser.java Thu Jan 22 22:32:36 2009
@@ -1,18 +1,23 @@
 package org.apache.ibatis.parser;
 
-import org.apache.ibatis.xml.*;
-import org.apache.ibatis.mapping.*;
-import org.apache.ibatis.type.*;
-import org.apache.ibatis.plugin.Interceptor;
-import org.apache.ibatis.reflection.*;
+import org.apache.ibatis.datasource.DataSourceFactory;
+import org.apache.ibatis.executor.ErrorContext;
 import org.apache.ibatis.io.Resources;
+import org.apache.ibatis.mapping.Configuration;
 import org.apache.ibatis.mapping.Environment;
-import org.apache.ibatis.datasource.DataSourceFactory;
+import org.apache.ibatis.mapping.ExecutorType;
+import org.apache.ibatis.plugin.Interceptor;
+import org.apache.ibatis.reflection.MetaClass;
+import org.apache.ibatis.reflection.ObjectFactory;
 import org.apache.ibatis.transaction.TransactionFactory;
-import org.apache.ibatis.executor.ErrorContext;
+import org.apache.ibatis.type.TypeHandler;
+import org.apache.ibatis.xml.Nodelet;
+import org.apache.ibatis.xml.NodeletContext;
+import org.apache.ibatis.xml.NodeletParser;
 
 import java.io.Reader;
-import java.util.*;
+import java.util.Map;
+import java.util.Properties;
 
 public class MapperConfigParser extends BaseParser {
 
@@ -25,11 +30,11 @@
   private Environment.Builder environmentBuilder;
 
   public MapperConfigParser(Reader reader) {
-    this(reader,null,null);
+    this(reader, null, null);
   }
 
   public MapperConfigParser(Reader reader, String environment) {
-    this(reader,environment,null);
+    this(reader, environment, null);
   }
 
   public MapperConfigParser(Reader reader, String environment, Properties props) {

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperEntityResolver.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperEntityResolver.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperEntityResolver.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperEntityResolver.java Thu Jan 22 22:32:36 2009
@@ -1,10 +1,14 @@
 package org.apache.ibatis.parser;
 
-import org.xml.sax.*;
 import org.apache.ibatis.io.Resources;
-
-import java.io.*;
-import java.util.*;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Offline entity resolver for the iBATIS DTDs

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperParser.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperParser.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperParser.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperParser.java Thu Jan 22 22:32:36 2009
@@ -1,14 +1,20 @@
 package org.apache.ibatis.parser;
 
-import org.apache.ibatis.mapping.*;
-import org.apache.ibatis.reflection.MetaClass;
-import org.apache.ibatis.type.*;
-import org.apache.ibatis.xml.*;
 import org.apache.ibatis.cache.Cache;
 import org.apache.ibatis.executor.ErrorContext;
+import org.apache.ibatis.mapping.*;
+import org.apache.ibatis.reflection.MetaClass;
+import org.apache.ibatis.type.JdbcType;
+import org.apache.ibatis.type.TypeHandler;
+import org.apache.ibatis.xml.Nodelet;
+import org.apache.ibatis.xml.NodeletContext;
+import org.apache.ibatis.xml.NodeletParser;
 
 import java.io.Reader;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Properties;
 
 public class MapperParser extends BaseParser {
 
@@ -72,24 +78,24 @@
     }
     cache = configuration.getCache(namespaceCacheId(ns));
     if (cache == null) {
-      throw new ParserException("No cache for namespace '"+ns+"' could be found.");
+      throw new ParserException("No cache for namespace '" + ns + "' could be found.");
     }
   }
 
   //  <cache type="LRU" flushInterval="3600000" size="1000" readOnly="false" />
   @Nodelet("/mapper/cache")
   public void cacheElement(NodeletContext context) throws Exception {
-    String type = context.getStringAttribute("perpetual","PERPETUAL");
+    String type = context.getStringAttribute("perpetual", "PERPETUAL");
     type = typeAliasRegistry.resolveAlias(type);
     Class typeClass = Class.forName(type);
 
-    String eviction = context.getStringAttribute("eviction","LRU");
+    String eviction = context.getStringAttribute("eviction", "LRU");
     eviction = typeAliasRegistry.resolveAlias(eviction);
     Class evictionClass = Class.forName(eviction);
 
-    Long flushInterval = context.getLongAttribute("flushInterval",null);
-    Integer size = context.getIntAttribute("size",null);
-    boolean readOnly = context.getBooleanAttribute("readOnly",false);
+    Long flushInterval = context.getLongAttribute("flushInterval", null);
+    Integer size = context.getIntAttribute("size", null);
+    boolean readOnly = context.getBooleanAttribute("readOnly", false);
 
     Properties props = context.getChildrenAsProperties();
 
@@ -269,13 +275,13 @@
   //  <procedure ...>
   @Nodelet("/mapper/procedure")
   public void procedureElement(NodeletContext context) throws Exception {
-    buildStatement(context,StatementType.CALLABLE);
+    buildStatement(context, StatementType.CALLABLE);
   }
 
   //  <procedure ...>
   @Nodelet("/mapper/statement")
   public void statementElement(NodeletContext context) throws Exception {
-    buildStatement(context,StatementType.STATEMENT);
+    buildStatement(context, StatementType.STATEMENT);
   }
 
   private String applyNamespace(String base) {
@@ -313,10 +319,10 @@
   private void setStatementCache(NodeletContext context, MappedStatement.Builder statementBuilder) {
     boolean isSelect = "select".equals(context.getNode().getNodeName());
 
-    boolean flushCache = context.getBooleanAttribute("flushCache",!isSelect);
+    boolean flushCache = context.getBooleanAttribute("flushCache", !isSelect);
     statementBuilder.flushCacheRequired(flushCache);
 
-    boolean useCache = context.getBooleanAttribute("useCache",isSelect);
+    boolean useCache = context.getBooleanAttribute("useCache", isSelect);
     statementBuilder.useCache(useCache);
 
     statementBuilder.cache(cache);
@@ -421,7 +427,7 @@
     resultMap = applyNamespace(resultMap);
     String mode = context.getStringAttribute("mode");
     String typeHandler = context.getStringAttribute("typeHandler");
-    Integer numericScale = context.getIntAttribute("numericScale",null);
+    Integer numericScale = context.getIntAttribute("numericScale", null);
 
     ParameterMode modeEnum = resolveParameterMode(mode);
     Class resultType = parameterMapBuilder.type();

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/SqlSourceParser.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/SqlSourceParser.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/SqlSourceParser.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/SqlSourceParser.java Thu Jan 22 22:32:36 2009
@@ -1,10 +1,15 @@
 package org.apache.ibatis.parser;
 
-import org.apache.ibatis.mapping.*;
-import org.apache.ibatis.xml.*;
+import org.apache.ibatis.mapping.Configuration;
+import org.apache.ibatis.mapping.ParameterMapping;
+import org.apache.ibatis.mapping.SqlSource;
 import org.apache.ibatis.type.TypeHandler;
+import org.apache.ibatis.xml.GenericTokenParser;
+import org.apache.ibatis.xml.NodeletContext;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
 
 public class SqlSourceParser extends BaseParser {
 
@@ -33,13 +38,14 @@
       parameterMappings.add(buildParameterMapping(content));
       return "?";
     }
+
     private ParameterMapping buildParameterMapping(String content) {
-      StringTokenizer parameterMappingParts = new StringTokenizer(content,", ");
+      StringTokenizer parameterMappingParts = new StringTokenizer(content, ", ");
       String property = parameterMappingParts.nextToken();
       ParameterMapping.Builder builder = new ParameterMapping.Builder(configuration, property, Object.class);
       while (parameterMappingParts.hasMoreTokens()) {
         String attribute = parameterMappingParts.nextToken();
-        StringTokenizer attributeParts = new StringTokenizer(attribute,"=");
+        StringTokenizer attributeParts = new StringTokenizer(attribute, "=");
         if (attributeParts.countTokens() == 2) {
           String name = attributeParts.nextToken();
           String value = attributeParts.nextToken();

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/plugin/InterceptorChain.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/plugin/InterceptorChain.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/plugin/InterceptorChain.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/plugin/InterceptorChain.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,7 @@
 package org.apache.ibatis.plugin;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
 public class InterceptorChain {
 

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/plugin/Intercepts.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/plugin/Intercepts.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/plugin/Intercepts.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/plugin/Intercepts.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,9 @@
 package org.apache.ibatis.plugin;
 
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/plugin/Invocation.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/plugin/Invocation.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/plugin/Invocation.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/plugin/Invocation.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,7 @@
 package org.apache.ibatis.plugin;
 
-import java.lang.reflect.*;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 
 public class Invocation {
 

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/plugin/Plugin.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/plugin/Plugin.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/plugin/Plugin.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/plugin/Plugin.java Thu Jan 22 22:32:36 2009
@@ -2,8 +2,13 @@
 
 import org.apache.ibatis.reflection.ExceptionUtil;
 
-import java.lang.reflect.*;
-import java.util.*;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 
 public class Plugin implements InvocationHandler {
 

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/plugin/Signature.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/plugin/Signature.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/plugin/Signature.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/plugin/Signature.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,9 @@
 package org.apache.ibatis.plugin;
 
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/reflection/ExceptionUtil.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/reflection/ExceptionUtil.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/reflection/ExceptionUtil.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/reflection/ExceptionUtil.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,7 @@
 package org.apache.ibatis.reflection;
 
-import java.lang.reflect.*;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.UndeclaredThrowableException;
 
 public class ExceptionUtil {
 

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/reflection/GetFieldInvoker.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/reflection/GetFieldInvoker.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/reflection/GetFieldInvoker.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/reflection/GetFieldInvoker.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,7 @@
 package org.apache.ibatis.reflection;
 
-import java.lang.reflect.*;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
 
 class GetFieldInvoker implements Invoker {
   private Field field;

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/reflection/MetaObject.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/reflection/MetaObject.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/reflection/MetaObject.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/reflection/MetaObject.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,7 @@
 package org.apache.ibatis.reflection;
 
-import java.util.*;
+import java.util.List;
+import java.util.Map;
 
 public class MetaObject {
 
@@ -223,7 +224,7 @@
   private Object getIndexedProperty(PropertyTokenizer prop, Object object) {
     Object collection = resolveCollection(prop, object);
     if (collection instanceof Map) {
-      return ((Map)collection).get(prop.getIndex());
+      return ((Map) collection).get(prop.getIndex());
     }
     return getListValue(prop, collection);
   }
@@ -258,10 +259,10 @@
   private void setIndexedProperty(PropertyTokenizer prop, Object object, Object value) {
     Object collection = resolveCollection(prop, object);
     if (collection instanceof Map) {
-      ((Map)collection).put(prop.getIndex(),value);
+      ((Map) collection).put(prop.getIndex(), value);
     } else {
       setListValue(prop, collection, value);
-    }    
+    }
   }
 
   private void setListValue(PropertyTokenizer prop, Object list, Object value) {

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/reflection/MethodInvoker.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/reflection/MethodInvoker.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/reflection/MethodInvoker.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/reflection/MethodInvoker.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,7 @@
 package org.apache.ibatis.reflection;
 
-import java.lang.reflect.*;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 
 class MethodInvoker implements Invoker {
 

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/reflection/ObjectFactory.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/reflection/ObjectFactory.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/reflection/ObjectFactory.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/reflection/ObjectFactory.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,7 @@
 package org.apache.ibatis.reflection;
 
-import java.util.*;
+import java.util.List;
+import java.util.Properties;
 
 public interface ObjectFactory {
 

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/reflection/ReflectionException.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/reflection/ReflectionException.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/reflection/ReflectionException.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/reflection/ReflectionException.java Thu Jan 22 22:32:36 2009
@@ -17,5 +17,5 @@
   public ReflectionException(Throwable cause) {
     super(cause);
   }
-  
+
 }

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/reflection/SetFieldInvoker.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/reflection/SetFieldInvoker.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/reflection/SetFieldInvoker.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/reflection/SetFieldInvoker.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,7 @@
 package org.apache.ibatis.reflection;
 
-import java.lang.reflect.*;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
 
 class SetFieldInvoker implements Invoker {
   private Field field;

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/Transaction.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/Transaction.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/Transaction.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/Transaction.java Thu Jan 22 22:32:36 2009
@@ -6,8 +6,11 @@
 public interface Transaction {
 
   Connection getConnection();
+
   void commit() throws SQLException;
+
   void rollback() throws SQLException;
+
   void close() throws SQLException;
 
 }

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/TransactionException.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/TransactionException.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/TransactionException.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/TransactionException.java Thu Jan 22 22:32:36 2009
@@ -17,5 +17,5 @@
   public TransactionException(Throwable cause) {
     super(cause);
   }
-  
+
 }

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/TransactionFactory.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/TransactionFactory.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/TransactionFactory.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/TransactionFactory.java Thu Jan 22 22:32:36 2009
@@ -6,7 +6,7 @@
 public interface TransactionFactory {
 
   void setProperties(Properties props);
-    
+
   Transaction newTransaction(Connection conn, boolean autoCommit);
 
 }

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/jdbc/JdbcTransaction.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/jdbc/JdbcTransaction.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/jdbc/JdbcTransaction.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/jdbc/JdbcTransaction.java Thu Jan 22 22:32:36 2009
@@ -1,8 +1,10 @@
 package org.apache.ibatis.transaction.jdbc;
 
-import org.apache.ibatis.transaction.*;
+import org.apache.ibatis.transaction.Transaction;
+import org.apache.ibatis.transaction.TransactionException;
 
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.SQLException;
 
 public class JdbcTransaction implements Transaction {
 

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/jdbc/JdbcTransactionFactory.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/jdbc/JdbcTransactionFactory.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/jdbc/JdbcTransactionFactory.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/jdbc/JdbcTransactionFactory.java Thu Jan 22 22:32:36 2009
@@ -1,10 +1,10 @@
 package org.apache.ibatis.transaction.jdbc;
 
-import org.apache.ibatis.transaction.TransactionFactory;
 import org.apache.ibatis.transaction.Transaction;
+import org.apache.ibatis.transaction.TransactionFactory;
 
-import java.util.Properties;
 import java.sql.Connection;
+import java.util.Properties;
 
 public class JdbcTransactionFactory implements TransactionFactory {
 

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/managed/ManagedTransaction.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/managed/ManagedTransaction.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/managed/ManagedTransaction.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/managed/ManagedTransaction.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,6 @@
 package org.apache.ibatis.transaction.managed;
 
-import org.apache.ibatis.transaction.*;
+import org.apache.ibatis.transaction.Transaction;
 
 import java.sql.Connection;
 import java.sql.SQLException;

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/managed/ManagedTransactionFactory.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/managed/ManagedTransactionFactory.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/managed/ManagedTransactionFactory.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/managed/ManagedTransactionFactory.java Thu Jan 22 22:32:36 2009
@@ -1,10 +1,10 @@
 package org.apache.ibatis.transaction.managed;
 
-import org.apache.ibatis.transaction.TransactionFactory;
 import org.apache.ibatis.transaction.Transaction;
+import org.apache.ibatis.transaction.TransactionFactory;
 
-import java.util.Properties;
 import java.sql.Connection;
+import java.util.Properties;
 
 public class ManagedTransactionFactory implements TransactionFactory {
 

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/BaseTypeHandler.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/BaseTypeHandler.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/BaseTypeHandler.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/BaseTypeHandler.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,9 @@
 package org.apache.ibatis.type;
 
-import java.sql.*;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 
 public abstract class BaseTypeHandler implements TypeHandler {
 

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/BigDecimalTypeHandler.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/BigDecimalTypeHandler.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/BigDecimalTypeHandler.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/BigDecimalTypeHandler.java Thu Jan 22 22:32:36 2009
@@ -1,7 +1,10 @@
 package org.apache.ibatis.type;
 
 import java.math.BigDecimal;
-import java.sql.*;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 
 public class BigDecimalTypeHandler extends BaseTypeHandler {
 

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/BooleanTypeHandler.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/BooleanTypeHandler.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/BooleanTypeHandler.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/BooleanTypeHandler.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,9 @@
 package org.apache.ibatis.type;
 
-import java.sql.*;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 
 public class BooleanTypeHandler extends BaseTypeHandler {
 

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/ByteArrayTypeHandler.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/ByteArrayTypeHandler.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/ByteArrayTypeHandler.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/ByteArrayTypeHandler.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,9 @@
 package org.apache.ibatis.type;
 
-import java.sql.*;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 
 public class ByteArrayTypeHandler extends BaseTypeHandler {
 

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/ByteTypeHandler.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/ByteTypeHandler.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/ByteTypeHandler.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/ByteTypeHandler.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,9 @@
 package org.apache.ibatis.type;
 
-import java.sql.*;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 
 public class ByteTypeHandler extends BaseTypeHandler {
 

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/DateOnlyTypeHandler.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/DateOnlyTypeHandler.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/DateOnlyTypeHandler.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/DateOnlyTypeHandler.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,9 @@
 package org.apache.ibatis.type;
 
-import java.sql.*;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.util.Date;
 
 public class DateOnlyTypeHandler extends BaseTypeHandler {

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/DateTypeHandler.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/DateTypeHandler.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/DateTypeHandler.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/DateTypeHandler.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,9 @@
 package org.apache.ibatis.type;
 
-import java.sql.*;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.util.Date;
 
 public class DateTypeHandler extends BaseTypeHandler {

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/DoubleTypeHandler.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/DoubleTypeHandler.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/DoubleTypeHandler.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/DoubleTypeHandler.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,9 @@
 package org.apache.ibatis.type;
 
-import java.sql.*;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 
 public class DoubleTypeHandler extends BaseTypeHandler {
 

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/EnumTypeHandler.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/EnumTypeHandler.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/EnumTypeHandler.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/EnumTypeHandler.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,9 @@
 package org.apache.ibatis.type;
 
-import java.sql.*;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 
 public class EnumTypeHandler extends BaseTypeHandler implements TypeHandler {
 

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/FloatTypeHandler.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/FloatTypeHandler.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/FloatTypeHandler.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/FloatTypeHandler.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,9 @@
 package org.apache.ibatis.type;
 
-import java.sql.*;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 
 public class FloatTypeHandler extends BaseTypeHandler {
 

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/IntegerTypeHandler.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/IntegerTypeHandler.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/IntegerTypeHandler.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/IntegerTypeHandler.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,9 @@
 package org.apache.ibatis.type;
 
-import java.sql.*;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 
 public class IntegerTypeHandler extends BaseTypeHandler {
 

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/LongTypeHandler.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/LongTypeHandler.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/LongTypeHandler.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/LongTypeHandler.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,9 @@
 package org.apache.ibatis.type;
 
-import java.sql.*;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 
 public class LongTypeHandler extends BaseTypeHandler {
 

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/ObjectTypeHandler.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/ObjectTypeHandler.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/ObjectTypeHandler.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/ObjectTypeHandler.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,9 @@
 package org.apache.ibatis.type;
 
-import java.sql.*;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 
 public class ObjectTypeHandler extends BaseTypeHandler {
 

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/ShortTypeHandler.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/ShortTypeHandler.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/ShortTypeHandler.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/ShortTypeHandler.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,9 @@
 package org.apache.ibatis.type;
 
-import java.sql.*;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 
 public class ShortTypeHandler extends BaseTypeHandler {
 

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/SimpleTypeRegistry.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/SimpleTypeRegistry.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/SimpleTypeRegistry.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/SimpleTypeRegistry.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,7 @@
 package org.apache.ibatis.type;
 
-import java.math.*;
+import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.util.*;
 
 public class SimpleTypeRegistry {

Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/SqlDateTypeHandler.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/SqlDateTypeHandler.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/SqlDateTypeHandler.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/SqlDateTypeHandler.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,9 @@
 package org.apache.ibatis.type;
 
-import java.sql.*;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 
 public class SqlDateTypeHandler extends BaseTypeHandler {
 



Mime
View raw message