Author: sebb
Date: Thu Apr 3 01:05:33 2014
New Revision: 1584238
URL: http://svn.apache.org/r1584238
Log:
Standardise on static final rather than final static
Modified:
commons/proper/jcs/trunk/auxiliary-builds/javagroups/src/java/org/apache/commons/jcs/auxiliary/javagroups/JavaGroupsCache.java
commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/javagroups/JavaGroupsCache.java
commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheManager.java
commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/lateral/javagroups/JGConnectionHolder.java
commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/lateral/javagroups/LateralCacheJGListener.java
commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/lateral/javagroups/LateralJGCacheManager.java
commons/proper/jcs/trunk/src/experimental/org/apache/commons/jcs/auxiliary/lateral/socket/udp/LateralCacheUDPListener.java
commons/proper/jcs/trunk/src/experimental/org/apache/commons/jcs/auxiliary/lateral/xmlrpc/LateralCacheXMLRPCListener.java
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/AuxiliaryCacheConfigurator.java
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCachePoolAccessManager.java
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPListener.java
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheManager.java
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheMonitor.java
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheMonitor.java
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServer.java
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/control/CompositeCacheConfigurator.java
Modified:
commons/proper/jcs/trunk/auxiliary-builds/javagroups/src/java/org/apache/commons/jcs/auxiliary/javagroups/JavaGroupsCache.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/auxiliary-builds/javagroups/src/java/org/apache/commons/jcs/auxiliary/javagroups/JavaGroupsCache.java?rev=1584238&r1=1584237&r2=1584238&view=diff
==============================================================================
---
commons/proper/jcs/trunk/auxiliary-builds/javagroups/src/java/org/apache/commons/jcs/auxiliary/javagroups/JavaGroupsCache.java
(original)
+++
commons/proper/jcs/trunk/auxiliary-builds/javagroups/src/java/org/apache/commons/jcs/auxiliary/javagroups/JavaGroupsCache.java
Thu Apr 3 01:05:33 2014
@@ -360,10 +360,10 @@ public class JavaGroupsCache
*/
static class Request implements Serializable
{
- public final static int UPDATE = 1;
- public final static int REMOVE = 2;
- public final static int REMOVE_ALL = 3;
- public final static int GET = 5;
+ public static final int UPDATE = 1;
+ public static final int REMOVE = 2;
+ public static final int REMOVE_ALL = 3;
+ public static final int GET = 5;
private ICacheElement<K, V> cacheElement;
private int command;
Modified:
commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/javagroups/JavaGroupsCache.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/javagroups/JavaGroupsCache.java?rev=1584238&r1=1584237&r2=1584238&view=diff
==============================================================================
---
commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/javagroups/JavaGroupsCache.java
(original)
+++
commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/javagroups/JavaGroupsCache.java
Thu Apr 3 01:05:33 2014
@@ -422,13 +422,13 @@ public class JavaGroupsCache
static class Request
implements Serializable
{
- public final static int UPDATE = 1;
+ public static final int UPDATE = 1;
- public final static int REMOVE = 2;
+ public static final int REMOVE = 2;
- public final static int REMOVE_ALL = 3;
+ public static final int REMOVE_ALL = 3;
- public final static int GET = 5;
+ public static final int GET = 5;
private ICacheElement<K, V> cacheElement;
Modified:
commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheManager.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheManager.java?rev=1584238&r1=1584237&r2=1584238&view=diff
==============================================================================
---
commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheManager.java
(original)
+++
commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheManager.java
Thu Apr 3 01:05:33 2014
@@ -60,7 +60,7 @@ public class LateralCacheManager
private static LateralCacheMonitor monitor;
- final static Map instances = new HashMap();
+ static final Map instances = new HashMap();
// each manager instance has caches
final Map caches = new HashMap();
Modified:
commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/lateral/javagroups/JGConnectionHolder.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/lateral/javagroups/JGConnectionHolder.java?rev=1584238&r1=1584237&r2=1584238&view=diff
==============================================================================
---
commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/lateral/javagroups/JGConnectionHolder.java
(original)
+++
commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/lateral/javagroups/JGConnectionHolder.java
Thu Apr 3 01:05:33 2014
@@ -49,7 +49,7 @@ public class JGConnectionHolder
/**
* Description of the Field
*/
- protected final static HashMap instances = new HashMap();
+ protected static final HashMap instances = new HashMap();
/**
* Gets the instance attribute of the LateralGroupCacheJGListener class
Modified:
commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/lateral/javagroups/LateralCacheJGListener.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/lateral/javagroups/LateralCacheJGListener.java?rev=1584238&r1=1584237&r2=1584238&view=diff
==============================================================================
---
commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/lateral/javagroups/LateralCacheJGListener.java
(original)
+++
commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/lateral/javagroups/LateralCacheJGListener.java
Thu Apr 3 01:05:33 2014
@@ -54,7 +54,7 @@ public class LateralCacheJGListener
/**
* Description of the Field
*/
- protected final static HashMap instances = new HashMap();
+ protected static final HashMap instances = new HashMap();
// instance vars
private LateralJGReceiver receiver;
Modified:
commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/lateral/javagroups/LateralJGCacheManager.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/lateral/javagroups/LateralJGCacheManager.java?rev=1584238&r1=1584237&r2=1584238&view=diff
==============================================================================
---
commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/lateral/javagroups/LateralJGCacheManager.java
(original)
+++
commons/proper/jcs/trunk/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/lateral/javagroups/LateralJGCacheManager.java
Thu Apr 3 01:05:33 2014
@@ -62,7 +62,7 @@ public class LateralJGCacheManager
private static LateralCacheMonitor monitor;
- final static Map instances = new HashMap();
+ static final Map instances = new HashMap();
// each manager instance has caches
final Map caches = new HashMap();
Modified:
commons/proper/jcs/trunk/src/experimental/org/apache/commons/jcs/auxiliary/lateral/socket/udp/LateralCacheUDPListener.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/experimental/org/apache/commons/jcs/auxiliary/lateral/socket/udp/LateralCacheUDPListener.java?rev=1584238&r1=1584237&r2=1584238&view=diff
==============================================================================
---
commons/proper/jcs/trunk/src/experimental/org/apache/commons/jcs/auxiliary/lateral/socket/udp/LateralCacheUDPListener.java
(original)
+++
commons/proper/jcs/trunk/src/experimental/org/apache/commons/jcs/auxiliary/lateral/socket/udp/LateralCacheUDPListener.java
Thu Apr 3 01:05:33 2014
@@ -52,7 +52,7 @@ public class LateralCacheUDPListener imp
protected static transient CompositeCacheManager cacheMgr;
/** Description of the Field */
- protected final static HashMap instances = new HashMap();
+ protected static final HashMap instances = new HashMap();
// instance vars
private LateralUDPReceiver receiver;
Modified:
commons/proper/jcs/trunk/src/experimental/org/apache/commons/jcs/auxiliary/lateral/xmlrpc/LateralCacheXMLRPCListener.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/experimental/org/apache/commons/jcs/auxiliary/lateral/xmlrpc/LateralCacheXMLRPCListener.java?rev=1584238&r1=1584237&r2=1584238&view=diff
==============================================================================
---
commons/proper/jcs/trunk/src/experimental/org/apache/commons/jcs/auxiliary/lateral/xmlrpc/LateralCacheXMLRPCListener.java
(original)
+++
commons/proper/jcs/trunk/src/experimental/org/apache/commons/jcs/auxiliary/lateral/xmlrpc/LateralCacheXMLRPCListener.java
Thu Apr 3 01:05:33 2014
@@ -53,7 +53,7 @@ public class LateralCacheXMLRPCListener
/** Description of the Field */
protected static transient CompositeCacheManager cacheMgr;
/** Description of the Field */
- protected final static HashMap instances = new HashMap();
+ protected static final HashMap instances = new HashMap();
// instance vars
private LateralXMLRPCReceiver receiver;
Modified:
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/AuxiliaryCacheConfigurator.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/AuxiliaryCacheConfigurator.java?rev=1584238&r1=1584237&r2=1584238&view=diff
==============================================================================
---
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/AuxiliaryCacheConfigurator.java
(original)
+++
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/AuxiliaryCacheConfigurator.java
Thu Apr 3 01:05:33 2014
@@ -39,21 +39,21 @@ public class AuxiliaryCacheConfigurator
private static final Log log = LogFactory.getLog(
AuxiliaryCacheConfigurator.class );
/** .attributes */
- public final static String ATTRIBUTE_PREFIX = ".attributes";
+ public static final String ATTRIBUTE_PREFIX = ".attributes";
/**
* jcs.auxiliary.NAME.cacheeventlogger=CLASSNAME
* <p>
* jcs.auxiliary.NAME.cacheeventlogger.attributes.CUSTOMPROPERTY=VALUE
*/
- public final static String CACHE_EVENT_LOGGER_PREFIX = ".cacheeventlogger";
+ public static final String CACHE_EVENT_LOGGER_PREFIX = ".cacheeventlogger";
/**
* jcs.auxiliary.NAME.serializer=CLASSNAME
* <p>
* jcs.auxiliary.NAME.serializer.attributes.CUSTOMPROPERTY=VALUE
*/
- public final static String SERIALIZER_PREFIX = ".serializer";
+ public static final String SERIALIZER_PREFIX = ".serializer";
/**
* Parses the event logger config, if there is any for the auxiliary.
Modified:
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCachePoolAccessManager.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCachePoolAccessManager.java?rev=1584238&r1=1584237&r2=1584238&view=diff
==============================================================================
---
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCachePoolAccessManager.java
(original)
+++
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCachePoolAccessManager.java
Thu Apr 3 01:05:33 2014
@@ -51,7 +51,7 @@ public class JDBCDiskCachePoolAccessMana
public static final String POOL_CONFIGURATION_PREFIX =
"jcs.jdbcconnectionpool.";
/** .attributes */
- public final static String ATTRIBUTE_PREFIX = ".attributes";
+ public static final String ATTRIBUTE_PREFIX = ".attributes";
/** The logger. */
private static final Log log = LogFactory.getLog(
JDBCDiskCachePoolAccessManager.class );
Modified:
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPListener.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPListener.java?rev=1584238&r1=1584237&r2=1584238&view=diff
==============================================================================
---
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPListener.java
(original)
+++
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPListener.java
Thu Apr 3 01:05:33 2014
@@ -65,7 +65,7 @@ public class LateralTCPListener<K extend
private transient ICompositeCacheManager cacheManager;
/** Map of available instances, keyed by port */
- protected final static HashMap<String, ILateralCacheListener<?, ?>>
instances =
+ protected static final HashMap<String, ILateralCacheListener<?, ?>>
instances =
new HashMap<String, ILateralCacheListener<?, ?>>();
/** The socket listener */
Modified:
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheManager.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheManager.java?rev=1584238&r1=1584237&r2=1584238&view=diff
==============================================================================
---
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheManager.java
(original)
+++
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheManager.java
Thu Apr 3 01:05:33 2014
@@ -60,7 +60,7 @@ public class RemoteCacheManager
private static final Log log = LogFactory.getLog( RemoteCacheManager.class
);
/** Contains mappings of Location instance to RemoteCacheManager instance.
*/
- final static Map<Location, RemoteCacheManager> instances = new
HashMap<Location, RemoteCacheManager>();
+ static final Map<Location, RemoteCacheManager> instances = new
HashMap<Location, RemoteCacheManager>();
/** Monitors connections. */
private static RemoteCacheMonitor monitor;
Modified:
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheMonitor.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheMonitor.java?rev=1584238&r1=1584237&r2=1584238&view=diff
==============================================================================
---
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheMonitor.java
(original)
+++
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheMonitor.java
Thu Apr 3 01:05:33 2014
@@ -52,10 +52,10 @@ public class RemoteCacheMonitor
private boolean alright = true;
/** Time driven mode */
- final static int TIME = 0;
+ static final int TIME = 0;
/** Error driven mode -- only check on health if there is an error */
- final static int ERROR = 1;
+ static final int ERROR = 1;
/** The mode to use */
static int mode = ERROR;
Modified:
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheMonitor.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheMonitor.java?rev=1584238&r1=1584237&r2=1584238&view=diff
==============================================================================
---
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheMonitor.java
(original)
+++
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheMonitor.java
Thu Apr 3 01:05:33 2014
@@ -54,10 +54,10 @@ public class RemoteHttpCacheMonitor
private boolean alright = true;
/** Time driven mode */
- final static int TIME = 0;
+ static final int TIME = 0;
/** Error driven mode -- only check on health if there is an error */
- final static int ERROR = 1;
+ static final int ERROR = 1;
/** The mode to use */
static int mode = ERROR;
Modified:
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServer.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServer.java?rev=1584238&r1=1584237&r2=1584238&view=diff
==============================================================================
---
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServer.java
(original)
+++
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServer.java
Thu Apr 3 01:05:33 2014
@@ -79,7 +79,7 @@ public class RemoteCacheServer<K extends
private static final Log log = LogFactory.getLog( RemoteCacheServer.class
);
/** timing -- if we should record operation times. */
- protected final static boolean timing = true;
+ protected static final boolean timing = true;
/** Number of puts into the cache. */
private int puts = 0;
Modified:
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/control/CompositeCacheConfigurator.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/control/CompositeCacheConfigurator.java?rev=1584238&r1=1584237&r2=1584238&view=diff
==============================================================================
---
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/control/CompositeCacheConfigurator.java
(original)
+++
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/control/CompositeCacheConfigurator.java
Thu Apr 3 01:05:33 2014
@@ -58,32 +58,32 @@ public class CompositeCacheConfigurator
private static final Log log = LogFactory.getLog(
CompositeCacheConfigurator.class );
/** default region prefix */
- final static String DEFAULT_REGION = "jcs.default";
+ static final String DEFAULT_REGION = "jcs.default";
/** normal region prefix */
- final static String REGION_PREFIX = "jcs.region.";
+ static final String REGION_PREFIX = "jcs.region.";
/** system region prefix. might not be used */
- final static String SYSTEM_REGION_PREFIX = "jcs.system.";
+ static final String SYSTEM_REGION_PREFIX = "jcs.system.";
/** auxiliary prefix */
- final static String AUXILIARY_PREFIX = "jcs.auxiliary.";
+ static final String AUXILIARY_PREFIX = "jcs.auxiliary.";
/** .attributes */
- final static String ATTRIBUTE_PREFIX = ".attributes";
+ static final String ATTRIBUTE_PREFIX = ".attributes";
/** .cacheattributes */
- final static String CACHE_ATTRIBUTE_PREFIX = ".cacheattributes";
+ static final String CACHE_ATTRIBUTE_PREFIX = ".cacheattributes";
/** .elementattributes */
- final static String ELEMENT_ATTRIBUTE_PREFIX = ".elementattributes";
+ static final String ELEMENT_ATTRIBUTE_PREFIX = ".elementattributes";
/**
* jcs.auxiliary.NAME.keymatcher=CLASSNAME
* <p>
* jcs.auxiliary.NAME.keymatcher.attributes.CUSTOMPROPERTY=VALUE
*/
- public final static String KEY_MATCHER_PREFIX = ".keymatcher";
+ public static final String KEY_MATCHER_PREFIX = ".keymatcher";
/** Can't operate on the interface. */
private final CompositeCacheManager compositeCacheManager;
