Revision: 6615 Author: [email protected] Date: Tue Nov 3 12:45:24 2009 Log: Merged tr...@6613 into this branch Fix checkstyle warnings svn merge --ignore-ancestry -c 6613 http://google-web-toolkit.googlecode.com/svn/trunk/ .
http://code.google.com/p/google-web-toolkit/source/detail?r=6615 Modified: /releases/2.0/branch-info.txt /releases/2.0/user/src/com/google/gwt/uibinder/client/UiBinderUtil.java /releases/2.0/user/src/com/google/gwt/uibinder/rebind/UiBinderParser.java /releases/2.0/user/src/com/google/gwt/uibinder/rebind/XMLElement.java ======================================= --- /releases/2.0/branch-info.txt Tue Nov 3 12:37:03 2009 +++ /releases/2.0/branch-info.txt Tue Nov 3 12:45:24 2009 @@ -216,3 +216,7 @@ tr...@6611 was merged into this branch Fix accidentally extended timeout in JUnitShell svn merge --ignore-ancestry -c 6611 https://google-web-toolkit.googlecode.com/svn/trunk . + +tr...@6613 was merged into this branch + Fix checkstyle warnings + svn merge --ignore-ancestry -c 6613 http://google-web-toolkit.googlecode.com/svn/trunk/ . ======================================= --- /releases/2.0/user/src/com/google/gwt/uibinder/client/UiBinderUtil.java Mon Nov 2 12:44:54 2009 +++ /releases/2.0/user/src/com/google/gwt/uibinder/client/UiBinderUtil.java Tue Nov 3 12:45:24 2009 @@ -79,7 +79,6 @@ return new TempAttachment(origParent, origSibling, element); } - public static Element fromHtml(String html) { ensureHiddenDiv(); ======================================= --- /releases/2.0/user/src/com/google/gwt/uibinder/rebind/UiBinderParser.java Mon Nov 2 13:18:15 2009 +++ /releases/2.0/user/src/com/google/gwt/uibinder/rebind/UiBinderParser.java Tue Nov 3 12:45:24 2009 @@ -147,7 +147,7 @@ } /** - * Interprets <ui:data> elements + * Interprets <ui:data> elements. */ private void createData(XMLElement elem) throws UnableToCompleteException { String name = elem.consumeRequiredAttribute(FIELD_ATTRIBUTE); @@ -161,7 +161,7 @@ } /** - * Interprets <ui:image> elements + * Interprets <ui:image> elements. */ private void createImage(XMLElement elem) throws UnableToCompleteException { String name = elem.consumeRequiredAttribute(FIELD_ATTRIBUTE); ======================================= --- /releases/2.0/user/src/com/google/gwt/uibinder/rebind/XMLElement.java Mon Nov 2 21:21:03 2009 +++ /releases/2.0/user/src/com/google/gwt/uibinder/rebind/XMLElement.java Tue Nov 3 12:45:24 2009 @@ -230,8 +230,8 @@ /** * Consumes the given attribute as an enum value. * - * @param attr the attribute's full name (including prefix) - * @param type the enumerated type of which this attribute must be a member + * @param name the attribute's full name (including prefix) + * @param enumType the enumerated type of which this attribute must be a member * @return the attribute's value * @throws UnableToCompleteException */ --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
