Author: [EMAIL PROTECTED]
Date: Fri Nov 14 11:01:56 2008
New Revision: 4080
Modified:
branches/1_6_clean_events/user/src/com/google/gwt/event/dom/client/DomEvent.java
branches/1_6_clean_events/user/src/com/google/gwt/user/client/ui/CustomButton.java
branches/1_6_clean_events/user/src/com/google/gwt/user/client/ui/Image.java
branches/1_6_clean_events/user/test/com/google/gwt/event/shared/HandlerManagerTest.java
Log:
Removing unsafeFireNativeEvent, also let formatter replace two spaces with
0 in HandlerManagerTest, as I think that is the GWT standard on empty lines
and HandlerManagerTest is a new file.
Modified:
branches/1_6_clean_events/user/src/com/google/gwt/event/dom/client/DomEvent.java
==============================================================================
---
branches/1_6_clean_events/user/src/com/google/gwt/event/dom/client/DomEvent.java
(original)
+++
branches/1_6_clean_events/user/src/com/google/gwt/event/dom/client/DomEvent.java
Fri Nov 14 11:01:56 2008
@@ -76,7 +76,6 @@
init();
}
registered.unsafePut(eventName, this);
- reverseRegistered.put(eventToSink, this);
}
Type(int nativeEventTypeInt, String eventName, DomEvent<H> cached,
@@ -101,9 +100,7 @@
}
private static PrivateMap<Type<?>> registered;
-
- private static PrivateMap<Type<?>> reverseRegistered;
-
+
/**
* Fires the given native event on the specified handlers.
*
@@ -125,47 +122,10 @@
}
}
}
-
- /**
- * Fires the given native event on the manager with a null underlying
native
- * event.
- *
- * <p>
- * This method is used in the rare case that GWT widgets have to fire
native
- * events but do not have access to the corresponding native event. It
allows
- * the compiler to avoid instantiating event types that are never
handlers.
- * </p>
- *
- * @deprecated should go away after triggering of native events is
introduced
- * @param eventType the GWT event type representing the type of the
native
- * event.
- * @param handlers the handler manager containing the handlers
- */
- @Deprecated
- public static void unsafeFireNativeEvent(int eventType,
- HandlerManager handlers) {
- if (registered != null) {
- final DomEvent.Type<?> typeKey = reverseRegistered.get(eventType);
- if (typeKey != null) {
- // Store and restore native event just in case we are in recursive
- // loop.
- Event currentNative = null;
- if (typeKey.flyweight.isLive()) {
- currentNative = typeKey.flyweight.nativeEvent;
- }
- typeKey.flyweight.setNativeEvent(null);
- handlers.fireEvent(typeKey.flyweight);
- if (currentNative != null) {
- typeKey.flyweight.setNativeEvent(currentNative);
- }
- }
- }
- }
-
+
// This method can go away once we have eager clinits.
static void init() {
registered = new PrivateMap<Type<?>>();
- reverseRegistered = new PrivateMap<Type<?>>();
}
private Event nativeEvent;
Modified:
branches/1_6_clean_events/user/src/com/google/gwt/user/client/ui/CustomButton.java
==============================================================================
---
branches/1_6_clean_events/user/src/com/google/gwt/user/client/ui/CustomButton.java
(original)
+++
branches/1_6_clean_events/user/src/com/google/gwt/user/client/ui/CustomButton.java
Fri Nov 14 11:01:56 2008
@@ -16,8 +16,8 @@
package com.google.gwt.user.client.ui;
+import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
-import com.google.gwt.event.dom.client.DomEvent;
import com.google.gwt.user.client.DOM;
import com.google.gwt.user.client.Element;
import com.google.gwt.user.client.Event;
@@ -387,7 +387,7 @@
/**
* Constructor for <code>CustomButton</code>.
*
- * @param upText the text for the default (up) face of the button.
+ * @param upText the text for the default (up) face of the button
*/
public CustomButton(String upText) {
this();
@@ -672,7 +672,7 @@
* Sets whether this button is enabled.
*
* @param enabled <code>true</code> to enable the button,
<code>false</code>
- * to disable it
+ * to disable it
*/
@Override
public final void setEnabled(boolean enabled) {
@@ -779,7 +779,7 @@
* Sets whether this button is down.
*
* @param down <code>true</code> to press the button, <code>false</code>
- * otherwise
+ * otherwise
*/
protected void setDown(boolean down) {
if (down != isDown()) {
@@ -797,7 +797,9 @@
}
void fireClickListeners(Event nativeEvent) {
- DomEvent.unsafeFireNativeEvent(Event.ONCLICK, getHandlers());
+ // Joel's triggering of native events should replace this.
+ fireEvent(new ClickEvent() {
+ });
}
/**
Modified:
branches/1_6_clean_events/user/src/com/google/gwt/user/client/ui/Image.java
==============================================================================
---
branches/1_6_clean_events/user/src/com/google/gwt/user/client/ui/Image.java
(original)
+++
branches/1_6_clean_events/user/src/com/google/gwt/user/client/ui/Image.java
Fri Nov 14 11:01:56 2008
@@ -21,7 +21,6 @@
import com.google.gwt.dom.client.ImageElement;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
-import com.google.gwt.event.dom.client.DomEvent;
import com.google.gwt.event.dom.client.ErrorEvent;
import com.google.gwt.event.dom.client.ErrorHandler;
import com.google.gwt.event.dom.client.HasAllMouseHandlers;
@@ -207,8 +206,8 @@
*/
DeferredCommand.addCommand(new Command() {
public void execute() {
- DomEvent.unsafeFireNativeEvent(Event.ONLOAD,
- image.getHandlers());
+ image.fireEvent(new LoadEvent() {
+ });
}
});
}
Modified:
branches/1_6_clean_events/user/test/com/google/gwt/event/shared/HandlerManagerTest.java
==============================================================================
---
branches/1_6_clean_events/user/test/com/google/gwt/event/shared/HandlerManagerTest.java
(original)
+++
branches/1_6_clean_events/user/test/com/google/gwt/event/shared/HandlerManagerTest.java
Fri Nov 14 11:01:56 2008
@@ -18,10 +18,8 @@
import com.google.gwt.core.client.GWT;
import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwt.event.dom.client.DomEvent;
import com.google.gwt.event.dom.client.MouseDownEvent;
import com.google.gwt.event.dom.client.MouseDownHandler;
-import com.google.gwt.user.client.Event;
/**
* Handler manager test.
@@ -39,7 +37,8 @@
manager.addHandler(MouseDownEvent.getType(), mouse1);
manager.addHandler(MouseDownEvent.getType(), mouse2);
manager.addHandler(MouseDownEvent.getType(), adaptor1);
- DomEvent.unsafeFireNativeEvent(Event.ONMOUSEDOWN, manager);
+ manager.fireEvent(new MouseDownEvent() {
+ });
assertEquals(3, manager.getHandlerCount(MouseDownEvent.getType()));
assertFired(mouse1, mouse2, adaptor1);
manager.addHandler(MouseDownEvent.getType(), mouse3);
@@ -60,7 +59,8 @@
assertEquals(3, manager.getHandlerCount(ClickEvent.getType()));
reset();
- DomEvent.unsafeFireNativeEvent(Event.ONMOUSEDOWN, manager);
+ manager.fireEvent(new MouseDownEvent() {
+ });
assertFired(mouse1, mouse2, mouse3, adaptor1);
assertNotFired(click1, click2);
}
@@ -71,20 +71,24 @@
addHandlers(manager);
// Gets rid of first instance.
manager.removeHandler(MouseDownEvent.getType(), adaptor1);
- DomEvent.unsafeFireNativeEvent(Event.ONMOUSEDOWN, manager);
+ manager.fireEvent(new MouseDownEvent() {
+ });
assertFired(mouse1, mouse2, mouse3, adaptor1);
assertNotFired(click1, click2);
// Gets rid of second instance.
manager.removeHandler(MouseDownEvent.getType(), adaptor1);
reset();
- DomEvent.unsafeFireNativeEvent(Event.ONMOUSEDOWN, manager);
+ manager.fireEvent(new MouseDownEvent() {
+ });
+
assertFired(mouse1, mouse2, mouse3);
assertNotFired(adaptor1, click1, click2);
// Checks to see if click events are still working.
reset();
- DomEvent.unsafeFireNativeEvent(Event.ONCLICK, manager);
+ manager.fireEvent(new ClickEvent() {
+ });
assertNotFired(mouse1, mouse2, mouse3);
assertFired(click1, click2, adaptor1);
@@ -174,16 +178,18 @@
manager.addHandler(MouseDownEvent.getType(), mouse1);
manager.addHandler(MouseDownEvent.getType(), mouse2);
manager.addHandler(MouseDownEvent.getType(), mouse3);
- manager.fireEvent(new MouseDownEvent() { });
+ manager.fireEvent(new MouseDownEvent() {
+ });
assertFired(one, mouse1, mouse2, mouse3);
assertNotFired(two);
reset();
- manager.fireEvent(new MouseDownEvent() { });
+ manager.fireEvent(new MouseDownEvent() {
+ });
assertFired(one, mouse1, mouse2, mouse3);
assertNotFired(two);
}
-
+
@SuppressWarnings("deprecation")
public void testConcurrentAddAfterRemoveIsNotClobbered() {
final HandlerManager manager = new HandlerManager("bogus source");
@@ -199,19 +205,23 @@
if (!GWT.isScript()) {
try {
- manager.fireEvent(new MouseDownEvent() { });
+ manager.fireEvent(new MouseDownEvent() {
+ });
fail("Should have thrown on remove");
- } catch (AssertionError e) { /* pass */ }
+ } catch (AssertionError e) { /* pass */
+ }
return;
}
-
- // Web mode, no asserts, so remove will quietly succeed.
- manager.fireEvent(new MouseDownEvent() { });
+
+ // Web mode, no asserts, so remove will quietly succeed.
+ manager.fireEvent(new MouseDownEvent() {
+ });
assertFired(one);
reset();
- manager.fireEvent(new MouseDownEvent() { });
+ manager.fireEvent(new MouseDownEvent() {
+ });
assertFired(one, mouse1);
- }
+ }
@SuppressWarnings("deprecation")
public void testMultiFiring() {
@@ -247,7 +257,8 @@
});
reset();
- DomEvent.unsafeFireNativeEvent(Event.ONMOUSEDOWN, manager);
+ manager.fireEvent(new MouseDownEvent() {
+ });
assertFired(mouse1, adaptor1, mouse3);
}
}
--~--~---------~--~----~------------~-------~--~----~
http://groups.google.com/group/Google-Web-Toolkit-Contributors
-~----------~----~----~----~------~----~------~--~---
