[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: JTextField fixes

Kaffe CVS cvs-commits at kaffe.org
Thu Jan 27 06:06:25 PST 2005


PatchSet 5926 
Date: 2005/01/27 13:58:30
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: JTextField fixes

2005-01-27  Dalibor Topic  <robilad at kaffe.org>

        Resynced with GNU Classpath.

2005-01-26  Michael Koch  <konqueror at gmx.de>

* javax/swing/JTextField.java
(postActionEvent): Use text in field when actionCommand is null.
(getActionCommand): Removed.

Members: 
	ChangeLog:1.3465->1.3466 
	libraries/javalib/javax/swing/JTextField.java:1.7->1.8 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3465 kaffe/ChangeLog:1.3466
--- kaffe/ChangeLog:1.3465	Thu Jan 27 13:56:36 2005
+++ kaffe/ChangeLog	Thu Jan 27 13:58:30 2005
@@ -4,6 +4,16 @@
 	
 	2005-01-26  Michael Koch  <konqueror at gmx.de>
 
+	* javax/swing/JTextField.java
+	(postActionEvent): Use text in field when actionCommand is null.
+	(getActionCommand): Removed.
+	
+2005-01-27  Dalibor Topic  <robilad at kaffe.org>
+
+        Resynced with GNU Classpath.
+	
+	2005-01-26  Michael Koch  <konqueror at gmx.de>
+
 	* javax/swing/AbstractSet.java: Removed.
 	
 2005-01-27  Dalibor Topic  <robilad at kaffe.org>
Index: kaffe/libraries/javalib/javax/swing/JTextField.java
diff -u kaffe/libraries/javalib/javax/swing/JTextField.java:1.7 kaffe/libraries/javalib/javax/swing/JTextField.java:1.8
--- kaffe/libraries/javalib/javax/swing/JTextField.java:1.7	Sat Jan 22 18:52:01 2005
+++ kaffe/libraries/javalib/javax/swing/JTextField.java	Thu Jan 27 13:58:34 2005
@@ -1,5 +1,5 @@
 /* JTextField.java --
-   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -322,7 +322,8 @@
 
   public void postActionEvent()
   {
-    ActionEvent event = new ActionEvent(this, 0, actionCommand);
+    String command = actionCommand != null ? actionCommand : getText();
+    ActionEvent event = new ActionEvent(this, 0, command);
     ActionListener[] listeners = getActionListeners();
 
     for (int index = 0; index < listeners.length; ++index)
@@ -369,17 +370,9 @@
   /**
    * @since 1.3
    */
-  public String getActionCommand()
-  {
-    return actionCommand;
-  }
-
-  /**
-   * @since 1.3
-   */
   public void setActionCommand(String command)
   {
-    this.actionCommand = command;
+    actionCommand = command;
   }
 
   /**




More information about the kaffe mailing list