Fixing TODOs; rename UiBinderWriter methods for generating tokens for SafeHtml instances and safe constants. Review at http://gwt-code-reviews.appspot.com/1420813 Review by: rjrjr@google.com git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@10102 8db76d5a-ed1c-0410-87a9-c151d255dfc7

diff --git a/user/src/com/google/gwt/uibinder/elementparsers/AttachableInterpreter.java b/user/src/com/google/gwt/uibinder/elementparsers/AttachableInterpreter.java
index 012b458..7c1a17a 100644
--- a/user/src/com/google/gwt/uibinder/elementparsers/AttachableInterpreter.java
+++ b/user/src/com/google/gwt/uibinder/elementparsers/AttachableInterpreter.java

@@ -79,6 +79,6 @@
     // TODO(rdcastro): use the render() call that receives the SafeHtmlBuilder
     String elementHtml = fieldManager.convertFieldToGetter(childFieldWriter.getName()) + ".render("
         + fieldManager.convertFieldToGetter(idHolder) + ")";
-    return uiWriter.tokenForExpression(elementHtml);
+    return uiWriter.tokenForSafeHtmlExpression(elementHtml);
   }
 }

diff --git a/user/src/com/google/gwt/uibinder/elementparsers/HtmlInterpreter.java b/user/src/com/google/gwt/uibinder/elementparsers/HtmlInterpreter.java
index bc57c3c..b10b824 100644
--- a/user/src/com/google/gwt/uibinder/elementparsers/HtmlInterpreter.java
+++ b/user/src/com/google/gwt/uibinder/elementparsers/HtmlInterpreter.java

@@ -88,7 +88,7 @@
     if (writer.useLazyWidgetBuilders() &&
         writer.isSubclassOf(elem, SafeHtml.class)) {
       String childFieldName = writer.parseElementToField(elem);
-      return writer.tokenForExpression(childFieldName);
+      return writer.tokenForSafeHtmlExpression(childFieldName);
     }
     return pipe.interpretElement(elem);
   }

diff --git a/user/src/com/google/gwt/uibinder/elementparsers/HtmlMessageInterpreter.java b/user/src/com/google/gwt/uibinder/elementparsers/HtmlMessageInterpreter.java
index 689158a..8aa9371 100644
--- a/user/src/com/google/gwt/uibinder/elementparsers/HtmlMessageInterpreter.java
+++ b/user/src/com/google/gwt/uibinder/elementparsers/HtmlMessageInterpreter.java

@@ -74,7 +74,7 @@
 
       MessageWriter message = messages.newMessage(elem);
       message.setDefaultMessage(elem.consumeInnerHtml(phiProvider.get(message)));
-      return uiWriter.tokenForSafeHtmlExpression(messages.declareMessage(message));
+      return uiWriter.tokenForSafeConstant(messages.declareMessage(message));
     }
 
     return null;

diff --git a/user/src/com/google/gwt/uibinder/rebind/UiBinderWriter.java b/user/src/com/google/gwt/uibinder/rebind/UiBinderWriter.java
index d0572f8..a56f961 100644
--- a/user/src/com/google/gwt/uibinder/rebind/UiBinderWriter.java
+++ b/user/src/com/google/gwt/uibinder/rebind/UiBinderWriter.java

@@ -775,18 +775,6 @@
         type.getQualifiedSourceName(), asCommaSeparatedList(args)));
   }
 
-  // TODO(rdcastro): Rename this to tokenForSafeHtmlExpression and the method
-  // above to something else.
-  public String tokenForExpression(String expression) {
-    if (!useSafeHtmlTemplates) {
-      return tokenForStringExpression(expression);
-    }
-
-    String token = tokenator.nextToken(expression);
-    htmlTemplates.noteSafeConstant(expression);
-    return tokenator.nextToken(expression);
-  }
-
   /**
    * Like {@link #tokenForStringExpression}, but used for runtime expressions
    * that we trust to be safe to interpret at runtime as HTML without escaping,
@@ -796,8 +784,7 @@
    *
    * @param expression
    */
-  // TODO(rdcastro): Rename this tokenForSafeConstant.
-  public String tokenForSafeHtmlExpression(String expression) {
+  public String tokenForSafeConstant(String expression) {
     if (!useSafeHtmlTemplates) {
       return tokenForStringExpression(expression);
     }
@@ -810,6 +797,22 @@
   }
 
   /**
+   * Like {@link #tokenForStringExpression}, but used for runtime {@link SafeHtml}
+   * instances.
+   *
+   * @param expression
+   */
+  public String tokenForSafeHtmlExpression(String expression) {
+    if (!useSafeHtmlTemplates) {
+      return tokenForStringExpression(expression);
+    }
+
+    String token = tokenator.nextToken(expression);
+    htmlTemplates.noteSafeConstant(expression);
+    return tokenator.nextToken(expression);
+  }
+
+  /**
    * Returns a string token that can be used in place the given expression
    * inside any string literals. Before the generated code is written, the
    * expression will be stitched back into the generated code in place of the