Imported Classpath 0.18.

	* sources.am, Makefile.in: Updated.
	* Makefile.am (nat_source_files): Removed natProxy.cc.
	* java/lang/reflect/natProxy.cc: Removed.
	* gnu/classpath/jdwp/VMFrame.java,
	gnu/classpath/jdwp/VMIdManager.java,
	gnu/classpath/jdwp/VMVirtualMachine.java,
	java/lang/reflect/VMProxy.java: New files.

2005-09-23  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* scripts/makemake.tcl (verbose): Add gnu/java/awt/peer/qt to BC
	list.

2005-09-23  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* gnu/java/net/DefaultContentHandlerFactory.java (getContent):
	Remove ClasspathToolkit references.

2005-09-23  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* gnu/awt/xlib/XCanvasPeer.java: Add new peer methods.
	* gnu/awt/xlib/XFramePeer.java: Likewise.
	* gnu/awt/xlib/XGraphicsConfiguration.java: Likewise.

2005-09-23  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* Makefile.am (libgcjawt_la_SOURCES): Remove jawt.c.  Add
	classpath/native/jawt/jawt.c.
	* Makefile.in: Regenerate.
	* jawt.c: Remove file.
	* include/Makefile.am (tool_include__HEADERS): Remove jawt.h and
	jawt_md.h.  Add ../classpath/include/jawt.h and
	../classpath/include/jawt_md.h.
	* include/Makefile.in: Regenerate.
	* include/jawt.h: Regenerate.
	* include/jawt_md.h: Regenerate.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@104586 138bc75d-0d04-0410-961f-82ee72b054a4

5 files changed, 111 insertions, 18 deletions

diff --git a/libjava/classpath/examples/.cvsignore b/libjava/classpath/examples/.cvsignore
index 3b4de9f3c5e..5563799166b 100644
--- a/libjava/classpath/examples/.cvsignore
+++ b/libjava/classpath/examples/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
 examples.zip
+Makefile.jawt
diff --git a/libjava/classpath/examples/Makefile.am b/libjava/classpath/examples/Makefile.am
index 74abc11c066..b7eeacb63fe 100644
--- a/libjava/classpath/examples/Makefile.am
+++ b/libjava/classpath/examples/Makefile.am
@@ -22,6 +22,9 @@ endif
 # All our example java source files
 EXAMPLE_JAVA_FILES = $(srcdir)/gnu/classpath/examples/*/*.java
 
+# The example C source files
+EXAMPLE_C_FILES = $(srcdir)/gnu/classpath/examples/*/*.c
+
 # The zip files with classes we want to produce.
 EXAMPLE_ZIP = examples.zip
 
@@ -31,6 +34,9 @@ BUILT_SOURCES = $(EXAMPLE_ZIP)
 # the png icons we use in some of the examples.
 EXAMPLE_ICONS = $(srcdir)/gnu/classpath/examples/icons/*.png
 
+# All the files we find "interesting"
+ALL_EXAMPLE_FILES = $(EXAMPLE_JAVA_FILES) $(EXAMPLE_C_FILES) $(EXAMPLE_ICONS)
+
 # Some architecture independent data to be installed.
 example_DATA = $(EXAMPLE_ZIP) README
 
@@ -41,7 +47,7 @@ exampledir = $(pkgdatadir)/examples
 # (Be careful to strip off the srcdir part of the path when installing.)
 install-data-local:
 	srcdir_cnt=`echo $(srcdir) | wc -c`; \
-	for file in $(EXAMPLE_JAVA_FILES) $(EXAMPLE_ICONS); do \
+	for file in $(ALL_EXAMPLE_FILES); do \
 	  f=`echo $$file | cut -c$$srcdir_cnt-`; \
 	  fdir=`dirname $$f`; \
 	  if test ! -d $(DESTDIR)/$(pkgdatadir)/examples/$$fdir; then \
@@ -51,20 +57,24 @@ install-data-local:
 	  echo "$(INSTALL_DATA) $$file $(DESTDIR)/$(pkgdatadir)/examples/$$f"; \
 	  $(INSTALL_DATA) $$file $(DESTDIR)/$(pkgdatadir)/examples/$$f; \
 	done
+	echo "$(INSTALL_DATA) Makefile.jawt $(DESTDIR)/$(pkgdatadir)/examples/"
+	$(INSTALL_DATA) Makefile.jawt $(DESTDIR)/$(pkgdatadir)/examples/
 
 uninstall-local:
 	srcdir_cnt=`echo $(srcdir) | wc -c`; \
-	for file in $(EXAMPLE_JAVA_FILES) $(EXAMPLE_ICONS); do \
+	for file in $(ALL_EXAMPLE_FILES); do \
 	  f=`echo $$file | cut -c$$srcdir_cnt-`; \
 	  echo "rm -f $(DESTDIR)/$(pkgdatadir)/examples/$$f"; \
 	  rm -f $(DESTDIR)/$(pkgdatadir)/examples/$$f; \
 	done
+	echo "rm -f $(DESTDIR)/$(pkgdatadir)/examples/Makefile.jawt"
+	rm -f $(DESTDIR)/$(pkgdatadir)/examples/Makefile.jawt
 
 # Make sure everything is included in the distribution.
-EXTRA_DIST = README
+EXTRA_DIST = README Makefile.jawt.in
 dist-hook:
 	srcdir_cnt=`echo $(srcdir) | wc -c`; \
-	for file in $(EXAMPLE_JAVA_FILES) $(EXAMPLE_ICONS); do \
+	for file in $(ALL_EXAMPLE_FILES); do \
 	  f=`echo $$file | cut -c$$srcdir_cnt-`; \
 	  fdir=`dirname $$f`; \
 	  if test ! -d $(distdir)/$$fdir; then \
@@ -87,4 +97,4 @@ $(EXAMPLE_ZIP): $(EXAMPLE_JAVA_FILES)
 
 # Zip file be gone! (and make sure the classes are gone too)
 clean-local:
-	rm -f $(EXAMPLE_ZIP) classes
+	rm -rf $(EXAMPLE_ZIP) classes
diff --git a/libjava/classpath/examples/Makefile.in b/libjava/classpath/examples/Makefile.in
index 9d649201592..92c0858704b 100644
--- a/libjava/classpath/examples/Makefile.in
+++ b/libjava/classpath/examples/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -38,7 +38,8 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = examples
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.jawt.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../libtool.m4 \
 	$(top_srcdir)/m4/accross.m4 $(top_srcdir)/m4/acinclude.m4 \
@@ -49,7 +50,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = Makefile.jawt
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -92,8 +93,14 @@ CREATE_JNI_HEADERS_FALSE = @CREATE_JNI_HEADERS_FALSE@
 CREATE_JNI_HEADERS_TRUE = @CREATE_JNI_HEADERS_TRUE@
 CREATE_JNI_LIBRARIES_FALSE = @CREATE_JNI_LIBRARIES_FALSE@
 CREATE_JNI_LIBRARIES_TRUE = @CREATE_JNI_LIBRARIES_TRUE@
+CREATE_QT_PEER_LIBRARIES_FALSE = @CREATE_QT_PEER_LIBRARIES_FALSE@
+CREATE_QT_PEER_LIBRARIES_TRUE = @CREATE_QT_PEER_LIBRARIES_TRUE@
 CREATE_XMLJ_LIBRARY_FALSE = @CREATE_XMLJ_LIBRARY_FALSE@
 CREATE_XMLJ_LIBRARY_TRUE = @CREATE_XMLJ_LIBRARY_TRUE@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATE = @DATE@
 DEFS = @DEFS@
@@ -155,6 +162,7 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MKDIR = @MKDIR@
+MOC = @MOC@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -166,12 +174,13 @@ PANGOFT2_CFLAGS = @PANGOFT2_CFLAGS@
 PANGOFT2_LIBS = @PANGOFT2_LIBS@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+QT_CFLAGS = @QT_CFLAGS@
+QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
 REGEN_PARSERS_FALSE = @REGEN_PARSERS_FALSE@
 REGEN_PARSERS_TRUE = @REGEN_PARSERS_TRUE@
 REMOVE = @REMOVE@
 SET_MAKE = @SET_MAKE@
-SH = @SH@
 SHELL = @SHELL@
 STRICT_WARNING_CFLAGS = @STRICT_WARNING_CFLAGS@
 STRIP = @STRIP@
@@ -193,10 +202,13 @@ X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
 ZIP = @ZIP@
 ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -246,6 +258,9 @@ vm_classes = @vm_classes@
 # All our example java source files
 EXAMPLE_JAVA_FILES = $(srcdir)/gnu/classpath/examples/*/*.java
 
+# The example C source files
+EXAMPLE_C_FILES = $(srcdir)/gnu/classpath/examples/*/*.c
+
 # The zip files with classes we want to produce.
 EXAMPLE_ZIP = examples.zip
 
@@ -255,6 +270,9 @@ BUILT_SOURCES = $(EXAMPLE_ZIP)
 # the png icons we use in some of the examples.
 EXAMPLE_ICONS = $(srcdir)/gnu/classpath/examples/icons/*.png
 
+# All the files we find "interesting"
+ALL_EXAMPLE_FILES = $(EXAMPLE_JAVA_FILES) $(EXAMPLE_C_FILES) $(EXAMPLE_ICONS)
+
 # Some architecture independent data to be installed.
 example_DATA = $(EXAMPLE_ZIP) README
 
@@ -262,7 +280,7 @@ example_DATA = $(EXAMPLE_ZIP) README
 exampledir = $(pkgdatadir)/examples
 
 # Make sure everything is included in the distribution.
-EXTRA_DIST = README
+EXTRA_DIST = README Makefile.jawt.in
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -296,6 +314,8 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+Makefile.jawt: $(top_builddir)/config.status $(srcdir)/Makefile.jawt.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -458,7 +478,7 @@ uninstall-am: uninstall-exampleDATA uninstall-info-am uninstall-local
 # (Be careful to strip off the srcdir part of the path when installing.)
 install-data-local:
 	srcdir_cnt=`echo $(srcdir) | wc -c`; \
-	for file in $(EXAMPLE_JAVA_FILES) $(EXAMPLE_ICONS); do \
+	for file in $(ALL_EXAMPLE_FILES); do \
 	  f=`echo $$file | cut -c$$srcdir_cnt-`; \
 	  fdir=`dirname $$f`; \
 	  if test ! -d $(DESTDIR)/$(pkgdatadir)/examples/$$fdir; then \
@@ -468,17 +488,21 @@ install-data-local:
 	  echo "$(INSTALL_DATA) $$file $(DESTDIR)/$(pkgdatadir)/examples/$$f"; \
 	  $(INSTALL_DATA) $$file $(DESTDIR)/$(pkgdatadir)/examples/$$f; \
 	done
+	echo "$(INSTALL_DATA) Makefile.jawt $(DESTDIR)/$(pkgdatadir)/examples/"
+	$(INSTALL_DATA) Makefile.jawt $(DESTDIR)/$(pkgdatadir)/examples/
 
 uninstall-local:
 	srcdir_cnt=`echo $(srcdir) | wc -c`; \
-	for file in $(EXAMPLE_JAVA_FILES) $(EXAMPLE_ICONS); do \
+	for file in $(ALL_EXAMPLE_FILES); do \
 	  f=`echo $$file | cut -c$$srcdir_cnt-`; \
 	  echo "rm -f $(DESTDIR)/$(pkgdatadir)/examples/$$f"; \
 	  rm -f $(DESTDIR)/$(pkgdatadir)/examples/$$f; \
 	done
+	echo "rm -f $(DESTDIR)/$(pkgdatadir)/examples/Makefile.jawt"
+	rm -f $(DESTDIR)/$(pkgdatadir)/examples/Makefile.jawt
 dist-hook:
 	srcdir_cnt=`echo $(srcdir) | wc -c`; \
-	for file in $(EXAMPLE_JAVA_FILES) $(EXAMPLE_ICONS); do \
+	for file in $(ALL_EXAMPLE_FILES); do \
 	  f=`echo $$file | cut -c$$srcdir_cnt-`; \
 	  fdir=`dirname $$f`; \
 	  if test ! -d $(distdir)/$$fdir; then \
@@ -501,7 +525,7 @@ $(EXAMPLE_ZIP): $(EXAMPLE_JAVA_FILES)
 
 # Zip file be gone! (and make sure the classes are gone too)
 clean-local:
-	rm -f $(EXAMPLE_ZIP) classes
+	rm -rf $(EXAMPLE_ZIP) classes
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libjava/classpath/examples/README b/libjava/classpath/examples/README
index d850c2c1771..727677363c6 100644
--- a/libjava/classpath/examples/README
+++ b/libjava/classpath/examples/README
@@ -7,7 +7,8 @@ class Demo which contains a main() method to run that particular example.
 The examples can be compiled and run with gcj as follows:
 
   gcj -o swingdemo --main=gnu.classpath.examples.swing.Demo \
-      gnu/classpath/examples/swing/Demo.java
+      gnu/classpath/examples/swing/Demo.java \
+      gnu/classpath/examples/swing/GNULookAndFeel.java
   ./swingdemo
 
 Or with a traditional byte code interpreter like:
@@ -22,6 +23,29 @@ run as follows:
   kaffe -classpath examples.zip gnu.classpath.examples.awt.Demo
   kaffe -classpath examples.zip gnu.classpath.examples.swing.Demo
 
+The jawt Demo needs some extra support library that currently needs to be
+build by hand.  The following assumes GNU Classpath was installed in
+/usr/local/classpath, if you installed it somewhere else then adjust the
+-I and -L paths accordingly. The included Makefile.jawt is setup this way.
+
+You can invoke it with:
+
+	make -f Makefile.jawt
+
+Or you can compile by hand as follows:
+
+  gcj -C gnu/classpath/examples/jawt/DemoJAWT.java
+  gcjh -jni gnu.classpath.examples.jawt.DemoJAWT -o DemoJAWT.h
+  gcc -g -O0 -Wall -I. -I/usr/X11R6/include -L. -L/usr/X11R6/lib \
+    -I/usr/local/classpath/include -L/usr/local/classpath/lib/classpath \
+    -lX11 -ljawtgnu -shared -o libDemoJAWT.so \
+    gnu/classpath/examples/jawt/DemoJAWT.c
+
+You can then run the example as follows:
+
+  export LD_LIBRARY_PATH=.:/usr/local/classpath/lib/classpath
+  jamvm gnu.classpath.examples.jawt.DemoJAWT
+
 All example code is distributed under the GNU General Public License (GPL).
 
 The example icons used in some of the examples come from gnome-icon-theme
diff --git a/libjava/classpath/examples/gnu/classpath/examples/swing/Demo.java b/libjava/classpath/examples/gnu/classpath/examples/swing/Demo.java
index 4471be155dd..e8c428b5963 100644
--- a/libjava/classpath/examples/gnu/classpath/examples/swing/Demo.java
+++ b/libjava/classpath/examples/gnu/classpath/examples/swing/Demo.java
@@ -141,6 +141,8 @@ public class Demo
     preferences.add(new JCheckBoxMenuItem("Check Spelling",
 		    stockIcon("spell-check")));
     preferences.add(new JCheckBoxMenuItem("World Peace"));
+    preferences.add(new JSeparator());
+    preferences.add(new JRadioButtonMenuItem("Radio Button"));
     edit.add(preferences);
 
     JMenu examples = new JMenu("Examples");
@@ -493,6 +495,7 @@ public class Demo
 
     final JTree tree = new JTree(root);
     tree.setLargeModel(true);
+    tree.setEditable(true);
     DefaultTreeSelectionModel dtsm = new DefaultTreeSelectionModel();
     dtsm.setSelectionMode(DefaultTreeSelectionModel.SINGLE_TREE_SELECTION);
     tree.setSelectionModel(dtsm);
@@ -501,7 +504,6 @@ public class Demo
     JButton add = mkButton("add element");
     add.addActionListener(new ActionListener()
       {
-        int i = 0;
         public void actionPerformed(ActionEvent e)
         {
            for (int i = 0; i < tree.getRowCount(); i++)
@@ -641,6 +643,29 @@ public class Demo
     return panel;
   }
 
+  static JPanel mkTabWorld() 
+  {
+    JPanel panel = new JPanel(new GridLayout(2, 2));
+    panel.setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2));
+    JTabbedPane tabs1 = new JTabbedPane(SwingConstants.TOP);
+    tabs1.add("Top Item 1", new JButton("Button"));
+    tabs1.add("Top Item 2", new JButton("Button"));
+    JTabbedPane tabs2 = new JTabbedPane(SwingConstants.LEFT);
+    tabs2.add("Left Item 1", new JButton("Button"));
+    tabs2.add("Left Item 2", new JButton("Button"));
+    JTabbedPane tabs3 = new JTabbedPane(SwingConstants.BOTTOM);
+    tabs3.add("Bottom Item 1", new JButton("Button"));
+    tabs3.add("Bottom Item 2", new JButton("Button"));
+    JTabbedPane tabs4 = new JTabbedPane(SwingConstants.RIGHT);
+    tabs4.add("Right Item 1", new JButton("Button"));
+    tabs4.add("Right Item 2", new JButton("Button"));
+    panel.add(tabs1);
+    panel.add(tabs2);
+    panel.add(tabs3);
+    panel.add(tabs4);
+    return panel;        
+  }
+
   static JTabbedPane mkTabbedPane()
   {
     JTabbedPane tabs = new JTabbedPane();
@@ -649,6 +674,7 @@ public class Demo
     tabs.add("List world!", mkListWorld());
     tabs.add("Desktop world!", mkDesktopWorld());
     tabs.add("Tree world!", mkTreeWorld());
+    tabs.add("Tab world!", mkTabWorld());
     return tabs;
   }
 
@@ -658,6 +684,8 @@ public class Demo
     slider.setPaintTrack(true);
     slider.setPaintTicks(true);
     slider.setMajorTickSpacing(30);
+    slider.setMinorTickSpacing(5);
+    slider.setPaintLabels(true);
     slider.setInverted(false);
     JProgressBar progress = new JProgressBar();
     BoundedRangeModel model = new DefaultBoundedRangeModel(10, 1, 0, 100);
@@ -1063,7 +1091,13 @@ public class Demo
     
     JButton exitDisposer = mkDisposerButton(frame);
     panel.add(exitDisposer);
-
+    exitDisposer.addActionListener(new ActionListener()
+      {
+	public void actionPerformed(ActionEvent e)
+	{
+	  System.exit(1);
+	}
+      });
     return panel;
   }