Merge pull request square#432 from google/moe_sync_08_08

Rename ExceptionSuperclass.NONE to NO_EXCEPTIONS for clarity.
tbroyer · Aug 9, 2016 · efc1fb2 · efc1fb2
2 parents e9066f6 + 44fa7f2
commit efc1fb2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/compiler/src/main/java/dagger/internal/codegen/BindingMethodValidator.java b/compiler/src/main/java/dagger/internal/codegen/BindingMethodValidator.java
@@ -422,7 +422,7 @@ protected enum Abstractness {
    */
   protected enum ExceptionSuperclass {
     /** Methods may not declare any throwable types. */
-    NONE {
+    NO_EXCEPTIONS {
       @Override
       protected void checkThrows(
           BindingMethodValidator validator, ValidationReport.Builder<ExecutableElement> builder) {

diff --git a/compiler/src/main/java/dagger/internal/codegen/MultibindsMethodValidator.java b/compiler/src/main/java/dagger/internal/codegen/MultibindsMethodValidator.java
@@ -17,6 +17,7 @@
 package dagger.internal.codegen;
 
 import static dagger.internal.codegen.BindingMethodValidator.Abstractness.MUST_BE_ABSTRACT;
+import static dagger.internal.codegen.BindingMethodValidator.ExceptionSuperclass.NO_EXCEPTIONS;
 import static dagger.internal.codegen.ErrorMessages.MultibindsMessages.METHOD_MUST_RETURN_MAP_OR_SET;
 import static dagger.internal.codegen.ErrorMessages.MultibindsMessages.NO_MAP_KEY;
 import static dagger.internal.codegen.ErrorMessages.MultibindsMessages.PARAMETERS;
@@ -62,7 +63,7 @@ protected MultibindsMethodValidator(
         methodAnnotation,
         enclosingElementAnnotations,
         MUST_BE_ABSTRACT,
-        ExceptionSuperclass.NONE);
+        NO_EXCEPTIONS);
   }
 
   @Override