[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: swing fixes

Kaffe CVS cvs-commits at kaffe.org
Fri Jun 10 12:46:48 PDT 2005


PatchSet 6613 
Date: 2005/06/10 19:40:44
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: swing fixes

Members: 
	ChangeLog:1.4139->1.4140 
	libraries/javalib/javax/swing/JFileChooser.java:1.6->1.7 
	libraries/javalib/javax/swing/JLayeredPane.java:1.7->1.8 
	libraries/javalib/javax/swing/SwingUtilities.java:1.14->1.15 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4139 kaffe/ChangeLog:1.4140
--- kaffe/ChangeLog:1.4139	Fri Jun 10 19:36:20 2005
+++ kaffe/ChangeLog	Fri Jun 10 19:40:44 2005
@@ -2,6 +2,26 @@
 
 	Resynced with GNU Classpath.
 
+	2005-05-30  Roman Kennke  <roman at kennke.org>
+
+	* javax/swing/JLayeredPane.java
+	(putLayer): Implemented new method.
+
+	2005-05-30  Roman Kennke  <roman at kennke.org>
+
+	* javax/swing/JFileChooser.java:
+	Fixed values of some constant fields.
+
+	2005-05-30  Roman Kennke  <roman at kennke.org>
+
+	* javax/swing/SwingUtilities.java:
+	(getWindowAncestor): This method has to be static instead of
+	non-static.
+	
+2005-06-10  Dalibor Topic  <robilad at kaffe.org>
+
+	Resynced with GNU Classpath.
+
 	2005-05-29  Michael Koch  <konqueror at gmx.de>
 
 	* java/util/LinkedHashMap.java (access): Set 'root.pred'.
Index: kaffe/libraries/javalib/javax/swing/JFileChooser.java
diff -u kaffe/libraries/javalib/javax/swing/JFileChooser.java:1.6 kaffe/libraries/javalib/javax/swing/JFileChooser.java:1.7
--- kaffe/libraries/javalib/javax/swing/JFileChooser.java:1.6	Mon May 30 01:27:47 2005
+++ kaffe/libraries/javalib/javax/swing/JFileChooser.java	Fri Jun 10 19:40:48 2005
@@ -114,10 +114,11 @@
 
   /** DOCUMENT ME! */
   public static final String SELECTED_FILE_CHANGED_PROPERTY =
-    "SelectedFilesChangedProperty";
+    "SelectedFileChangedProperty";
 
   /** DOCUMENT ME! */
-  public static final String SELECTED_FILES_CHANGED_PROPERTY = "selectedFiles";
+  public static final String SELECTED_FILES_CHANGED_PROPERTY =
+    "SelectedFilesChangedProperty";
 
   /** DOCUMENT ME! */
   public static final String MULTI_SELECTION_ENABLED_CHANGED_PROPERTY =
Index: kaffe/libraries/javalib/javax/swing/JLayeredPane.java
diff -u kaffe/libraries/javalib/javax/swing/JLayeredPane.java:1.7 kaffe/libraries/javalib/javax/swing/JLayeredPane.java:1.8
--- kaffe/libraries/javalib/javax/swing/JLayeredPane.java:1.7	Thu May 26 11:10:40 2005
+++ kaffe/libraries/javalib/javax/swing/JLayeredPane.java	Fri Jun 10 19:40:48 2005
@@ -599,4 +599,15 @@
     revalidate();
     repaint();
   }     
+
+  /**
+   * Sets the layer property for a JComponent.
+   *
+   * @param component the component for which to set the layer
+   * @param layer the layer property to set
+   */
+  public static void putLayer(JComponent component, int layer)
+  {
+    getLayeredPaneAbove(component).setLayer(component, layer);
+  }
 }
Index: kaffe/libraries/javalib/javax/swing/SwingUtilities.java
diff -u kaffe/libraries/javalib/javax/swing/SwingUtilities.java:1.14 kaffe/libraries/javalib/javax/swing/SwingUtilities.java:1.15
--- kaffe/libraries/javalib/javax/swing/SwingUtilities.java:1.14	Thu May 26 11:10:44 2005
+++ kaffe/libraries/javalib/javax/swing/SwingUtilities.java	Fri Jun 10 19:40:48 2005
@@ -365,7 +365,7 @@
    * @return the first ancestor Window of <code>comp</code> or
    *     <code>null</code> if <code>comp</code> is not contained in a Window
    */
-  public Window getWindowAncestor(Component comp)
+  public static Window getWindowAncestor(Component comp)
   {
     return (Window) getAncestorOfClass(Window.class, comp);
   }



More information about the kaffe mailing list