commit df98fcd16ab0f74e5ba31af67cf98bd319a58e43
author limpbizkit <limpbizkit@d779f126-a31b-0410-b53b-1d3aecad763e> Sat Jun 14 05:02:15 2008 +0000
committer limpbizkit <limpbizkit@d779f126-a31b-0410-b53b-1d3aecad763e> Sat Jun 14 05:02:15 2008 +0000
tree 7537ae5194007053e10d2644c876996e1ecd7a42
parent 49f67c0f62bc1748dd32e1d86616085231e974e7

Refactoring error messages. I changed 'em from public static final constants to methods. The benefit is that now the arguments are typechecked. More importantly, now we can gather coverage on methods. Which opens the door to figuring out which methods we have test coverage for (not very many!)

git-svn-id: https://google-guice.googlecode.com/svn/trunk@516 d779f126-a31b-0410-b53b-1d3aecad763e

src/com/google/inject/ScopesCommandProcessor.java

diff --git a/src/com/google/inject/ScopesCommandProcessor.java b/src/com/google/inject/ScopesCommandProcessor.java
index 87c0ce7..c2a2894 100644
--- a/src/com/google/inject/ScopesCommandProcessor.java
+++ b/src/com/google/inject/ScopesCommandProcessor.java
@@ -16,13 +16,12 @@
 
 package com.google.inject;
 
+import static com.google.common.base.Preconditions.checkNotNull;
 import com.google.inject.commands.BindScopeCommand;
 import com.google.inject.internal.Annotations;
 import com.google.inject.internal.ErrorHandler;
-import com.google.inject.internal.ErrorMessages;
+import com.google.inject.internal.ErrorMessage;
 import com.google.inject.internal.StackTraceElements;
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import java.lang.annotation.Annotation;
 import java.util.Map;
 
@@ -48,20 +47,19 @@
 
     if (!Scopes.isScopeAnnotation(annotationType)) {
       addError(StackTraceElements.forType(annotationType),
-          ErrorMessages.MISSING_SCOPE_ANNOTATION);
+          ErrorMessage.missingScopeAnnotation());
       // Go ahead and bind anyway so we don't get collateral errors.
     }
 
     if (!Annotations.isRetainedAtRuntime(annotationType)) {
       addError(StackTraceElements.forType(annotationType),
-          ErrorMessages.MISSING_RUNTIME_RETENTION, command.getSource());
+          ErrorMessage.missingRuntimeRetention(command.getSource()));
       // Go ahead and bind anyway so we don't get collateral errors.
     }
 
     Scope existing = scopes.get(checkNotNull(annotationType, "annotation type"));
     if (existing != null) {
-      addError(command.getSource(), ErrorMessages.DUPLICATE_SCOPES, existing,
-          annotationType, scope);
+      addError(command.getSource(), ErrorMessage.duplicateScopes(existing, annotationType, scope));
     } else {
       scopes.put(annotationType, checkNotNull(scope, "scope"));
     }