[gwt-contrib] Reduce the visiblity of a UiBinderWriter method. (issue1500807)

[rjrjr]

Reviewers: hermes,

Description:
Reduce the visiblity of a UiBinderWriter method.

Please review this at http://gwt-code-reviews.appspot.com/1500807/

Affected files:
  M user/src/com/google/gwt/uibinder/rebind/UiBinderWriter.java


Index: user/src/com/google/gwt/uibinder/rebind/UiBinderWriter.java
===================================================================
--- user/src/com/google/gwt/uibinder/rebind/UiBinderWriter.java	(revision  
10473)
+++ user/src/com/google/gwt/uibinder/rebind/UiBinderWriter.java	(working  
copy)
@@ -540,31 +540,6 @@
   }

   /**
-   * Declares a field of the given type name, returning the name of the  
declared
-   * field. If the element has a field or id attribute, use its value.
-   * Otherwise, create and return a new, private field name for it.
-   */
-  public String declareField(String typeName, XMLElement elem)
-      throws UnableToCompleteException {
-    JClassType type = oracle.findType(typeName);
-    if (type == null) {
-      die(elem, "Unknown type %s", typeName);
-    }
-
-    String fieldName = getFieldName(elem);
-    if (fieldName == null) {
-      // TODO(rjrjr) could collide with user declared name, as is
-      // also a worry in HandlerEvaluator. Need a general scheme for
-      // anonymous fields. See the note in HandlerEvaluator and do
-      // something like that, but in FieldManager.
-      fieldName = "f_" + elem.getLocalName() + ++fieldIndex;
-    }
-    fieldName = normalizeFieldName(fieldName);
-    fieldManager.registerField(type, fieldName);
-    return fieldName;
-  }
-
-  /**
    * If this element has a gwt:field attribute, create a field for it of  
the
    * appropriate type, and return the field name. If no gwt:field  
attribute is
    * found, do nothing and return null
@@ -948,9 +923,7 @@
     JClassType type = findFieldType(elem);

     // Declare its field.
-    String fieldName = declareField(type.getQualifiedSourceName(), elem);
-
-    FieldWriter field = fieldManager.lookup(fieldName);
+    FieldWriter field = declareField(type.getQualifiedSourceName(), elem);

     // Push the field that will hold this widget on top of the  
parsedFieldStack
     // to ensure that fields registered by its parsers will be noted as
@@ -959,7 +932,7 @@

     // Give all the parsers a chance to generate their code.
     for (ElementParser parser : getParsersForClass(type)) {
-      parser.parse(elem, fieldName, type, this);
+      parser.parse(elem, field.getName(), type, this);
     }
     fieldManager.pop();

@@ -1097,6 +1070,30 @@
     String parser = "com.google.gwt.uibinder.elementparsers." + className
         + "Parser";
     addElementParser(gwtClass, parser);
+  }
+
+  /**
+   * Declares a field of the given type name, returning the name of the  
declared
+   * field. If the element has a field or id attribute, use its value.
+   * Otherwise, create and return a new, private field name for it.
+   */
+  private FieldWriter declareField(String typeName, XMLElement elem)
+      throws UnableToCompleteException {
+    JClassType type = oracle.findType(typeName);
+    if (type == null) {
+      die(elem, "Unknown type %s", typeName);
+    }
+
+    String fieldName = getFieldName(elem);
+    if (fieldName == null) {
+      // TODO(rjrjr) could collide with user declared name, as is
+      // also a worry in HandlerEvaluator. Need a general scheme for
+      // anonymous fields. See the note in HandlerEvaluator and do
+      // something like that, but in FieldManager.
+      fieldName = "f_" + elem.getLocalName() + ++fieldIndex;
+    }
+    fieldName = normalizeFieldName(fieldName);
+    return fieldManager.registerField(type, fieldName);
   }

   /**
@@ -1818,8 +1815,7 @@
     w.write("}");
   }

-  private void writeRendererGetters(IndentedWriter w, JClassType owner,  
String rootFieldName)
-      throws UnableToCompleteException {
+  private void writeRendererGetters(IndentedWriter w, JClassType owner,  
String rootFieldName) {
     List<JMethod> getters = findGetterNames(owner);

     // For every requested getter


--
http://groups.google.com/group/Google-Web-Toolkit-Contributors