[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: JFileChoser fixes
Kaffe CVS
cvs-commits at kaffe.org
Wed Dec 22 18:17:12 PST 2004
PatchSet 5715
Date: 2004/12/23 02:13:05
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: JFileChoser fixes
Members:
ChangeLog:1.3260->1.3261
libraries/javalib/javax/swing/JFileChooser.java:1.2->1.3
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3260 kaffe/ChangeLog:1.3261
--- kaffe/ChangeLog:1.3260 Thu Dec 23 01:58:51 2004
+++ kaffe/ChangeLog Thu Dec 23 02:13:05 2004
@@ -1,5 +1,17 @@
2004-12-22 Dalibor Topic <robilad at kaffe.org>
+ * libraries/javalib/javax/swing/JFileChooser.java:
+ Resynced with GNU Classpath.
+
+ 2004-12-22 Michael Koch <konqueror at gmx.de>
+
+ * javax/swing/JFileChooser.java
+ (showDialog): Return CANCEL_OPTION for now.
+ (showOpenDialog): Likewise.
+ (showSaveDialog): Likewise.
+
+2004-12-22 Dalibor Topic <robilad at kaffe.org>
+
* libraries/javalib/javax/swing/JTextField.java:
Resynced with GNU Classpath.
Index: kaffe/libraries/javalib/javax/swing/JFileChooser.java
diff -u kaffe/libraries/javalib/javax/swing/JFileChooser.java:1.2 kaffe/libraries/javalib/javax/swing/JFileChooser.java:1.3
--- kaffe/libraries/javalib/javax/swing/JFileChooser.java:1.2 Sun Oct 24 13:39:11 2004
+++ kaffe/libraries/javalib/javax/swing/JFileChooser.java Thu Dec 23 02:13:08 2004
@@ -522,7 +522,7 @@
* @returns int
*/
public int showOpenDialog(Component parent) {
- return 0; // TODO
+ return CANCEL_OPTION; // TODO
} // showOpenDialog()
/**
@@ -531,7 +531,7 @@
* @returns int
*/
public int showSaveDialog(Component parent) {
- return 0; // TODO
+ return CANCEL_OPTION; // TODO
} // showSaveDialog()
/**
@@ -541,7 +541,7 @@
* @returns int
*/
public int showDialog(Component parent, String approveButtonText) {
- return 0; // TODO
+ return CANCEL_OPTION; // TODO
} // showDialog()
/**
More information about the kaffe
mailing list