[kaffe] CVS kaffe (riccardo): fixed warnings

Kaffe CVS cvs-commits at kaffe.org
Thu Feb 16 16:43:38 PST 2006


PatchSet 7133 
Date: 2006/02/17 00:28:53
Author: riccardo
Branch: HEAD
Tag: (none) 
Log:
fixed warnings

Members: 
	ChangeLog:1.4651->1.4652 
	libraries/javalib/awt-implementations/kaffe/java/awt/Choice.java:1.1->1.2 
	libraries/javalib/awt-implementations/kaffe/java/awt/DefKeyFilter.java:1.2->1.3 
	libraries/javalib/awt-implementations/kaffe/java/awt/FileDialog.java:1.1->1.2 
	libraries/javalib/awt-implementations/kaffe/java/awt/GraphicsLink.java:1.1->1.2 
	libraries/javalib/awt-implementations/kaffe/java/awt/PopupWindow.java:1.1->1.2 
	libraries/javalib/awt-implementations/kaffe/java/awt/TextComponent.java:1.1->1.2 
	libraries/javalib/awt-implementations/kaffe/java/awt/TextField.java:1.1->1.2 
	libraries/javalib/awt-implementations/kaffe/java/awt/image/MemoryImageSource.java:1.2->1.3 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4651 kaffe/ChangeLog:1.4652
--- kaffe/ChangeLog:1.4651	Tue Feb 14 00:21:52 2006
+++ kaffe/ChangeLog	Fri Feb 17 00:28:53 2006
@@ -1,3 +1,14 @@
+2006-02-17  Riccardo Mottola <riccardo at kaffe.org>
+	* libraries/javalib/awt-implementations/kaffe/java/awt/Choice.java,
+	libraries/javalib/awt-implementations/kaffe/java/awt/DefKeyFilter.java,
+	libraries/javalib/awt-implementations/kaffe/java/awt/FileDialog.java,
+	libraries/javalib/awt-implementations/kaffe/java/awt/GraphicsLink.java,
+	libraries/javalib/awt-implementations/kaffe/java/awt/PopupWindow.java,
+	libraries/javalib/awt-implementations/kaffe/java/awt/TextComponent.java,
+	libraries/javalib/awt-implementations/kaffe/java/awt/TextField.java,
+	libraries/javalib/awt-implementations/kaffe/java/awt/image/MemoryImageSource.java:
+	Fixed warnings.
+
 2006-02-13  Dalibor Topic  <robilad at kaffe.org>
 
 	* libraries/javalib/external/classpath/java/net/URI.java (quote):
Index: kaffe/libraries/javalib/awt-implementations/kaffe/java/awt/Choice.java
diff -u kaffe/libraries/javalib/awt-implementations/kaffe/java/awt/Choice.java:1.1 kaffe/libraries/javalib/awt-implementations/kaffe/java/awt/Choice.java:1.2
--- kaffe/libraries/javalib/awt-implementations/kaffe/java/awt/Choice.java:1.1	Thu Jul 22 19:19:30 2004
+++ kaffe/libraries/javalib/awt-implementations/kaffe/java/awt/Choice.java	Fri Feb 17 00:28:57 2006
@@ -186,7 +186,7 @@
 }
 
 public void itemStateChanged ( ItemEvent e) {
-	if ( e.getStateChange() == e.SELECTED ){
+	if ( e.getStateChange() == ItemEvent.SELECTED ){
 		if ( prompter.list.selMouse )
 			select( prompter.list.getSelectedItem() );
 	}
@@ -197,11 +197,11 @@
 	int cc = e.getKeyCode();
 	
 	if ( (prompter != null) && (src == prompter.list) ){
-		if ( cc == e.VK_ESCAPE )
+		if ( cc == KeyEvent.VK_ESCAPE )
 			closePrompt( true);
 	}
 	else {	
-		if ( cc == e.VK_DOWN )
+		if ( cc == KeyEvent.VK_DOWN )
 			openPrompt();
 	}
 }
Index: kaffe/libraries/javalib/awt-implementations/kaffe/java/awt/DefKeyFilter.java
diff -u kaffe/libraries/javalib/awt-implementations/kaffe/java/awt/DefKeyFilter.java:1.2 kaffe/libraries/javalib/awt-implementations/kaffe/java/awt/DefKeyFilter.java:1.3
--- kaffe/libraries/javalib/awt-implementations/kaffe/java/awt/DefKeyFilter.java:1.2	Wed Oct 19 20:10:48 2005
+++ kaffe/libraries/javalib/awt-implementations/kaffe/java/awt/DefKeyFilter.java	Fri Feb 17 00:28:57 2006
@@ -1,3 +1,15 @@
+/**
+ * class TextComponent - 
+ *
+ * Copyright (c) 1998
+ *      Transvirtual Technologies, Inc.  All rights reserved.
+ * Copyright (c) 2006
+ *      Kaffe.org developers. See ChangeLog for details.
+ *
+ * See the file "license.terms" for information on usage and redistribution
+ * of this file.
+ */
+
 package java.awt;
 
 import java.awt.event.KeyEvent;
@@ -8,8 +20,8 @@
   implements KeyHook
 {
 public boolean intercept ( KeyEvent e ) {
-	if ( e.isControlDown() && (e.getKeyCode() == e.VK_F12) ){
-		if ( e.id == e.KEY_RELEASED ) {
+	if ( e.isControlDown() && (e.getKeyCode() == KeyEvent.VK_F12) ){
+		if ( e.id == KeyEvent.KEY_RELEASED ) {
 			Component c = (Component)e.getSource();
 			System.out.println( "keyTgt: " + c);
 			System.out.println( "active: " + AWTEvent.activeWindow);
Index: kaffe/libraries/javalib/awt-implementations/kaffe/java/awt/FileDialog.java
diff -u kaffe/libraries/javalib/awt-implementations/kaffe/java/awt/FileDialog.java:1.1 kaffe/libraries/javalib/awt-implementations/kaffe/java/awt/FileDialog.java:1.2
--- kaffe/libraries/javalib/awt-implementations/kaffe/java/awt/FileDialog.java:1.1	Thu Jul 22 19:19:31 2004
+++ kaffe/libraries/javalib/awt-implementations/kaffe/java/awt/FileDialog.java	Fri Feb 17 00:28:57 2006
@@ -1,24 +1,29 @@
-package java.awt;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
-import java.io.File;
-import java.io.FilenameFilter;
-import java.util.Vector;
-
 /**
  * FileDialog - 
  *
  * Copyright (c) 1998
  *      Transvirtual Technologies, Inc.  All rights reserved.
+ * Copyright (c) 2006
+ *      Kaffe.org developers. See ChangeLog for details.
  *
  * See the file "license.terms" for information on usage and redistribution 
  * of this file. 
  *
- * @author J. Mehlitz
+ * original code P.C.Mehlitz
+ * some code taken or adapted from Classpath
  */
+ 
+
+package java.awt;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.io.File;
+import java.io.FilenameFilter;
+import java.util.Vector;
+
 public class FileDialog
   extends Dialog
   implements ActionListener, ItemListener, FilenameFilter
@@ -203,9 +208,9 @@
 	setLayout ( new GridBagLayout() );
 	gc.ipadx = 1;
 	gc.ipady = 1;
-	gc.fill = gc.BOTH;
+	gc.fill = GridBagConstraints.BOTH;
 	gc.weightx = 1;
-	gc.gridwidth = gc.REMAINDER;
+	gc.gridwidth = GridBagConstraints.REMAINDER;
 
 	gc.insets.left = db;
 	gc.insets.right = db;
@@ -217,7 +222,7 @@
 	gc.insets.right = 0;
 	add( lDirs, gc);
 	
-	gc.gridwidth = gc.REMAINDER;
+	gc.gridwidth = GridBagConstraints.REMAINDER;
 	gc.insets.left = 0;
 	gc.insets.right = db;
 	add( lFiles, gc);
@@ -230,13 +235,13 @@
 	add( tFile, gc);
 	
 	gc.gridwidth = 1;
-	gc.fill = gc.NONE;
+	gc.fill = GridBagConstraints.NONE;
 	gc.insets.left = db;
 	gc.insets.right = db;
 	gc.insets.bottom = 10;
 	add( bOk, gc);
 	
-	gc.gridwidth = gc.REMAINDER;
+	gc.gridwidth = GridBagConstraints.REMAINDER;
 	add( bCan, gc);
 }
 
@@ -248,7 +253,7 @@
 
 public void itemStateChanged( ItemEvent e) {
 
-	if ( e.getStateChange() != e.SELECTED )
+	if ( e.getStateChange() != ItemEvent.SELECTED )
 		return;
 
 	Object s = e.getSource();
Index: kaffe/libraries/javalib/awt-implementations/kaffe/java/awt/GraphicsLink.java
diff -u kaffe/libraries/javalib/awt-implementations/kaffe/java/awt/GraphicsLink.java:1.1 kaffe/libraries/javalib/awt-implementations/kaffe/java/awt/GraphicsLink.java:1.2
--- kaffe/libraries/javalib/awt-implementations/kaffe/java/awt/GraphicsLink.java:1.1	Thu Jul 22 19:19:31 2004
+++ kaffe/libraries/javalib/awt-implementations/kaffe/java/awt/GraphicsLink.java	Fri Feb 17 00:28:57 2006
@@ -56,7 +56,7 @@
 	NativeGraphics g = (NativeGraphics)get();
 	
 	if ( g != null ) {
-		boolean isTgtVisible = ((tgt.flags & tgt.IS_SHOWING) == tgt.IS_SHOWING);
+		boolean isTgtVisible = ((tgt.flags & Component.IS_SHOWING) == Component.IS_SHOWING);
 	
 		if ( isTgtVisible != isVisible ){
 			Toolkit.graSetVisible( g.nativeData, isTgtVisible);
Index: kaffe/libraries/javalib/awt-implementations/kaffe/java/awt/PopupWindow.java
diff -u kaffe/libraries/javalib/awt-implementations/kaffe/java/awt/PopupWindow.java:1.1 kaffe/libraries/javalib/awt-implementations/kaffe/java/awt/PopupWindow.java:1.2
--- kaffe/libraries/javalib/awt-implementations/kaffe/java/awt/PopupWindow.java:1.1	Thu Jul 22 19:19:33 2004
+++ kaffe/libraries/javalib/awt-implementations/kaffe/java/awt/PopupWindow.java	Fri Feb 17 00:28:57 2006
@@ -1,21 +1,24 @@
-package java.awt;
-
-import java.awt.event.FocusEvent;
-import java.awt.event.KeyEvent;
-import java.awt.event.MouseEvent;
-import java.util.Vector;
-
 /**
  * class PopupWindow -
  *
  * Copyright (c) 1998
  *      Transvirtual Technologies, Inc.  All rights reserved.
+ * Copyright (c) 2006
+ *      Kaffe.org developers. See ChangeLog for details.
  *
- * See the file "license.terms" for information on usage and redistribution
- * of this file.
+ * See the file "license.terms" for information on usage and redistribution 
+ * of this file. 
  *
- * @author J.Mehlitz
+ * original code P.C.Mehlitz
  */
+package java.awt;
+
+import java.awt.event.FocusEvent;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseEvent;
+import java.util.Vector;
+
+
 class PopupWindow
   extends Window
 {
@@ -194,7 +197,7 @@
 }
 
 void process ( FocusEvent evt ) {
-	if ( evt.id == evt.FOCUS_GAINED ){
+	if ( evt.id == FocusEvent.FOCUS_GAINED ){
 		disposeSubMenus();
 	}
 	else if ( (AWTEvent.keyTgt != sub) && !isMaster(AWTEvent.keyTgt)) {
Index: kaffe/libraries/javalib/awt-implementations/kaffe/java/awt/TextComponent.java
diff -u kaffe/libraries/javalib/awt-implementations/kaffe/java/awt/TextComponent.java:1.1 kaffe/libraries/javalib/awt-implementations/kaffe/java/awt/TextComponent.java:1.2
--- kaffe/libraries/javalib/awt-implementations/kaffe/java/awt/TextComponent.java:1.1	Thu Jul 22 19:19:33 2004
+++ kaffe/libraries/javalib/awt-implementations/kaffe/java/awt/TextComponent.java	Fri Feb 17 00:28:57 2006
@@ -1,3 +1,15 @@
+/**
+ * class TextComponent - 
+ *
+ * Copyright (c) 1998
+ *      Transvirtual Technologies, Inc.  All rights reserved.
+ * Copyright (c) 2006
+ *      Kaffe.org developers. See ChangeLog for details.
+ *
+ * See the file "license.terms" for information on usage and redistribution
+ * of this file.
+ */
+ 
 package java.awt;
 
 import java.awt.datatransfer.Clipboard;
@@ -10,15 +22,7 @@
 import java.awt.event.TextEvent;
 import java.awt.event.TextListener;
 
-/**
- * class TextComponent - 
- *
- * Copyright (c) 1998
- *      Transvirtual Technologies, Inc.  All rights reserved.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file.
- */
+
 abstract public class TextComponent
   extends Container
   implements ActionListener
@@ -87,7 +91,7 @@
 	int mods = e.getModifiers();
 	int chr  = e.getKeyChar();
 
-	if ( (mods != 0) && (mods != e.SHIFT_MASK) )
+	if ( (mods != 0) && (mods != KeyEvent.SHIFT_MASK) )
 		return false;
 
 	switch( chr ) {
Index: kaffe/libraries/javalib/awt-implementations/kaffe/java/awt/TextField.java
diff -u kaffe/libraries/javalib/awt-implementations/kaffe/java/awt/TextField.java:1.1 kaffe/libraries/javalib/awt-implementations/kaffe/java/awt/TextField.java:1.2
--- kaffe/libraries/javalib/awt-implementations/kaffe/java/awt/TextField.java:1.1	Thu Jul 22 19:19:34 2004
+++ kaffe/libraries/javalib/awt-implementations/kaffe/java/awt/TextField.java	Fri Feb 17 00:28:57 2006
@@ -1,3 +1,16 @@
+/**
+ * class TextField - 
+ *
+ * Copyright (c) 1998
+ *      Transvirtual Technologies, Inc.  All rights reserved.
+ * Copyright (c) 2006
+ *      Kaffe.org developers. See ChangeLog for details.
+ *
+ * See the file "license.terms" for information on usage and redistribution 
+ * of this file. 
+ *
+ */
+
 package java.awt;
 
 import java.awt.event.ActionEvent;
@@ -11,15 +24,7 @@
 import java.awt.event.MouseListener;
 import java.awt.event.MouseMotionListener;
 
-/**
- * class TextField - 
- *
- * Copyright (c) 1998
- *      Transvirtual Technologies, Inc.  All rights reserved.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file.
- */
+
 public class TextField
   extends TextComponent
   implements MouseMotionListener, KeyListener, FocusListener, MouseListener
@@ -209,7 +214,7 @@
 	int code = e.getKeyCode();
 
 	// do not consume unused keys for ShortcutHandler
-	if ( (mods != 0) && (mods != e.SHIFT_MASK) ) {
+	if ( (mods != 0) && (mods != KeyEvent.SHIFT_MASK) ) {
 		return;
 	}
 
Index: kaffe/libraries/javalib/awt-implementations/kaffe/java/awt/image/MemoryImageSource.java
diff -u kaffe/libraries/javalib/awt-implementations/kaffe/java/awt/image/MemoryImageSource.java:1.2 kaffe/libraries/javalib/awt-implementations/kaffe/java/awt/image/MemoryImageSource.java:1.3
--- kaffe/libraries/javalib/awt-implementations/kaffe/java/awt/image/MemoryImageSource.java:1.2	Wed Oct 19 20:10:50 2005
+++ kaffe/libraries/javalib/awt-implementations/kaffe/java/awt/image/MemoryImageSource.java	Fri Feb 17 00:28:57 2006
@@ -3,11 +3,14 @@
  *
  * Copyright (c) 1998
  *      Transvirtual Technologies, Inc.  All rights reserved.
+ * Copyright (c) 2006
+ *      Kaffe.org developers. See ChangeLog for details.
  *
  * See the file "license.terms" for information on usage and redistribution 
  * of this file. 
  *
- * @author J. Mehlitz
+ * original code P.C.Mehlitz
+ * some code taken or adapted from Classpath
  */
 
 package java.awt.image;
@@ -78,7 +81,7 @@
 	ic.setDimensions( width, height);	
 	ic.setColorModel( model);
 	ic.setProperties( props);
-	ic.setHints( ic.TOPDOWNLEFTRIGHT | ic.SINGLEPASS | ic.SINGLEFRAME | ic.COMPLETESCANLINES);
+	ic.setHints( ImageConsumer.TOPDOWNLEFTRIGHT | ImageConsumer.SINGLEPASS | ImageConsumer.SINGLEFRAME | ImageConsumer.COMPLETESCANLINES);
 }
 
 public boolean isConsumer( ImageConsumer ic) {
@@ -117,7 +120,7 @@
 		ImageConsumer ic = (ImageConsumer) consumers.elementAt( i);
 		transferPels( ic, x, y, w, h);
 		if ( framenotify && isConsumer( ic) ) {
-			ic.setHints( ic.SINGLEFRAMEDONE);
+			ic.setHints( ImageConsumer.SINGLEFRAMEDONE);
 		}
 	}
 }
@@ -143,7 +146,7 @@
 	if ( ! animated ) {
 		for ( int i=0; i<consumers.size(); i++) {
 			ImageConsumer ic = (ImageConsumer) consumers.elementAt( i);
-			ic.imageComplete( ic.STATICIMAGEDONE);
+			ic.imageComplete( ImageConsumer.STATICIMAGEDONE);
 		}
 		consumers.removeAllElements();
 	}
@@ -161,7 +164,7 @@
 }
 
 private void terminateConsumer(ImageConsumer ic) {
-	ic.imageComplete(ic.STATICIMAGEDONE);
+	ic.imageComplete(ImageConsumer.STATICIMAGEDONE);
 }
 
 private void transferPels( ImageConsumer ic, int x, int y, int w, int h) {




More information about the kaffe mailing list