changeset 1662:f0c0c9d89e6b

get rid of EventTypeUtil
author snorthov
date Mon, 20 Aug 2012 17:02:57 -0400
parents de4c5b536f72
children 6e30ae5e68a2
files javafx-ui-common/src/com/sun/javafx/stage/FocusUngrabEvent.java javafx-ui-common/src/javafx/scene/input/ContextMenuEvent.java javafx-ui-common/src/javafx/scene/input/DragEvent.java javafx-ui-common/src/javafx/scene/input/GestureEvent.java javafx-ui-common/src/javafx/scene/input/InputEvent.java javafx-ui-common/src/javafx/scene/input/InputMethodEvent.java javafx-ui-common/src/javafx/scene/input/KeyEvent.java javafx-ui-common/src/javafx/scene/input/MouseDragEvent.java javafx-ui-common/src/javafx/scene/input/MouseEvent.java javafx-ui-common/src/javafx/scene/input/RotateEvent.java javafx-ui-common/src/javafx/scene/input/ScrollEvent.java javafx-ui-common/src/javafx/scene/input/SwipeEvent.java javafx-ui-common/src/javafx/scene/input/TouchEvent.java javafx-ui-common/src/javafx/scene/input/ZoomEvent.java javafx-ui-common/src/javafx/stage/WindowEvent.java javafx-ui-controls/src/javafx/scene/control/CheckBoxTreeItem.java javafx-ui-controls/src/javafx/scene/control/ComboBoxBase.java javafx-ui-controls/src/javafx/scene/control/ListView.java javafx-ui-controls/src/javafx/scene/control/Menu.java javafx-ui-controls/src/javafx/scene/control/MenuItem.java javafx-ui-controls/src/javafx/scene/control/Tab.java javafx-ui-controls/src/javafx/scene/control/TableColumn.java javafx-ui-controls/src/javafx/scene/control/TreeItem.java javafx-ui-controls/src/javafx/scene/control/TreeView.java
diffstat 24 files changed, 94 insertions(+), 94 deletions(-) [+]
line wrap: on
line diff
--- a/javafx-ui-common/src/com/sun/javafx/stage/FocusUngrabEvent.java	Thu Aug 16 16:36:07 2012 -0700
+++ b/javafx-ui-common/src/com/sun/javafx/stage/FocusUngrabEvent.java	Mon Aug 20 17:02:57 2012 -0400
@@ -32,7 +32,7 @@
 
 public final class FocusUngrabEvent extends Event {
     public static final EventType<FocusUngrabEvent> FOCUS_UNGRAB =
-            EventTypeUtil.registerInternalEventType(Event.ANY, "FOCUS_UNGRAB");
+            new EventType<FocusUngrabEvent>(Event.ANY, "FOCUS_UNGRAB");
 
     public FocusUngrabEvent() {
         super(FOCUS_UNGRAB);
--- a/javafx-ui-common/src/javafx/scene/input/ContextMenuEvent.java	Thu Aug 16 16:36:07 2012 -0700
+++ b/javafx-ui-common/src/javafx/scene/input/ContextMenuEvent.java	Mon Aug 20 17:02:57 2012 -0400
@@ -53,7 +53,7 @@
      * This event occurs when a context menu is requested.
      */
     public static final EventType<ContextMenuEvent> CONTEXT_MENU_REQUESTED =
-            EventTypeUtil.registerInternalEventType(ContextMenuEvent.ANY, "CONTEXT_MENU_REQUESTED");
+            new EventType<ContextMenuEvent>(ContextMenuEvent.ANY, "CONTEXT_MENU_REQUESTED");
 
     private ContextMenuEvent(final EventType<? extends ContextMenuEvent> eventType) {
         super(eventType);
--- a/javafx-ui-common/src/javafx/scene/input/DragEvent.java	Thu Aug 16 16:36:07 2012 -0700
+++ b/javafx-ui-common/src/javafx/scene/input/DragEvent.java	Mon Aug 20 17:02:57 2012 -0400
@@ -205,7 +205,7 @@
      * Common supertype for all drag event types.
      */
     public static final EventType<DragEvent> ANY =
-            EventTypeUtil.registerInternalEventType(InputEvent.ANY, "DRAG");
+            new EventType<DragEvent>(InputEvent.ANY, "DRAG");
 
     /**
      * This event occurs when drag gesture enters a node. It's the
@@ -218,7 +218,7 @@
      * which is similar
      */
     public static final EventType<DragEvent> DRAG_ENTERED_TARGET =
-            EventTypeUtil.registerInternalEventType(DragEvent.ANY, "DRAG_ENTERED_TARGET");
+            new EventType<DragEvent>(DragEvent.ANY, "DRAG_ENTERED_TARGET");
 
     /**
      * This event occurs when drag gesture enters a node.
@@ -230,7 +230,7 @@
      * which is similar
      */
     public static final EventType<DragEvent> DRAG_ENTERED =
-            EventTypeUtil.registerInternalEventType(DragEvent.DRAG_ENTERED_TARGET, "DRAG_ENTERED");
+            new EventType<DragEvent>(DragEvent.DRAG_ENTERED_TARGET, "DRAG_ENTERED");
 
     /**
      * This event occurs when drag gesture exits a node. It's the
@@ -243,7 +243,7 @@
      * which is similar
      */
     public static final EventType<DragEvent> DRAG_EXITED_TARGET =
-            EventTypeUtil.registerInternalEventType(DragEvent.ANY, "DRAG_EXITED_TARGET");
+            new EventType<DragEvent>(DragEvent.ANY, "DRAG_EXITED_TARGET");
 
     /**
      * This event occurs when drag gesture exits a node.
@@ -255,13 +255,13 @@
      * which is similar
      */
     public static final EventType<DragEvent> DRAG_EXITED =
-            EventTypeUtil.registerInternalEventType(DragEvent.DRAG_EXITED_TARGET, "DRAG_EXITED");
+            new EventType<DragEvent>(DragEvent.DRAG_EXITED_TARGET, "DRAG_EXITED");
 
     /**
      * This event occurs when drag gesture progresses within this node.
      */
     public static final EventType<DragEvent> DRAG_OVER =
-            EventTypeUtil.registerInternalEventType(DragEvent.ANY, "DRAG_OVER");
+            new EventType<DragEvent>(DragEvent.ANY, "DRAG_OVER");
 
     // Do we want DRAG_TRANSFER_MODE_CHANGED event?
 //    /**
@@ -280,7 +280,7 @@
      * in handler of this event.
      */
     public static final EventType<DragEvent> DRAG_DROPPED =
-            EventTypeUtil.registerInternalEventType(DragEvent.ANY, "DRAG_DROPPED");
+            new EventType<DragEvent>(DragEvent.ANY, "DRAG_DROPPED");
 
     /**
      * This event occurs on drag-and-drop gesture source after its data has
@@ -293,7 +293,7 @@
      * indicates that no data was transferred during the drag and drop gesture.
      */
     public static final EventType<DragEvent> DRAG_DONE =
-            EventTypeUtil.registerInternalEventType(DragEvent.ANY, "DRAG_DONE");
+            new EventType<DragEvent>(DragEvent.ANY, "DRAG_DONE");
 
     private DragEvent(final EventType<? extends DragEvent> eventType) {
         super(eventType);
--- a/javafx-ui-common/src/javafx/scene/input/GestureEvent.java	Thu Aug 16 16:36:07 2012 -0700
+++ b/javafx-ui-common/src/javafx/scene/input/GestureEvent.java	Mon Aug 20 17:02:57 2012 -0400
@@ -51,7 +51,7 @@
      * Common supertype for all gestures.
      */
     public static final EventType<GestureEvent> ANY =
-            EventTypeUtil.registerInternalEventType(InputEvent.ANY, "GESTURE");
+            new EventType<GestureEvent>(InputEvent.ANY, "GESTURE");
 
     /**
      * Creates a new instance of {@code GestureEvent}.
--- a/javafx-ui-common/src/javafx/scene/input/InputEvent.java	Thu Aug 16 16:36:07 2012 -0700
+++ b/javafx-ui-common/src/javafx/scene/input/InputEvent.java	Mon Aug 20 17:02:57 2012 -0400
@@ -38,7 +38,7 @@
      * Common supertype for all input event types.
      */
     public static final EventType<InputEvent> ANY =
-            EventTypeUtil.registerInternalEventType(Event.ANY, "INPUT");
+            new EventType<InputEvent> (Event.ANY, "INPUT");
 
     /**
      * Creates new instance of InputEvent.
--- a/javafx-ui-common/src/javafx/scene/input/InputMethodEvent.java	Thu Aug 16 16:36:07 2012 -0700
+++ b/javafx-ui-common/src/javafx/scene/input/InputMethodEvent.java	Mon Aug 20 17:02:57 2012 -0400
@@ -53,7 +53,7 @@
      * The only valid EventType for the InputMethodEvent.
      */
     public static final EventType<InputMethodEvent> INPUT_METHOD_TEXT_CHANGED =
-            EventTypeUtil.registerInternalEventType(InputEvent.ANY, "INPUT_METHOD_TEXT_CHANGED");
+            new EventType<InputMethodEvent>(InputEvent.ANY, "INPUT_METHOD_TEXT_CHANGED");
 
     private InputMethodEvent(final EventType<? extends InputMethodEvent> eventType) {
         super(eventType);
--- a/javafx-ui-common/src/javafx/scene/input/KeyEvent.java	Thu Aug 16 16:36:07 2012 -0700
+++ b/javafx-ui-common/src/javafx/scene/input/KeyEvent.java	Mon Aug 20 17:02:57 2012 -0400
@@ -86,19 +86,19 @@
      * Common supertype for all key event types.
      */
     public static final EventType<KeyEvent> ANY =
-            EventTypeUtil.registerInternalEventType(InputEvent.ANY, "KEY");
+            new EventType<KeyEvent>(InputEvent.ANY, "KEY");
 
     /**
      * This event occurs when a key has been pressed.
      */
     public static final EventType<KeyEvent> KEY_PRESSED =
-            EventTypeUtil.registerInternalEventType(KeyEvent.ANY, "KEY_PRESSED");
+            new EventType<KeyEvent>(KeyEvent.ANY, "KEY_PRESSED");
 
     /**
      * This event occurs when a key has been released.
      */
     public static final EventType<KeyEvent> KEY_RELEASED =
-            EventTypeUtil.registerInternalEventType(KeyEvent.ANY, "KEY_RELEASED");
+            new EventType<KeyEvent>(KeyEvent.ANY, "KEY_RELEASED");
 
     /**
      * This event occurs when a key has been typed (pressed and released).
@@ -106,7 +106,7 @@
      * string, the {@code code} and {@code text} fields are not used.
      */
     public static final EventType<KeyEvent> KEY_TYPED =
-            EventTypeUtil.registerInternalEventType(KeyEvent.ANY, "KEY_TYPED");
+            new EventType<KeyEvent>(KeyEvent.ANY, "KEY_TYPED");
 
     private KeyEvent(final EventType<? extends KeyEvent> eventType) {
         super(eventType);
--- a/javafx-ui-common/src/javafx/scene/input/MouseDragEvent.java	Thu Aug 16 16:36:07 2012 -0700
+++ b/javafx-ui-common/src/javafx/scene/input/MouseDragEvent.java	Mon Aug 20 17:02:57 2012 -0400
@@ -59,20 +59,20 @@
      * Common supertype for all mouse event types.
      */
     public static final EventType<MouseDragEvent> ANY =
-            EventTypeUtil.registerInternalEventType(MouseEvent.ANY, "MOUSE-DRAG");
+            new EventType<MouseDragEvent>(MouseEvent.ANY, "MOUSE-DRAG");
 
     /**
      * This event occurs when the gesture progresses within this node.
      */
     public static final EventType<MouseDragEvent> MOUSE_DRAG_OVER =
-            EventTypeUtil.registerInternalEventType(MouseDragEvent.ANY, "MOUSE-DRAG_OVER");
+            new EventType<MouseDragEvent>(MouseDragEvent.ANY, "MOUSE-DRAG_OVER");
 
     /**
      * This event occurs when the gesture ends (by releasing mouse button)
      * on this node.
      */
     public static final EventType<MouseDragEvent> MOUSE_DRAG_RELEASED =
-            EventTypeUtil.registerInternalEventType(MouseDragEvent.ANY, "MOUSE-DRAG_RELEASED");
+            new EventType<MouseDragEvent>(MouseDragEvent.ANY, "MOUSE-DRAG_RELEASED");
 
     /**
      * This event occurs when the gesture enters a node. It's the bubbling variant,
@@ -85,7 +85,7 @@
      * which is similar
      */
     public static final EventType<MouseDragEvent> MOUSE_DRAG_ENTERED_TARGET =
-            EventTypeUtil.registerInternalEventType(MouseDragEvent.ANY, "MOUSE-DRAG_ENTERED_TARGET");
+            new EventType<MouseDragEvent>(MouseDragEvent.ANY, "MOUSE-DRAG_ENTERED_TARGET");
 
     /**
      * This event occurs when the gesture enters a node. This event type is
@@ -96,7 +96,7 @@
      * which is similar
      */
     public static final EventType<MouseDragEvent> MOUSE_DRAG_ENTERED =
-            EventTypeUtil.registerInternalEventType(MouseDragEvent.MOUSE_DRAG_ENTERED_TARGET,
+            new EventType<MouseDragEvent>(MouseDragEvent.MOUSE_DRAG_ENTERED_TARGET,
                     "MOUSE-DRAG_ENTERED");
 
     /**
@@ -110,7 +110,7 @@
      * which is similar
      */
     public static final EventType<MouseDragEvent> MOUSE_DRAG_EXITED_TARGET =
-            EventTypeUtil.registerInternalEventType(MouseDragEvent.ANY, "MOUSE-DRAG_EXITED_TARGET");
+            new EventType<MouseDragEvent>(MouseDragEvent.ANY, "MOUSE-DRAG_EXITED_TARGET");
 
     /**
      * This event occurs when the gesture exits a node. This event type is
@@ -121,7 +121,7 @@
      * which is similar
      */
     public static final EventType<MouseDragEvent> MOUSE_DRAG_EXITED =
-            EventTypeUtil.registerInternalEventType(MouseDragEvent.MOUSE_DRAG_EXITED_TARGET,
+            new EventType<MouseDragEvent>(MouseDragEvent.MOUSE_DRAG_EXITED_TARGET,
                     "MOUSE-DRAG_EXITED");
 
     private MouseDragEvent(Object source, EventTarget target,
--- a/javafx-ui-common/src/javafx/scene/input/MouseEvent.java	Thu Aug 16 16:36:07 2012 -0700
+++ b/javafx-ui-common/src/javafx/scene/input/MouseEvent.java	Mon Aug 20 17:02:57 2012 -0400
@@ -133,7 +133,7 @@
      * Common supertype for all mouse event types.
      */
     public static final EventType<MouseEvent> ANY =
-            EventTypeUtil.registerInternalEventType(InputEvent.ANY, "MOUSE");
+            new EventType<MouseEvent>(InputEvent.ANY, "MOUSE");
 
     /**
      * This event occurs when mouse button is pressed. This activates a
@@ -141,7 +141,7 @@
      * the button is released are delivered to the same node.
      */
     public static final EventType<MouseEvent> MOUSE_PRESSED =
-            EventTypeUtil.registerInternalEventType(MouseEvent.ANY, "MOUSE_PRESSED");
+            new EventType<MouseEvent>(MouseEvent.ANY, "MOUSE_PRESSED");
 
     /**
      * This event occurs when mouse button is released. It is delivered
@@ -149,7 +149,7 @@
      * a press-drag-release gesture.
      */
     public static final EventType<MouseEvent> MOUSE_RELEASED =
-            EventTypeUtil.registerInternalEventType(MouseEvent.ANY, "MOUSE_RELEASED");
+            new EventType<MouseEvent>(MouseEvent.ANY, "MOUSE_RELEASED");
 
     /**
      * This event occurs when mouse button has been clicked (pressed and
@@ -159,7 +159,7 @@
      * pressed and released).
      */
     public static final EventType<MouseEvent> MOUSE_CLICKED =
-            EventTypeUtil.registerInternalEventType(MouseEvent.ANY, "MOUSE_CLICKED");
+            new EventType<MouseEvent>(MouseEvent.ANY, "MOUSE_CLICKED");
 
     /**
      * This event occurs when mouse enters a node. It's the bubbling variant,
@@ -171,7 +171,7 @@
      * @see MouseEvent MouseEvent for more information about mouse entered/exited handling
      */
     public static final EventType<MouseEvent> MOUSE_ENTERED_TARGET =
-            EventTypeUtil.registerInternalEventType(MouseEvent.ANY, "MOUSE_ENTERED_TARGET");
+            new EventType<MouseEvent>(MouseEvent.ANY, "MOUSE_ENTERED_TARGET");
 
     /**
      * This event occurs when mouse enters a node. This event type is delivered
@@ -181,7 +181,7 @@
      * @see MouseEvent MouseEvent for more information about mouse entered/exited handling
      */
     public static final EventType<MouseEvent> MOUSE_ENTERED =
-            EventTypeUtil.registerInternalEventType(MouseEvent.MOUSE_ENTERED_TARGET, "MOUSE_ENTERED");
+            new EventType<MouseEvent>(MouseEvent.MOUSE_ENTERED_TARGET, "MOUSE_ENTERED");
 
     /**
      * This event occurs when mouse exits a node. It's the bubbling variant,
@@ -193,7 +193,7 @@
      * @see MouseEvent MouseEvent for more information about mouse entered/exited handling
      */
     public static final EventType<MouseEvent> MOUSE_EXITED_TARGET =
-            EventTypeUtil.registerInternalEventType(MouseEvent.ANY, "MOUSE_EXITED_TARGET");
+            new EventType<MouseEvent>(MouseEvent.ANY, "MOUSE_EXITED_TARGET");
 
     /**
      * This event occurs when mouse exits a node. This event type is delivered
@@ -203,7 +203,7 @@
      * @see MouseEvent MouseEvent for more information about mouse entered/exited handling
      */
     public static final EventType<MouseEvent> MOUSE_EXITED =
-            EventTypeUtil.registerInternalEventType(MouseEvent.MOUSE_EXITED_TARGET, "MOUSE_EXITED");
+            new EventType<MouseEvent>(MouseEvent.MOUSE_EXITED_TARGET, "MOUSE_EXITED");
 
     /**
      * This event occurs when mouse moves within a node and no buttons
@@ -211,7 +211,7 @@
      * occurs instead.
      */
     public static final EventType<MouseEvent> MOUSE_MOVED =
-            EventTypeUtil.registerInternalEventType(MouseEvent.ANY, "MOUSE_MOVED");
+            new EventType<MouseEvent>(MouseEvent.ANY, "MOUSE_MOVED");
 
     /**
      * This event occurs when mouse moves with a pressed button.
@@ -220,7 +220,7 @@
      * regardless of the mouse being within bounds of the node.
      */
     public static final EventType<MouseEvent> MOUSE_DRAGGED =
-            EventTypeUtil.registerInternalEventType(MouseEvent.ANY, "MOUSE_DRAGGED");
+            new EventType<MouseEvent>(MouseEvent.ANY, "MOUSE_DRAGGED");
 
     /**
      * This event is delivered to a node that is identified as a source of a
@@ -240,7 +240,7 @@
      * @see DragEvent DragEvent for more details about drag and drop gestures
      */
     public static final EventType<MouseEvent> DRAG_DETECTED =
-            EventTypeUtil.registerInternalEventType(MouseEvent.ANY, "DRAG_DETECTED");
+            new EventType<MouseEvent>(MouseEvent.ANY, "DRAG_DETECTED");
 
     MouseEvent(final EventType<? extends MouseEvent> eventType) {
         super(eventType);
--- a/javafx-ui-common/src/javafx/scene/input/RotateEvent.java	Thu Aug 16 16:36:07 2012 -0700
+++ b/javafx-ui-common/src/javafx/scene/input/RotateEvent.java	Mon Aug 20 17:02:57 2012 -0400
@@ -63,26 +63,26 @@
      * Common supertype for all rotate event types.
      */
     public static final EventType<RotateEvent> ANY =
-            EventTypeUtil.registerInternalEventType(GestureEvent.ANY, "ANY_ROTATE");
+            new EventType<RotateEvent>(GestureEvent.ANY, "ANY_ROTATE");
 
     /**
      * This event occurs when user performs a rotating gesture such as
      * dragging two fingers around each other.
      */
     public static final EventType<RotateEvent> ROTATE =
-            EventTypeUtil.registerInternalEventType(RotateEvent.ANY, "ROTATE");
+            new EventType<RotateEvent>(RotateEvent.ANY, "ROTATE");
 
     /**
      * This event occurs when a rotating gesture is detected.
      */
     public static final EventType<RotateEvent> ROTATION_STARTED =
-            EventTypeUtil.registerInternalEventType(RotateEvent.ANY, "ROTATION_STARTED");
+            new EventType<RotateEvent>(RotateEvent.ANY, "ROTATION_STARTED");
 
     /**
      * This event occurs when a rotating gesture ends.
      */
     public static final EventType<RotateEvent> ROTATION_FINISHED =
-            EventTypeUtil.registerInternalEventType(RotateEvent.ANY, "ROTATION_FINISHED");
+            new EventType<RotateEvent>(RotateEvent.ANY, "ROTATION_FINISHED");
 
     private RotateEvent(final EventType<? extends RotateEvent> eventType) {
         super(eventType);
--- a/javafx-ui-common/src/javafx/scene/input/ScrollEvent.java	Thu Aug 16 16:36:07 2012 -0700
+++ b/javafx-ui-common/src/javafx/scene/input/ScrollEvent.java	Mon Aug 20 17:02:57 2012 -0400
@@ -103,28 +103,28 @@
      * Common supertype for all scroll event types.
      */
     public static final EventType<ScrollEvent> ANY =
-            EventTypeUtil.registerInternalEventType(GestureEvent.ANY, "ANY_SCROLL");
+            new EventType<ScrollEvent> (GestureEvent.ANY, "ANY_SCROLL");
 
     /**
      * This event occurs when user performs a scrolling action such as
      * rotating mouse wheel or dragging a finger over touch screen.
      */
     public static final EventType<ScrollEvent> SCROLL =
-            EventTypeUtil.registerInternalEventType(ScrollEvent.ANY, "SCROLL");
+            new EventType<ScrollEvent> (ScrollEvent.ANY, "SCROLL");
 
     /**
      * This event occurs when a scrolling gesture is detected. It doesn't
      * occur for mouse wheel scrolling.
      */
     public static final EventType<ScrollEvent> SCROLL_STARTED =
-            EventTypeUtil.registerInternalEventType(ScrollEvent.ANY, "SCROLL_STARTED");
+            new EventType<ScrollEvent> (ScrollEvent.ANY, "SCROLL_STARTED");
 
     /**
      * This event occurs when a scrolling gesture ends. It doesn't
      * occur for mouse wheel scrolling.
      */
     public static final EventType<ScrollEvent> SCROLL_FINISHED =
-            EventTypeUtil.registerInternalEventType(ScrollEvent.ANY, "SCROLL_FINISHED");
+            new EventType<ScrollEvent> (ScrollEvent.ANY, "SCROLL_FINISHED");
 
     
     private ScrollEvent(final EventType<? extends ScrollEvent> eventType) {
--- a/javafx-ui-common/src/javafx/scene/input/SwipeEvent.java	Thu Aug 16 16:36:07 2012 -0700
+++ b/javafx-ui-common/src/javafx/scene/input/SwipeEvent.java	Mon Aug 20 17:02:57 2012 -0400
@@ -62,31 +62,31 @@
      * Common supertype for all swipe event types.
      */
     public static final EventType<SwipeEvent> ANY =
-            EventTypeUtil.registerInternalEventType(GestureEvent.ANY, "ANY_SWIPE");
+            new EventType<SwipeEvent>(GestureEvent.ANY, "ANY_SWIPE");
 
     /**
      * This event occurs when user performs leftward swipe gesture.
      */
     public static final EventType<SwipeEvent> SWIPE_LEFT =
-            EventTypeUtil.registerInternalEventType(SwipeEvent.ANY, "SWIPE_LEFT");
+            new EventType<SwipeEvent>(SwipeEvent.ANY, "SWIPE_LEFT");
 
     /**
      * This event occurs when user performs rightward swipe gesture.
      */
     public static final EventType<SwipeEvent> SWIPE_RIGHT =
-            EventTypeUtil.registerInternalEventType(SwipeEvent.ANY, "SWIPE_RIGHT");
+            new EventType<SwipeEvent>(SwipeEvent.ANY, "SWIPE_RIGHT");
 
     /**
      * This event occurs when user performs upward swipe gesture.
      */
     public static final EventType<SwipeEvent> SWIPE_UP =
-            EventTypeUtil.registerInternalEventType(SwipeEvent.ANY, "SWIPE_UP");
+            new EventType<SwipeEvent>(SwipeEvent.ANY, "SWIPE_UP");
 
     /**
      * This event occurs when user performs downward swipe gesture.
      */
     public static final EventType<SwipeEvent> SWIPE_DOWN =
-            EventTypeUtil.registerInternalEventType(SwipeEvent.ANY, "SWIPE_DOWN");
+            new EventType<SwipeEvent>(SwipeEvent.ANY, "SWIPE_DOWN");
 
     private SwipeEvent(final EventType<? extends SwipeEvent> eventType) {
         super(eventType);
--- a/javafx-ui-common/src/javafx/scene/input/TouchEvent.java	Thu Aug 16 16:36:07 2012 -0700
+++ b/javafx-ui-common/src/javafx/scene/input/TouchEvent.java	Mon Aug 20 17:02:57 2012 -0400
@@ -63,33 +63,33 @@
      * Common supertype for all touch event types.
      */
     public static final EventType<TouchEvent> ANY =
-            EventTypeUtil.registerInternalEventType(InputEvent.ANY, "TOUCH");
+            new EventType<TouchEvent>(InputEvent.ANY, "TOUCH");
 
     /**
      * This event occurs when the touch point is pressed (touched for the
      * first time).
      */
     public static final EventType<TouchEvent> TOUCH_PRESSED =
-            EventTypeUtil.registerInternalEventType(ANY, "TOUCH_PRESSED");
+            new EventType<TouchEvent>(ANY, "TOUCH_PRESSED");
 
     /**
      * This event occurs when the touch point is moved.
      */
     public static final EventType<TouchEvent> TOUCH_MOVED =
-            EventTypeUtil.registerInternalEventType(ANY, "TOUCH_MOVED");
+            new EventType<TouchEvent>(ANY, "TOUCH_MOVED");
 
     /**
      * This event occurs when the touch point is released.
      */
     public static final EventType<TouchEvent> TOUCH_RELEASED =
-            EventTypeUtil.registerInternalEventType(ANY, "TOUCH_RELEASED");
+            new EventType<TouchEvent>(ANY, "TOUCH_RELEASED");
 
     /**
      * This event occurs when the touch point is pressed and still (doesn't
      * move).
      */
     public static final EventType<TouchEvent> TOUCH_STATIONARY =
-            EventTypeUtil.registerInternalEventType(ANY, "TOUCH_STATIONARY");
+            new EventType<TouchEvent>(ANY, "TOUCH_STATIONARY");
 
     private TouchEvent(EventType<? extends TouchEvent> eventType) {
         super(eventType);
--- a/javafx-ui-common/src/javafx/scene/input/ZoomEvent.java	Thu Aug 16 16:36:07 2012 -0700
+++ b/javafx-ui-common/src/javafx/scene/input/ZoomEvent.java	Mon Aug 20 17:02:57 2012 -0400
@@ -63,26 +63,26 @@
      * Common supertype for all zoom event types.
      */
     public static final EventType<ZoomEvent> ANY =
-            EventTypeUtil.registerInternalEventType(GestureEvent.ANY, "ANY_ZOOM");
+            new EventType<ZoomEvent>(GestureEvent.ANY, "ANY_ZOOM");
 
     /**
      * This event occurs when user performs a zooming gesture such as
      * dragging two fingers apart.
      */
     public static final EventType<ZoomEvent> ZOOM =
-            EventTypeUtil.registerInternalEventType(ZoomEvent.ANY, "ZOOM");
+            new EventType<ZoomEvent>(ZoomEvent.ANY, "ZOOM");
 
     /**
      * This event occurs when a zooming gesture is detected.
      */
     public static final EventType<ZoomEvent> ZOOM_STARTED =
-            EventTypeUtil.registerInternalEventType(ZoomEvent.ANY, "ZOOM_STARTED");
+            new EventType<ZoomEvent>(ZoomEvent.ANY, "ZOOM_STARTED");
 
     /**
      * This event occurs when a zooming gesture ends.
      */
     public static final EventType<ZoomEvent> ZOOM_FINISHED =
-            EventTypeUtil.registerInternalEventType(ZoomEvent.ANY, "ZOOM_FINISHED");
+            new EventType<ZoomEvent>(ZoomEvent.ANY, "ZOOM_FINISHED");
 
     private ZoomEvent(final EventType<? extends ZoomEvent> eventType) {
         super(eventType);
--- a/javafx-ui-common/src/javafx/stage/WindowEvent.java	Thu Aug 16 16:36:07 2012 -0700
+++ b/javafx-ui-common/src/javafx/stage/WindowEvent.java	Mon Aug 20 17:02:57 2012 -0400
@@ -37,31 +37,31 @@
      * Common supertype for all window event types.
      */
     public static final EventType<WindowEvent> ANY =
-            EventTypeUtil.registerInternalEventType(Event.ANY, "WINDOW");
+            new EventType<WindowEvent>(Event.ANY, "WINDOW");
 
     /**
      * This event occurs on window just before it is shown.
      */
     public static final EventType<WindowEvent> WINDOW_SHOWING =
-            EventTypeUtil.registerInternalEventType(WindowEvent.ANY, "WINDOW_SHOWING");
+            new EventType<WindowEvent>(WindowEvent.ANY, "WINDOW_SHOWING");
 
     /**
      * This event occurs on window just after it is shown.
      */
     public static final EventType<WindowEvent> WINDOW_SHOWN =
-            EventTypeUtil.registerInternalEventType(WindowEvent.ANY, "WINDOW_SHOWN");
+            new EventType<WindowEvent>(WindowEvent.ANY, "WINDOW_SHOWN");
 
     /**
      * This event occurs on window just before it is hidden.
      */
     public static final EventType<WindowEvent> WINDOW_HIDING =
-            EventTypeUtil.registerInternalEventType(WindowEvent.ANY, "WINDOW_HIDING");
+            new EventType<WindowEvent>(WindowEvent.ANY, "WINDOW_HIDING");
 
     /**
      * This event occurs on window just after it is hidden.
      */
     public static final EventType<WindowEvent> WINDOW_HIDDEN =
-            EventTypeUtil.registerInternalEventType(WindowEvent.ANY, "WINDOW_HIDDEN");
+            new EventType<WindowEvent>(WindowEvent.ANY, "WINDOW_HIDDEN");
 
     /**
      * This event is delivered to a
@@ -70,7 +70,7 @@
      * handler for this event closes the corresponding window.
      */
     public static final EventType<WindowEvent> WINDOW_CLOSE_REQUEST =
-            EventTypeUtil.registerInternalEventType(WindowEvent.ANY, "WINDOW_CLOSE_REQUEST");
+            new EventType<WindowEvent>(WindowEvent.ANY, "WINDOW_CLOSE_REQUEST");
 
     /**
      * Construct a new {@code Event} with the specified event source, target
--- a/javafx-ui-controls/src/javafx/scene/control/CheckBoxTreeItem.java	Thu Aug 16 16:36:07 2012 -0700
+++ b/javafx-ui-controls/src/javafx/scene/control/CheckBoxTreeItem.java	Mon Aug 20 17:02:57 2012 -0400
@@ -96,7 +96,7 @@
         return (EventType<TreeModificationEvent<T>>) CHECK_BOX_SELECTION_CHANGED_EVENT;
     }
     private static final EventType<?> CHECK_BOX_SELECTION_CHANGED_EVENT
-            = EventTypeUtil.registerInternalEventType(Event.ANY, "checkBoxSelectionChangedEvent");
+            = new EventType(Event.ANY, "checkBoxSelectionChangedEvent");
 
     /***************************************************************************
      *                                                                         *
--- a/javafx-ui-controls/src/javafx/scene/control/ComboBoxBase.java	Thu Aug 16 16:36:07 2012 -0700
+++ b/javafx-ui-controls/src/javafx/scene/control/ComboBoxBase.java	Mon Aug 20 17:02:57 2012 -0400
@@ -79,25 +79,25 @@
      * has clicked or otherwise interacted with the ComboBox.
      */
     public static final EventType<Event> ON_SHOWING =
-            EventTypeUtil.registerInternalEventType(Event.ANY, "COMBO_BOX_BASE_ON_SHOWING");
+            new EventType<Event>(Event.ANY, "COMBO_BOX_BASE_ON_SHOWING");
 
     /**
      * <p>Called after the ComboBox has shown its popup/display.
      */
     public static final EventType<Event> ON_SHOWN =
-            EventTypeUtil.registerInternalEventType(Event.ANY, "COMBO_BOX_BASE_ON_SHOWN");
+            new EventType<Event>(Event.ANY, "COMBO_BOX_BASE_ON_SHOWN");
 
     /**
      * <p>Called when the ComboBox popup/display <b>will</b> be hidden. 
      */
     public static final EventType<Event> ON_HIDING =
-            EventTypeUtil.registerInternalEventType(Event.ANY, "COMBO_BOX_BASE_ON_HIDING");
+            new EventType<Event>(Event.ANY, "COMBO_BOX_BASE_ON_HIDING");
 
     /**
      * <p>Called when the ComboBox popup/display has been hidden.
      */
     public static final EventType<Event> ON_HIDDEN =
-            EventTypeUtil.registerInternalEventType(Event.ANY, "COMBO_BOX_BASE_ON_HIDDEN");
+            new EventType<Event>(Event.ANY, "COMBO_BOX_BASE_ON_HIDDEN");
     
     
     
--- a/javafx-ui-controls/src/javafx/scene/control/ListView.java	Thu Aug 16 16:36:07 2012 -0700
+++ b/javafx-ui-controls/src/javafx/scene/control/ListView.java	Mon Aug 20 17:02:57 2012 -0400
@@ -167,7 +167,7 @@
         return (EventType<ListView.EditEvent<T>>) EDIT_ANY_EVENT;
     }
     private static final EventType<?> EDIT_ANY_EVENT =
-            EventTypeUtil.registerInternalEventType(Event.ANY, "LIST_VIEW_EDIT");
+            new EventType(Event.ANY, "LIST_VIEW_EDIT");
     
     /**
      * An EventType used to indicate that an edit event has started within the
@@ -178,7 +178,7 @@
         return (EventType<ListView.EditEvent<T>>) EDIT_START_EVENT;
     }
     private static final EventType<?> EDIT_START_EVENT =
-            EventTypeUtil.registerInternalEventType(editAnyEvent(), "EDIT_START");
+            new EventType(editAnyEvent(), "EDIT_START");
 
     /**
      * An EventType used to indicate that an edit event has just been canceled
@@ -189,7 +189,7 @@
         return (EventType<ListView.EditEvent<T>>) EDIT_CANCEL_EVENT;
     }
     private static final EventType<?> EDIT_CANCEL_EVENT =
-            EventTypeUtil.registerInternalEventType(editAnyEvent(), "EDIT_CANCEL");
+            new EventType(editAnyEvent(), "EDIT_CANCEL");
 
     /**
      * An EventType used to indicate that an edit event has been committed
@@ -200,7 +200,7 @@
         return (EventType<ListView.EditEvent<T>>) EDIT_COMMIT_EVENT;
     }
     private static final EventType<?> EDIT_COMMIT_EVENT =
-            EventTypeUtil.registerInternalEventType(editAnyEvent(), "EDIT_COMMIT");
+            new EventType(editAnyEvent(), "EDIT_COMMIT");
     
     
 
--- a/javafx-ui-controls/src/javafx/scene/control/Menu.java	Thu Aug 16 16:36:07 2012 -0700
+++ b/javafx-ui-controls/src/javafx/scene/control/Menu.java	Mon Aug 20 17:02:57 2012 -0400
@@ -89,7 +89,7 @@
      * </p>
      */
     public static final EventType<Event> ON_SHOWING =
-            EventTypeUtil.registerInternalEventType(Event.ANY, "MENU_ON_SHOWING");
+            new EventType<Event>(Event.ANY, "MENU_ON_SHOWING");
 
     /**
      * <p>Called when the contentMenu for this menu shows. However if the
@@ -97,7 +97,7 @@
      * </p>
      */
     public static final EventType<Event> ON_SHOWN =
-            EventTypeUtil.registerInternalEventType(Event.ANY, "MENU_ON_SHOWN");
+            new EventType<Event>(Event.ANY, "MENU_ON_SHOWN");
 
     /**
      * <p>Called when the contentMenu for this menu <b>will</b> be hidden. However if the
@@ -105,7 +105,7 @@
      * </p>
      */
     public static final EventType<Event> ON_HIDING =
-            EventTypeUtil.registerInternalEventType(Event.ANY, "MENU_ON_HIDING");
+            new EventType<Event>(Event.ANY, "MENU_ON_HIDING");
 
     /**
      * <p>Called when the contentMenu for this menu is hidden. However if the
@@ -113,7 +113,7 @@
      * </p>
      */
     public static final EventType<Event> ON_HIDDEN =
-            EventTypeUtil.registerInternalEventType(Event.ANY, "MENU_ON_HIDDEN");
+            new EventType<Event>(Event.ANY, "MENU_ON_HIDDEN");
 
     /***************************************************************************
      *                                                                         *
--- a/javafx-ui-controls/src/javafx/scene/control/MenuItem.java	Thu Aug 16 16:36:07 2012 -0700
+++ b/javafx-ui-controls/src/javafx/scene/control/MenuItem.java	Mon Aug 20 17:02:57 2012 -0400
@@ -331,7 +331,7 @@
     /**
      * <p>Called when a accelerator for the Menuitem is invoked</p>
      */
-    public static final EventType<Event> MENU_VALIDATION_EVENT = EventTypeUtil.registerInternalEventType
+    public static final EventType<Event> MENU_VALIDATION_EVENT = new EventType<Event>
             (Event.ANY, "MENU_VALIDATION_EVENT");
     
     /**
--- a/javafx-ui-controls/src/javafx/scene/control/Tab.java	Thu Aug 16 16:36:07 2012 -0700
+++ b/javafx-ui-controls/src/javafx/scene/control/Tab.java	Mon Aug 20 17:02:57 2012 -0400
@@ -381,7 +381,7 @@
      * <p>Called when the tab becomes selected or unselected.</p>
      */
     public static final EventType<Event> SELECTION_CHANGED_EVENT = 
-            EventTypeUtil.registerInternalEventType(Event.ANY, "SELECTION_CHANGED_EVENT");
+            new EventType<Event> (Event.ANY, "SELECTION_CHANGED_EVENT");
     private ObjectProperty<EventHandler<Event>> onSelectionChanged;
 
     /**
@@ -427,7 +427,7 @@
     /**
      * <p>Called when a user closes this tab. This is useful for freeing up memory.</p>
      */
-    public static final EventType<Event> CLOSED_EVENT = EventTypeUtil.registerInternalEventType(Event.ANY, "TAB_CLOSED");
+    public static final EventType<Event> CLOSED_EVENT = new EventType<Event> (Event.ANY, "TAB_CLOSED");
     private ObjectProperty<EventHandler<Event>> onClosed;
 
     /**
--- a/javafx-ui-controls/src/javafx/scene/control/TableColumn.java	Thu Aug 16 16:36:07 2012 -0700
+++ b/javafx-ui-controls/src/javafx/scene/control/TableColumn.java	Mon Aug 20 17:02:57 2012 -0400
@@ -170,7 +170,7 @@
         return (EventType<CellEditEvent<S,T>>) EDIT_ANY_EVENT;
     }
     private static final EventType<?> EDIT_ANY_EVENT =
-            EventTypeUtil.registerInternalEventType(Event.ANY, "TABLE_COLUMN_EDIT");
+            new EventType(Event.ANY, "TABLE_COLUMN_EDIT");
 
     /**
      * Indicates that the user has performed some interaction to start an edit
@@ -182,7 +182,7 @@
         return (EventType<CellEditEvent<S,T>>) EDIT_START_EVENT;
     }
     private static final EventType<?> EDIT_START_EVENT =
-            EventTypeUtil.registerInternalEventType(editAnyEvent(), "EDIT_START");
+            new EventType(editAnyEvent(), "EDIT_START");
 
     /**
      * Indicates that the editing has been canceled, meaning that no change should
@@ -193,7 +193,7 @@
         return (EventType<CellEditEvent<S,T>>) EDIT_CANCEL_EVENT;
     }
     private static final EventType<?> EDIT_CANCEL_EVENT =
-            EventTypeUtil.registerInternalEventType(editAnyEvent(), "EDIT_CANCEL");
+            new EventType(editAnyEvent(), "EDIT_CANCEL");
 
     /**
      * Indicates that the editing has been committed by the user, meaning that
@@ -205,7 +205,7 @@
         return (EventType<CellEditEvent<S,T>>) EDIT_COMMIT_EVENT;
     }
     private static final EventType<?> EDIT_COMMIT_EVENT =
-            EventTypeUtil.registerInternalEventType(editAnyEvent(), "EDIT_COMMIT");
+            new EventType(editAnyEvent(), "EDIT_COMMIT");
     
     
     
--- a/javafx-ui-controls/src/javafx/scene/control/TreeItem.java	Thu Aug 16 16:36:07 2012 -0700
+++ b/javafx-ui-controls/src/javafx/scene/control/TreeItem.java	Mon Aug 20 17:02:57 2012 -0400
@@ -221,7 +221,7 @@
         return (EventType<TreeModificationEvent<T>>) TREE_NOTIFICATION_EVENT;
     }
     private static final EventType TREE_NOTIFICATION_EVENT
-            = EventTypeUtil.registerInternalEventType(Event.ANY, "TreeNotificationEvent");
+            = new EventType(Event.ANY, "TreeNotificationEvent");
 
     /**
      * The general EventType used when the TreeItem receives a modification that
@@ -238,7 +238,7 @@
         return (EventType<TreeModificationEvent<T>>) TREE_ITEM_COUNT_CHANGE_EVENT;
     }
     private static final EventType TREE_ITEM_COUNT_CHANGE_EVENT
-            = EventTypeUtil.registerInternalEventType(treeNotificationEvent(), "TreeItemCountChangeEvent");
+            = new EventType(treeNotificationEvent(), "TreeItemCountChangeEvent");
 
     /**
      * An EventType used when the TreeItem receives a modification to its
@@ -251,7 +251,7 @@
         return (EventType<TreeModificationEvent<T>>) BRANCH_EXPANDED_EVENT;
     }
     private static final EventType<?> BRANCH_EXPANDED_EVENT
-            = EventTypeUtil.registerInternalEventType(treeItemCountChangeEvent(), "BranchExpandedEvent");
+            = new EventType(treeItemCountChangeEvent(), "BranchExpandedEvent");
 
     /**
      * An EventType used when the TreeItem receives a modification to its
@@ -264,7 +264,7 @@
         return (EventType<TreeModificationEvent<T>>) BRANCH_COLLAPSED_EVENT;
     }
     private static final EventType<?> BRANCH_COLLAPSED_EVENT
-            = EventTypeUtil.registerInternalEventType(treeItemCountChangeEvent(), "BranchCollapsedEvent");
+            = new EventType(treeItemCountChangeEvent(), "BranchCollapsedEvent");
 
     /**
      * An EventType used when the TreeItem receives a direct modification to its
@@ -277,7 +277,7 @@
         return (EventType<TreeModificationEvent<T>>) CHILDREN_MODIFICATION_EVENT;
     }
     private static final EventType<?> CHILDREN_MODIFICATION_EVENT
-            = EventTypeUtil.registerInternalEventType(treeItemCountChangeEvent(), "ChildrenModificationEvent");
+            = new EventType(treeItemCountChangeEvent(), "ChildrenModificationEvent");
 
     /**
      * An EventType used when the TreeItem receives a modification to its
@@ -290,7 +290,7 @@
         return (EventType<TreeModificationEvent<T>>) VALUE_CHANGED_EVENT;
     }
     private static final EventType<?> VALUE_CHANGED_EVENT
-            = EventTypeUtil.registerInternalEventType(treeNotificationEvent(), "ValueChangedEvent");
+            = new EventType(treeNotificationEvent(), "ValueChangedEvent");
 
     /**
      * An EventType used when the TreeItem receives a modification to its
@@ -303,7 +303,7 @@
         return (EventType<TreeModificationEvent<T>>) GRAPHIC_CHANGED_EVENT;
     }
     private static final EventType<?> GRAPHIC_CHANGED_EVENT
-            = EventTypeUtil.registerInternalEventType(treeNotificationEvent(), "GraphicChangedEvent");
+            = new EventType(treeNotificationEvent(), "GraphicChangedEvent");
     
     
 
--- a/javafx-ui-controls/src/javafx/scene/control/TreeView.java	Thu Aug 16 16:36:07 2012 -0700
+++ b/javafx-ui-controls/src/javafx/scene/control/TreeView.java	Mon Aug 20 17:02:57 2012 -0400
@@ -136,7 +136,7 @@
         return (EventType<EditEvent<T>>) EDIT_ANY_EVENT;
     }
     private static final EventType<?> EDIT_ANY_EVENT =
-            EventTypeUtil.registerInternalEventType(Event.ANY, "TREE_VIEW_EDIT");
+            new EventType(Event.ANY, "TREE_VIEW_EDIT");
 
     /**
      * An EventType used to indicate that an edit event has started within the
@@ -149,7 +149,7 @@
         return (EventType<EditEvent<T>>) EDIT_START_EVENT;
     }
     private static final EventType<?> EDIT_START_EVENT =
-            EventTypeUtil.registerInternalEventType(editAnyEvent(), "EDIT_START");
+            new EventType(editAnyEvent(), "EDIT_START");
 
     /**
      * An EventType used to indicate that an edit event has just been canceled
@@ -163,7 +163,7 @@
         return (EventType<EditEvent<T>>) EDIT_CANCEL_EVENT;
     }
     private static final EventType<?> EDIT_CANCEL_EVENT =
-            EventTypeUtil.registerInternalEventType(editAnyEvent(), "EDIT_CANCEL");
+            new EventType(editAnyEvent(), "EDIT_CANCEL");
 
     /**
      * An EventType that is used to indicate that an edit in a TreeView has been
@@ -178,7 +178,7 @@
         return (EventType<EditEvent<T>>) EDIT_COMMIT_EVENT;
     }
     private static final EventType<?> EDIT_COMMIT_EVENT =
-            EventTypeUtil.registerInternalEventType(editAnyEvent(), "EDIT_COMMIT");
+            new EventType(editAnyEvent(), "EDIT_COMMIT");
     
     /**
      * Returns the number of levels of 'indentation' of the given TreeItem,