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.

From-SVN: r104586

1 files changed, 18 insertions, 18 deletions

diff --git a/libjava/classpath/javax/swing/UIDefaults.java b/libjava/classpath/javax/swing/UIDefaults.java
index 06fee05c658..ab78ca6442f 100644
--- a/libjava/classpath/javax/swing/UIDefaults.java
+++ b/libjava/classpath/javax/swing/UIDefaults.java
@@ -421,9 +421,9 @@ public class UIDefaults extends Hashtable
    * @return the font entry for <code>key</code> or null if no such entry
    *     exists
    */
-  public Font getFont(Object key, Locale l)
+  public Font getFont(Object key, Locale locale)
   {
-    Object o = get(key, l);
+    Object o = get(key, locale);
     return o instanceof Font ? (Font) o : null;
   }
 
@@ -450,9 +450,9 @@ public class UIDefaults extends Hashtable
    * @return the color entry for <code>key</code> or null if no such entry
    *     exists
    */
-  public Color getColor(Object key, Locale l)
+  public Color getColor(Object key, Locale locale)
   {
-    Object o = get(key, l);
+    Object o = get(key, locale);
     return o instanceof Color ? (Color) o : null;
   }
 
@@ -479,9 +479,9 @@ public class UIDefaults extends Hashtable
    * @return the icon entry for <code>key</code> or null if no such entry
    *     exists
    */
-  public Icon getIcon(Object key, Locale l)
+  public Icon getIcon(Object key, Locale locale)
   {
-    Object o = get(key, l);
+    Object o = get(key, locale);
     return o instanceof Icon ? (Icon) o : null;
   }
 
@@ -508,9 +508,9 @@ public class UIDefaults extends Hashtable
    * @return the border entry for <code>key</code> or null if no such entry
    *     exists
    */
-  public Border getBorder(Object key, Locale l)
+  public Border getBorder(Object key, Locale locale)
   {
-    Object o = get(key, l);
+    Object o = get(key, locale);
     return o instanceof Border ? (Border) o : null;
   }
 
@@ -537,9 +537,9 @@ public class UIDefaults extends Hashtable
    * @return the string entry for <code>key</code> or null if no such entry
    *     exists
    */
-  public String getString(Object key, Locale l)
+  public String getString(Object key, Locale locale)
   {
-    Object o = get(key, l);
+    Object o = get(key, locale);
     return o instanceof String ? (String) o : null;
   }
 
@@ -566,9 +566,9 @@ public class UIDefaults extends Hashtable
    * @return the integer entry for <code>key</code> or null if no such entry
    *     exists
    */
-  public int getInt(Object key, Locale l)
+  public int getInt(Object key, Locale locale)
   {
-    Object o = get(key, l);
+    Object o = get(key, locale);
     return o instanceof Integer ? ((Integer) o).intValue() : 0;
   }
 
@@ -594,9 +594,9 @@ public class UIDefaults extends Hashtable
    * @return the boolean entry for <code>key</code> or null if no such entry
    *     exists
    */
-  public boolean getBoolean(Object key, Locale l)
+  public boolean getBoolean(Object key, Locale locale)
   {
-    return Boolean.TRUE.equals(get(key, l));
+    return Boolean.TRUE.equals(get(key, locale));
   }
 
   /**
@@ -622,9 +622,9 @@ public class UIDefaults extends Hashtable
    * @return the boolean entry for <code>key</code> or null if no such entry
    *     exists
    */
-  public Insets getInsets(Object key, Locale l) 
+  public Insets getInsets(Object key, Locale locale) 
   {
-    Object o = get(key, l);
+    Object o = get(key, locale);
     return o instanceof Insets ? (Insets) o : null;
   }
 
@@ -651,9 +651,9 @@ public class UIDefaults extends Hashtable
    * @return the boolean entry for <code>key</code> or null if no such entry
    *     exists
    */
-  public Dimension getDimension(Object key, Locale l) 
+  public Dimension getDimension(Object key, Locale locale) 
   {
-    Object o = get(key, l);
+    Object o = get(key, locale);
     return o instanceof Dimension ? (Dimension) o : null;
   }