Menu
▾
▴
[jboss-cvs] JBossCache/src-50/org/jboss/cache/pojo ...
|
From: Ben W. <bw...@jb...> - 2006-07-07 10:36:50
|
User: bwang
Date: 06/07/07 06:36:44
Modified: src-50/org/jboss/cache/pojo AOPInstance.java
ObjectGraphHandler.java TreeCacheAopDelegate.java
Log:
Renamed CacheInterceptor to CacheFieldInterceptor
Revision Changes Path
1.3 +1 -1 JBossCache/src-50/org/jboss/cache/pojo/AOPInstance.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AOPInstance.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/AOPInstance.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- AOPInstance.java 27 Jun 2006 05:25:43 -0000 1.2
+++ AOPInstance.java 7 Jul 2006 10:36:44 -0000 1.3
@@ -14,7 +14,7 @@
/**
* Wrapper type for cached AOP instances.
- * When an object is looked up or put in TreeCacheAOP, this object will be advised with a CacheInterceptor.
+ * When an object is looked up or put in TreeCacheAOP, this object will be advised with a CacheFieldInterceptor.
* The tree cache stores a reference to this object (for example to update the instance variables, etc.).
* Since this reference need to be transactional but never replicated (the reference is only valid within the VM)
* this reference is wrapped into an AOPInstance.
1.6 +4 -4 JBossCache/src-50/org/jboss/cache/pojo/ObjectGraphHandler.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ObjectGraphHandler.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/ObjectGraphHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- ObjectGraphHandler.java 7 Jul 2006 10:26:07 -0000 1.5
+++ ObjectGraphHandler.java 7 Jul 2006 10:36:44 -0000 1.6
@@ -17,14 +17,14 @@
import org.jboss.cache.pojo.interceptors.dynamic.AbstractCollectionInterceptor;
import org.jboss.cache.pojo.util.AopUtil;
import org.jboss.cache.pojo.interceptors.dynamic.BaseInterceptor;
-import org.jboss.cache.pojo.interceptors.dynamic.CacheInterceptor;
+import org.jboss.cache.pojo.interceptors.dynamic.CacheFieldInterceptor;
/**
* Handle the object graph management.
*
* @author Ben Wang
* Date: Aug 4, 2005
- * @version $Id: ObjectGraphHandler.java,v 1.5 2006/07/07 10:26:07 bwang Exp $
+ * @version $Id: ObjectGraphHandler.java,v 1.6 2006/07/07 10:36:44 bwang Exp $
*/
class ObjectGraphHandler
{
@@ -48,7 +48,7 @@
if (refFqn != null)
{
// this is recursive. Need to obtain the object from parent fqn
- // No need to add CacheInterceptor as a result. Everything is re-directed.
+ // No need to add CacheFieldInterceptor as a result. Everything is re-directed.
// In addition, this op will not be recursive.
if (log.isDebugEnabled())
{
@@ -140,7 +140,7 @@
internal_.relocate(fqn, newFqn);
// Reset the fqn in the cache interceptor
InstanceAdvisor advisor = ((Advised) pojo)._getInstanceAdvisor();
- CacheInterceptor interceptor = (CacheInterceptor) AopUtil.findCacheInterceptor(advisor);
+ CacheFieldInterceptor interceptor = (CacheFieldInterceptor) AopUtil.findCacheInterceptor(advisor);
if (interceptor == null)
throw new IllegalStateException("ObjectGraphHandler.objectGraphRemove(): null interceptor");
interceptor.setFqn(newFqn);
1.8 +6 -6 JBossCache/src-50/org/jboss/cache/pojo/TreeCacheAopDelegate.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TreeCacheAopDelegate.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/TreeCacheAopDelegate.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- TreeCacheAopDelegate.java 7 Jul 2006 10:26:07 -0000 1.7
+++ TreeCacheAopDelegate.java 7 Jul 2006 10:36:44 -0000 1.8
@@ -20,7 +20,7 @@
import org.jboss.cache.pojo.memory.FieldPersistentReference;
import org.jboss.cache.pojo.util.AopUtil;
import org.jboss.cache.pojo.interceptors.dynamic.BaseInterceptor;
-import org.jboss.cache.pojo.interceptors.dynamic.CacheInterceptor;
+import org.jboss.cache.pojo.interceptors.dynamic.CacheFieldInterceptor;
import java.lang.reflect.Field;
import java.util.Collection;
@@ -132,7 +132,7 @@
}
// Insert interceptor at runtime
InstanceAdvisor advisor = ((Advised) obj)._getInstanceAdvisor();
- CacheInterceptor interceptor = new CacheInterceptor(cache_, fqn, type);
+ CacheFieldInterceptor interceptor = new CacheFieldInterceptor(cache_, fqn, type);
interceptor.setAopInstance(aopInstance);
util_.attachInterceptor(advisor, interceptor);
} else
@@ -185,7 +185,7 @@
cache_._removeObject(fqn, true); // remove old value before overwriting it.
}
- // Remember not to print obj here since it will trigger the CacheInterceptor.
+ // Remember not to print obj here since it will trigger the CacheFieldInterceptor.
if (log.isDebugEnabled())
{
log.debug("putObject(): fqn: " + fqn);
@@ -417,7 +417,7 @@
// Always initialize the ref count so we can mark this as an AopNode.
AOPInstance aopInstance = InternalDelegate.initializeAopInstance();
// Insert interceptor at runtime
- CacheInterceptor interceptor = new CacheInterceptor(cache_, fqn, type);
+ CacheFieldInterceptor interceptor = new CacheFieldInterceptor(cache_, fqn, type);
interceptor.setAopInstance(aopInstance);
util_.attachInterceptor(advisor, interceptor);
@@ -551,7 +551,7 @@
{
if (bulkRemove(fqn, result))
{
- // Remember not to print obj here since it will trigger the CacheInterceptor.
+ // Remember not to print obj here since it will trigger the CacheFieldInterceptor.
if (log.isDebugEnabled())
{
log.debug("_removeObject(): fqn: " + fqn + "removing exisiting object in bulk.");
@@ -605,7 +605,7 @@
// Determine if we want to keep the interceptor for later use.
if (removeCacheInterceptor)
{
- CacheInterceptor interceptor = (CacheInterceptor) AopUtil.findCacheInterceptor(advisor);
+ CacheFieldInterceptor interceptor = (CacheFieldInterceptor) AopUtil.findCacheInterceptor(advisor);
// Remember to remove the interceptor from in-memory object but make sure it belongs to me first.
if (interceptor != null)
{
|
