Adding ParameterizedTypeImpl to getGenericSuperclass method.

[jpf-core.git] / src / main / gov / nasa / jpf / vm / MethodInfo.java

diff --git a/src/main/gov/nasa/jpf/vm/MethodInfo.java b/src/main/gov/nasa/jpf/vm/MethodInfo.java
index a5a83bb7d83f05722179c9e302668b43e0d9cad0..4176f686ee88b4339c8080f64be06016dfa8dad2 100644 (file)
--- a/src/main/gov/nasa/jpf/vm/MethodInfo.java
+++ b/src/main/gov/nasa/jpf/vm/MethodInfo.java
@@ -505,10 +505,13 @@ public class MethodInfo extends InfoObject implements GenericSignatureHolder  {
 
   // TODO: Fix for Groovy's model-checking
   public String[] getArgumentGenericTypeNames () {
-    // To accommodate methods that do not have generic types
-    if (genericSignature == "")
+    // TODO: We need to double check but for some reason Groovy has a type of generic signature with "<*>"
+    // TODO: in the class file.
+    if (genericSignature == null || genericSignature.equals("") || genericSignature.contains("<*>"))
       return getArgumentTypeNames();
-    return Types.getArgumentTypeNames(genericSignature);
+    // We need to first find the start of the method parameters in the signature
+    String methodParameters = genericSignature.substring(genericSignature.indexOf('('));
+    return Types.getArgumentTypeNames(methodParameters);
   }
 
   public int getArgumentsSize () {
@@ -588,11 +591,14 @@ public class MethodInfo extends InfoObject implements GenericSignatureHolder  {
     return Types.getReturnTypeName(signature);
   }
 
-  // TODO: Fix for Groovy's model-checking
   public String getGenericReturnTypeName () {
-    return Types.getGenericReturnTypeName(signature);
+    // TODO: We need to double check but for some reason Groovy has a type of generic signature with "<*>"
+    // TODO: in the class file.
+    if (genericSignature == null || genericSignature.equals("") || genericSignature.contains("<*>"))
+      return Types.getReturnTypeName(signature);
+    return Types.getGenericReturnTypeName(genericSignature);
   }
-  
+
   public String getSourceFileName () {
     if (ci != null) {
       return ci.getSourceFileName();