[jboss-svn-commits] JBL Code SVN: r26291 - labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util.

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

Author: Rikkola
Date: 2009-04-28 09:10:33 -0400 (Tue, 28 Apr 2009)
New Revision: 26291

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/ClassMethodInspector.java
Log:
GUVNOR-252 : Unable to fix broken imported brl rule
GUVNOR-261 : Can't select fields from a global list
BRMS-75 : Unable to fix broken imported brl rule

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/ClassMethodInspector.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/ClassMethodInspector.java	2009-04-28 11:40:05 UTC (rev 26290)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/ClassMethodInspector.java	2009-04-28 13:10:33 UTC (rev 26291)
@@ -4,7 +4,6 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
@@ -59,28 +58,27 @@
             return false;
         }
 
-        List interfaces = Arrays.asList( clazz.getInterfaces() );
 
-        if ( clazz.equals( Collection.class ) || interfaces.contains( Collection.class ) ) {
+        if ( Collection.class.isAssignableFrom( clazz ) ) {
             if ( checkCollectionMethods( methodName ) ) {
                 return false;
             }
         }
 
-        if ( clazz.equals( Set.class ) || interfaces.contains( Set.class ) ) {
+        if ( Set.class.isAssignableFrom( clazz ) ) {
             if ( checkCollectionMethods( methodName ) ) {
                 return false;
             }
         }
 
-        if ( clazz.equals( List.class ) || interfaces.contains( List.class ) ) {
+        if ( List.class.isAssignableFrom( clazz ) ) {
 
             if ( checkCollectionMethods( methodName ) || "listIterator".equals( methodName ) || "lastIndexOf".equals( methodName ) || "indexOf".equals( methodName ) || "subList".equals( methodName ) ) {
                 return false;
             }
         }
 
-        if ( clazz.equals( Map.class ) || interfaces.contains( Map.class ) ) {
+        if ( Map.class.isAssignableFrom( clazz ) ) {
             if ( "get".equals( methodName ) || "isEmpty".equals( methodName ) || "containsKey".equals( methodName ) || "values".equals( methodName ) || "entrySet".equals( methodName ) || "containsValue".equals( methodName )
                  || "keySet".equals( methodName ) || "size".equals( methodName ) ) {
                 return false;