[jboss-cvs] JBossCache/src/org/jboss/cache/interceptors ...
Manik Surtani
manik at jboss.org
Mon Jun 11 08:58:17 EDT 2007
User: msurtani
Date: 07/06/11 08:58:17
Modified: src/org/jboss/cache/interceptors
OrderedSynchronizationHandler.java
EvictionInterceptor.java
CreateIfNotExistsInterceptor.java
ActivationInterceptor.java
CacheStoreInterceptor.java
Log:
Reduce Java5 related ide generated warnings
Revision Changes Path
1.5 +44 -30 JBossCache/src/org/jboss/cache/interceptors/OrderedSynchronizationHandler.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: OrderedSynchronizationHandler.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/OrderedSynchronizationHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- OrderedSynchronizationHandler.java 19 Jul 2006 21:34:43 -0000 1.4
+++ OrderedSynchronizationHandler.java 11 Jun 2007 12:58:17 -0000 1.5
@@ -8,7 +8,6 @@
import javax.transaction.SystemException;
import javax.transaction.Transaction;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.Map;
@@ -20,68 +19,82 @@
* afterCompletion() <em>before</em> the TransactionInterceptor's.
*
* @author Bela Ban
- * @version $Id: OrderedSynchronizationHandler.java,v 1.4 2006/07/19 21:34:43 msurtani Exp $
+ * @version $Id: OrderedSynchronizationHandler.java,v 1.5 2007/06/11 12:58:17 msurtani Exp $
*/
-public class OrderedSynchronizationHandler implements Synchronization {
- Transaction tx=null;
- LinkedList handlers=new LinkedList();
+public class OrderedSynchronizationHandler implements Synchronization
+{
+ private Transaction tx = null;
+ private LinkedList<Synchronization> handlers = new LinkedList<Synchronization>();
- /** Map<Transaction,OrderedSynchronizationHandler> */
- static Map instances=new HashMap();
+ /**
+ * Map<Transaction,OrderedSynchronizationHandler>
+ */
+ static Map instances = new HashMap();
- static Log log=LogFactory.getLog(OrderedSynchronizationHandler.class);
+ static Log log = LogFactory.getLog(OrderedSynchronizationHandler.class);
- private OrderedSynchronizationHandler(Transaction tx) {
- this.tx=tx;
+ private OrderedSynchronizationHandler(Transaction tx)
+ {
+ this.tx = tx;
}
/**
* Creates a new instance of OrderedSynchronizationHandler, or fetches an existing instance. Key is the local
* transaction (tx). This instance registers with the TransactionManager automatically
+ *
* @param tx
*/
- public static OrderedSynchronizationHandler getInstance(Transaction tx) throws SystemException, RollbackException {
- OrderedSynchronizationHandler retval=(OrderedSynchronizationHandler)instances.get(tx);
- if(retval != null) return retval;
- retval=new OrderedSynchronizationHandler(tx);
+ public static OrderedSynchronizationHandler getInstance(Transaction tx) throws SystemException, RollbackException
+ {
+ OrderedSynchronizationHandler retval = (OrderedSynchronizationHandler) instances.get(tx);
+ if (retval != null) return retval;
+ retval = new OrderedSynchronizationHandler(tx);
tx.registerSynchronization(retval);
instances.put(tx, retval);
return retval;
}
- public void registerAtHead(Synchronization handler) {
+ public void registerAtHead(Synchronization handler)
+ {
register(handler, true);
}
- public void registerAtTail(Synchronization handler) {
+ public void registerAtTail(Synchronization handler)
+ {
register(handler, false);
}
- void register(Synchronization handler, boolean head) {
- if(handler != null && !handlers.contains(handler)) {
- if(head)
+ void register(Synchronization handler, boolean head)
+ {
+ if (handler != null && !handlers.contains(handler))
+ {
+ if (head)
handlers.addFirst(handler);
else
handlers.addLast(handler);
}
}
- public void beforeCompletion() {
- for(Iterator it=handlers.iterator(); it.hasNext();) {
- Synchronization sync=(Synchronization)it.next();
+ public void beforeCompletion()
+ {
+ for (Synchronization sync : handlers)
+ {
sync.beforeCompletion();
}
}
- public void afterCompletion(int status) {
- for(Iterator it=handlers.iterator(); it.hasNext();) {
- Synchronization sync=(Synchronization)it.next();
- try {
+ public void afterCompletion(int status)
+ {
+ for (Synchronization sync : handlers)
+ {
+ try
+ {
sync.afterCompletion(status);
}
- catch(Throwable t) {
+ catch (Throwable t)
+ {
log.error("failed calling afterCompletion() on " + sync, t);
}
}
@@ -90,8 +103,9 @@
instances.remove(tx);
}
- public String toString() {
- StringBuffer sb=new StringBuffer();
+ public String toString()
+ {
+ StringBuffer sb = new StringBuffer();
sb.append("tx=" + tx + ", handlers=" + handlers);
return sb.toString();
}
1.16 +2 -2 JBossCache/src/org/jboss/cache/interceptors/EvictionInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: EvictionInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/EvictionInterceptor.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- EvictionInterceptor.java 23 May 2007 15:22:03 -0000 1.15
+++ EvictionInterceptor.java 11 Jun 2007 12:58:17 -0000 1.16
@@ -28,7 +28,7 @@
* This interceptor is used to handle eviction events.
*
* @author Daniel Huang
- * @version $Revision: 1.15 $
+ * @version $Revision: 1.16 $
*/
public class EvictionInterceptor extends Interceptor
{
@@ -356,7 +356,7 @@
// because it still has children.
// If yes, put an ADD event in the queue so the node gets revisited
- boolean complete = (retVal != null && ((Boolean) retVal).booleanValue());
+ boolean complete = (retVal != null && (Boolean) retVal);
if (!complete)
{
Object[] args = mc.getArgs();
1.30 +9 -11 JBossCache/src/org/jboss/cache/interceptors/CreateIfNotExistsInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CreateIfNotExistsInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/CreateIfNotExistsInterceptor.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- CreateIfNotExistsInterceptor.java 8 Jun 2007 15:39:28 -0000 1.29
+++ CreateIfNotExistsInterceptor.java 11 Jun 2007 12:58:17 -0000 1.30
@@ -20,7 +20,7 @@
* (depending on the create_if_not_exists argument)
*
* @author Bela Ban
- * @version $Id: CreateIfNotExistsInterceptor.java,v 1.29 2007/06/08 15:39:28 msurtani Exp $
+ * @version $Id: CreateIfNotExistsInterceptor.java,v 1.30 2007/06/11 12:58:17 msurtani Exp $
* @deprecated This code is not used anymore and will be removed in a future unlock
*/
@Deprecated
@@ -263,10 +263,8 @@
private Fqn findFqnInPutList(Fqn fqn)
{
- Fqn tmp;
- for (Iterator it = put_list.iterator(); it.hasNext();)
+ for (Fqn tmp : put_list)
{
- tmp = (Fqn) it.next();
if (tmp.isChildOf(fqn) || tmp.equals(fqn))// child or same, e.g. put(/a/b/c) and rem(/a/b) or rem(/a/b/c)
{
return tmp;
1.58 +3 -5 JBossCache/src/org/jboss/cache/interceptors/ActivationInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ActivationInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/ActivationInterceptor.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- ActivationInterceptor.java 8 Jun 2007 15:39:28 -0000 1.57
+++ ActivationInterceptor.java 11 Jun 2007 12:58:17 -0000 1.58
@@ -15,7 +15,6 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -27,7 +26,7 @@
* their attributes have been initialized and their children have been loaded in memory.
*
* @author <a href="mailto:{hmesha at novell.com}">{Hany Mesha}</a>
- * @version $Id: ActivationInterceptor.java,v 1.57 2007/06/08 15:39:28 msurtani Exp $
+ * @version $Id: ActivationInterceptor.java,v 1.58 2007/06/11 12:58:17 msurtani Exp $
*/
public class ActivationInterceptor extends CacheLoaderInterceptor implements ActivationInterceptorMBean
{
@@ -267,7 +266,7 @@
private void prepareCacheLoader(InvocationContext ctx) throws Exception
{
- List modifications;
+ List<MethodCall> modifications;
TransactionEntry entry;
int txActs = 0;
GlobalTransaction gtx = ctx.getGlobalTransaction();
@@ -283,9 +282,8 @@
return;
}
List cache_loader_modifications = new ArrayList();
- for (Iterator it = modifications.iterator(); it.hasNext();)
+ for (MethodCall methodCall : modifications)
{
- MethodCall methodCall = (MethodCall) it.next();
Method method = methodCall.getMethod();
Object[] args;
if (method == null)
1.49 +6 -8 JBossCache/src/org/jboss/cache/interceptors/CacheStoreInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheStoreInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/CacheStoreInterceptor.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- CacheStoreInterceptor.java 23 May 2007 15:22:03 -0000 1.48
+++ CacheStoreInterceptor.java 11 Jun 2007 12:58:17 -0000 1.49
@@ -17,7 +17,6 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -28,7 +27,7 @@
* through the CacheLoader, either after each method call (no TXs), or at TX commit.
*
* @author Bela Ban
- * @version $Id: CacheStoreInterceptor.java,v 1.48 2007/05/23 15:22:03 msurtani Exp $
+ * @version $Id: CacheStoreInterceptor.java,v 1.49 2007/06/11 12:58:17 msurtani Exp $
*/
public class CacheStoreInterceptor extends BaseCacheLoaderInterceptor implements CacheStoreInterceptorMBean
{
@@ -314,11 +313,11 @@
return fqnList;
}
- private Fqn findFqn(Object[] o)
+ private Fqn findFqn(Object[] args)
{
- for (int i = 0; i < o.length; i++)
+ for (Object arg : args)
{
- if (o[i] instanceof Fqn) return (Fqn) o[i];
+ if (arg instanceof Fqn) return (Fqn) arg;
}
return null;
}
@@ -342,7 +341,7 @@
private void prepareCacheLoader(GlobalTransaction gtx, boolean onePhase) throws Exception
{
- List modifications;
+ List<MethodCall> modifications;
TransactionEntry entry;
int txPuts = 0;
@@ -359,9 +358,8 @@
}
if (log.isTraceEnabled()) log.trace("Cache loader modification list: " + modifications);
List cache_loader_modifications = new ArrayList();
- for (Iterator it = modifications.iterator(); it.hasNext();)
+ for (MethodCall methodCall : modifications)
{
- MethodCall methodCall = (MethodCall) it.next();
Modification mod = convertMethodCallToModification(methodCall);
cache_loader_modifications.add(mod);
if (configuration.getExposeManagementStatistics() && getStatisticsEnabled())
More information about the jboss-cvs-commits
mailing list