FYI: Patch: javax.swing merging

[Michael Koch <konqueror at gmx dot de>]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi list,


I commited another patches to merged javax.swing with classpath again.


Michael
- -- 
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)

iD8DBQE+/D4FWSOgCCdjSDsRAiPgAJ0TK75SrvrwSW1yP/PUui+gDZOp/QCeMv7p
ojjxDJdfSwb+M7f/naH5Rjk=
=6jpc
-----END PGP SIGNATURE-----

Attachment: swing.diff.bz2
Description: BZip2 compressed data

Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.1997
diff -u -b -B -r1.1997 ChangeLog
--- ChangeLog	27 Jun 2003 12:41:51 -0000	1.1997
+++ ChangeLog	27 Jun 2003 12:47:50 -0000
@@ -1,5 +1,13 @@
 2003-06-27  Michael Koch  <konqueror@gmx.de>
 
+	* Makefile.am
+	(awt_java_source_files): Added new files:
+	javax/swing/Popup.java,
+	javax/swing/PopupFactory.java
+	* Makefile.in: Regenerated.
+
+2003-06-27  Michael Koch  <konqueror@gmx.de>
+
 	* javax/swing/JWindow.java,
 	javax/swing/event/AncestorEvent.java,
 	javax/swing/event/HyperlinkEvent.java,
Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.am,v
retrieving revision 1.303
diff -u -b -B -r1.303 Makefile.am
--- Makefile.am	25 Jun 2003 12:41:55 -0000	1.303
+++ Makefile.am	27 Jun 2003 12:47:54 -0000
@@ -1434,6 +1434,8 @@
 javax/swing/JTextPane.java \
 javax/swing/JToolBar.java \
 javax/swing/OverlayLayout.java \
+javax/swing/Popup.java \
+javax/swing/PopupFactory.java \
 javax/swing/ProgressMonitor.java \
 javax/swing/ProgressMonitorInputStream.java \
 javax/swing/RepaintManager.java \
Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.in,v
retrieving revision 1.327
diff -u -b -B -r1.327 Makefile.in
--- Makefile.in	25 Jun 2003 12:41:56 -0000	1.327
+++ Makefile.in	27 Jun 2003 12:47:59 -0000
@@ -1203,6 +1203,8 @@
 javax/swing/JTextPane.java \
 javax/swing/JToolBar.java \
 javax/swing/OverlayLayout.java \
+javax/swing/Popup.java \
+javax/swing/PopupFactory.java \
 javax/swing/ProgressMonitor.java \
 javax/swing/ProgressMonitorInputStream.java \
 javax/swing/RepaintManager.java \
@@ -3995,7 +3997,8 @@
 .deps/javax/swing/MenuElement.P \
 .deps/javax/swing/MenuSelectionManager.P \
 .deps/javax/swing/MutableComboBoxModel.P \
-.deps/javax/swing/OverlayLayout.P .deps/javax/swing/ProgressMonitor.P \
+.deps/javax/swing/OverlayLayout.P .deps/javax/swing/Popup.P \
+.deps/javax/swing/PopupFactory.P .deps/javax/swing/ProgressMonitor.P \
 .deps/javax/swing/ProgressMonitorInputStream.P \
 .deps/javax/swing/Renderer.P .deps/javax/swing/RepaintManager.P \
 .deps/javax/swing/RootPaneContainer.P \