From 86712f4263084c2274af994a13e1170833c7a787 Mon Sep 17 00:00:00 2001 From: George Gastaldi Date: Thu, 24 Mar 2011 23:23:23 -0300 Subject: [PATCH 1/2] SEAMCATCH-51 --- .../example/basic/servlet/navigation/NavigationServlet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/basic-servlet/src/main/java/org/jboss/seam/exception/example/basic/servlet/navigation/NavigationServlet.java b/examples/basic-servlet/src/main/java/org/jboss/seam/exception/example/basic/servlet/navigation/NavigationServlet.java index c8ddb6a..a516fe8 100644 --- a/examples/basic-servlet/src/main/java/org/jboss/seam/exception/example/basic/servlet/navigation/NavigationServlet.java +++ b/examples/basic-servlet/src/main/java/org/jboss/seam/exception/example/basic/servlet/navigation/NavigationServlet.java @@ -40,7 +40,7 @@ public class NavigationServlet extends HttpServlet private enum NavigationEnum { NULLPOINTEREXCEPTION(new NullPointerException("Null pointer thrown")), - ASSERTIONERRROR(new AssertionError("Assertion Error")), + ASSERTIONERROR(new AssertionError("Assertion Error")), IOEXCEPTION(new IOException("IOException")), WRAPPEDILLEGALARG(new IllegalStateException("Wrapping IllegalStateException", new IllegalArgumentException("Inner IAE"))); From 7c522302e26e4c3b34bb377978a16728f4e8f4ed Mon Sep 17 00:00:00 2001 From: George Gastaldi Date: Thu, 24 Mar 2011 23:41:12 -0300 Subject: [PATCH 2/2] Removed compilation warning and avoided unnecessary cast --- .../seam/exception/control/extension/CatchExtension.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/impl/src/main/java/org/jboss/seam/exception/control/extension/CatchExtension.java b/impl/src/main/java/org/jboss/seam/exception/control/extension/CatchExtension.java index b444c0a..9782be7 100644 --- a/impl/src/main/java/org/jboss/seam/exception/control/extension/CatchExtension.java +++ b/impl/src/main/java/org/jboss/seam/exception/control/extension/CatchExtension.java @@ -51,7 +51,7 @@ /** * CDI extension to find handlers at startup. */ -@SuppressWarnings({"ALL"}) +@SuppressWarnings("unchecked") public class CatchExtension implements Extension { private final Map>> allHandlers; @@ -77,7 +77,7 @@ public void findHandlers(@Observes final ProcessBean pmb, final BeanManag return; } - final AnnotatedType type = (AnnotatedType) pmb.getAnnotated(); + final AnnotatedType type = (AnnotatedType) pmb.getAnnotated(); if (AnnotationInspector.isAnnotationPresent(type, HandlesExceptions.class, bm)) { final Set> methods = type.getMethods(); @@ -118,7 +118,7 @@ private void addHandlerMethod(Class exceptionType, A public Collection> getHandlersForExceptionType(Type exceptionClass, BeanManager bm, Set handlerQualifiers, TraversalMode traversalMode) { - final Set> returningHandlers = new TreeSet>(new ExceptionHandlerComparator()); + final Collection> returningHandlers = new TreeSet>(new ExceptionHandlerComparator()); final HierarchyDiscovery h = new HierarchyDiscovery(exceptionClass); final Set closure = h.getTypeClosure(); @@ -138,7 +138,7 @@ public Collection> getHandlersForExceptionTyp } } - return (Collection>) Collections.unmodifiableCollection(returningHandlers); + return Collections.unmodifiableCollection(returningHandlers); } private boolean containsAny(final Collection haystack,