From 7ae5fc44a1661f4bd800018ea8882fe62c884094 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Tue, 21 Mar 2023 10:05:20 +0100 Subject: NEWTEvent*.getEventTypeString(): Like MouseEvent, drop redundant leading type in returned string --- src/newt/classes/com/jogamp/newt/event/KeyEvent.java | 4 ++-- src/newt/classes/com/jogamp/newt/event/MonitorEvent.java | 4 ++-- src/newt/classes/com/jogamp/newt/event/WindowEvent.java | 14 +++++++------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/newt/classes/com/jogamp/newt/event/KeyEvent.java b/src/newt/classes/com/jogamp/newt/event/KeyEvent.java index 70e264685..9c3d15b87 100644 --- a/src/newt/classes/com/jogamp/newt/event/KeyEvent.java +++ b/src/newt/classes/com/jogamp/newt/event/KeyEvent.java @@ -213,8 +213,8 @@ public class KeyEvent extends InputEvent public static String getEventTypeString(final short type) { switch(type) { - case EVENT_KEY_PRESSED: return "EVENT_KEY_PRESSED"; - case EVENT_KEY_RELEASED: return "EVENT_KEY_RELEASED"; + case EVENT_KEY_PRESSED: return "PRESSED"; + case EVENT_KEY_RELEASED: return "RELEASED"; default: return "unknown (" + type + ")"; } } diff --git a/src/newt/classes/com/jogamp/newt/event/MonitorEvent.java b/src/newt/classes/com/jogamp/newt/event/MonitorEvent.java index 2e42f3392..ffe8ac658 100644 --- a/src/newt/classes/com/jogamp/newt/event/MonitorEvent.java +++ b/src/newt/classes/com/jogamp/newt/event/MonitorEvent.java @@ -50,8 +50,8 @@ public class MonitorEvent extends OutputEvent { public static String getEventTypeString(final short type) { switch(type) { - case EVENT_MONITOR_MODE_CHANGE_NOTIFY: return "EVENT_MONITOR_MODE_CHANGE_NOTIFY"; - case EVENT_MONITOR_MODE_CHANGED: return "EVENT_MONITOR_MODE_CHANGED"; + case EVENT_MONITOR_MODE_CHANGE_NOTIFY: return "MODE_CHANGE_NOTIFY"; + case EVENT_MONITOR_MODE_CHANGED: return "MODE_CHANGED"; default: return "unknown (" + type + ")"; } } diff --git a/src/newt/classes/com/jogamp/newt/event/WindowEvent.java b/src/newt/classes/com/jogamp/newt/event/WindowEvent.java index 021bd6cae..012c46a6e 100644 --- a/src/newt/classes/com/jogamp/newt/event/WindowEvent.java +++ b/src/newt/classes/com/jogamp/newt/event/WindowEvent.java @@ -55,13 +55,13 @@ public class WindowEvent extends NEWTEvent { public static String getEventTypeString(final short type) { switch(type) { - case EVENT_WINDOW_RESIZED: return "WINDOW_RESIZED"; - case EVENT_WINDOW_MOVED: return "WINDOW_MOVED"; - case EVENT_WINDOW_DESTROY_NOTIFY: return "EVENT_WINDOW_DESTROY_NOTIFY"; - case EVENT_WINDOW_GAINED_FOCUS: return "EVENT_WINDOW_GAINED_FOCUS"; - case EVENT_WINDOW_LOST_FOCUS: return "EVENT_WINDOW_LOST_FOCUS"; - case EVENT_WINDOW_REPAINT: return "EVENT_WINDOW_REPAINT"; - case EVENT_WINDOW_DESTROYED: return "EVENT_WINDOW_DESTROYED"; + case EVENT_WINDOW_RESIZED: return "RESIZED"; + case EVENT_WINDOW_MOVED: return "MOVED"; + case EVENT_WINDOW_DESTROY_NOTIFY: return "DESTROY_NOTIFY"; + case EVENT_WINDOW_GAINED_FOCUS: return "GAINED_FOCUS"; + case EVENT_WINDOW_LOST_FOCUS: return "LOST_FOCUS"; + case EVENT_WINDOW_REPAINT: return "REPAINT"; + case EVENT_WINDOW_DESTROYED: return "DESTROYED"; default: return "unknown (" + type + ")"; } } -- cgit v1.2.3