Reviewers: rjrjr,
Description:
Killing @deprecated "urn:with" from uibinder tests.
Please review this at http://gwt-code-reviews.appspot.com/1425814/
Affected files:
M user/test/com/google/gwt/uibinder/test/client/DomBasedUi.ui.xml
M user/test/com/google/gwt/uibinder/test/client/WidgetBasedUi.ui.xml
Index: user/test/com/google/gwt/uibinder/test/client/DomBasedUi.ui.xml
===================================================================
--- user/test/com/google/gwt/uibinder/test/client/DomBasedUi.ui.xml
(revision 10104)
+++ user/test/com/google/gwt/uibinder/test/client/DomBasedUi.ui.xml
(working copy)
@@ -12,15 +12,16 @@
<!-- implied. License for the specific language governing permissions
and -->
<!-- limitations under the
License. -->
<ui:UiBinder
- xmlns:ui='urn:ui:com.google.gwt.uibinder'
-
xmlns:res='urn:with:com.google.gwt.uibinder.test.client.DomBasedUi.Resources'
- >
- <div ui:field='root' res:class="style.bodyColor style.bodyFont"
+ xmlns:ui='urn:ui:com.google.gwt.uibinder'>
+
+ <ui:with field='res'
type='com.google.gwt.uibinder.test.client.DomBasedUi.Resources' />
+
+ <div ui:field='root' class="{res.style.bodyColor} {res.style.bodyFont}"
title="The title of this div is localizable">
<ui:attribute name='title'/>
Hello, <span ui:field="nameSpan" />.
<ui:msg>How goes it?</ui:msg>
- <h2 res:class="style.bodyColor style.bodyFont">Placeholders in
localizables</h2>
+ <h2 class="{res.style.bodyColor} {res.style.bodyFont">Placeholders in
localizables</h2>
<p><ui:msg>When you mark up your text for translation, there will be
bits
that you don't want the translators to mess with. You can protect
these with <span style="font-weight:bold"
Index: user/test/com/google/gwt/uibinder/test/client/WidgetBasedUi.ui.xml
===================================================================
--- user/test/com/google/gwt/uibinder/test/client/WidgetBasedUi.ui.xml
(revision 10104)
+++ user/test/com/google/gwt/uibinder/test/client/WidgetBasedUi.ui.xml
(working copy)
@@ -51,15 +51,16 @@
xmlns:gwt3='urn:import:com'
xmlns:demo='urn:import:com.google.gwt.uibinder.test.client'
-
xmlns:legacyValuesForBeans='urn:with:com.google.gwt.uibinder.test.client.WidgetBasedUi.FakeBundle2'
-
xmlns:legacyValuesForHtml='urn:with:com.google.gwt.uibinder.test.client.WidgetBasedUi.FakeBundle3'
-
ui:defaultLocale="en_US"
ui:generateKeys="com.google.gwt.i18n.rebind.keygen.MD5KeyGenerator"
ui:generateFormat="com.google.gwt.i18n.rebind.format.PropertiesFormat"
ui:generateFilename="myapp_translate_source"
ui:generateLocales="en_US"
>
+
+<ui:with field='legacyValuesForBeans'
type='com.google.gwt.uibinder.test.client.WidgetBasedUi.FakeBundle2' />
+<ui:with field='legacyValuesForHtml'
type='com.google.gwt.uibinder.test.client.WidgetBasedUi.FakeBundle3' />
+
<ui:with field='external'
type='com.google.gwt.uibinder.test.client.WidgetBasedUiExternalResources'>
(This text is ignored, but it's a handy place to document a resource.)
@@ -455,8 +456,8 @@
this label gets its text from somplace tricky and its style from a
ClientBundle
defined outside of this UI:</p>
<gwt:Label ui:field='bundledLabel' text="{values.helloText}"
styleName="{external.style.prettyText}"/>
- <gwt:Label ui:field='bundledLabelLegacy'
legacyValuesForBeans:text="helloText"
legacyValuesForBeans:styleName="helloText" />
- <div ui:field='bundledDivLegacy'
legacyValuesForHtml:class="helloText"/>
+ <gwt:Label ui:field='bundledLabelLegacy'
text="{legacyValuesForBeans.helloText}"
styleName="{legacyValuesForBeans.helloText}" />
+ <div ui:field='bundledDivLegacy'
class="{legacyValuesForHtml.helloText}"/>
<!-- Note use of id rather than ui:field, to test that ids work on
dom elements -->
<p class="{external.style.prettyText}" id='prettyPara'>
This stylish paragraph also gets its good looks from the
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
