FELIX-2665 : getting error about SlingFilterScope not being applicable for <T extends Enum>. Applied patch from Justin Edelson
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1023666 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/Util.java b/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/Util.java
index d3fbd6d..ce905d3 100644
--- a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/Util.java
+++ b/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/Util.java
@@ -304,8 +304,7 @@
}
}
- @SuppressWarnings("unchecked")
- public static <T extends Enum> T getEnumValue(Annotation annotation,
+ public static <T extends Enum<T>> T getEnumValue(Annotation annotation,
String name,
final Class<T> enumClass,
final Class<?> clazz,
@@ -330,15 +329,13 @@
if (dotPos >= 0) {
enumName = enumName.substring(dotPos+1);
}
- Object o = Enum.valueOf(enumClass, enumName);
- return (T)o;
+ return Enum.valueOf(enumClass, enumName);
}
}
return null;
}
- @SuppressWarnings("unchecked")
- public static <T extends Enum> T getEnumValue(Annotation annotation,
+ public static <T extends Enum<T>> T getEnumValue(Annotation annotation,
String name,
final Class<T> enumClass,
final Class<?> clazz) {