commit b519351746fe0185149fe76d9871ae1205966ee6
author rjrjr@google.com <rjrjr@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Tue Aug 16 17:08:37 2011 +0000
committer rjrjr@google.com <rjrjr@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Tue Aug 16 17:08:37 2011 +0000
tree 3f12793733bdd56c9d2aff0d63c7709a3fdd285d
parent 3409cfa126cc466e13671fe1dfed2e30f7fb7c7c

Don't generate bad code for bad field names

Review at http://gwt-code-reviews.appspot.com/1528803

Review by: rchandia@google.com

git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@10533 8db76d5a-ed1c-0410-87a9-c151d255dfc7

user/src/com/google/gwt/uibinder/rebind/FieldManager.java

diff --git a/user/src/com/google/gwt/uibinder/rebind/FieldManager.java b/user/src/com/google/gwt/uibinder/rebind/FieldManager.java
index 899f6cc..5b4b4c1 100644
--- a/user/src/com/google/gwt/uibinder/rebind/FieldManager.java
+++ b/user/src/com/google/gwt/uibinder/rebind/FieldManager.java
@@ -21,8 +21,8 @@
 import com.google.gwt.core.ext.typeinfo.JType;
 import com.google.gwt.core.ext.typeinfo.TypeOracle;
 import com.google.gwt.uibinder.rebind.model.ImplicitCssResource;
-import com.google.gwt.uibinder.rebind.model.OwnerField;
 import com.google.gwt.uibinder.rebind.model.OwnerClass;
+import com.google.gwt.uibinder.rebind.model.OwnerField;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -31,6 +31,7 @@
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.Map;
+import java.util.regex.Pattern;
 
 /**
  * This class handles all {@link FieldWriter} instances created for the current
@@ -53,6 +54,9 @@
     }
   };
 
+  private static final Pattern JAVA_IDENTIFIER =
+      Pattern.compile("[\\p{L}_$][\\p{L}\\p{N}_$]*");
+
   public static String getFieldBuilder(String fieldName) {
     return String.format("build_%s()", fieldName);
   }
@@ -60,8 +64,8 @@
   public static String getFieldGetter(String fieldName) {
     return String.format("get_%s()", fieldName);
   }
-
   private final TypeOracle types;
+
   private final MortalLogger logger;
 
   /**
@@ -343,6 +347,12 @@
     }
   }
 
+  private void ensureValidity(String fieldName) throws UnableToCompleteException {
+    if (!JAVA_IDENTIFIER.matcher(fieldName).matches()) {
+      logger.die("Illegal field name \"%s\"", fieldName);
+    }
+  }
+
   /**
    * Gets the number of times a getter for the given field is called.
    */
@@ -357,6 +367,7 @@
 
   private FieldWriter registerField(String fieldName, FieldWriter field)
       throws UnableToCompleteException {
+    ensureValidity(fieldName);
     requireUnique(fieldName);
     fieldsMap.put(fieldName, field);
 
@@ -368,7 +379,7 @@
 
     return field;
   }
-
+  
   private void requireUnique(String fieldName) throws UnableToCompleteException {
     if (fieldsMap.containsKey(fieldName)) {
       logger.die(DUPLICATE_FIELD_ERROR, fieldName);