Revert "ui:import tags now have highest precedence in the generated "
This reverts commit 178ae940a5de0029364dc1a68823eed7ad352471.
Related with change #12990 which breaks almost uibinder tests
see: http://build.gwtproject.org/job/gwt/403/
Change-Id: I293722a7bf7042349876d3dfd25479ff8813a782
diff --git a/user/src/com/google/gwt/uibinder/rebind/UiBinderParser.java b/user/src/com/google/gwt/uibinder/rebind/UiBinderParser.java
index 031ce28..4b01963 100644
--- a/user/src/com/google/gwt/uibinder/rebind/UiBinderParser.java
+++ b/user/src/com/google/gwt/uibinder/rebind/UiBinderParser.java
@@ -435,8 +435,8 @@
fieldType = (JClassType) importType;
}
- FieldWriter fieldWriter = fieldManager.registerField(FieldWriterType.IMPORTED,
- fieldType, constantName);
+ FieldWriter fieldWriter = fieldManager.registerField(fieldType,
+ constantName);
fieldWriter.setInitializer(rawFieldName);
}
diff --git a/user/test/com/google/gwt/uibinder/test/client/Constants.java b/user/test/com/google/gwt/uibinder/test/client/Constants.java
index 19cfc33..4d3f017 100644
--- a/user/test/com/google/gwt/uibinder/test/client/Constants.java
+++ b/user/test/com/google/gwt/uibinder/test/client/Constants.java
@@ -41,10 +41,6 @@
private static String PRIVATE = "private";
}
- interface InterfaceConst {
- String someValue = "imported text";
- }
-
public static String CONST_FOO = "Foo";
public SafeHtml getSafeHtml() {
diff --git a/user/test/com/google/gwt/uibinder/test/client/UiBinderTest.java b/user/test/com/google/gwt/uibinder/test/client/UiBinderTest.java
index d01535f..ddab38b 100644
--- a/user/test/com/google/gwt/uibinder/test/client/UiBinderTest.java
+++ b/user/test/com/google/gwt/uibinder/test/client/UiBinderTest.java
@@ -615,7 +615,6 @@
assertEquals(Constants.MyEnum.ENUM_1.name() + " "
+ Constants.MyEnum.ENUM_2.name(),
widgetUi.bracedParagraph.getAttribute("enum"));
- assertEquals(Constants.InterfaceConst.someValue, widgetUi.labelWithImportedText.getText());
}
public void suppressForIEfail_testBizarrelyElementedWidgets() {
diff --git a/user/test/com/google/gwt/uibinder/test/client/WidgetBasedUi.java b/user/test/com/google/gwt/uibinder/test/client/WidgetBasedUi.java
index 5afb9bd..6b4b60c 100644
--- a/user/test/com/google/gwt/uibinder/test/client/WidgetBasedUi.java
+++ b/user/test/com/google/gwt/uibinder/test/client/WidgetBasedUi.java
@@ -215,7 +215,6 @@
@UiField HTML htmlWithComputedSafeHtml;
@UiField HTML htmlWithComputedText;
@UiField Label labelWithComputedText;
- @UiField Label labelWithImportedText;
@UiField FlowPanel flowPanelWithTag;
@UiField Element myElementWithTagName;
@UiField DataResource embeddedSvgData;
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 cbc65ed..5aabf69 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
@@ -709,11 +709,6 @@
<gwt:HTML ui:field='htmlWithComputedSafeHtml'><ui:safehtml from="{constants.getSafeHtml}" /></gwt:HTML>
<gwt:HTML ui:field='htmlWithComputedText'><ui:text from="{constants.getText}" /></gwt:HTML>
<gwt:Label ui:field='labelWithComputedText'><ui:text from="{constants.getText}"/></gwt:Label>
- <gwt:Label ui:field="labelWithImportedText"><ui:text from="{InterfaceConst.someValue}" /></gwt:Label>
-
- <ui:import field='com.google.gwt.uibinder.test.client.Constants.InterfaceConst'>
- Test import parsing order
- </ui:import>
<element-with-tagname ui:field='myElementWithTagName'/>
<js-element-type ui:field='myJsElementType'/>
