Hi, A long time ago Graydon replaced all usage of the EventQueue through the GtkGenericPeer field q, where replaced by explicit method calls to get the current queue. But the old infrastructure was still in place. This removes that and replaces the last remaining usage of q with q() in GtkComponentPeer.
2006-02-12 Mark Wielaard <[EMAIL PROTECTED]>
* gnu/java/awt/peer/gtk/GtkComponentPeer.java (postKeyEvent): Call
q() to get EventQueue.
* gnu/java/awt/peer/gtk/GtkGenericPeer.java (q): Remove static field.
(enableQueue): Remove static method.
* gnu/java/awt/peer/gtk/GtkToolkit.java (getSystemEventQueueImpl):
Don't call GtkGenericPeer.enableQueue().
Committed,
Mark
? gnu/java/awt/peer/gtk/GtkPopupMenuPeer.java.menu
Index: gnu/java/awt/peer/gtk/GtkComponentPeer.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/awt/peer/gtk/GtkComponentPeer.java,v
retrieving revision 1.102
diff -u -r1.102 GtkComponentPeer.java
--- gnu/java/awt/peer/gtk/GtkComponentPeer.java 11 Feb 2006 20:45:16 -0000 1.102
+++ gnu/java/awt/peer/gtk/GtkComponentPeer.java 12 Feb 2006 11:37:04 -0000
@@ -47,6 +47,7 @@
import java.awt.Container;
import java.awt.Cursor;
import java.awt.Dimension;
+import java.awt.EventQueue;
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.Graphics;
@@ -587,6 +588,8 @@
KeyEvent keyEvent = new KeyEvent (awtComponent, id, when, mods,
keyCode, keyChar, keyLocation);
+ EventQueue q = q();
+
// Also post a KEY_TYPED event if keyEvent is a key press that
// doesn't represent an action or modifier key.
if (keyEvent.getID () == KeyEvent.KEY_PRESSED
@@ -595,15 +598,17 @@
&& keyCode != KeyEvent.VK_CONTROL
&& keyCode != KeyEvent.VK_ALT))
{
- synchronized (q)
- {
- q().postEvent (keyEvent);
- q().postEvent (new KeyEvent (awtComponent, KeyEvent.KEY_TYPED, when, mods,
- KeyEvent.VK_UNDEFINED, keyChar, keyLocation));
+ synchronized(q)
+ {
+ q.postEvent(keyEvent);
+ keyEvent = new KeyEvent(awtComponent, KeyEvent.KEY_TYPED, when,
+ mods, KeyEvent.VK_UNDEFINED, keyChar,
+ keyLocation);
+ q.postEvent(keyEvent);
}
}
else
- q().postEvent (keyEvent);
+ q.postEvent(keyEvent);
}
protected void postFocusEvent (int id, boolean temporary)
Index: gnu/java/awt/peer/gtk/GtkGenericPeer.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/awt/peer/gtk/GtkGenericPeer.java,v
retrieving revision 1.17
diff -u -r1.17 GtkGenericPeer.java
--- gnu/java/awt/peer/gtk/GtkGenericPeer.java 14 Jul 2005 22:07:02 -0000 1.17
+++ gnu/java/awt/peer/gtk/GtkGenericPeer.java 12 Feb 2006 11:37:04 -0000
@@ -52,9 +52,6 @@
// The widget or other java-side object we wrap.
protected Object awtWidget;
- // Global event queue.
- protected static EventQueue q = null;
-
// Dispose of our native state.
public native void dispose ();
@@ -68,12 +65,6 @@
this.awtWidget = awtWidget;
}
- public static void enableQueue (EventQueue sq)
- {
- if (q == null)
- q = sq;
- }
-
protected void postActionEvent (String command, int mods)
{
q().postEvent (new ActionEvent (awtWidget, ActionEvent.ACTION_PERFORMED,
Index: gnu/java/awt/peer/gtk/GtkToolkit.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java,v
retrieving revision 1.79
diff -u -r1.79 GtkToolkit.java
--- gnu/java/awt/peer/gtk/GtkToolkit.java 2 Sep 2005 09:15:22 -0000 1.79
+++ gnu/java/awt/peer/gtk/GtkToolkit.java 12 Feb 2006 11:37:04 -0000
@@ -608,7 +608,6 @@
if (q == null)
{
q = new EventQueue();
- GtkGenericPeer.enableQueue (q);
}
}
return q;
signature.asc
Description: This is a digitally signed message part
