Merge remote-tracking branch 'origin/master'

seam · Mar 25, 2011 · 3211e41 · 3211e41
2 parents 07bc85e + 7c52230
commit 3211e41
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/...ain/java/org/jboss/seam/exception/example/basic/servlet/navigation/NavigationServlet.java b/...ain/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")));
 

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
@@ -51,7 +51,7 @@
 /**
  * CDI extension to find handlers at startup.
  */
-@SuppressWarnings({"ALL"})
+@SuppressWarnings("unchecked")
 public class CatchExtension implements Extension {
     private final Map<? super Type, Collection<HandlerMethod<? extends Throwable>>> allHandlers;
 
@@ -77,7 +77,7 @@ public <T> void findHandlers(@Observes final ProcessBean<?> pmb, final BeanManag
             return;
         }
 
-        final AnnotatedType<T> type = (AnnotatedType<T>) pmb.getAnnotated();
+		final AnnotatedType<T> type = (AnnotatedType<T>) pmb.getAnnotated();
 
         if (AnnotationInspector.isAnnotationPresent(type, HandlesExceptions.class, bm)) {
             final Set<AnnotatedMethod<? super T>> methods = type.getMethods();
@@ -118,7 +118,7 @@ private <E extends Throwable, M> void addHandlerMethod(Class<E> exceptionType, A
     public Collection<HandlerMethod<? extends Throwable>> getHandlersForExceptionType(Type exceptionClass, BeanManager bm,
                                                                                       Set<Annotation> handlerQualifiers,
                                                                                       TraversalMode traversalMode) {
-        final Set<HandlerMethod<?>> returningHandlers = new TreeSet<HandlerMethod<?>>(new ExceptionHandlerComparator());
+        final Collection<HandlerMethod<? extends Throwable>> returningHandlers = new TreeSet<HandlerMethod<? extends Throwable>>(new ExceptionHandlerComparator());
         final HierarchyDiscovery h = new HierarchyDiscovery(exceptionClass);
         final Set<Type> closure = h.getTypeClosure();
 
@@ -138,7 +138,7 @@ public Collection<HandlerMethod<? extends Throwable>> getHandlersForExceptionTyp
             }
         }
 
-        return (Collection<HandlerMethod<? extends Throwable>>) Collections.unmodifiableCollection(returningHandlers);
+        return Collections.unmodifiableCollection(returningHandlers);
     }
 
     private boolean containsAny(final Collection<? extends Annotation> haystack,