More tests on the Class<U> case.

diff --git a/examples/Reflection.java b/examples/Reflection.java
index c49ce47fa6d9c6a96667b53d833556517cd744bd..f2bff8ab62ba9ce019cf132914e3b556448aad14 100644 (file)
--- a/examples/Reflection.java
+++ b/examples/Reflection.java
@@ -16,10 +16,10 @@ public class Reflection {
        
        }
 
-       class SampleClass<U> {
+       class SampleClass<VWXZ> {
           private String sampleField;
 
-          public Generic<Integer,String,Double,Short> setSampleField(Class<U> clazz, List<String> listString, Map<Integer,String> mapString,
+          public Generic<Integer,String,Double,Short> setSampleField(Class<VWXZ> clazz, List<String> listString, Map<Integer,String> mapString,
                                Generic<Integer,String,Double,Short> test,
                                String sampleField, int one, short two, double three, Object obj) {
                  this.sampleField = sampleField; 

diff --git a/src/main/gov/nasa/jpf/vm/Types.java b/src/main/gov/nasa/jpf/vm/Types.java
index 2e98b2545f7da0ef73e55125acffe9ed51e3f39c..16ee295718f9e9195f70ab3c45dc1c2f9be5c5c6 100644 (file)
--- a/src/main/gov/nasa/jpf/vm/Types.java
+++ b/src/main/gov/nasa/jpf/vm/Types.java
@@ -919,7 +919,8 @@ public class Types {
       return signature.substring(1, len1).replace('/', '.').
               replaceAll(";L", ", ").
               replace("<L","<").
-              replace(";>", ">");
+              replace(";>", ">").
+              replaceAll("<T", "<");
     }