[jboss-cvs] JBossAS SVN: r103363 - projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator.

[jboss-cvs-commits at lists.jboss.org]

Author: maeste
Date: 2010-03-31 17:05:10 -0400 (Wed, 31 Mar 2010)
New Revision: 103363

Modified:
   projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/Key.java
   projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/Validate.java
   projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/ValidateClass.java
   projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/ValidateObject.java
Log:
[JBJCA-303] converting Key class into enum

Modified: projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/Key.java
===================================================================
--- projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/Key.java	2010-03-31 20:48:57 UTC (rev 103362)
+++ projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/Key.java	2010-03-31 21:05:10 UTC (rev 103363)
@@ -25,30 +25,18 @@
 /**
  * Key
  */
-public class Key
-{
-   /** Resource adapter */
-   public static final int RESOURCE_ADAPTER = 0;
+public enum Key {
 
-   /** Managed connection factory */
-   public static final int MANAGED_CONNECTION_FACTORY = 1;
-
-   /** Activation spec */
-   public static final int ACTIVATION_SPEC = 2;
-
-   /** Admin object */
-   public static final int ADMIN_OBJECT = 3;
-
-   /** Managed connection */
-   public static final int MANAGED_CONNECTION = 4;
-   
-   /** Connection factory */
-   public static final int CONNECTION_FACTORY = 5;
-
-   /**
-    * Constructor
-    */
-   private Key()
-   {
-   }
+    /** Resource adapter */
+    RESOURCE_ADAPTER,
+    /** Managed connection factory */
+    MANAGED_CONNECTION_FACTORY,
+    /** Activation spec */
+    ACTIVATION_SPEC,
+    /** Admin object */
+    ADMIN_OBJECT,
+    /** Managed connection */
+    MANAGED_CONNECTION,
+    /** Connection factory */
+    CONNECTION_FACTORY;
 }

Modified: projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/Validate.java
===================================================================
--- projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/Validate.java	2010-03-31 20:48:57 UTC (rev 103362)
+++ projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/Validate.java	2010-03-31 21:05:10 UTC (rev 103363)
@@ -31,8 +31,8 @@
     * Get the key
     * @return The key
     */
-   public int getKey();
-   
+   public Key getKey();
+
    /**
     * Get the class
     * @return The class

Modified: projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/ValidateClass.java
===================================================================
--- projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/ValidateClass.java	2010-03-31 20:48:57 UTC (rev 103362)
+++ projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/ValidateClass.java	2010-03-31 21:05:10 UTC (rev 103363)
@@ -28,35 +28,35 @@
 /**
  * ValidateClass for objects that should be validated
  */
-public class ValidateClass implements Validate 
+public class ValidateClass implements Validate
 {
    /** Key */
-   private final int key;
+   private final Key key;
 
    /** config-property */
    private final List<ConfigPropertyMetaData> configProperties;
 
    /** Clazz */
    private Class<?> clazz;
-   
+
    /**
     * Constructor
     * @param key The key
     * @param clazz The class
     */
-   public ValidateClass(int key,
+   public ValidateClass(Key key,
                          Class<?> clazz)
    {
       this(key, clazz, null);
    }
-   
+
    /**
     * Constructor
     * @param key The key
     * @param clazz The class
     * @param configProperties The list of config property metadata
     */
-   public ValidateClass(int key,
+   public ValidateClass(Key key,
                          Class<?> clazz,
                          List<ConfigPropertyMetaData> configProperties)
    {
@@ -64,7 +64,7 @@
       this.clazz = clazz;
       this.configProperties = configProperties;
    }
-   
+
    /**
     * Constructor
     * @param key The key
@@ -72,7 +72,7 @@
     * @param cl the class loader used to load class
     * @param configProperties The list of config property metadata
     */
-   public ValidateClass(int key, String className, ClassLoader cl, List<ConfigPropertyMetaData> configProperties)
+   public ValidateClass(Key key, String className, ClassLoader cl, List<ConfigPropertyMetaData> configProperties)
    {
       this.key = key;
       try
@@ -90,7 +90,7 @@
     * Get the key
     * @return The key
     */
-   public int getKey()
+   public Key getKey()
    {
       return key;
    }
@@ -103,7 +103,7 @@
    {
       return clazz;
    }
-   
+
    /**
     * Get the list of config properties
     * @return The list

Modified: projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/ValidateObject.java
===================================================================
--- projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/ValidateObject.java	2010-03-31 20:48:57 UTC (rev 103362)
+++ projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/ValidateObject.java	2010-03-31 21:05:10 UTC (rev 103363)
@@ -39,19 +39,19 @@
     * @param key The key
     * @param object The key
     */
-   public ValidateObject(int key,
+   public ValidateObject(Key key,
                          Object object)
    {
       this(key, object, null);
    }
-   
+
    /**
     * Constructor
     * @param key The key
     * @param object The key
     * @param configProperties The list of config property metadata
     */
-   public ValidateObject(int key,
+   public ValidateObject(Key key,
                          Object object,
                          List<ConfigPropertyMetaData> configProperties)
    {