From 1e3f2eb7468a0bda5edcfffcb0350041a397d7e4 Mon Sep 17 00:00:00 2001 From: Ethan Lee Date: Thu, 2 Feb 2012 16:14:11 -0500 Subject: [PATCH] More name conversions from Jake2 to LWJake2. --- src/lwjake2/LWJake2.java | 2 +- src/lwjake2/render/lwjgl/LWJGLBase.java | 2 +- src/lwjake2/sys/InputListener.java | 34 +++++++++---------- src/lwjake2/sys/JOGLKBD.java | 20 +++++------ ...InputEvent.java => LWJake2InputEvent.java} | 6 ++-- 5 files changed, 32 insertions(+), 32 deletions(-) rename src/lwjake2/sys/{Jake2InputEvent.java => LWJake2InputEvent.java} (92%) diff --git a/src/lwjake2/LWJake2.java b/src/lwjake2/LWJake2.java index bdda94c..ccfd471 100644 --- a/src/lwjake2/LWJake2.java +++ b/src/lwjake2/LWJake2.java @@ -70,7 +70,7 @@ public final class LWJake2 { // in C the first arg is the filename int argc = (args == null) ? 1 : args.length + 1; String[] c_args = new String[argc]; - c_args[0] = "Jake2"; + c_args[0] = "LWJake2"; if (argc > 1) { System.arraycopy(args, 0, c_args, 1, argc - 1); } diff --git a/src/lwjake2/render/lwjgl/LWJGLBase.java b/src/lwjake2/render/lwjgl/LWJGLBase.java index 247497f..f47658a 100644 --- a/src/lwjake2/render/lwjgl/LWJGLBase.java +++ b/src/lwjake2/render/lwjgl/LWJGLBase.java @@ -207,7 +207,7 @@ public abstract class LWJGLBase { // destroy the existing window GLimp_Shutdown(); - Display.setTitle("Jake2"); + Display.setTitle("LWJake2"); DisplayMode displayMode = findDisplayMode(newDim); newDim.width = displayMode.getWidth(); diff --git a/src/lwjake2/sys/InputListener.java b/src/lwjake2/sys/InputListener.java index 433b246..66d6724 100644 --- a/src/lwjake2/sys/InputListener.java +++ b/src/lwjake2/sys/InputListener.java @@ -37,36 +37,36 @@ public final class InputListener implements KeyListener, MouseListener, MouseMotionListener, ComponentListener, MouseWheelListener { // modifications of eventQueue must be thread safe! - private static LinkedList eventQueue = new LinkedList(); + private static LinkedList eventQueue = new LinkedList(); - static void addEvent(Jake2InputEvent ev) { + static void addEvent(LWJake2InputEvent ev) { synchronized (eventQueue) { eventQueue.addLast(ev); } } - static Jake2InputEvent nextEvent() { - Jake2InputEvent ev; + static LWJake2InputEvent nextEvent() { + LWJake2InputEvent ev; synchronized (eventQueue) { - ev = (!eventQueue.isEmpty())?(Jake2InputEvent)eventQueue.removeFirst():null; + ev = (!eventQueue.isEmpty())?(LWJake2InputEvent)eventQueue.removeFirst():null; } return ev; } public void keyPressed(KeyEvent e) { if (!((e.getModifiersEx() & InputEvent.ALT_GRAPH_DOWN_MASK) != 0)) { - addEvent(new Jake2InputEvent(Jake2InputEvent.KeyPress, e)); + addEvent(new LWJake2InputEvent(LWJake2InputEvent.KeyPress, e)); } } public void keyReleased(KeyEvent e) { - addEvent(new Jake2InputEvent(Jake2InputEvent.KeyRelease, e)); + addEvent(new LWJake2InputEvent(LWJake2InputEvent.KeyRelease, e)); } public void keyTyped(KeyEvent e) { if ((e.getModifiersEx() & InputEvent.ALT_GRAPH_DOWN_MASK) != 0) { - addEvent(new Jake2InputEvent(Jake2InputEvent.KeyPress, e)); - addEvent(new Jake2InputEvent(Jake2InputEvent.KeyRelease, e)); + addEvent(new LWJake2InputEvent(LWJake2InputEvent.KeyPress, e)); + addEvent(new LWJake2InputEvent(LWJake2InputEvent.KeyRelease, e)); } } @@ -80,39 +80,39 @@ public final class InputListener implements KeyListener, MouseListener, } public void mousePressed(MouseEvent e) { - addEvent(new Jake2InputEvent(Jake2InputEvent.ButtonPress, e)); + addEvent(new LWJake2InputEvent(LWJake2InputEvent.ButtonPress, e)); } public void mouseReleased(MouseEvent e) { - addEvent(new Jake2InputEvent(Jake2InputEvent.ButtonRelease, e)); + addEvent(new LWJake2InputEvent(LWJake2InputEvent.ButtonRelease, e)); } public void mouseDragged(MouseEvent e) { - addEvent(new Jake2InputEvent(Jake2InputEvent.MotionNotify, e)); + addEvent(new LWJake2InputEvent(LWJake2InputEvent.MotionNotify, e)); } public void mouseMoved(MouseEvent e) { - addEvent(new Jake2InputEvent(Jake2InputEvent.MotionNotify, e)); + addEvent(new LWJake2InputEvent(LWJake2InputEvent.MotionNotify, e)); } public void componentHidden(ComponentEvent e) { } public void componentMoved(ComponentEvent e) { - addEvent(new Jake2InputEvent(Jake2InputEvent.ConfigureNotify, e)); + addEvent(new LWJake2InputEvent(LWJake2InputEvent.ConfigureNotify, e)); } public void componentResized(ComponentEvent e) { - addEvent(new Jake2InputEvent(Jake2InputEvent.ConfigureNotify, e)); + addEvent(new LWJake2InputEvent(LWJake2InputEvent.ConfigureNotify, e)); } public void componentShown(ComponentEvent e) { JOGLKBD.c = e.getComponent(); - addEvent(new Jake2InputEvent(Jake2InputEvent.CreateNotify, e)); + addEvent(new LWJake2InputEvent(LWJake2InputEvent.CreateNotify, e)); } public void mouseWheelMoved(MouseWheelEvent e) { - addEvent(new Jake2InputEvent(Jake2InputEvent.WheelMoved, e)); + addEvent(new LWJake2InputEvent(LWJake2InputEvent.WheelMoved, e)); } } diff --git a/src/lwjake2/sys/JOGLKBD.java b/src/lwjake2/sys/JOGLKBD.java index 0ff40cb..0ffb916 100644 --- a/src/lwjake2/sys/JOGLKBD.java +++ b/src/lwjake2/sys/JOGLKBD.java @@ -67,15 +67,15 @@ final public class JOGLKBD extends KBD { int key; - Jake2InputEvent event; + LWJake2InputEvent event; while ( (event=InputListener.nextEvent()) != null ) { switch(event.type) { - case Jake2InputEvent.KeyPress: - case Jake2InputEvent.KeyRelease: - Do_Key_Event(XLateKey((KeyEvent)event.ev), event.type == Jake2InputEvent.KeyPress); + case LWJake2InputEvent.KeyPress: + case LWJake2InputEvent.KeyRelease: + Do_Key_Event(XLateKey((KeyEvent)event.ev), event.type == LWJake2InputEvent.KeyPress); break; - case Jake2InputEvent.MotionNotify: + case LWJake2InputEvent.MotionNotify: // if (IN.ignorefirst) { // IN.ignorefirst = false; // break; @@ -89,17 +89,17 @@ final public class JOGLKBD extends KBD } break; // see java.awt.MouseEvent - case Jake2InputEvent.ButtonPress: + case LWJake2InputEvent.ButtonPress: key = mouseEventToKey((MouseEvent)event.ev); Do_Key_Event(key, true); break; - case Jake2InputEvent.ButtonRelease: + case LWJake2InputEvent.ButtonRelease: key = mouseEventToKey((MouseEvent)event.ev); Do_Key_Event(key, false); break; - case Jake2InputEvent.WheelMoved: + case LWJake2InputEvent.WheelMoved: int dir = ((MouseWheelEvent)event.ev).getWheelRotation(); if (dir > 0) { Do_Key_Event(Key.K_MWHEELDOWN, true); @@ -110,8 +110,8 @@ final public class JOGLKBD extends KBD } break; - case Jake2InputEvent.CreateNotify : - case Jake2InputEvent.ConfigureNotify : + case LWJake2InputEvent.CreateNotify : + case LWJake2InputEvent.ConfigureNotify : Component c = ((ComponentEvent)event.ev).getComponent(); win_x = 0; win_y = 0; diff --git a/src/lwjake2/sys/Jake2InputEvent.java b/src/lwjake2/sys/LWJake2InputEvent.java similarity index 92% rename from src/lwjake2/sys/Jake2InputEvent.java rename to src/lwjake2/sys/LWJake2InputEvent.java index 53aa532..110f13e 100644 --- a/src/lwjake2/sys/Jake2InputEvent.java +++ b/src/lwjake2/sys/LWJake2InputEvent.java @@ -21,9 +21,9 @@ package lwjake2.sys; import java.awt.AWTEvent; /** - * Jake2InputEvent + * LWJake2InputEvent */ -class Jake2InputEvent { +class LWJake2InputEvent { static final int KeyPress = 0; static final int KeyRelease = 1; static final int MotionNotify = 2; @@ -35,7 +35,7 @@ class Jake2InputEvent { int type; AWTEvent ev; - Jake2InputEvent(int type, AWTEvent ev) { + LWJake2InputEvent(int type, AWTEvent ev) { this.type = type; this.ev = ev; }