This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[gui][PATCH] Remove focus debugging messages
- From: Thomas Fitzsimmons <fitzsim at redhat dot com>
- To: java-patches at gcc dot gnu dot org
- Date: Thu, 22 Apr 2004 16:28:42 -0400
- Subject: [gui][PATCH] Remove focus debugging messages
Hi,
I committed this patch to java-gui-branch, to remove all the focus
debugging messages I left in the original commit.
Tom
2004-04-22 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/java/awt/peer/gtk/GtkComponentPeer.java: Remove
focus-related debugging messages.
* java/awt/DefaultKeyboardFocusManager.java: Likewise.
* java/awt/EventDispatchThread.java: Likewise.
* java/awt/KeyboardFocusManager.java: Likewise.
* java/awt/Window.java: Likewise.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c: Likewise.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c: Likewise.
Index: gnu/java/awt/peer/gtk/GtkComponentPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java,v
retrieving revision 1.16.2.4
diff -u -r1.16.2.4 GtkComponentPeer.java
--- gnu/java/awt/peer/gtk/GtkComponentPeer.java 22 Apr 2004 17:47:36 -0000 1.16.2.4
+++ gnu/java/awt/peer/gtk/GtkComponentPeer.java 22 Apr 2004 19:39:54 -0000
@@ -353,7 +353,6 @@
public void requestFocus ()
{
- System.out.println ("In GtkComponentPeer.requestFocus");
gtkWidgetRequestFocus ();
postFocusEvent (FocusEvent.FOCUS_GAINED, false);
}
@@ -482,7 +481,6 @@
protected void postFocusEvent (int id, boolean temporary)
{
- System.out.println ("GtkComponentPeer.postFocusEvent: " + awtComponent);
q.postEvent (new FocusEvent (awtComponent, id, temporary));
}
Index: java/awt/DefaultKeyboardFocusManager.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/DefaultKeyboardFocusManager.java,v
retrieving revision 1.1.54.1
diff -u -r1.1.54.1 DefaultKeyboardFocusManager.java
--- java/awt/DefaultKeyboardFocusManager.java 22 Apr 2004 17:47:38 -0000 1.1.54.1
+++ java/awt/DefaultKeyboardFocusManager.java 22 Apr 2004 19:39:54 -0000
@@ -167,10 +167,7 @@
if (((FocusEvent) e).isTemporary ())
setGlobalFocusOwner (target);
else
- {
- System.out.println ("SETTING FOCUS TO: " + target);
- setGlobalPermanentFocusOwner (target);
- }
+ setGlobalPermanentFocusOwner (target);
}
target.dispatchEvent (e);
@@ -228,8 +225,6 @@
public boolean dispatchKeyEvent (KeyEvent e)
{
- // System.out.println ("DefaultKeyboardFocusManager.dispatchKeyEvent: " + e);
-
Component focusOwner = getGlobalPermanentFocusOwner ();
focusOwner.dispatchEvent (e);
@@ -258,8 +253,6 @@
public boolean postProcessKeyEvent (KeyEvent e)
{
- // System.out.println ("DefaultKeyboardFocusManager.postProcessKeyEvent: " + e);
-
// Check if this event represents a menu shortcut.
// MenuShortcuts are activated by Ctrl- KeyEvents.
@@ -319,8 +312,6 @@
public void processKeyEvent (Component comp, KeyEvent e)
{
- // System.out.println ("DefaultKeyboardFocusManager.processKeyEvent: " + e);
-
AWTKeyStroke keystroke = AWTKeyStroke.getAWTKeyStrokeForEvent (e);
Set forwardKeystrokes = comp.getFocusTraversalKeys (KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS);
@@ -355,15 +346,11 @@
protected void enqueueKeyEvents (long after, Component untilFocused)
{
- System.out.println ("DefaultKeyboardFocusManager.enqueueKeyEvents: " + untilFocused);
-
delayRequests.add (new EventDelayRequest (after, untilFocused));
}
protected void dequeueKeyEvents (long after, Component untilFocused)
{
- System.out.println ("DefaultKeyboardFocusManager.dequeueKeyEvents: " + untilFocused);
-
// FIXME: need synchronization on delayRequests and enqueuedKeyEvents.
// Remove the KeyEvent with the oldest timestamp, which should be
@@ -388,8 +375,6 @@
protected void discardKeyEvents (Component comp)
{
- System.out.println ("DefaultKeyboardFocusManager.discardKeyEvents: " + comp);
-
// FIXME: need synchronization on delayRequests and enqueuedKeyEvents.
Iterator i = delayRequests.iterator ();
@@ -407,8 +392,6 @@
public void focusPreviousComponent (Component comp)
{
- System.out.println ("DefaultKeyboardFocusManager.focusPreviousComponent: " + comp);
-
Component focusComp = (comp == null) ? getGlobalFocusOwner () : comp;
Container focusCycleRoot = focusComp.getFocusCycleRootAncestor ();
FocusTraversalPolicy policy = focusCycleRoot.getFocusTraversalPolicy ();
@@ -419,22 +402,16 @@
public void focusNextComponent (Component comp)
{
- System.out.println ("DefaultKeyboardFocusManager.focusNextComponent: " + comp);
-
Component focusComp = (comp == null) ? getGlobalFocusOwner () : comp;
Container focusCycleRoot = focusComp.getFocusCycleRootAncestor ();
FocusTraversalPolicy policy = focusCycleRoot.getFocusTraversalPolicy ();
Component next = policy.getComponentAfter (focusCycleRoot, focusComp);
- System.out.println ("Got next component: " + next);
- System.out.println ("Got focus comp: " + focusComp);
next.requestFocus ();
}
public void upFocusCycle (Component comp)
{
- System.out.println ("DefaultKeyboardFocusManager.upFocusCycle: " + comp);
-
Component focusComp = (comp == null) ? getGlobalFocusOwner () : comp;
Container focusCycleRoot = focusComp.getFocusCycleRootAncestor ();
@@ -455,8 +432,6 @@
public void downFocusCycle (Container cont)
{
- System.out.println ("DefaultKeyboardFocusManager.downFocusCycle: " + cont);
-
if (cont == null)
return;
Index: java/awt/EventDispatchThread.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/EventDispatchThread.java,v
retrieving revision 1.5.6.1
diff -u -r1.5.6.1 EventDispatchThread.java
--- java/awt/EventDispatchThread.java 22 Apr 2004 17:47:38 -0000 1.5.6.1
+++ java/awt/EventDispatchThread.java 22 Apr 2004 19:39:54 -0000
@@ -80,13 +80,7 @@
// returning true. Otherwise, it returns false and we
// dispatch the event normally.
if (!manager.dispatchEvent (evt))
- {
- queue.dispatchEvent(evt);
- }
- else
- {
- // System.out.println ("Dispatched " + evt + " to DefaultKeyboardFocusManager");
- }
+ queue.dispatchEvent(evt);
}
catch (InterruptedException ie)
{
Index: java/awt/KeyboardFocusManager.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/KeyboardFocusManager.java,v
retrieving revision 1.2.24.1
diff -u -r1.2.24.1 KeyboardFocusManager.java
--- java/awt/KeyboardFocusManager.java 22 Apr 2004 17:47:38 -0000 1.2.24.1
+++ java/awt/KeyboardFocusManager.java 22 Apr 2004 19:39:54 -0000
@@ -366,7 +366,6 @@
*/
protected void setGlobalPermanentFocusOwner (Component focusOwner)
{
- System.out.println ("in setGlobalFocusOwner: " + focusOwner);
if (focusOwner == null || focusOwner.focusable)
setGlobalObject (currentPermanentFocusOwners, focusOwner,
"permanentFocusOwner");
Index: java/awt/Window.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Window.java,v
retrieving revision 1.32.12.3
diff -u -r1.32.12.3 Window.java
--- java/awt/Window.java 22 Apr 2004 17:47:38 -0000 1.32.12.3
+++ java/awt/Window.java 22 Apr 2004 19:39:56 -0000
@@ -262,7 +262,6 @@
if (initialFocusOwner != null)
initialFocusOwner.requestFocusInWindow (false);
- System.out.println ("GOT INITIAL FOCUS OWNER: " + initialFocusOwner);
shown = true;
}
}
Index: jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
===================================================================
RCS file: /cvs/gcc/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c,v
retrieving revision 1.15.2.5
diff -u -r1.15.2.5 gnu_java_awt_peer_gtk_GtkComponentPeer.c
--- jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c 22 Apr 2004 18:03:17 -0000 1.15.2.5
+++ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c 22 Apr 2004 19:39:57 -0000
@@ -192,7 +192,6 @@
gdk_threads_enter ();
- g_printerr ("sending event\n");
gtk_main_do_event (event);
gdk_threads_leave ();
@@ -881,7 +880,6 @@
GdkEventFocus *event,
jobject peer)
{
- g_printerr (" focus in: %p\n", peer);
(*gdk_env)->CallVoidMethod (gdk_env, peer,
postFocusEventID,
AWT_FOCUS_GAINED,
@@ -893,7 +891,6 @@
GdkEventFocus *event,
jobject peer)
{
- g_printerr (" focus out: %p\n", peer);
(*gdk_env)->CallVoidMethod (gdk_env, peer,
postFocusEventID,
AWT_FOCUS_LOST,
Index: jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c
===================================================================
RCS file: /cvs/gcc/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c,v
retrieving revision 1.19.2.3
diff -u -r1.19.2.3 gnu_java_awt_peer_gtk_GtkEvents.c
--- jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c 22 Apr 2004 18:03:17 -0000 1.19.2.3
+++ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c 22 Apr 2004 19:39:57 -0000
@@ -1066,8 +1066,6 @@
case GDK_KEY_PRESS:
if (GTK_IS_WINDOW (widget))
{
- g_print("got key event on widget %s\n", gtk_widget_get_name (widget));
-
(*gdk_env)->CallVoidMethod (gdk_env, peer,
postKeyEventID,
(jint) AWT_KEY_PRESSED,
@@ -1084,8 +1082,6 @@
case GDK_KEY_RELEASE:
if (GTK_IS_WINDOW (widget))
{
- g_print("got key event on widget %s\n", gtk_widget_get_name (widget));
-
(*gdk_env)->CallVoidMethod (gdk_env, peer,
postKeyEventID,
(jint) AWT_KEY_RELEASED,