[jboss-cvs] JBossAS SVN: r89246 - projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/annotations.

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

Author: alesj
Date: 2009-05-21 07:12:45 -0400 (Thu, 21 May 2009)
New Revision: 89246

Modified:
   projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/annotations/DisabledType.java
Log:
Add few javadocs.

Modified: projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/annotations/DisabledType.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/annotations/DisabledType.java	2009-05-21 11:07:50 UTC (rev 89245)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/annotations/DisabledType.java	2009-05-21 11:12:45 UTC (rev 89246)
@@ -36,7 +36,6 @@
    LIFECYCLE,
    POINTCUTS;
 
-
    /**
     * Is the type disabled for this constraint.
     *
@@ -45,11 +44,7 @@
     */
    public boolean isDisabled(DisabledType constraint)
    {
-      if (this == ALL)
-      {
-         return true;
-      }
-      return this == constraint;
+      return this == ALL || this == constraint;
    }
 
    /**
@@ -68,18 +63,26 @@
     *
     * @param values the disabled values
     * @param constraint the constraint
-    * @return true if disabled for this constraint
+    * @return true if disabled for this constraint, false otherwise
     */
    public static boolean isDisabled(DisabledType[] values, DisabledType constraint)
    {
       if (values == null || values.length == 0)
          return false;
+
       EnumSet<DisabledType> set = EnumSet.copyOf(Arrays.asList(values));
       return set.contains(ALL) || set.contains(constraint);
    }
-   
+
+   /**
+    * Do values mark enabled usage.
+    *
+    * @param values the disabled values
+    * @param constraint the constraint
+    * @return true if enabled for this constraint, false otherwise
+    */
    public static boolean isEnabled(DisabledType[] values, DisabledType constraint)
    {
-      return !isDisabled(values, constraint);
+      return isDisabled(values, constraint) == false;
    }
 }