You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2010/10/18 09:17:02 UTC
svn commit: r1023666 -
/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/Util.java
Author: cziegeler
Date: Mon Oct 18 07:17:02 2010
New Revision: 1023666
URL: http://svn.apache.org/viewvc?rev=1023666&view=rev
Log:
FELIX-2665 : getting error about SlingFilterScope not being applicable for <T extends Enum>. Applied patch from Justin Edelson
Modified:
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/Util.java
Modified: felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/Util.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/Util.java?rev=1023666&r1=1023665&r2=1023666&view=diff
==============================================================================
--- felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/Util.java (original)
+++ felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/Util.java Mon Oct 18 07:17:02 2010
@@ -304,8 +304,7 @@ public abstract class Util {
}
}
- @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 @@ public abstract class Util {
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) {