Fixed enum binding support (issue #49)

src/com/google/gwt/inject/rebind/binding/BindConstantBinding.java

 /*
  * Copyright 2008 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
@@ skipping 74 matching lines @@
       valueToOutput = instance.toString(); // Includes int & short.
     } else if (instance instanceof Enum) {
       String className = instance.getClass().getName();
 
       // Enums become anonymous inner classes if they have a custom
       // implementation. Their classname is then of the form "com.foo.Bar$1".
       // We need to be careful here to not clobber inner enums (which also
       // have a $ in their classname). The regex below matches any classname
       // that terminates in a $ followed by a number, i.e. an anonymous class.
       if (className.matches(".+\\$\\d+\\z")) {
-        className = className.substring(0, className.lastIndexOf("$"));

[Brian_Stoler, 2009/07/02 04:16:03]

Can you just check if getEnclosingClass is non-null and use that if not?

[Aragos, 2009/07/02 20:34:57]

On 2009/07/02 04:16:03, Brian_Stoler wrote:
> Can you just check if getEnclosingClass is non-null and use that if not?

Using getEnclosingClass instead of substring. I can't use it on the matcher
because it would also match inner enums.

+        className = instance.getClass().getEnclosingClass().getName();
       }
       className = nameGenerator.binaryNameToSourceName(className);
 
       valueToOutput = className + "." + ((Enum) instance).name();
     } else {
       throw new IllegalArgumentException("Attempted to create a constant binding with a "
           + "non-constant type: " + type);
     }
   }
 
   public void writeCreatorMethods(SourceWriter writer, String creatorMethodSignature) {
     assert valueToOutput != null;
 
     sourceWriteUtil.writeMethod(writer, creatorMethodSignature, "return " + valueToOutput + ";");
   }
 
   public RequiredKeys getRequiredKeys() {
     return new RequiredKeys(Collections.<Key<?>>emptySet());
   }
 }