Better map UnsafeGenericCast

Author: mickaelistria

org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ConverterTestSetup.java

@@ -998,7 +998,7 @@ private boolean matchesAlternateMessage(String original, String expected, int pr
 			return m;
 		case IProblem.JavadocMissingParamTag:
 			return original.replace("no @param for ", "Javadoc: Missing tag for parameter ").equals(expected);
-		case IProblem.UncheckedAccessOfValueOfFreeTypeVariable:
+		case IProblem.UncheckedAccessOfValueOfFreeTypeVariable: {
 			String p = "Type safety: The expression of type (.*) needs unchecked conversion to conform to (.*)";
 			Pattern r = Pattern.compile(p);
 			Matcher m1 = r.matcher(expected);
@@ -1012,6 +1012,25 @@ private boolean matchesAlternateMessage(String original, String expected, int pr
 				}
 			}
 			return false;
+		}
+		case IProblem.UnsafeGenericCast: {
+			String p = "Type safety: Unchecked cast from (.*) to (.*)";
+			Pattern r = Pattern.compile(p);
+			Matcher m1 = r.matcher(expected);
+			if (m1.find( )) {
+				String g0 = m1.group(1).replaceAll("capture#([0-9]*)-", "capture#$1 ");
+				String g1 = m1.group(2).replaceAll("capture#([0-9]*)-", "capture#$1 ");
+				String originalToSimple = original
+						.replaceAll("java\\.lang\\.", "")
+						.replaceAll("java\\.util\\.", "");
+				String found = "unchecked cast\n  required: *" + g1 + "\n  found: *" + g0;
+				found = found.replaceAll("\\?", "\\\\?");
+				if( originalToSimple.replaceAll(found, "").equals("")) {
+					return true;
+				}
+			}
+			return false;
+		}
 		case IProblem.DuplicateMethod: // TODO these should really be fixed elsewhere
 			if( expected.startsWith("Duplicate local variable ")) {
 				return original.startsWith(expected.substring(16) + " is already defined");