Revision: 7737
Author: [email protected]
Date: Tue Mar 16 08:57:25 2010
Log: Adding a default return value to eventGetTypeInt.
http://gwt-code-reviews.appspot.com/222801
Review by: [email protected]
http://code.google.com/p/google-web-toolkit/source/detail?r=7737
Modified:
/trunk/user/src/com/google/gwt/user/client/DOM.java
/trunk/user/src/com/google/gwt/user/client/Event.java
/trunk/user/src/com/google/gwt/user/client/impl/DOMImpl.java
/trunk/user/test/com/google/gwt/user/client/EventTest.java
=======================================
--- /trunk/user/src/com/google/gwt/user/client/DOM.java Fri Oct 16 14:48:33
2009
+++ /trunk/user/src/com/google/gwt/user/client/DOM.java Tue Mar 16 08:57:25
2010
@@ -585,7 +585,7 @@
* Gets the enumerated type of this event (as defined in {...@link Event}).
*
* @param evt the event to be tested
- * @return the event's enumerated type
+ * @return the event's enumerated type, or -1 if not defined
*/
public static int eventGetType(Event evt) {
return impl.eventGetTypeInt(evt);
=======================================
--- /trunk/user/src/com/google/gwt/user/client/Event.java Fri Sep 18
10:54:47 2009
+++ /trunk/user/src/com/google/gwt/user/client/Event.java Tue Mar 16
08:57:25 2010
@@ -485,7 +485,7 @@
* Gets the enumerated type of this event given a valid event type name.
*
* @param typeName the typeName to be tested
- * @return the event's enumerated type
+ * @return the event's enumerated type, or -1 if not defined
*/
public static int getTypeInt(String typeName) {
return DOM.impl.eventGetTypeInt(typeName);
=======================================
--- /trunk/user/src/com/google/gwt/user/client/impl/DOMImpl.java Tue Jul 21
07:10:53 2009
+++ /trunk/user/src/com/google/gwt/user/client/impl/DOMImpl.java Tue Mar 16
08:57:25 2010
@@ -84,6 +84,7 @@
case "DOMMouseScroll": return 0x20000;
case "contextmenu": return 0x40000;
case "paste": return 0x80000;
+ default: return -1;
}
}-*/;
=======================================
--- /trunk/user/test/com/google/gwt/user/client/EventTest.java Thu Feb 25
06:57:14 2010
+++ /trunk/user/test/com/google/gwt/user/client/EventTest.java Tue Mar 16
08:57:25 2010
@@ -380,6 +380,24 @@
public void testFireNativePreviewEventWithoutHandlers() {
assertTrue(Event.fireNativePreviewEvent(null));
}
+
+ public void testGetTypeInt() {
+ assertEquals(Event.ONBLUR, Event.getTypeInt("blur"));
+ assertEquals(Event.ONCHANGE, Event.getTypeInt("change"));
+ assertEquals(Event.ONCLICK, Event.getTypeInt("click"));
+ assertEquals(Event.ONERROR, Event.getTypeInt("error"));
+ assertEquals(Event.ONFOCUS, Event.getTypeInt("focus"));
+ assertEquals(Event.ONKEYDOWN, Event.getTypeInt("keydown"));
+ assertEquals(Event.ONKEYPRESS, Event.getTypeInt("keypress"));
+ assertEquals(Event.ONKEYUP, Event.getTypeInt("keyup"));
+ assertEquals(Event.ONLOAD, Event.getTypeInt("load"));
+ assertEquals(Event.ONMOUSEDOWN, Event.getTypeInt("mousedown"));
+ assertEquals(Event.ONMOUSEMOVE, Event.getTypeInt("mousemove"));
+ assertEquals(Event.ONMOUSEOUT, Event.getTypeInt("mouseout"));
+ assertEquals(Event.ONMOUSEOVER, Event.getTypeInt("mouseover"));
+ assertEquals(Event.ONMOUSEUP, Event.getTypeInt("mouseup"));
+ assertEquals(-1, Event.getTypeInt("undefined"));
+ }
/**
* Test that legacy EventPreview and NativePreviewHandlers can both
cancel the
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
