Avoid creating anonymous inner classes with wildcard type parameters.

Under Java 7 wildcards can not be type parameters of superclasses in the extends clause
nor superinterfaces in the implementing clause. Anonymous inner classes can not have wildcards
in their type parameters.

Change-Id: Ifbcd6ecec455512a7da5eb473c6bf2e9f402f0ea
Review-Link: https://gwt-review.googlesource.com/#/c/2470/

Review by: goktug@google.com

git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@11596 8db76d5a-ed1c-0410-87a9-c151d255dfc7

Author: rluble@google.com

user/src/com/google/gwt/uibinder/rebind/HandlerEvaluator.java

@@ -200,13 +200,20 @@ protected void writeHandler(IndentedWriter writer, String uiOwner,
     }
 
     writer.newline();
-    writer.write("final %1$s %2$s = new %1$s() {",
-        handlerType.getParameterizedQualifiedSourceName(), handlerVarName);
+    // Create the anonymous class extending the raw type to avoid errors under the new JDT
+    // if the type has a wildcard.
+    writer.write("final %1$s %2$s = (%1$s) new %3$s() {",
+        handlerType.getParameterizedQualifiedSourceName(), handlerVarName,
+        handlerType.getQualifiedSourceName());
     writer.indent();
     writer.write("public void %1$s(%2$s event) {", methods[0].getName(),
-        eventType.getParameterizedQualifiedSourceName());
+        // Use the event raw type to match the signature as we are using implementing the raw type
+        // interface.
+        eventType.getQualifiedSourceName());
     writer.indent();
-    writer.write("%1$s.%2$s(event);", uiOwner, boundMethod);
+    // Cast the event to the parameterized type to avoid warnings..
+    writer.write("%1$s.%2$s((%3$s) event);", uiOwner, boundMethod,
+        eventType.getParameterizedQualifiedSourceName());
     writer.outdent();
     writer.write("}");
     writer.outdent();

user/test/com/google/gwt/uibinder/UiBinderSuite.java

@@ -22,6 +22,7 @@
 import com.google.gwt.uibinder.test.client.SafeUriIntegrationTest;
 import com.google.gwt.uibinder.test.client.UiBinderTest;
 import com.google.gwt.uibinder.test.client.UiChildTest;
+import com.google.gwt.uibinder.test.client.UiHandlerTest;
 
 import junit.framework.Test;
 
@@ -39,7 +40,8 @@ public static Test suite() {
     suite.addTestSuite(UiBinderTest.class);
     suite.addTestSuite(UiBinderUtilTest.class);
     suite.addTestSuite(UiChildTest.class);
-    
+    suite.addTestSuite(UiHandlerTest.class);
+
     return suite;
   }
 

user/test/com/google/gwt/uibinder/test/client/UiHandlerTest.java

@@ -0,0 +1,79 @@
+/*
+ * Copyright 2013 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.junit.client.GWTTestCase;
+import com.google.gwt.user.client.ui.DockPanel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Functional test for UiHandler
+ *
+ * TODO(rluble): add more relevant tests.
+ */
+public class UiHandlerTest extends GWTTestCase {
+  private WidgetBasedUi widgetUi;
+  private DomBasedUi domUi;
+  private DockPanel root;
+
+  @Override
+  public String getModuleName() {
+    return "com.google.gwt.uibinder.test.UiBinderSuite";
+  }
+
+  @Override
+  public void gwtSetUp() throws Exception {
+    super.gwtSetUp();
+    UiBinderTestApp app = UiBinderTestApp.getInstance();
+    widgetUi = app.getWidgetUi();
+    domUi = app.getDomUi();
+    root = widgetUi.root;
+  }
+
+  public void testValueChangeEvent() {
+    widgetUi.valueChangeEvent = null;
+    widgetUi.myDoubleBox.setValue(0.0);
+    widgetUi.myDoubleBox.setValue(10.0, true);
+    assertNotNull(widgetUi.valueChangeEvent);
+    assertEquals(10.0, widgetUi.valueChangeEvent.getValue());
+  }
+
+  /**
+   * Tests that the code generated for handling events parametrized by wildcards work.
+   */
+  public void testValueChangeEventWildcardString() {
+    widgetUi.wildcardValueChangeEventString = null;
+    widgetUi.myWildcardValueChangeWidgetString.setValue(null);
+    widgetUi.myWildcardValueChangeWidgetString.setValue("Changed");
+    assertNotNull(widgetUi.wildcardValueChangeEventString);
+    assertEquals("Changed", (String) widgetUi.wildcardValueChangeEventString.getValue());
+  }
+
+  /**
+   * Tests that the code generated for handling events parametrized by wildcards work.
+   */
+  public void testValueChangeEventWildcardList() {
+    widgetUi.wildcardValueChangeEventList = null;
+    List<String> newValue = new ArrayList<String>();
+    newValue.add("Changed");
+    widgetUi.myWildcardValueChangeWidgetList.setValue(null);
+    widgetUi.myWildcardValueChangeWidgetList.setValue(newValue);
+    assertNotNull(widgetUi.wildcardValueChangeEventList);
+    assertEquals(newValue, widgetUi.wildcardValueChangeEventList.getValue());
+  }
+}

user/test/com/google/gwt/uibinder/test/client/WidgetBasedUi.java

@@ -24,6 +24,7 @@
 import com.google.gwt.dom.client.ParagraphElement;
 import com.google.gwt.dom.client.SpanElement;
 import com.google.gwt.dom.client.TableElement;
+import com.google.gwt.event.logical.shared.ValueChangeEvent;
 import com.google.gwt.i18n.client.DateTimeFormat;
 import com.google.gwt.i18n.client.DateTimeFormat.PredefinedFormat;
 import com.google.gwt.i18n.client.NumberFormat;
@@ -36,12 +37,14 @@
 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.uibinder.client.UiHandler;
 import com.google.gwt.user.client.ui.AbsolutePanel;
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.DateLabel;
 import com.google.gwt.user.client.ui.DisclosurePanel;
 import com.google.gwt.user.client.ui.DockPanel;
+import com.google.gwt.user.client.ui.DoubleBox;
 import com.google.gwt.user.client.ui.Grid;
 import com.google.gwt.user.client.ui.HTML;
 import com.google.gwt.user.client.ui.HTMLPanel;
@@ -63,6 +66,8 @@
 import com.google.gwt.user.client.ui.ValueLabel;
 import com.google.gwt.user.client.ui.Widget;
 
+import java.util.List;
+
 /**
  * Sample use of a {@code UiBinder} with the com.google.gwt.user Widget set, and
  * custom widgets.
@@ -76,7 +81,7 @@ public class WidgetBasedUi extends Composite {
   public interface Style extends CssResource {
     String menuBar();
   }
-  
+
   interface Binder extends UiBinder<Widget, WidgetBasedUi> {
   }
   static class FakeBundle2 extends FakeBundle {
@@ -85,10 +90,10 @@ static class FakeBundle2 extends FakeBundle {
   static class FakeBundle3 extends FakeBundle {
   }
   private static final Binder binder = GWT.create(Binder.class);
-  
+
   @UiField(provided = true)
   final WidgetBasedUiExternalResources external = GWT.create(WidgetBasedUiExternalResources.class);
-  
+
   public static final DateTimeFormat MY_DATE_FORMAT = DateTimeFormat.getFormat(PredefinedFormat.DATE_FULL);
   public static final NumberFormat MY_NUMBER_FORMAT = NumberFormat.getDecimalFormat();
 
@@ -195,11 +200,36 @@ static class FakeBundle3 extends FakeBundle {
   @UiField(provided = true) @SuppressWarnings("rawtypes")
   Renderer doubleRenderer = DoubleRenderer.instance();
   @UiField ValueLabel<Double> myValueLabel;
+  @UiField DoubleBox myDoubleBox;
+  @UiField(provided = true)
+  WildcardValueChangeWidget myWildcardValueChangeWidgetString =
+      new WildcardValueChangeWidget<String>();
+  @UiField(provided = true)
+  WildcardValueChangeWidget myWildcardValueChangeWidgetList =
+      new WildcardValueChangeWidget<List<?>>();
   @UiField ImageElement myImage;
   @UiField HTML htmlWithComputedSafeHtml;
   @UiField HTML htmlWithComputedText;
   @UiField Label labelWithComputedText;
 
+  public ValueChangeEvent<Double> valueChangeEvent;
+  @UiHandler("myDoubleBox")
+  void onValueChange(ValueChangeEvent<Double> event) {
+    this.valueChangeEvent = event;
+  }
+
+  public ValueChangeEvent<?> wildcardValueChangeEventString;
+  @UiHandler("myWildcardValueChangeWidgetString")
+  void onWildcaredValueChangeString(ValueChangeEvent<?> event) {
+    this.wildcardValueChangeEventString = event;
+  }
+
+  public ValueChangeEvent<List<?>> wildcardValueChangeEventList;
+  @UiHandler("myWildcardValueChangeWidgetList")
+  void onWildcaredValueChangeList(ValueChangeEvent<List<?>> event) {
+    this.wildcardValueChangeEventList = event;
+  }
+
   public WidgetBasedUi() {
     external.style().ensureInjected();
     initWidget(binder.createAndBindUi(this));

user/test/com/google/gwt/uibinder/test/client/WidgetBasedUi.ui.xml

@@ -691,6 +691,10 @@
 
   <gwt3:google.gwt.user.client.ui.ValueLabel ui:field='myValueLabel' renderer='{doubleRenderer}' />
 
+  <gwt:DoubleBox ui:field='myDoubleBox'  />
+  <demo:WildcardValueChangeWidget ui:field='myWildcardValueChangeWidgetString'  />
+  <demo:WildcardValueChangeWidget ui:field='myWildcardValueChangeWidgetList'  />
+
   <img src="{values.aUrl}" ui:field='myImage'/>
 
   <gwt:HTML ui:field='htmlWithComputedSafeHtml'><ui:safehtml from="{constants.getSafeHtml}" /></gwt:HTML>

user/test/com/google/gwt/uibinder/test/client/WildcardValueChangeWidget.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright 2013 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.dom.client.Document;
+import com.google.gwt.event.logical.shared.ValueChangeEvent;
+import com.google.gwt.event.logical.shared.ValueChangeHandler;
+import com.google.gwt.event.shared.HandlerRegistration;
+import com.google.gwt.user.client.ui.FocusWidget;
+
+/**
+ * A Widget that has an event parametrized by a wildcard.
+ * Note that parameterizing events by wildcards is not good practice.
+ *
+ * @param <T> Type for the value. Note that the addValueChangeHandler does not use <T>, but ?
+ *            instead. (That is exactly what the test is testing).
+ */
+public class WildcardValueChangeWidget<T> extends FocusWidget {
+
+  T myValue;
+
+  protected WildcardValueChangeWidget() {
+    super(Document.get().createDivElement());
+  }
+
+  /**
+   * Here is the key for the test. ValueChangeHandler is parameterized by ? and not <T>
+   */
+  public HandlerRegistration addValueChangeHandler(ValueChangeHandler<?> handler) {
+    return addHandler(handler, ValueChangeEvent.getType());
+  }
+
+  public T getValue() {
+    return myValue;
+  }
+
+  public void setValue(T value) {
+    myValue = value;
+    fireEvent(new ValueChangeEvent<T>(value) { });
+  }
+}