[jbosscache-commits] JBoss Cache SVN: r6349 - in core/trunk/src/main/java/org/jboss/cache: config and 1 other directories.

[jbosscache-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2008-07-21 09:04:46 -0400 (Mon, 21 Jul 2008)
New Revision: 6349

Modified:
   core/trunk/src/main/java/org/jboss/cache/Modification.java
   core/trunk/src/main/java/org/jboss/cache/Region.java
   core/trunk/src/main/java/org/jboss/cache/config/Configuration.java
   core/trunk/src/main/java/org/jboss/cache/notifications/event/Event.java
   core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeModifiedEvent.java
Log:
enums made static where possible

Modified: core/trunk/src/main/java/org/jboss/cache/Modification.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/Modification.java	2008-07-21 13:03:16 UTC (rev 6348)
+++ core/trunk/src/main/java/org/jboss/cache/Modification.java	2008-07-21 13:04:46 UTC (rev 6349)
@@ -30,7 +30,7 @@
 
    private static final long serialVersionUID = 7463314130283897197L;
 
-   public enum ModificationType
+   public static enum ModificationType
    {
       PUT_KEY_VALUE,
       PUT_DATA,

Modified: core/trunk/src/main/java/org/jboss/cache/Region.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/Region.java	2008-07-21 13:03:16 UTC (rev 6348)
+++ core/trunk/src/main/java/org/jboss/cache/Region.java	2008-07-21 13:04:46 UTC (rev 6349)
@@ -37,7 +37,7 @@
    /**
     * Types of regions.
     */
-   enum Type
+   static enum Type
    {
       EVICTION, MARSHALLING, ANY
    }
@@ -45,7 +45,7 @@
    /**
     * Region status
     */
-   enum Status
+   static enum Status
    {
       ACTIVATING, ACTIVE, INACTIVATING, INACTIVE
    }

Modified: core/trunk/src/main/java/org/jboss/cache/config/Configuration.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/Configuration.java	2008-07-21 13:03:16 UTC (rev 6348)
+++ core/trunk/src/main/java/org/jboss/cache/config/Configuration.java	2008-07-21 13:04:46 UTC (rev 6349)
@@ -36,7 +36,7 @@
    /**
     * Behavior of the JVM shutdown hook registered by the cache
     */
-   public enum ShutdownHookBehavior
+   public static enum ShutdownHookBehavior
    {
       /**
        * By default a shutdown hook is registered if no MBean server (apart from the JDK default) is detected.
@@ -55,7 +55,7 @@
    /**
     * Cache replication mode.
     */
-   public enum CacheMode
+   public static enum CacheMode
    {
       /**
        * Data is not replicated.
@@ -120,7 +120,7 @@
    /**
     * Cache node locking scheme.
     */
-   public enum NodeLockingScheme
+   public static enum NodeLockingScheme
    {
       /**
        * Data is locked using the MVCC locking scheme.  This is the default locking scheme in JBoss Cache 3.0.0.
@@ -146,7 +146,6 @@
        */
       public boolean isVersionedScheme()
       {
-//         return this == MVCC || this == OPTIMISTIC;
          return this == OPTIMISTIC;
       }
    }

Modified: core/trunk/src/main/java/org/jboss/cache/notifications/event/Event.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/event/Event.java	2008-07-21 13:03:16 UTC (rev 6348)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/event/Event.java	2008-07-21 13:04:46 UTC (rev 6349)
@@ -10,7 +10,7 @@
  */
 public interface Event
 {
-   enum Type
+   static enum Type
    {
       CACHE_STARTED, CACHE_STOPPED, CACHE_BLOCKED, CACHE_UNBLOCKED, NODE_ACTIVATED, NODE_PASSIVATED,
       NODE_LOADED, NODE_EVICTED, NODE_CREATED, NODE_REMOVED, NODE_MODIFIED, NODE_MOVED, NODE_VISITED,

Modified: core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeModifiedEvent.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeModifiedEvent.java	2008-07-21 13:03:16 UTC (rev 6348)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeModifiedEvent.java	2008-07-21 13:04:46 UTC (rev 6349)
@@ -13,7 +13,7 @@
    /**
     * Different cache modification types.
     */
-   enum ModificationType
+   static enum ModificationType
    {
       PUT_DATA, REMOVE_DATA, PUT_MAP
    }