[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[cp-patches] FYI: Some (jikes) warning fixes
|
From: |
Mark Wielaard |
|
Subject: |
[cp-patches] FYI: Some (jikes) warning fixes |
|
Date: |
Fri, 12 Aug 2005 18:11:49 +0200 |
Hi,
jikes was complaining about a couple of constructs used in our code.
Were it was easy and obviously correct to fix this I did to make the
compilation experience with jikes nicer.
2005-08-12 Mark Wielaard <address@hidden>
* 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 for
guiThread.QApplicationPointer and graphicsEnv.getScreenDevices().
* 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/security/PolicyFile.javai (refresh): Assign only outside
if statement.
Committed,
Mark
Index: gnu/java/awt/peer/qt/QtButtonPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/qt/QtButtonPeer.java,v
retrieving revision 1.1
diff -u -r1.1 QtButtonPeer.java
--- gnu/java/awt/peer/qt/QtButtonPeer.java 11 Aug 2005 17:06:48 -0000
1.1
+++ gnu/java/awt/peer/qt/QtButtonPeer.java 12 Aug 2005 16:03:40 -0000
@@ -66,7 +66,7 @@
((Button)owner).getActionCommand(),
System.currentTimeMillis(),
(modifiers & 0x2FF));
- 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.1
diff -u -r1.1 QtCheckboxPeer.java
--- gnu/java/awt/peer/qt/QtCheckboxPeer.java 11 Aug 2005 17:06:48 -0000
1.1
+++ gnu/java/awt/peer/qt/QtCheckboxPeer.java 12 Aug 2005 16:03:40 -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.1
diff -u -r1.1 QtChoicePeer.java
--- gnu/java/awt/peer/qt/QtChoicePeer.java 11 Aug 2005 17:06:48 -0000
1.1
+++ gnu/java/awt/peer/qt/QtChoicePeer.java 12 Aug 2005 16:03:40 -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.1
diff -u -r1.1 QtComponentPeer.java
--- gnu/java/awt/peer/qt/QtComponentPeer.java 11 Aug 2005 17:06:48 -0000
1.1
+++ gnu/java/awt/peer/qt/QtComponentPeer.java 12 Aug 2005 16:03:40 -0000
@@ -123,7 +123,7 @@
{
this.owner = owner;
this.toolkit = kit;
- qtApp = toolkit.guiThread.QApplicationPointer;
+ qtApp = QtToolkit.guiThread.QApplicationPointer;
nativeObject = 0;
callInit(); // Calls the init method FROM THE MAIN THREAD.
setup();
@@ -204,7 +204,7 @@
{
WindowEvent e = new WindowEvent((Window)owner,
WindowEvent.WINDOW_CLOSING);
- toolkit.eventQueue.postEvent(e);
+ QtToolkit.eventQueue.postEvent(e);
}
}
@@ -214,19 +214,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)
@@ -238,7 +238,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)
@@ -248,7 +248,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)
@@ -257,7 +257,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.
@@ -277,7 +277,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)
@@ -303,7 +303,7 @@
timeStamp,
(modifiers & 0x2FF), x, y, clickCount,
false, button);
- toolkit.eventQueue.postEvent(e);
+ QtToolkit.eventQueue.postEvent(e);
}
lastMME = timeStamp;
}
@@ -325,7 +325,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)
@@ -345,14 +345,14 @@
System.currentTimeMillis(),
(modifiers & 0x2FF), x, y, clickCount,
false, button);
- toolkit.eventQueue.postEvent(e);
+ QtToolkit.eventQueue.postEvent(e);
}
protected void moveEvent()
{
ComponentEvent e = new ComponentEvent(owner,
ComponentEvent.COMPONENT_MOVED);
- toolkit.eventQueue.postEvent(e);
+ QtToolkit.eventQueue.postEvent(e);
}
protected void paintEvent(QtGraphics g)
@@ -380,7 +380,7 @@
owner.setSize(width, height);
ComponentEvent e = new ComponentEvent(owner,
ComponentEvent.COMPONENT_RESIZED);
- toolkit.eventQueue.postEvent(e);
+ QtToolkit.eventQueue.postEvent(e);
}
protected void showEvent()
@@ -389,13 +389,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);
}
}
@@ -403,7 +403,7 @@
{
ComponentEvent e = new ComponentEvent(owner,
ComponentEvent.COMPONENT_HIDDEN);
- toolkit.eventQueue.postEvent(e);
+ QtToolkit.eventQueue.postEvent(e);
}
private native Dimension getMinimumSizeNative();
@@ -517,7 +517,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/QtMenuItemPeer.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/awt/peer/qt/QtMenuItemPeer.java,v
retrieving revision 1.1
diff -u -r1.1 QtMenuItemPeer.java
--- gnu/java/awt/peer/qt/QtMenuItemPeer.java 11 Aug 2005 17:06:48 -0000
1.1
+++ gnu/java/awt/peer/qt/QtMenuItemPeer.java 12 Aug 2005 16:03:40 -0000
@@ -76,7 +76,7 @@
ActionEvent e = new ActionEvent(owner,
ActionEvent.ACTION_PERFORMED,
((MenuItem)owner).getActionCommand());
- 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.1
diff -u -r1.1 QtMenuPeer.java
--- gnu/java/awt/peer/qt/QtMenuPeer.java 11 Aug 2005 17:06:48 -0000
1.1
+++ gnu/java/awt/peer/qt/QtMenuPeer.java 12 Aug 2005 16:03:40 -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.1
diff -u -r1.1 QtScrollbarPeer.java
--- gnu/java/awt/peer/qt/QtScrollbarPeer.java 11 Aug 2005 17:06:48 -0000
1.1
+++ gnu/java/awt/peer/qt/QtScrollbarPeer.java 12 Aug 2005 16:03:40 -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/security/PolicyFile.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/PolicyFile.java,v
retrieving revision 1.5
diff -u -r1.5 PolicyFile.java
--- gnu/java/security/PolicyFile.java 8 Aug 2005 07:18:42 -0000 1.5
+++ gnu/java/security/PolicyFile.java 12 Aug 2005 16:03:40 -0000
@@ -220,8 +220,8 @@
logger.log (Component.POLICY, "java.security.policy={0}", s);
if (s != null)
{
- boolean only;
- if (only = s.startsWith ("="))
+ boolean only = s.startsWith ("=");
+ if (only)
s = s.substring (1);
policyFiles.clear ();
policyFiles.add (new URL (s));
signature.asc
Description: This is a digitally signed message part
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [cp-patches] FYI: Some (jikes) warning fixes,
Mark Wielaard <=