[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: Swing cleanups

Kaffe CVS cvs-commits at kaffe.org
Wed Jan 26 05:35:30 PST 2005


PatchSet 5917 
Date: 2005/01/26 13:29:45
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: Swing cleanups

2005-01-26  Dalibor Topic  <robilad at kaffe.org>

        Resynced with GNU Classpath.

        2005-01-24  Michael Koch  <konqueror at gmx.de>

        * javax/swing/JScrollPane.java
        (ScrollBar): Made class protected.
        * javax/swing/JSpinner.java
        (JSpinner): Added @since tag.
        (listenerList): Removed.
        * javax/swing/JTable.java
        (setValueAt): New method.
        (getColumn): Likewise.
        * javax/swing/JWindow.java
        (rootPaneCheckingEnabled): Renamed from checking.

Members: 
	ChangeLog:1.3456->1.3457 
	libraries/javalib/javax/swing/JScrollPane.java:1.6->1.7 
	libraries/javalib/javax/swing/JSpinner.java:1.4->1.5 
	libraries/javalib/javax/swing/JTable.java:1.17->1.18 
	libraries/javalib/javax/swing/JWindow.java:1.6->1.7 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3456 kaffe/ChangeLog:1.3457
--- kaffe/ChangeLog:1.3456	Wed Jan 26 13:24:53 2005
+++ kaffe/ChangeLog	Wed Jan 26 13:29:45 2005
@@ -4,6 +4,23 @@
 
 	2005-01-24  Michael Koch  <konqueror at gmx.de>
 
+        * javax/swing/JScrollPane.java
+        (ScrollBar): Made class protected.
+        * javax/swing/JSpinner.java
+        (JSpinner): Added @since tag.
+        (listenerList): Removed.
+        * javax/swing/JTable.java
+        (setValueAt): New method.
+        (getColumn): Likewise.
+        * javax/swing/JWindow.java
+        (rootPaneCheckingEnabled): Renamed from checking.
+
+2005-01-26  Dalibor Topic  <robilad at kaffe.org>
+
+        Resynced with GNU Classpath.
+
+	2005-01-24  Michael Koch  <konqueror at gmx.de>
+
         * javax/swing/plaf/basic/BasicTextUI.java
         (RootView.modelToView): Made it public and return a java.awt.Shape.
         Handle null subview.
Index: kaffe/libraries/javalib/javax/swing/JScrollPane.java
diff -u kaffe/libraries/javalib/javax/swing/JScrollPane.java:1.6 kaffe/libraries/javalib/javax/swing/JScrollPane.java:1.7
--- kaffe/libraries/javalib/javax/swing/JScrollPane.java:1.6	Sat Oct  9 11:40:41 2004
+++ kaffe/libraries/javalib/javax/swing/JScrollPane.java	Wed Jan 26 13:29:53 2005
@@ -1,5 +1,5 @@
 /* JScrollPane.java -- 
-   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -624,7 +624,7 @@
     super.setUI(ui);
   }
 
-  class ScrollBar 
+  protected class ScrollBar 
     extends JScrollBar
     implements UIResource
   {
@@ -660,8 +660,5 @@
                                               direction);
         }
     }
-
-
   }
-  
 }
Index: kaffe/libraries/javalib/javax/swing/JSpinner.java
diff -u kaffe/libraries/javalib/javax/swing/JSpinner.java:1.4 kaffe/libraries/javalib/javax/swing/JSpinner.java:1.5
--- kaffe/libraries/javalib/javax/swing/JSpinner.java:1.4	Sun Oct 24 13:39:12 2004
+++ kaffe/libraries/javalib/javax/swing/JSpinner.java	Wed Jan 26 13:29:53 2005
@@ -1,5 +1,5 @@
 /* JSpinner.java --
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -59,7 +59,8 @@
  * way to manipulate the value.
  *
  * @author Ka-Hing Cheung
- * @version 1.0
+ * 
+ * @since 1.4
  */
 public class JSpinner extends JComponent
 {
@@ -284,9 +285,6 @@
 
   /** DOCUMENT ME! */
   private JComponent editor;
-
-  /** DOCUMENT ME! */
-  private EventListenerList listenerList = new EventListenerList();
 
   /** DOCUMENT ME! */
   private ChangeListener listener = new ChangeListener()
Index: kaffe/libraries/javalib/javax/swing/JTable.java
diff -u kaffe/libraries/javalib/javax/swing/JTable.java:1.17 kaffe/libraries/javalib/javax/swing/JTable.java:1.18
--- kaffe/libraries/javalib/javax/swing/JTable.java:1.17	Sat Jan 22 18:54:11 2005
+++ kaffe/libraries/javalib/javax/swing/JTable.java	Wed Jan 26 13:29:53 2005
@@ -1864,4 +1864,14 @@
   {
     return dataModel.getValueAt(row, convertColumnIndexToModel(column));
   }
+
+  public void setValueAt(Object value, int row, int column)
+  {
+    dataModel.setValueAt(value, row, convertColumnIndexToModel(column));
+  }
+
+  public TableColumn getColumn(Object identifier)
+  {
+    return columnModel.getColumn(columnModel.getColumnIndex(identifier));
+  }
 }
Index: kaffe/libraries/javalib/javax/swing/JWindow.java
diff -u kaffe/libraries/javalib/javax/swing/JWindow.java:1.6 kaffe/libraries/javalib/javax/swing/JWindow.java:1.7
--- kaffe/libraries/javalib/javax/swing/JWindow.java:1.6	Wed Jan  5 20:06:46 2005
+++ kaffe/libraries/javalib/javax/swing/JWindow.java	Wed Jan 26 13:29:53 2005
@@ -1,5 +1,5 @@
 /* JWindow.java --
-   Copyright (C) 2002, 2003, 2004  Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -62,9 +62,8 @@
 {
   private static final long serialVersionUID = 5420698392125238833L;
   
-  private boolean checking;
-  
   protected JRootPane rootPane;
+  protected boolean rootPaneCheckingEnabled;
   protected AccessibleContext accessibleContext;
 
   public JWindow()
@@ -176,12 +175,12 @@
 
   protected boolean isRootPaneCheckingEnabled()
   {
-    return checking;
+    return rootPaneCheckingEnabled;
   }
 
   protected void setRootPaneCheckingEnabled(boolean enabled)
   {
-    checking = enabled;
+    rootPaneCheckingEnabled = enabled;
   }
 
   public void update(Graphics g)




More information about the kaffe mailing list