[gwt-contrib] [google-web-toolkit] r10023 committed - Make EventBus backward compatible....

Tue, 19 Apr 2011 10:03:08 -0700 

Revision: 10023
Author:   rj...@google.com
Date:     Tue Apr 19 06:56:46 2011
Log:      Make EventBus backward compatible.

Review at http://gwt-code-reviews.appspot.com/1423803

Review by: robertvaw...@google.com
http://code.google.com/p/google-web-toolkit/source/detail?r=10023

Modified:
 /trunk/user/src/com/google/gwt/event/shared/EventBus.java
 /trunk/user/src/com/google/gwt/event/shared/ResettableEventBus.java
 /trunk/user/src/com/google/gwt/event/shared/SimpleEventBus.java
 /trunk/user/src/com/google/gwt/event/shared/testing/CountingEventBus.java

=======================================
--- /trunk/user/src/com/google/gwt/event/shared/EventBus.java Mon Apr 18 16:25:25 2011 +++ /trunk/user/src/com/google/gwt/event/shared/EventBus.java Tue Apr 19 06:56:46 2011 
@@ -21,8 +21,9 @@
  * Extends {com.google.web.bindery.event.shared.EventBus} for legacy
  * compatibility.
  */
-public abstract class EventBus extends com.google.web.bindery.event.shared.EventBus implements HasHandlers { 
-
+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));
   }
@@ -31,8 +32,24 @@
       Object source, H handler) {
     return wrap(addHandlerToSource((Event.Type<H>) type, source, handler));
   }
-
-  public void fireEvent(GwtEvent<?> event) {
+
+  public void fireEvent(Event<?> event) {
+    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 void fireEvent(GwtEvent<?> event);
+
+  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. " + + "Use that directly, or try com.google.gwt.event.shared.SimpleEventBus"); 
+  }
+
+ public abstract void fireEventFromSource(GwtEvent<?> event, Object source); 
+
+  protected void castFireEvent(GwtEvent<?> event) {
     try {
       fireEvent((Event<?>) event);
     } catch (com.google.web.bindery.event.shared.UmbrellaException e) {
@@ -40,7 +57,7 @@
     }
   }

-  public void fireEventFromSource(GwtEvent<?> event, Object source) {
+ protected void castFireEventFromSource(GwtEvent<?> event, Object source) { 
     try {
       fireEventFromSource((Event<?>) event, source);
     } catch (com.google.web.bindery.event.shared.UmbrellaException e) {
=======================================
--- /trunk/user/src/com/google/gwt/event/shared/ResettableEventBus.java Mon Apr 18 16:25:25 2011 +++ /trunk/user/src/com/google/gwt/event/shared/ResettableEventBus.java Tue Apr 19 06:56:46 2011 
@@ -58,11 +58,21 @@
   public void fireEvent(Event<?> event) {
     real.fireEvent(event);
   }
+
+  @Override
+  public void fireEvent(GwtEvent<?> event) {
+    castFireEvent(event);
+  }

   @Override
   public void fireEventFromSource(Event<?> event, Object source) {
     real.fireEventFromSource(event, source);
   }
+
+  @Override
+  public void fireEventFromSource(GwtEvent<?> event, Object source) {
+    castFireEventFromSource(event, source);
+  }

   public void removeHandlers() {
     real.removeHandlers();
=======================================
--- /trunk/user/src/com/google/gwt/event/shared/SimpleEventBus.java Mon Apr 18 16:25:25 2011 +++ /trunk/user/src/com/google/gwt/event/shared/SimpleEventBus.java Tue Apr 19 06:56:46 2011 
@@ -41,9 +41,19 @@
   public void fireEvent(Event<?> event) {
     real.fireEvent(event);
   }
+
+  @Override
+  public void fireEvent(GwtEvent<?> event) {
+    castFireEvent(event);
+  }

   @Override
   public void fireEventFromSource(Event<?> event, Object source) {
     real.fireEventFromSource(event, source);
   }
-}
+
+  @Override
+  public void fireEventFromSource(GwtEvent<?> event, Object source) {
+    castFireEventFromSource(event, source);
+  }
+}
=======================================
--- /trunk/user/src/com/google/gwt/event/shared/testing/CountingEventBus.java Mon Apr 18 16:25:25 2011 +++ /trunk/user/src/com/google/gwt/event/shared/testing/CountingEventBus.java Tue Apr 19 06:56:46 2011 
@@ -49,11 +49,21 @@
   public void fireEvent(Event<?> event) {
     real.fireEvent(event);
   }
+
+  @Override
+  public void fireEvent(GwtEvent<?> event) {
+    castFireEvent(event);
+  }

   @Override
   public void fireEventFromSource(Event<?> event, Object source) {
     real.fireEventFromSource(event, source);
   }
+
+  @Override
+  public void fireEventFromSource(GwtEvent<?> event, Object source) {
+    castFireEventFromSource(event, source);
+  }

   public int getCount(GwtEvent.Type<?> type) {
     return real.getCount(type);

--
http://groups.google.com/group/Google-Web-Toolkit-Contributors

Reply via email to