Moved event classed from com.jogamp.newt to com.jogamp.newt.event

11 files changed, 43 insertions, 35 deletions

diff --git a/src/newt/classes/com/jogamp/newt/Event.java b/src/newt/classes/com/jogamp/newt/event/Event.java
index d42a95735..d42a95735 100644
--- a/src/newt/classes/com/jogamp/newt/Event.java
+++ b/src/newt/classes/com/jogamp/newt/event/Event.java
diff --git a/src/newt/classes/com/jogamp/newt/EventListener.java b/src/newt/classes/com/jogamp/newt/event/EventListener.java
index 75cb487dd..e47b9ccb3 100644
--- a/src/newt/classes/com/jogamp/newt/EventListener.java
+++ b/src/newt/classes/com/jogamp/newt/event/EventListener.java
@@ -31,9 +31,11 @@
  * 
  */
 
-package com.jogamp.newt;
+package com.jogamp.newt.event;
 
-public interface EventListener
+import com.jogamp.newt.*;
+
+public interface EventListener extends java.util.EventListener
 {
     public static final int WINDOW  = 1 << 0;
     public static final int MOUSE   = 1 << 1;
diff --git a/src/newt/classes/com/jogamp/newt/InputEvent.java b/src/newt/classes/com/jogamp/newt/event/InputEvent.java
index d4c3f6905..01a4b307a 100644
--- a/src/newt/classes/com/jogamp/newt/InputEvent.java
+++ b/src/newt/classes/com/jogamp/newt/event/InputEvent.java
@@ -31,7 +31,9 @@
  * 
  */
 
-package com.jogamp.newt;
+package com.jogamp.newt.event;
+
+import com.jogamp.newt.*;
 
 public abstract class InputEvent extends Event
 {
@@ -44,8 +46,8 @@ public abstract class InputEvent extends Event
  public static final int  BUTTON2_MASK   = 1 << 7;
  public static final int  BUTTON3_MASK   = 1 << 8;
 
- protected InputEvent(boolean sysEvent, int eventType, Window source, long when, int modifiers) {
-    super(sysEvent, eventType, source, when);
+ protected InputEvent(int eventType, Object source, long when, int modifiers) {
+    super(eventType, source, when);
     this.consumed=false;
     this.modifiers=modifiers;
  }
diff --git a/src/newt/classes/com/jogamp/newt/KeyEvent.java b/src/newt/classes/com/jogamp/newt/event/KeyEvent.java
index bec77160b..f5ade47d8 100644
--- a/src/newt/classes/com/jogamp/newt/KeyEvent.java
+++ b/src/newt/classes/com/jogamp/newt/event/KeyEvent.java
@@ -31,18 +31,17 @@
  * 
  */
 
-package com.jogamp.newt;
+package com.jogamp.newt.event;
+
+import com.jogamp.newt.*;
 
 public class KeyEvent extends InputEvent
 {
- KeyEvent(boolean sysEvent, int eventType, Window source, long when, int modifiers, int keyCode, char keyChar) {
-     super(sysEvent, eventType, source, when, modifiers); 
+ public KeyEvent(int eventType, Object source, long when, int modifiers, int keyCode, char keyChar) {
+     super(eventType, source, when, modifiers); 
      this.keyCode=keyCode;
      this.keyChar=keyChar;
  }
- public KeyEvent(int eventType, Window source, long when, int modifiers, int keyCode, char keyChar) {
-     this(false, eventType, source, when, modifiers, keyCode, keyChar);
- }
 
  public char getKeyChar() {
     return keyChar;
diff --git a/src/newt/classes/com/jogamp/newt/KeyListener.java b/src/newt/classes/com/jogamp/newt/event/KeyListener.java
index 28e2b833b..925a902f7 100644
--- a/src/newt/classes/com/jogamp/newt/KeyListener.java
+++ b/src/newt/classes/com/jogamp/newt/event/KeyListener.java
@@ -31,7 +31,9 @@
  * 
  */
 
-package com.jogamp.newt;
+package com.jogamp.newt.event;
+
+import com.jogamp.newt.*;
 
 public interface KeyListener extends EventListener
 {
diff --git a/src/newt/classes/com/jogamp/newt/MouseEvent.java b/src/newt/classes/com/jogamp/newt/event/MouseEvent.java
index d5412c0cc..662b81c9e 100644
--- a/src/newt/classes/com/jogamp/newt/MouseEvent.java
+++ b/src/newt/classes/com/jogamp/newt/event/MouseEvent.java
@@ -31,7 +31,9 @@
  * 
  */
 
-package com.jogamp.newt;
+package com.jogamp.newt.event;
+
+import com.jogamp.newt.*;
 
 public class MouseEvent extends InputEvent
 {
@@ -43,22 +45,17 @@ public class MouseEvent extends InputEvent
   public static final int BUTTON6 = 6;
   public static final int BUTTON_NUMBER = 6;
 
- protected MouseEvent(boolean sysEvent, int eventType, Window source, long when,
-                      int modifiers, int x, int y, int clickCount, int button,
-                      int rotation)
+ public MouseEvent(int eventType, Object source, long when,
+                   int modifiers, int x, int y, int clickCount, int button,
+                   int rotation)
  {
-     super(sysEvent, eventType, source, when, modifiers); 
+     super(eventType, source, when, modifiers); 
      this.x=x;
      this.y=y;
      this.clickCount=clickCount;
      this.button=button;
      this.wheelRotation = rotation;
  }
- public MouseEvent(int eventType, Window source, long when, int modifiers,
-                   int x, int y, int clickCount, int button, int rotation) {
-     this(false, eventType, source, when, modifiers, x, y, clickCount, button,
-          rotation);
- }
 
  public int getButton() {
     return button;
diff --git a/src/newt/classes/com/jogamp/newt/MouseListener.java b/src/newt/classes/com/jogamp/newt/event/MouseListener.java
index 6d931dd31..3d5b4d83f 100644
--- a/src/newt/classes/com/jogamp/newt/MouseListener.java
+++ b/src/newt/classes/com/jogamp/newt/event/MouseListener.java
@@ -31,7 +31,9 @@
  * 
  */
 
-package com.jogamp.newt;
+package com.jogamp.newt.event;
+
+import com.jogamp.newt.*;
 
 public interface MouseListener extends EventListener
 {
diff --git a/src/newt/classes/com/jogamp/newt/PaintEvent.java b/src/newt/classes/com/jogamp/newt/event/PaintEvent.java
index 51c43725a..469358625 100755
--- a/src/newt/classes/com/jogamp/newt/PaintEvent.java
+++ b/src/newt/classes/com/jogamp/newt/event/PaintEvent.java
@@ -31,7 +31,9 @@
  *
  */
 
-package com.jogamp.newt;
+package com.jogamp.newt.event;
+
+import com.jogamp.newt.*;
 
 /**
  *
@@ -41,10 +43,10 @@ public class PaintEvent extends Event {
 
     // bounds of the damage region
     private int x, y, width, height;
-    public PaintEvent(int eventType, Window source,
+    public PaintEvent(int eventType, Object source,
                        long when, int x, int y, int w, int h)
     {
-        super(true, eventType, source, when);
+        super(eventType, source, when);
         this.x = x;
         this.y = y;
         this.width = w;
diff --git a/src/newt/classes/com/jogamp/newt/PaintListener.java b/src/newt/classes/com/jogamp/newt/event/PaintListener.java
index 6fbc9c8fc..f64ae0069 100755
--- a/src/newt/classes/com/jogamp/newt/PaintListener.java
+++ b/src/newt/classes/com/jogamp/newt/event/PaintListener.java
@@ -31,7 +31,9 @@
  *
  */
 
-package com.jogamp.newt;
+package com.jogamp.newt.event;
+
+import com.jogamp.newt.*;
 
 /**
  *
diff --git a/src/newt/classes/com/jogamp/newt/WindowEvent.java b/src/newt/classes/com/jogamp/newt/event/WindowEvent.java
index 1189401af..8204bfc79 100644
--- a/src/newt/classes/com/jogamp/newt/WindowEvent.java
+++ b/src/newt/classes/com/jogamp/newt/event/WindowEvent.java
@@ -31,7 +31,9 @@
  * 
  */
 
-package com.jogamp.newt;
+package com.jogamp.newt.event;
+
+import com.jogamp.newt.*;
 
 public class WindowEvent extends Event {
     public static final int EVENT_WINDOW_RESIZED = 100;
@@ -41,12 +43,8 @@ public class WindowEvent extends Event {
     public static final int EVENT_WINDOW_LOST_FOCUS = 104;
     // public static final int EVENT_WINDOW_REPAINT = 105; // TODO
 
-    public WindowEvent(int eventType, Window source, long when) {
-        this(false, eventType, source, when);
-    }
-
-    WindowEvent(boolean isSystemEvent, int eventType, Window source, long when) {
-        super(isSystemEvent, eventType, source, when);
+    public WindowEvent(int eventType, Object source, long when) {
+        super(eventType, source, when);
     }
 
     public static String getEventTypeString(int type) {
diff --git a/src/newt/classes/com/jogamp/newt/WindowListener.java b/src/newt/classes/com/jogamp/newt/event/WindowListener.java
index 0ec63435c..8c7601a8d 100644
--- a/src/newt/classes/com/jogamp/newt/WindowListener.java
+++ b/src/newt/classes/com/jogamp/newt/event/WindowListener.java
@@ -31,7 +31,9 @@
  * 
  */
 
-package com.jogamp.newt;
+package com.jogamp.newt.event;
+
+import com.jogamp.newt.*;
 
 public interface WindowListener extends EventListener {
     public void windowResized(WindowEvent e);