int genericStart = currParam.indexOf('<');
if (genericStart != -1) {
if (currParam.charAt(genericStart + 1) == '*') {
- semicolon = genericStart + 4;
+ // Need to offset with idx to anticipate for array types (idx is incremented for array types)
+ semicolon = genericStart + idx + 3;
} else {
int generic = signature.indexOf('>', semicolon);
if (generic != -1) {
return arrTypeVarNames;
}
- // TODO: Fix for Groovy's model-checking
public static String[] getParameterizedTypes(String signature) {
int pos = signature.indexOf('<', 0);
if (pos == -1)
String typeVarName = "";
int comma = signature.indexOf(',', pos);
if (comma == -1) {
- int closing = signature.indexOf('>', pos);
+ int closing = signature.lastIndexOf('>', signature.length());
typeVarName = signature.substring(pos + 1, closing);
pos = signature.length();
} else {
return signature.substring(0, opening);
}
+ public static String getArrayClassName(String signature) {
+ int opening = signature.indexOf('[');
+ if (opening == -1)
+ return signature;
+ else
+ return signature.substring(0, opening);
+ }
+
public static String getOwnerClassName(String signature) {
int marker = signature.indexOf('$');
if (marker == -1)
return (opening != -1);
}
+ public static boolean isParameterizedType(String signature) {
+ return Types.isGenericSignature(signature);
+ }
+
+ public static boolean isArraySignature(String signature) {
+ if (signature == null || signature.equals(""))
+ return false;
+ int opening = signature.indexOf('[');
+ return (opening != -1);
+ }
+
public static boolean isTypeParameter(String parameterizedType, String signature) {
if (signature == null || signature.equals(""))
return false;
}
public static boolean isWildcardType(String signature) {
- return (signature.startsWith("+L") || signature.startsWith("-L") || signature.equals("*"));
+ return (signature.startsWith("+L") ||
+ signature.startsWith("-L") ||
+ signature.startsWith("+") ||
+ signature.startsWith("-") ||
+ signature.equals("*"));
}
public static String getWildcardType(String signature) {
}
return signature.replaceAll("\\+L|-L", "");
}
+
+ public static String getTypeParameter(String signature) {
+ if (signature == null || signature.equals(""))
+ return signature;
+
+ if (signature.equals("*")) {
+ return signature;
+ }
+
+ String cleanSig = signature.replaceAll("\\+|-", "");
+ if (cleanSig.length()%2 != 0) {
+ // This is probably a class, e.g., +java.lang.Class
+ return signature;
+ }
+
+ // Check if this is not a class name, e.g., +java.lang.Class
+ if (cleanSig.contains(".")) {
+ return signature;
+ }
+
+ // Just return the second half of the signature to get the Type parameter
+ int halfPos = cleanSig.length()/2;
+ //String firstHalf = cleanSig.substring(0, halfPos);
+ String secondHalf = cleanSig.substring(halfPos, cleanSig.length());
+ return secondHalf;
+ }
// TODO: Fix for Groovy's model-checking
}