Revision: 6597 Author: [email protected] Date: Mon Nov 2 18:29:39 2009 Log: Merges tr...@6596 into releases/2.0 Fix DockLayoutPanelParser and StackLayoutPanelParser svn merge --ignore-ancestry -c 6596 https://google-web-toolkit.googlecode.com/svn/trunk .
http://code.google.com/p/google-web-toolkit/source/detail?r=6597 Modified: /releases/2.0/branch-info.txt /releases/2.0/user/src/com/google/gwt/uibinder/parsers/DockLayoutPanelParser.java /releases/2.0/user/src/com/google/gwt/uibinder/parsers/StackLayoutPanelParser.java ======================================= --- /releases/2.0/branch-info.txt Mon Nov 2 13:47:14 2009 +++ /releases/2.0/branch-info.txt Mon Nov 2 18:29:39 2009 @@ -188,3 +188,7 @@ Propagate log message colors to lower-priority ancestors. svn merge --ignore-ancestry -c6592 \ https://google-web-toolkit.googlecode.com/svn/trunk/ . + +tr...@6596 was merged into this branch + Fix DockLayoutPanelParser and StackLayoutPanelParser + svn merge --ignore-ancestry -c 6596 https://google-web-toolkit.googlecode.com/svn/trunk . ======================================= --- /releases/2.0/user/src/com/google/gwt/uibinder/parsers/DockLayoutPanelParser.java Mon Nov 2 13:18:15 2009 +++ /releases/2.0/user/src/com/google/gwt/uibinder/parsers/DockLayoutPanelParser.java Mon Nov 2 18:29:39 2009 @@ -90,7 +90,7 @@ if (requiresSize(child)) { String size = child.consumeDoubleAttribute("size"); - writer.addStatement("%s.%s(%s, %f);", fieldName, addMethodName(child), + writer.addStatement("%s.%s(%s, %s);", fieldName, addMethodName(child), childFieldName, size); } else { writer.addStatement("%s.%s(%s);", fieldName, addMethodName(child), ======================================= --- /releases/2.0/user/src/com/google/gwt/uibinder/parsers/StackLayoutPanelParser.java Mon Nov 2 13:18:15 2009 +++ /releases/2.0/user/src/com/google/gwt/uibinder/parsers/StackLayoutPanelParser.java Mon Nov 2 18:29:39 2009 @@ -68,7 +68,7 @@ String headerFieldName = writer.parseElementToField(headerWidgetElem); String childFieldName = writer.parseElementToField(widgetElem); - writer.addStatement("%s.add(%s, %s, %f);", fieldName, childFieldName, + writer.addStatement("%s.add(%s, %s, %s);", fieldName, childFieldName, headerFieldName, size); } --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
