[cp-patches] FYI: Warning fixes for qt4 peers and gnu CORBA

[Mark Wielaard]

Hi,

While testing the qt4 peers against the lastest qt4.0.1 packages in
Debian unstable (they compile and work out of the box with
--enable-qt-peer and -Dawt.toolkit=gnu.java.awt.peer.qt.QtToolkit) I
noticed a lot of warnings being produced when --with-jikes was given.
To make the out of the box experience for out jikes lovers much nicer I
cleaned most of them up.

2005-09-04  Mark Wielaard  <address@hidden>

    * gnu/CORBA/Interceptor/Registrator.java (m_prefix): Mark static.
    * gnu/java/awt/peer/qt/QtButtonPeer.java: Replace uses of
    toolkit.eventQueue.postEvent() with QtToolkit.eventQueue.postEvent().
    * gnu/java/awt/peer/qt/QtCheckboxPeer.java: Likewise.
    * gnu/java/awt/peer/qt/QtChoicePeer.java: Likewise.
    * gnu/java/awt/peer/qt/QtComponentPeer.java: Likewise and similar
    for guiThread and graphicsEnv.
    * gnu/java/awt/peer/qt/QtListPeer.java: Likewise.
    * gnu/java/awt/peer/qt/QtMenuItemPeer.java: Likewise.
    * gnu/java/awt/peer/qt/QtMenuPeer.java: Likewise.
    * gnu/java/awt/peer/qt/QtScrollbarPeer.java: Likewise.
    * gnu/java/awt/peer/qt/QtTextAreaPeer.java: Likewise.
    * gnu/java/awt/peer/qt/QtTextFieldPeer.java: Likewise.

Committed,

Mark

Index: gnu/CORBA/Interceptor/Registrator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/CORBA/Interceptor/Registrator.java,v
retrieving revision 1.1
diff -u -r1.1 Registrator.java
--- gnu/CORBA/Interceptor/Registrator.java      28 Aug 2005 11:23:37 -0000      
1.1
+++ gnu/CORBA/Interceptor/Registrator.java      4 Sep 2005 15:19:26 -0000
@@ -87,7 +87,7 @@
   /**
    * The agreed properties prefix.
    */
-  public final String m_prefix =
+  public final static String m_prefix =
     "org.omg.PortableInterceptor.ORBInitializerClass.";
 
   /**
@@ -467,4 +467,4 @@
   {
     return m_ior.size() > 0;
   }
-}
\ No newline at end of file
+}
Index: gnu/java/awt/peer/qt/QtButtonPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/qt/QtButtonPeer.java,v
retrieving revision 1.3
diff -u -r1.3 QtButtonPeer.java
--- gnu/java/awt/peer/qt/QtButtonPeer.java      16 Aug 2005 23:22:09 -0000      
1.3
+++ gnu/java/awt/peer/qt/QtButtonPeer.java      4 Sep 2005 15:19:26 -0000
@@ -66,7 +66,7 @@
                                    ((Button)owner).getActionCommand(),
                                    System.currentTimeMillis(),
                                    modifiers);
-    toolkit.eventQueue.postEvent(e);
+    QtToolkit.eventQueue.postEvent(e);
   }
 
   // ************ Public methods *********************
Index: gnu/java/awt/peer/qt/QtCheckboxPeer.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/gnu/java/awt/peer/qt/QtCheckboxPeer.java,v
retrieving revision 1.3
diff -u -r1.3 QtCheckboxPeer.java
--- gnu/java/awt/peer/qt/QtCheckboxPeer.java    16 Aug 2005 23:22:09 -0000      
1.3
+++ gnu/java/awt/peer/qt/QtCheckboxPeer.java    4 Sep 2005 15:19:26 -0000
@@ -84,7 +84,7 @@
                                ItemEvent.ITEM_STATE_CHANGED, 
                                ((Checkbox)owner).getLabel(),
                                sel);
-    toolkit.eventQueue.postEvent(e);
+    QtToolkit.eventQueue.postEvent(e);
   }
   
   // ************ Public methods *********************
Index: gnu/java/awt/peer/qt/QtChoicePeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/qt/QtChoicePeer.java,v
retrieving revision 1.3
diff -u -r1.3 QtChoicePeer.java
--- gnu/java/awt/peer/qt/QtChoicePeer.java      16 Aug 2005 23:22:09 -0000      
1.3
+++ gnu/java/awt/peer/qt/QtChoicePeer.java      4 Sep 2005 15:19:26 -0000
@@ -68,7 +68,7 @@
                                ItemEvent.ITEM_STATE_CHANGED, 
                                ((Choice)owner).getItem(index), 
                                ItemEvent.SELECTED);
-    toolkit.eventQueue.postEvent(e);
+    QtToolkit.eventQueue.postEvent(e);
   }
 
   // ************ Public methods *********************
Index: gnu/java/awt/peer/qt/QtComponentPeer.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/gnu/java/awt/peer/qt/QtComponentPeer.java,v
retrieving revision 1.7
diff -u -r1.7 QtComponentPeer.java
--- gnu/java/awt/peer/qt/QtComponentPeer.java   23 Aug 2005 10:37:08 -0000      
1.7
+++ gnu/java/awt/peer/qt/QtComponentPeer.java   4 Sep 2005 15:19:26 -0000
@@ -116,7 +116,7 @@
   {
     this.owner = owner;
     this.toolkit = kit;
-    qtApp = toolkit.guiThread.QApplicationPointer;
+    qtApp = QtToolkit.guiThread.QApplicationPointer;
     nativeObject = 0;
     synchronized(this) 
       {
@@ -230,7 +230,7 @@
       {
        WindowEvent e = new WindowEvent((Window)owner, 
                                        WindowEvent.WINDOW_CLOSING);
-       toolkit.eventQueue.postEvent(e);
+       QtToolkit.eventQueue.postEvent(e);
       }
   }
 
@@ -240,19 +240,19 @@
                                  MouseEvent.MOUSE_ENTERED,
                                  System.currentTimeMillis(),
                                  (modifiers & 0x2FF), x, y, 0, false);
-    toolkit.eventQueue.postEvent(e);
+    QtToolkit.eventQueue.postEvent(e);
   }
 
   protected void focusInEvent()
   {
     FocusEvent e = new FocusEvent(owner, FocusEvent.FOCUS_GAINED);
-    toolkit.eventQueue.postEvent(e);
+    QtToolkit.eventQueue.postEvent(e);
    }
 
   protected void focusOutEvent()
   {
     FocusEvent e = new FocusEvent(owner, FocusEvent.FOCUS_LOST);
-    toolkit.eventQueue.postEvent(e);
+    QtToolkit.eventQueue.postEvent(e);
   }
 
   protected void keyPressEvent(int modifiers, int code, int unicode, int dummy)
@@ -264,7 +264,7 @@
                              modifiers, code, (char)(unicode & 0xFFFF),
                              KeyEvent.KEY_LOCATION_UNKNOWN);
     if (!manager.dispatchEvent (e))
-      toolkit.eventQueue.postEvent(e);
+      QtToolkit.eventQueue.postEvent(e);
   }
 
   protected void keyReleaseEvent(int modifiers, int code, int unicode, int 
dummy)
@@ -274,7 +274,7 @@
                              System.currentTimeMillis(),
                              modifiers, code, (char)(unicode & 0xFFFF),
                              KeyEvent.KEY_LOCATION_UNKNOWN);
-    toolkit.eventQueue.postEvent(e);
+    QtToolkit.eventQueue.postEvent(e);
   }
 
   protected void leaveEvent(int modifiers, int x, int y, int dummy)
@@ -283,7 +283,7 @@
                                  MouseEvent.MOUSE_EXITED,
                                  System.currentTimeMillis(),
                                  (modifiers & 0x2FF), x, y, 0, false);
-    toolkit.eventQueue.postEvent(e);
+    QtToolkit.eventQueue.postEvent(e);
   }
 
   // FIXME: Coalesce press-release events into clicks.
@@ -303,7 +303,7 @@
                                  System.currentTimeMillis(),
                                  (modifiers & 0x2FF), x, y, clickCount, 
                                  false, button);
-    toolkit.eventQueue.postEvent(e);
+    QtToolkit.eventQueue.postEvent(e);
   }
 
   protected void mouseMoveEvent( int modifiers, int x, int y, int clickCount)
@@ -327,7 +327,7 @@
                                  System.currentTimeMillis(),
                                  (modifiers & 0x2FF), x, y, clickCount, 
                                  false, button);
-    toolkit.eventQueue.postEvent(e);
+    QtToolkit.eventQueue.postEvent(e);
   }
 
   protected void mousePressEvent( int modifiers, int x, int y, int clickCount)
@@ -347,7 +347,7 @@
                                  (modifiers & 0x2FF), x, y, clickCount, 
                                  ( button == POPUP_TRIGGER ), 
                                   button);
-    toolkit.eventQueue.postEvent(e);
+    QtToolkit.eventQueue.postEvent(e);
   }
 
   protected void mouseReleaseEvent( int modifiers, int x, int y, int 
clickCount)
@@ -367,7 +367,7 @@
                                  System.currentTimeMillis(),
                                  (modifiers & 0x2FF), x, y, clickCount, 
                                  false, button);
-    toolkit.eventQueue.postEvent(e);
+    QtToolkit.eventQueue.postEvent(e);
   }
 
   protected void moveEvent(int x, int y, int oldx, int oldy)
@@ -393,7 +393,7 @@
     ignoreResize = false;
     ComponentEvent e = new ComponentEvent(owner, 
                                          ComponentEvent.COMPONENT_RESIZED);
-    toolkit.eventQueue.postEvent(e);
+    QtToolkit.eventQueue.postEvent(e);
     QtToolkit.repaintThread.queueComponent(this);
   }
 
@@ -403,13 +403,13 @@
       {
        WindowEvent e = new WindowEvent((Window)owner, 
                                        WindowEvent.WINDOW_OPENED);
-       toolkit.eventQueue.postEvent(e);
+       QtToolkit.eventQueue.postEvent(e);
       }
     else 
       {
        ComponentEvent e = new ComponentEvent(owner, 
                                              ComponentEvent.COMPONENT_SHOWN);
-       toolkit.eventQueue.postEvent(e);
+       QtToolkit.eventQueue.postEvent(e);
       }
   }
 
@@ -417,7 +417,7 @@
   {
     ComponentEvent e = new ComponentEvent(owner, 
                                          ComponentEvent.COMPONENT_HIDDEN);
-    toolkit.eventQueue.postEvent(e);
+    QtToolkit.eventQueue.postEvent(e);
   }
 
   // ************ Public methods *********************
@@ -527,7 +527,7 @@
   public GraphicsConfiguration getGraphicsConfiguration()
   {
     int id = whichScreen(); // get the ID of the screen the widget is on.
-    GraphicsDevice[] devs = toolkit.graphicsEnv.getScreenDevices();
+    GraphicsDevice[] devs = QtToolkit.graphicsEnv.getScreenDevices();
     return devs[id].getDefaultConfiguration();
   }
 
Index: gnu/java/awt/peer/qt/QtListPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/qt/QtListPeer.java,v
retrieving revision 1.3
diff -u -r1.3 QtListPeer.java
--- gnu/java/awt/peer/qt/QtListPeer.java        21 Aug 2005 00:19:49 -0000      
1.3
+++ gnu/java/awt/peer/qt/QtListPeer.java        4 Sep 2005 15:19:26 -0000
@@ -90,7 +90,7 @@
                                      ItemEvent.ITEM_STATE_CHANGED, 
                                      ""+index,
                                      ItemEvent.SELECTED);
-         toolkit.eventQueue.postEvent(e);
+         QtToolkit.eventQueue.postEvent(e);
        }
   }
 
@@ -104,7 +104,7 @@
                                    ((List)owner).getItem( index ),
                                    System.currentTimeMillis(),
                                    modifiers);
-    toolkit.eventQueue.postEvent(e);
+    QtToolkit.eventQueue.postEvent(e);
   }
 
   private native void select(int index, boolean selected);
Index: gnu/java/awt/peer/qt/QtMenuItemPeer.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/gnu/java/awt/peer/qt/QtMenuItemPeer.java,v
retrieving revision 1.3
diff -u -r1.3 QtMenuItemPeer.java
--- gnu/java/awt/peer/qt/QtMenuItemPeer.java    16 Aug 2005 23:22:09 -0000      
1.3
+++ gnu/java/awt/peer/qt/QtMenuItemPeer.java    4 Sep 2005 15:19:26 -0000
@@ -78,7 +78,7 @@
                                    ((MenuItem)owner).getActionCommand(),
                                    System.currentTimeMillis(),
                                    (modifiers & 0x2FF));
-    toolkit.eventQueue.postEvent(e);
+    QtToolkit.eventQueue.postEvent(e);
   }
 
   // ************ Public methods *********************
Index: gnu/java/awt/peer/qt/QtMenuPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/qt/QtMenuPeer.java,v
retrieving revision 1.4
diff -u -r1.4 QtMenuPeer.java
--- gnu/java/awt/peer/qt/QtMenuPeer.java        23 Aug 2005 02:13:48 -0000      
1.4
+++ gnu/java/awt/peer/qt/QtMenuPeer.java        4 Sep 2005 15:19:26 -0000
@@ -88,7 +88,7 @@
     ActionEvent e = new ActionEvent(owner,
                                    ActionEvent.ACTION_PERFORMED,
                                    ((Menu)owner).getActionCommand());
-    toolkit.eventQueue.postEvent(e);
+    QtToolkit.eventQueue.postEvent(e);
   }
 
   private native void allowTearOff();
Index: gnu/java/awt/peer/qt/QtScrollbarPeer.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/gnu/java/awt/peer/qt/QtScrollbarPeer.java,v
retrieving revision 1.3
diff -u -r1.3 QtScrollbarPeer.java
--- gnu/java/awt/peer/qt/QtScrollbarPeer.java   16 Aug 2005 23:22:09 -0000      
1.3
+++ gnu/java/awt/peer/qt/QtScrollbarPeer.java   4 Sep 2005 15:19:26 -0000
@@ -67,7 +67,7 @@
     AdjustmentEvent e = new AdjustmentEvent((Scrollbar)owner,
                                            
AdjustmentEvent.ADJUSTMENT_VALUE_CHANGED,
                                            type, value);
-    toolkit.eventQueue.postEvent(e);
+    QtToolkit.eventQueue.postEvent(e);
   }
   
   // ************ Public methods *********************
Index: gnu/java/awt/peer/qt/QtTextAreaPeer.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/gnu/java/awt/peer/qt/QtTextAreaPeer.java,v
retrieving revision 1.3
diff -u -r1.3 QtTextAreaPeer.java
--- gnu/java/awt/peer/qt/QtTextAreaPeer.java    19 Aug 2005 01:29:26 -0000      
1.3
+++ gnu/java/awt/peer/qt/QtTextAreaPeer.java    4 Sep 2005 15:19:26 -0000
@@ -71,7 +71,7 @@
   private void textChanged()
   {  
     TextEvent e = new TextEvent(owner, TextEvent.TEXT_VALUE_CHANGED);
-    toolkit.eventQueue.postEvent(e);
+    QtToolkit.eventQueue.postEvent(e);
   }
 
   // ************ Public methods *********************
Index: gnu/java/awt/peer/qt/QtTextFieldPeer.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/gnu/java/awt/peer/qt/QtTextFieldPeer.java,v
retrieving revision 1.3
diff -u -r1.3 QtTextFieldPeer.java
--- gnu/java/awt/peer/qt/QtTextFieldPeer.java   19 Aug 2005 01:29:26 -0000      
1.3
+++ gnu/java/awt/peer/qt/QtTextFieldPeer.java   4 Sep 2005 15:19:26 -0000
@@ -66,7 +66,7 @@
   private void textChanged()
   {
     TextEvent e = new TextEvent(owner, TextEvent.TEXT_VALUE_CHANGED);
-    toolkit.eventQueue.postEvent(e);
+    QtToolkit.eventQueue.postEvent(e);
   }
 
   /**

signature.asc
Description: This is a digitally signed message part