[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: cleanups in swing
Kaffe CVS
cvs-commits at kaffe.org
Mon Oct 25 12:37:22 PDT 2004
PatchSet 5366
Date: 2004/10/25 19:30:44
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: cleanups in swing
2004-10-25 Dalibor Topic <robilad at kaffe.org>
* libraries/javalib/javax/swing/JMenuBar.java,
libraries/javalib/javax/swing/tree/DefaultTreeSelectionModel.java:
Resynced with GNU Classpath.
2004-10-25 Michael Koch <konqueror at gmx.de>
* javax/swing/JMenuBar.java
(updateUI): Simplified.
* javax/swing/tree/DefaultTreeSelectionModel.java:
Reorganized import statements.
Members:
ChangeLog:1.2918->1.2919
libraries/javalib/javax/swing/JMenuBar.java:1.4->1.5
libraries/javalib/javax/swing/tree/DefaultTreeSelectionModel.java:1.3->1.4
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2918 kaffe/ChangeLog:1.2919
--- kaffe/ChangeLog:1.2918 Mon Oct 25 19:27:42 2004
+++ kaffe/ChangeLog Mon Oct 25 19:30:44 2004
@@ -1,5 +1,18 @@
2004-10-25 Dalibor Topic <robilad at kaffe.org>
+ * libraries/javalib/javax/swing/JMenuBar.java,
+ libraries/javalib/javax/swing/tree/DefaultTreeSelectionModel.java:
+ Resynced with GNU Classpath.
+
+ 2004-10-25 Michael Koch <konqueror at gmx.de>
+
+ * javax/swing/JMenuBar.java
+ (updateUI): Simplified.
+ * javax/swing/tree/DefaultTreeSelectionModel.java:
+ Reorganized import statements.
+
+2004-10-25 Dalibor Topic <robilad at kaffe.org>
+
* libraries/javalib/java/net/InetAddress.java:
Resynced with GNU Classpath.
Index: kaffe/libraries/javalib/javax/swing/JMenuBar.java
diff -u kaffe/libraries/javalib/javax/swing/JMenuBar.java:1.4 kaffe/libraries/javalib/javax/swing/JMenuBar.java:1.5
--- kaffe/libraries/javalib/javax/swing/JMenuBar.java:1.4 Sun Oct 24 13:39:11 2004
+++ kaffe/libraries/javalib/javax/swing/JMenuBar.java Mon Oct 25 19:30:45 2004
@@ -463,8 +463,7 @@
*/
public void updateUI()
{
- MenuBarUI ui = ((MenuBarUI) UIManager.getUI(this));
- setUI(ui);
+ setUI((MenuBarUI) UIManager.getUI(this));
invalidate();
}
}
Index: kaffe/libraries/javalib/javax/swing/tree/DefaultTreeSelectionModel.java
diff -u kaffe/libraries/javalib/javax/swing/tree/DefaultTreeSelectionModel.java:1.3 kaffe/libraries/javalib/javax/swing/tree/DefaultTreeSelectionModel.java:1.4
--- kaffe/libraries/javalib/javax/swing/tree/DefaultTreeSelectionModel.java:1.3 Sun Oct 24 18:25:55 2004
+++ kaffe/libraries/javalib/javax/swing/tree/DefaultTreeSelectionModel.java Mon Oct 25 19:30:46 2004
@@ -35,6 +35,7 @@
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
+
package javax.swing.tree;
import java.beans.PropertyChangeListener;
@@ -44,12 +45,12 @@
import java.io.Serializable;
import java.util.EventListener;
import java.util.Vector;
+
import javax.swing.DefaultListSelectionModel;
import javax.swing.event.EventListenerList;
import javax.swing.event.SwingPropertyChangeSupport;
import javax.swing.event.TreeSelectionEvent;
import javax.swing.event.TreeSelectionListener;
-
/**
* DefaultTreeSelectionModel
More information about the kaffe
mailing list