fixed some compiler warnings

Author: emacarron

src/main/java/org/apache/ibatis/builder/MapperBuilderAssistant.java

@@ -32,13 +32,12 @@ public String getCurrentNamespace() {
 
   public void setCurrentNamespace(String currentNamespace) {
     if (currentNamespace == null) {
-      throw new BuilderException(
-          "The mapper element requires a namespace attribute to be specified.");
+      throw new BuilderException("The mapper element requires a namespace attribute to be specified.");
     }
 
     if (this.currentNamespace != null && !this.currentNamespace.equals(currentNamespace)) {
       throw new BuilderException("Wrong namespace. Expected '"
-          + this.currentNamespace + "' but found '" + currentNamespace + "'");
+          + this.currentNamespace + "' but found '" + currentNamespace + "'.");
     }
 
     this.currentNamespace = currentNamespace;

src/main/java/org/apache/ibatis/builder/xml/XMLMapperBuilder.java

@@ -35,7 +35,6 @@ public class XMLMapperBuilder extends BaseBuilder {
   private XPathParser parser;
   private MapperBuilderAssistant builderAssistant;
   private Map<String, XNode> sqlFragments;
-  private String resource;
 
   @Deprecated
   public XMLMapperBuilder(Reader reader, Configuration configuration, String resource, Map<String, XNode> sqlFragments, String namespace) {
@@ -64,7 +63,6 @@ private XMLMapperBuilder(XPathParser parser, Configuration configuration, String
     this.builderAssistant = new MapperBuilderAssistant(configuration, resource);
     this.parser = parser;
     this.sqlFragments = sqlFragments;
-    this.resource = resource;
   }
 
   public void parse() {
@@ -75,9 +73,6 @@ public void parse() {
       configurationElement(context);
       configuration.addLoadedResource(namespace);
       bindMapperForNamespace();
-
-      // TODO skip current processed statements
-      // try with pending statements
       parsePendingChacheRefs();
       parsePendingStatements();
     }
@@ -104,7 +99,6 @@ private void configurationElement(XNode context) {
   private void buildStatementFromContext(List<XNode> list) {
     for (XNode context : list) {
       final XMLStatementBuilder statementParser = new XMLStatementBuilder(configuration, builderAssistant, context);
-      // TODO parse just one time!
       try {
     	  statementParser.parseStatementNode();
       } catch (IncompleteStatementException e) {

src/main/java/org/apache/ibatis/executor/loader/ResultLoader.java

@@ -12,7 +12,6 @@
 import org.apache.ibatis.session.RowBounds;
 import org.apache.ibatis.transaction.Transaction;
 import org.apache.ibatis.transaction.TransactionFactory;
-import org.apache.ibatis.transaction.jdbc.JdbcTransaction;
 
 import javax.sql.DataSource;
 import java.sql.Connection;

src/test/java/org/apache/ibatis/io/ResourcesTest.java

@@ -1,9 +1,8 @@
 package org.apache.ibatis.io;
 
-import org.apache.ibatis.BaseDataTest;
-import static org.junit.Assert.*;
-import org.junit.Test;
-import sun.nio.cs.US_ASCII;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import java.io.File;
 import java.io.IOException;
@@ -13,6 +12,9 @@
 import java.nio.charset.Charset;
 import java.util.Properties;
 
+import org.apache.ibatis.BaseDataTest;
+import org.junit.Test;
+
 public class ResourcesTest extends BaseDataTest {
 
   private static final ClassLoader CLASS_LOADER = ResourcesTest.class.getClassLoader();
@@ -120,7 +122,7 @@ public void shouldGetReader() throws IOException {
     Charset charset = Resources.getCharset();
 
     // charset
-    Resources.setCharset(new US_ASCII());
+    Resources.setCharset(Charset.forName("US-ASCII"));
     assertNotNull(Resources.getResourceAsReader(JPETSTORE_PROPERTIES));
 
     // no charset
@@ -139,7 +141,7 @@ public void shouldGetReaderWithClassLoader() throws IOException {
     Charset charset = Resources.getCharset();
 
     // charset
-    Resources.setCharset(new US_ASCII());
+    Resources.setCharset(Charset.forName("US-ASCII"));
     assertNotNull(Resources.getResourceAsReader(getClass().getClassLoader(), JPETSTORE_PROPERTIES));
 
     // no charset