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

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

Author: baunax
Date: 2010-01-26 16:20:12 -0500 (Tue, 26 Jan 2010)
New Revision: 31235

Modified:
   labs/jbossrules/branches/guvnor_expressionEditor2_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/server/util/ClassMethodInspector.java
Log:
changed to consider "(b|B)oolean isXXX" as a getter

Modified: labs/jbossrules/branches/guvnor_expressionEditor2_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/server/util/ClassMethodInspector.java
===================================================================
--- labs/jbossrules/branches/guvnor_expressionEditor2_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/server/util/ClassMethodInspector.java	2010-01-26 21:18:29 UTC (rev 31234)
+++ labs/jbossrules/branches/guvnor_expressionEditor2_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/server/util/ClassMethodInspector.java	2010-01-26 21:20:12 UTC (rev 31235)
@@ -32,16 +32,17 @@
             int modifiers = methods[i].getModifiers();
             String methodName = aMethod.getName();
 
-            if ( isNotGetterOrSetter( methodName ) && isReasonableMethod( clazz,
-                                                                          methodName ) && Modifier.isPublic( modifiers ) ) {
+            if ( isNotGetterOrSetter(aMethod) && isReasonableMethod( clazz,
+            		methodName ) && Modifier.isPublic( modifiers ) ) {
 
                 Class<?>[] listParam = aMethod.getParameterTypes();
                 
-
-                MethodInfo info = new MethodInfo( methodName,
-                                                  solveParams( listParam ), 
-                                                  aMethod.getReturnType() );
-                this.methods.add( info );
+                
+				MethodInfo info = new MethodInfo(methodName,
+						solveParams(listParam), aMethod.getReturnType(),
+						SuggestionCompletionEngineBuilder
+								.obtainGenericType(aMethod.getGenericReturnType()));
+				this.methods.add(info);
             }
         }
     }
@@ -116,10 +117,12 @@
      * 
      * @param methodName
      */
-    private boolean isNotGetterOrSetter(String methodName) {
-        boolean isGetterOrSetter = (methodName.length() > 3 && (methodName.startsWith( "set" ) || methodName.startsWith( "get" )));
-
-        return !isGetterOrSetter;
+    private boolean isNotGetterOrSetter(Method m) {
+    	String name = m.getName();
+        return !((name.length() > 3 && (name.startsWith( "set" ) || name.startsWith( "get" ))) ||
+        	(name.length() > 2 && name.startsWith("is") 
+        			&& (Boolean.class.isAssignableFrom(m.getReturnType()) || Boolean.TYPE == m.getReturnType())));
+        
     }
 
     public List<String> getMethodFields(String methodName) {