[jboss-cvs] JBossAS SVN: r63896 - projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/assignability.

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

Author: flavia.rainone at jboss.com
Date: 2007-07-06 22:07:11 -0400 (Fri, 06 Jul 2007)
New Revision: 63896

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/assignability/DegreeAlgorithm.java
Log:
[JBAOP-421] Unified MAX_DEGREE with HIGHEST_DEGREE

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/assignability/DegreeAlgorithm.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/assignability/DegreeAlgorithm.java	2007-07-07 02:03:49 UTC (rev 63895)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/assignability/DegreeAlgorithm.java	2007-07-07 02:07:11 UTC (rev 63896)
@@ -35,7 +35,6 @@
  */
 public class DegreeAlgorithm
 {
-   private static final short HIGHEST_DEGREE = 1000;
    public static final short NOT_ASSIGNABLE_DEGREE = Short.MAX_VALUE;
    public static final short MAX_DEGREE = NOT_ASSIGNABLE_DEGREE - 1;
    
@@ -57,12 +56,12 @@
        Class<?> clazz = getClassType(type);
        if (clazz == null)
        {
-          return HIGHEST_DEGREE;
+          return MAX_DEGREE;
        }
        Class<?> fromClass = getClassType(fromType);
        if (fromClass == null)
        {
-          return HIGHEST_DEGREE;
+          return MAX_DEGREE;
        }
        return getAssignabilityDegree(fromClass, clazz);
    }