Finishes the job of making EventBus backward compatible,
half done in r10023
Review at http://gwt-code-reviews.appspot.com/1425804
Review by: robertvawter@google.com
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@10033 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/user/src/com/google/gwt/event/shared/EventBus.java b/user/src/com/google/gwt/event/shared/EventBus.java
index 50bfdaa..267cef4 100644
--- a/user/src/com/google/gwt/event/shared/EventBus.java
+++ b/user/src/com/google/gwt/event/shared/EventBus.java
@@ -24,15 +24,27 @@
public abstract class EventBus extends com.google.web.bindery.event.shared.EventBus implements
HasHandlers {
- public <H extends EventHandler> HandlerRegistration addHandler(GwtEvent.Type<H> type, H handler) {
- return wrap(addHandler((Event.Type<H>) type, handler));
+ @Override
+ public <H> com.google.web.bindery.event.shared.HandlerRegistration addHandler(Event.Type<H> type, H handler) {
+ throw new UnsupportedOperationException("Subclass responsibility. "
+ + "This class is a legacy wrapper for com.google.web.bindery.event.shared.EventBus. "
+ + "Use that directly, or try com.google.gwt.event.shared.SimpleEventBus");
}
+
+ public abstract <H extends EventHandler> HandlerRegistration addHandler(GwtEvent.Type<H> type, H handler);
- public <H extends EventHandler> HandlerRegistration addHandlerToSource(GwtEvent.Type<H> type,
+ @Override
+ public <H> com.google.web.bindery.event.shared.HandlerRegistration addHandlerToSource(Event.Type<H> type,
Object source, H handler) {
- return wrap(addHandlerToSource((Event.Type<H>) type, source, handler));
+ throw new UnsupportedOperationException("Subclass responsibility. "
+ + "This class is a legacy wrapper for com.google.web.bindery.event.shared.EventBus. "
+ + "Use that directly, or try com.google.gwt.event.shared.SimpleEventBus");
}
+ public abstract <H extends EventHandler> HandlerRegistration addHandlerToSource(GwtEvent.Type<H> type,
+ Object source, H handler);
+
+ @Override
public void fireEvent(Event<?> event) {
throw new UnsupportedOperationException("Subclass responsibility. "
+ "This class is a legacy wrapper for com.google.web.bindery.event.shared.EventBus. "
@@ -41,6 +53,8 @@
public abstract void fireEvent(GwtEvent<?> event);
+
+ @Override
public void fireEventFromSource(Event<?> event, Object source) {
throw new UnsupportedOperationException("Subclass responsibility. "
+ "This class is a legacy wrapper for com.google.web.bindery.event.shared.EventBus. "
diff --git a/user/src/com/google/gwt/event/shared/ResettableEventBus.java b/user/src/com/google/gwt/event/shared/ResettableEventBus.java
index 719e7a9..4e12fe8 100644
--- a/user/src/com/google/gwt/event/shared/ResettableEventBus.java
+++ b/user/src/com/google/gwt/event/shared/ResettableEventBus.java
@@ -37,18 +37,28 @@
return super.getRegistrationSize();
}
}
-
+
private final TestableResettableEventBus real;
public ResettableEventBus(EventBus wrappedBus) {
real = new TestableResettableEventBus(wrappedBus);
}
+ public <H extends EventHandler> com.google.gwt.event.shared.HandlerRegistration addHandler(
+ GwtEvent.Type<H> type, H handler) {
+ return wrap(addHandler((Event.Type<H>) type, handler));
+ }
+
@Override
public <H> HandlerRegistration addHandler(Type<H> type, H handler) {
return real.addHandler(type, handler);
}
+ public <H extends EventHandler> com.google.gwt.event.shared.HandlerRegistration addHandlerToSource(
+ GwtEvent.Type<H> type, Object source, H handler) {
+ return wrap(addHandlerToSource((Event.Type<H>) type, source, handler));
+ }
+
@Override
public <H> HandlerRegistration addHandlerToSource(Type<H> type, Object source, H handler) {
return real.addHandlerToSource(type, source, handler);
diff --git a/user/src/com/google/gwt/event/shared/SimpleEventBus.java b/user/src/com/google/gwt/event/shared/SimpleEventBus.java
index 08c6f33..40b042d 100644
--- a/user/src/com/google/gwt/event/shared/SimpleEventBus.java
+++ b/user/src/com/google/gwt/event/shared/SimpleEventBus.java
@@ -27,11 +27,21 @@
private final com.google.web.bindery.event.shared.SimpleEventBus real =
new com.google.web.bindery.event.shared.SimpleEventBus();
+ public <H extends EventHandler> com.google.gwt.event.shared.HandlerRegistration addHandler(
+ GwtEvent.Type<H> type, H handler) {
+ return wrap(addHandler((Event.Type<H>) type, handler));
+ }
+
@Override
public <H> HandlerRegistration addHandler(Type<H> type, H handler) {
return real.addHandler(type, handler);
}
+ public <H extends EventHandler> com.google.gwt.event.shared.HandlerRegistration addHandlerToSource(
+ GwtEvent.Type<H> type, Object source, H handler) {
+ return wrap(addHandlerToSource((Event.Type<H>) type, source, handler));
+ }
+
@Override
public <H> HandlerRegistration addHandlerToSource(Type<H> type, Object source, H handler) {
return real.addHandlerToSource(type, source, handler);
diff --git a/user/src/com/google/gwt/event/shared/testing/CountingEventBus.java b/user/src/com/google/gwt/event/shared/testing/CountingEventBus.java
index f20110e..b0aa76b 100644
--- a/user/src/com/google/gwt/event/shared/testing/CountingEventBus.java
+++ b/user/src/com/google/gwt/event/shared/testing/CountingEventBus.java
@@ -15,6 +15,7 @@
*/
package com.google.gwt.event.shared.testing;
+import com.google.gwt.event.shared.EventHandler;
import com.google.gwt.event.shared.GwtEvent;
import com.google.web.bindery.event.shared.Event;
import com.google.web.bindery.event.shared.Event.Type;
@@ -35,11 +36,21 @@
real = new com.google.web.bindery.event.shared.testing.CountingEventBus(wrapped);
}
+ public <H extends EventHandler> com.google.gwt.event.shared.HandlerRegistration addHandler(
+ GwtEvent.Type<H> type, H handler) {
+ return wrap(addHandler((Event.Type<H>) type, handler));
+ }
+
@Override
public <H> HandlerRegistration addHandler(Type<H> type, H handler) {
return real.addHandler(type, handler);
}
+ public <H extends EventHandler> com.google.gwt.event.shared.HandlerRegistration addHandlerToSource(
+ GwtEvent.Type<H> type, Object source, H handler) {
+ return wrap(addHandlerToSource((Event.Type<H>) type, source, handler));
+ }
+
@Override
public <H> HandlerRegistration addHandlerToSource(Type<H> type, Object source, H handler) {
return real.addHandlerToSource(type, source, handler);
diff --git a/user/test/com/google/gwt/event/EventSuite.java b/user/test/com/google/gwt/event/EventSuite.java
index 008e88c..b21cc0d 100644
--- a/user/test/com/google/gwt/event/EventSuite.java
+++ b/user/test/com/google/gwt/event/EventSuite.java
@@ -17,9 +17,10 @@
import com.google.gwt.event.dom.client.DomEventTest;
import com.google.gwt.event.logical.shared.LogicalEventsTest;
+import com.google.gwt.event.shared.EventBusTest;
import com.google.gwt.event.shared.HandlerManagerTest;
-import com.google.gwt.event.shared.SimpleEventBusTest;
import com.google.gwt.event.shared.ResettableEventBusTest;
+import com.google.gwt.event.shared.SimpleEventBusTest;
import com.google.gwt.junit.tools.GWTTestSuite;
import junit.framework.Test;
@@ -32,11 +33,12 @@
GWTTestSuite suite = new GWTTestSuite(
"Test for suite for the com.google.gwt.event module.");
- suite.addTestSuite(LogicalEventsTest.class);
suite.addTestSuite(DomEventTest.class);
+ suite.addTestSuite(EventBusTest.class);
suite.addTestSuite(HandlerManagerTest.class);
- suite.addTestSuite(SimpleEventBusTest.class);
+ suite.addTestSuite(LogicalEventsTest.class);
suite.addTestSuite(ResettableEventBusTest.class);
+ suite.addTestSuite(SimpleEventBusTest.class);
return suite;
}
diff --git a/user/test/com/google/gwt/event/shared/EventBusTest.java b/user/test/com/google/gwt/event/shared/EventBusTest.java
new file mode 100644
index 0000000..16d03d3
--- /dev/null
+++ b/user/test/com/google/gwt/event/shared/EventBusTest.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2011 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.event.shared;
+
+import com.google.gwt.event.shared.GwtEvent.Type;
+
+import junit.framework.TestCase;
+
+/**
+ * Test that EventBus is api compatible after its retrofit to extend
+ * {@link com.google.web.bindery.event.shared.EventBus}.
+ */
+public class EventBusTest extends TestCase {
+ EventBus bus = new EventBus() {
+
+ @Override
+ public <H extends EventHandler> HandlerRegistration addHandler(Type<H> type, H handler) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public <H extends EventHandler> HandlerRegistration addHandlerToSource(Type<H> type,
+ Object source, H handler) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void fireEvent(GwtEvent<?> event) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void fireEventFromSource(GwtEvent<?> event, Object source) {
+ throw new UnsupportedOperationException();
+ }
+ };
+
+ public void testOne() {
+ // Nothing to test, really, just make sure it still compiles.
+ assertNotNull(bus);
+ }
+}
