Author: cbegin
Date: Mon Mar 29 00:20:56 2010
New Revision: 928541
URL: http://svn.apache.org/viewvc?rev=928541&view=rev
Log:
cleaned up weird boolean logic and parameters
Modified:
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/builder/MapperBuilderAssistant.java
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/builder/xml/XMLMapperBuilder.java
Modified:
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/builder/MapperBuilderAssistant.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/builder/MapperBuilderAssistant.java?rev=928541&r1=928540&r2=928541&view=diff
==============================================================================
---
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/builder/MapperBuilderAssistant.java
(original)
+++
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/builder/MapperBuilderAssistant.java
Mon Mar 29 00:20:56 2010
@@ -60,7 +60,7 @@ public class MapperBuilderAssistant exte
Class evictionClass,
Long flushInterval,
Integer size,
- boolean readOnly,
+ boolean readWrite,
Properties props) {
typeClass = valueOrDefault(typeClass, PerpetualCache.class);
evictionClass = valueOrDefault(evictionClass, LruCache.class);
@@ -69,7 +69,7 @@ public class MapperBuilderAssistant exte
.addDecorator(evictionClass)
.clearInterval(flushInterval)
.size(size)
- .readWrite(!readOnly)
+ .readWrite(readWrite)
.properties(props)
.build();
configuration.addCache(cache);
Modified:
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java?rev=928541&r1=928540&r2=928541&view=diff
==============================================================================
---
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java
(original)
+++
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java
Mon Mar 29 00:20:56 2010
@@ -75,7 +75,7 @@ public class MapperAnnotationBuilder {
private void parseCache() {
CacheNamespace cacheDomain = (CacheNamespace)
type.getAnnotation(CacheNamespace.class);
if (cacheDomain != null) {
- assistant.useNewCache(cacheDomain.implementation(),
cacheDomain.eviction(), cacheDomain.flushInterval(), cacheDomain.size(),
!cacheDomain.readWrite(), null);
+ assistant.useNewCache(cacheDomain.implementation(),
cacheDomain.eviction(), cacheDomain.flushInterval(), cacheDomain.size(),
cacheDomain.readWrite(), null);
}
}
Modified:
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/builder/xml/XMLMapperBuilder.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/builder/xml/XMLMapperBuilder.java?rev=928541&r1=928540&r2=928541&view=diff
==============================================================================
---
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/builder/xml/XMLMapperBuilder.java
(original)
+++
ibatis/java/ibatis-3/trunk/src/main/java/org/apache/ibatis/builder/xml/XMLMapperBuilder.java
Mon Mar 29 00:20:56 2010
@@ -75,9 +75,9 @@ public class XMLMapperBuilder extends Ba
Class evictionClass = typeAliasRegistry.resolveAlias(eviction);
Long flushInterval = context.getLongAttribute("flushInterval");
Integer size = context.getIntAttribute("size");
- boolean readOnly = context.getBooleanAttribute("readOnly", false);
+ boolean readWrite = !context.getBooleanAttribute("readOnly", false);
Properties props = context.getChildrenAsProperties();
- builderAssistant.useNewCache(typeClass, evictionClass, flushInterval,
size, readOnly, props);
+ builderAssistant.useNewCache(typeClass, evictionClass, flushInterval,
size, readWrite, props);
}
}