Reviewers: jgw, Message: Joel, here's a quick one.
Please review this at http://gwt-code-reviews.appspot.com/91811 Affected files: M user/src/com/google/gwt/uibinder/parsers/HorizontalAlignmentConstantParser.java M user/src/com/google/gwt/uibinder/parsers/StrictAttributeParser.java M user/src/com/google/gwt/uibinder/parsers/VerticalAlignmentConstantParser.java M user/test/com/google/gwt/uibinder/test/client/WidgetBasedUi.ui.xml Index: user/src/com/google/gwt/uibinder/parsers/HorizontalAlignmentConstantParser.java diff --git a/user/src/com/google/gwt/uibinder/parsers/HorizontalAlignmentConstantParser.java b/user/src/com/google/gwt/uibinder/parsers/HorizontalAlignmentConstantParser.java index b70b717b5bbc3deef703b974d111f2e84f55831a..85d05fdb53a091a57e0cf93e48da291b976f0b52 100644 --- a/user/src/com/google/gwt/uibinder/parsers/HorizontalAlignmentConstantParser.java +++ b/user/src/com/google/gwt/uibinder/parsers/HorizontalAlignmentConstantParser.java @@ -24,7 +24,7 @@ import java.util.HashMap; * 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 class HorizontalAlignmentConstantParser implements AttributeParser { public String parse(String value, MortalLogger logger) throws UnableToCompleteException { String translated = values.get(value); - if (translated == null) { - logger.die("Invalid value: horizontalAlignment='" + value + "'"); + if (translated != null) { + return translated; } - return translated; + return super.parse(value, logger); } } Index: user/src/com/google/gwt/uibinder/parsers/StrictAttributeParser.java diff --git a/user/src/com/google/gwt/uibinder/parsers/StrictAttributeParser.java b/user/src/com/google/gwt/uibinder/parsers/StrictAttributeParser.java index 18acbc738c649cd899642cfc2c677b6b722a99d0..2dd6a1464901ce6eef2b6105b45d36a86f83d05f 100644 --- a/user/src/com/google/gwt/uibinder/parsers/StrictAttributeParser.java +++ b/user/src/com/google/gwt/uibinder/parsers/StrictAttributeParser.java @@ -66,7 +66,7 @@ public class StrictAttributeParser implements AttributeParser { 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 } } Index: user/src/com/google/gwt/uibinder/parsers/VerticalAlignmentConstantParser.java diff --git a/user/src/com/google/gwt/uibinder/parsers/VerticalAlignmentConstantParser.java b/user/src/com/google/gwt/uibinder/parsers/VerticalAlignmentConstantParser.java index 6a7fcada0b03c5a13dc63415719b0be591e533c2..f1d0a696e0c71357d503c89c07c9ff6c3492ac8d 100644 --- a/user/src/com/google/gwt/uibinder/parsers/VerticalAlignmentConstantParser.java +++ b/user/src/com/google/gwt/uibinder/parsers/VerticalAlignmentConstantParser.java @@ -24,7 +24,7 @@ import java.util.HashMap; * 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 class VerticalAlignmentConstantParser implements AttributeParser { public String parse(String value, MortalLogger logger) throws UnableToCompleteException { String translated = values.get(value); - if (translated == null) { - logger.die("Invalid value: vorizontalAlignment='%s'", value); + if (translated != null) { + return translated; } - return translated; + return super.parse(value, logger); } } Index: user/test/com/google/gwt/uibinder/test/client/WidgetBasedUi.ui.xml diff --git a/user/test/com/google/gwt/uibinder/test/client/WidgetBasedUi.ui.xml b/user/test/com/google/gwt/uibinder/test/client/WidgetBasedUi.ui.xml index f3f2f486aa1c66c0c7172ad0859460549f85025c..e1c8d1a2f5b4fcc0c0ddcc7fea86254d048b7c0c 100644 --- a/user/test/com/google/gwt/uibinder/test/client/WidgetBasedUi.ui.xml +++ b/user/test/com/google/gwt/uibinder/test/client/WidgetBasedUi.ui.xml @@ -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 -~----------~----~----~----~------~----~------~--~---
