Revision: 7423
Author: [email protected]
Date: Fri Jan 15 18:03:38 2010
Log: Merges tr...@7422 into releases/2.0
Fixes issue 4431 UiBinder with Generic Types fails compilation with error
svn merge --ignore-ancestry -c 7422
http://google-web-toolkit.googlecode.com/svn/trunk .
http://code.google.com/p/google-web-toolkit/source/detail?r=7423
Added:
/releases/2.0/user/test/com/google/gwt/uibinder/test/client/ParameterizedWidget.java
/releases/2.0/user/test/com/google/gwt/uibinder/test/client/ParameterizedWidget.ui.xml
Deleted:
/releases/2.0/user/test/com/google/gwt/uibinder/test/client/ParameterizedWidgets.java
/releases/2.0/user/test/com/google/gwt/uibinder/test/client/ParameterizedWidgets.ui.xml
Modified:
/releases/2.0/branch-info.txt
/releases/2.0/user/src/com/google/gwt/uibinder/rebind/UiBinderWriter.java
/releases/2.0/user/test/com/google/gwt/uibinder/test/client/Abstract.java
/releases/2.0/user/test/com/google/gwt/uibinder/test/client/TestParameterizedWidgets.java
=======================================
--- /dev/null
+++
/releases/2.0/user/test/com/google/gwt/uibinder/test/client/ParameterizedWidget.java
Fri Jan 15 18:03:38 2010
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2009 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
not
+ * use this file except in compliance with the License. You may obtain a
copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
under
+ * the License.
+ */
+package com.google.gwt.uibinder.test.client;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.uibinder.client.UiBinder;
+import com.google.gwt.uibinder.client.UiFactory;
+import com.google.gwt.uibinder.client.UiField;
+import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.Widget;
+
+/**
+ * Used by {...@link TestParameterizedWidgets}.
+ */
+class ParameterizedWidget<T> extends Composite {
+ interface Binder extends UiBinder<Widget, ParameterizedWidget<?>> {
+ }
+
+ static final Binder binder = GWT.create(Binder.class);
+
+ @UiField
+ Abstract<?> a;
+
+ ParameterizedWidget() {
+ initWidget(binder.createAndBindUi(this));
+ }
+
+ @UiFactory
+ Abstract<?> createA() {
+ return new Abstract<String>() {
+ };
+ }
+}
=======================================
--- /dev/null
+++
/releases/2.0/user/test/com/google/gwt/uibinder/test/client/ParameterizedWidget.ui.xml
Fri Jan 15 18:03:38 2010
@@ -0,0 +1,4 @@
+<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
+ xmlns:t="urn:import:com.google.gwt.uibinder.test.client">
+ <t:Abstract ui:field='a'></t:Abstract>
+</ui:UiBinder>
=======================================
---
/releases/2.0/user/test/com/google/gwt/uibinder/test/client/ParameterizedWidgets.java
Fri Nov 20 14:07:49 2009
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2009 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may
not
- * use this file except in compliance with the License. You may obtain a
copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
under
- * the License.
- */
-package com.google.gwt.uibinder.test.client;
-
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.uibinder.client.UiBinder;
-import com.google.gwt.uibinder.client.UiFactory;
-import com.google.gwt.uibinder.client.UiField;
-import com.google.gwt.user.client.ui.Widget;
-
-/**
- * Used by {...@link TestParameterizedWidgets}
- */
-class ParameterizedWidgets {
- interface Binder extends UiBinder<Widget, ParameterizedWidgets> {
- }
-
- static final Binder binder = GWT.create(Binder.class);
-
- @UiField
- Abstract<?> a;
-
- ParameterizedWidgets() {
- binder.createAndBindUi(this);
- }
-
- @UiFactory
- Abstract<?> createA() {
- return new Abstract<String>() {
- };
- }
-}
=======================================
---
/releases/2.0/user/test/com/google/gwt/uibinder/test/client/ParameterizedWidgets.ui.xml
Fri Nov 20 14:07:49 2009
+++ /dev/null
@@ -1,4 +0,0 @@
-<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
- xmlns:t="urn:import:com.google.gwt.uibinder.test.client">
- <t:Abstract ui:field='a'></t:Abstract>
-</ui:UiBinder>
=======================================
--- /releases/2.0/branch-info.txt Fri Jan 15 17:06:54 2010
+++ /releases/2.0/branch-info.txt Fri Jan 15 18:03:38 2010
@@ -1245,3 +1245,7 @@
svn merge --ignore-ancestry -c 7411
http://google-web-toolkit.googlecode.com/svn/trunk .
svn merge --ignore-ancestry -c 7185
http://google-web-toolkit.googlecode.com/svn/trunk .
svn merge --ignore-ancestry -c 7361
http://google-web-toolkit.googlecode.com/svn/trunk .
+
+tr...@7422 was merged into this branch
+ Fixes issue 4431 UiBinder with Generic Types fails compilation with error
+ svn merge --ignore-ancestry -c 7422
http://google-web-toolkit.googlecode.com/svn/trunk .
=======================================
---
/releases/2.0/user/src/com/google/gwt/uibinder/rebind/UiBinderWriter.java
Fri Jan 15 17:06:54 2010
+++
/releases/2.0/user/src/com/google/gwt/uibinder/rebind/UiBinderWriter.java
Fri Jan 15 18:03:38 2010
@@ -978,7 +978,7 @@
// createAndBindUi method
w.write("public %s createAndBindUi(final %s owner) {",
- uiRootType.getName(), uiOwnerType.getName());
+ uiRootType.getParameterizedQualifiedSourceName(),
uiOwnerType.getParameterizedQualifiedSourceName());
w.indent();
w.newline();
@@ -1009,7 +1009,7 @@
private void writeClassOpen(IndentedWriter w) {
w.write("public class %s implements UiBinder<%s, %s>, %s {",
implClassName,
- uiRootType.getName(), uiOwnerType.getName(), baseClass.getName());
+ uiRootType.getParameterizedQualifiedSourceName(),
uiOwnerType.getParameterizedQualifiedSourceName(),
baseClass.getParameterizedQualifiedSourceName());
w.indent();
}
=======================================
---
/releases/2.0/user/test/com/google/gwt/uibinder/test/client/Abstract.java
Fri Nov 20 14:07:49 2009
+++
/releases/2.0/user/test/com/google/gwt/uibinder/test/client/Abstract.java
Fri Jan 15 18:03:38 2010
@@ -19,7 +19,7 @@
import com.google.gwt.user.client.ui.Widget;
/**
- * Used by {...@link ParameterizedWidgets}.
+ * Used by {...@link ParameterizedWidget}.
* @see TestParameterizedWidgets
*/
abstract class Abstract<T> extends Widget {
=======================================
---
/releases/2.0/user/test/com/google/gwt/uibinder/test/client/TestParameterizedWidgets.java
Fri Nov 20 14:07:49 2009
+++
/releases/2.0/user/test/com/google/gwt/uibinder/test/client/TestParameterizedWidgets.java
Fri Jan 15 18:03:38 2010
@@ -27,7 +27,7 @@
}
public void testHappy() {
- ParameterizedWidgets ui = new ParameterizedWidgets();
+ ParameterizedWidget<String> ui = new ParameterizedWidget<String>();
assertNotNull(ui.a);
}
}
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
