Revision: 6634 Author: [email protected] Date: Tue Nov 3 21:19:08 2009 Log: Merges tr...@6632, 6633 into this branch Make the alignment parsers field ref friendly, Makes User depend upon UiBinder svn merge --ignore-ancestry -r 6631:6633 https://google-web-toolkit.googlecode.com/svn/trunk .
http://code.google.com/p/google-web-toolkit/source/detail?r=6634 Modified: /releases/2.0/branch-info.txt /releases/2.0/user/src/com/google/gwt/uibinder/parsers/HorizontalAlignmentConstantParser.java /releases/2.0/user/src/com/google/gwt/uibinder/parsers/StrictAttributeParser.java /releases/2.0/user/src/com/google/gwt/uibinder/parsers/VerticalAlignmentConstantParser.java /releases/2.0/user/src/com/google/gwt/user/User.gwt.xml /releases/2.0/user/test/com/google/gwt/uibinder/test/UiBinderTestApp.gwt.xml /releases/2.0/user/test/com/google/gwt/uibinder/test/client/WidgetBasedUi.ui.xml ======================================= --- /releases/2.0/branch-info.txt Tue Nov 3 18:02:50 2009 +++ /releases/2.0/branch-info.txt Tue Nov 3 21:19:08 2009 @@ -242,3 +242,7 @@ tr...@6612 was merged into this branch Checkstyle fixes in UiBinder tests svn merge --ignore-ancestry -c r6612 https://google-web-toolkit.googlecode.com/svn/trunk . + +tr...@6632, 6633 were merged into this branch + Make the alignment parsers field ref friendly, Makes User depend upon UiBinder + svn merge --ignore-ancestry -r 6631:6633 https://google-web-toolkit.googlecode.com/svn/trunk . ======================================= --- /releases/2.0/user/src/com/google/gwt/uibinder/parsers/HorizontalAlignmentConstantParser.java Mon Nov 2 13:18:15 2009 +++ /releases/2.0/user/src/com/google/gwt/uibinder/parsers/HorizontalAlignmentConstantParser.java Tue Nov 3 21:19:08 2009 @@ -24,7 +24,7 @@ * Parses a * {...@link com.google.gwt.user.client.ui.HasHorizontalAlignment.HorizontalAlignmentConstant}. */ -public class HorizontalAlignmentConstantParser implements AttributeParser { +public class HorizontalAlignmentConstantParser extends StrictAttributeParser { private static final HashMap<String, String> values = new HashMap<String, String>(); @@ -41,9 +41,9 @@ public String parse(String value, MortalLogger logger) throws UnableToCompleteException { String translated = values.get(value); - if (translated == null) { - logger.die("Invalid value: horizontalAlignment='" + value + "'"); - } - return translated; + if (translated != null) { + return translated; + } + return super.parse(value, logger); } } ======================================= --- /releases/2.0/user/src/com/google/gwt/uibinder/parsers/StrictAttributeParser.java Mon Nov 2 13:18:15 2009 +++ /releases/2.0/user/src/com/google/gwt/uibinder/parsers/StrictAttributeParser.java Tue Nov 3 21:19:08 2009 @@ -66,7 +66,7 @@ try { return new FieldReferenceConverter(new FieldReferenceDelegate()).convert(value); } catch (IllegalFieldReferenceException e) { - logger.die("Bad field reference: \"%s\"", value); + logger.die("Cannot parse value: \"%s\"", value); return null; // Unreachable } } ======================================= --- /releases/2.0/user/src/com/google/gwt/uibinder/parsers/VerticalAlignmentConstantParser.java Mon Nov 2 13:18:15 2009 +++ /releases/2.0/user/src/com/google/gwt/uibinder/parsers/VerticalAlignmentConstantParser.java Tue Nov 3 21:19:08 2009 @@ -24,7 +24,7 @@ * Parses a * {...@link com.google.gwt.user.client.ui.HasVerticalAlignment.VerticalAlignmentConstant}. */ -public class VerticalAlignmentConstantParser implements AttributeParser { +public class VerticalAlignmentConstantParser extends StrictAttributeParser { private static final HashMap<String, String> values = new HashMap<String, String>(); @@ -41,9 +41,9 @@ public String parse(String value, MortalLogger logger) throws UnableToCompleteException { String translated = values.get(value); - if (translated == null) { - logger.die("Invalid value: vorizontalAlignment='%s'", value); - } - return translated; + if (translated != null) { + return translated; + } + return super.parse(value, logger); } } ======================================= --- /releases/2.0/user/src/com/google/gwt/user/User.gwt.xml Wed Aug 5 08:05:56 2009 +++ /releases/2.0/user/src/com/google/gwt/user/User.gwt.xml Tue Nov 3 21:19:08 2009 @@ -23,6 +23,7 @@ <inherits name="com.google.gwt.animation.Animation"/> <inherits name="com.google.gwt.resources.Resources"/> <inherits name="com.google.gwt.layout.Layout"/> + <inherits name="com.google.gwt.uibinder.UiBinder"/> <inherits name="com.google.gwt.user.AsyncProxy"/> <inherits name="com.google.gwt.user.RemoteService"/> <inherits name="com.google.gwt.user.DocumentRoot" /> ======================================= --- /releases/2.0/user/test/com/google/gwt/uibinder/test/UiBinderTestApp.gwt.xml Fri Oct 30 16:12:45 2009 +++ /releases/2.0/user/test/com/google/gwt/uibinder/test/UiBinderTestApp.gwt.xml Tue Nov 3 21:19:08 2009 @@ -13,7 +13,7 @@ <!-- GWT UiBinder support. --> <module> - <inherits name="com.google.gwt.uibinder.UiBinder" /> + <inherits name="com.google.gwt.user.User" /> <inherits name="com.google.gwt.debug.Debug"/> <entry-point class="com.google.gwt.uibinder.test.client.UiBinderTestApp" /> </module> ======================================= --- /releases/2.0/user/test/com/google/gwt/uibinder/test/client/WidgetBasedUi.ui.xml Mon Nov 2 21:56:11 2009 +++ /releases/2.0/user/test/com/google/gwt/uibinder/test/client/WidgetBasedUi.ui.xml Tue Nov 3 21:19:08 2009 @@ -278,7 +278,7 @@ <ui:attribute name="text" description="radio button name"/> </demo:PointlessRadioButtonSubclass> - <gwt:HorizontalPanel> + <gwt:HorizontalPanel horizontalAlignment="ALIGN_LEFT"> <gwt:Cell><gwt:HTMLPanel> <p> ... a StackPanel ... </p> --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
