Author: cbegin
Date: Wed May 6 02:03:04 2009
New Revision: 772028
URL: http://svn.apache.org/viewvc?rev=772028&view=rev
Log:
renamed MapperConfigurator to be more meaningful
Added:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/SequentialMapperBuilder.java
- copied, changed from r772024,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperConfigurator.java
Removed:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperConfigurator.java
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/annotation/MapperAnnotationParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/xml/XMLMapperParser.java
Copied:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/SequentialMapperBuilder.java
(from r772024,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperConfigurator.java)
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/SequentialMapperBuilder.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/SequentialMapperBuilder.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperConfigurator.java&r1=772024&r2=772028&rev=772028&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperConfigurator.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/SequentialMapperBuilder.java
Wed May 6 02:03:04 2009
@@ -10,7 +10,7 @@
import java.util.*;
-public class MapperConfigurator extends BaseParser {
+public class SequentialMapperBuilder extends BaseParser {
private String namespace;
private String resource;
@@ -26,13 +26,13 @@
private Cache cache;
- public MapperConfigurator(Configuration configuration, String resource) {
+ public SequentialMapperBuilder(Configuration configuration, String resource)
{
super(configuration);
ErrorContext.instance().resource(resource);
this.resource = resource;
}
- public String namespace() {
+ public String getNamespace() {
return namespace;
}
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/annotation/MapperAnnotationParser.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/annotation/MapperAnnotationParser.java?rev=772028&r1=772027&r2=772028&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/annotation/MapperAnnotationParser.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/annotation/MapperAnnotationParser.java
Wed May 6 02:03:04 2009
@@ -16,12 +16,12 @@
public class MapperAnnotationParser {
- private MapperConfigurator configurator;
+ private SequentialMapperBuilder configurator;
private Class type;
public MapperAnnotationParser(Configuration config, Class type) {
String resource = type.getName().replace('.', '/') + ".java (best guess)";
- this.configurator = new MapperConfigurator(config, resource);
+ this.configurator = new SequentialMapperBuilder(config, resource);
this.type = type;
}
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/xml/XMLMapperParser.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/xml/XMLMapperParser.java?rev=772028&r1=772027&r2=772028&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/xml/XMLMapperParser.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/xml/XMLMapperParser.java
Wed May 6 02:03:04 2009
@@ -12,7 +12,7 @@
protected Reader reader;
protected NodeletParser parser;
- protected MapperConfigurator mapperConfigurator;
+ protected SequentialMapperBuilder mapperConfigurator;
public XMLMapperParser(Reader reader, Configuration configuration, String
resource, String namespace) {
this(reader, configuration, resource);
@@ -21,7 +21,7 @@
public XMLMapperParser(Reader reader, Configuration configuration, String
resource) {
super(configuration);
- this.mapperConfigurator = new MapperConfigurator(configuration, resource);
+ this.mapperConfigurator = new SequentialMapperBuilder(configuration,
resource);
this.reader = reader;
this.parser = new NodeletParser();
this.parser.addNodeletHandler(this);
@@ -271,7 +271,7 @@
}
private void bindMapperForNamespace() {
- String namespace = mapperConfigurator.namespace();
+ String namespace = mapperConfigurator.getNamespace();
if (namespace != null) {
Class boundType = null;
try {
