aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Koch <konqueror@gmx.de>2005-01-24 21:57:23 +0000
committerMichael Koch <konqueror@gmx.de>2005-01-24 21:57:23 +0000
commit4bf37be6c4632827d8db9425b0d1607b2253ca48 (patch)
treeab52a1dd20c539128bd6db32b1ef08be5ad336f2
parent990b38f65a42bf7bc3f40b32c8b2c829aaee6285 (diff)
2005-01-24 Michael Koch <konqueror@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. git-svn-id: https://gcc.gnu.org/svn/gcc/branches/java-gui-branch@94188 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--libjava/ChangeLog13
-rw-r--r--libjava/javax/swing/JScrollPane.java7
-rw-r--r--libjava/javax/swing/JSpinner.java8
-rw-r--r--libjava/javax/swing/JTable.java10
-rw-r--r--libjava/javax/swing/JWindow.java9
5 files changed, 32 insertions, 15 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index ec243b9ab3a..460503876f1 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,18 @@
2005-01-24 Michael Koch <konqueror@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-24 Michael Koch <konqueror@gmx.de>
+
* javax/swing/plaf/basic/BasicTextUI.java
(RootView.modelToView): Made it public and return a java.awt.Shape.
Handle null subview.
diff --git a/libjava/javax/swing/JScrollPane.java b/libjava/javax/swing/JScrollPane.java
index 01131b7268e..9f051cd68a3 100644
--- a/libjava/javax/swing/JScrollPane.java
+++ b/libjava/javax/swing/JScrollPane.java
@@ -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 @@ public class JScrollPane
super.setUI(ui);
}
- class ScrollBar
+ protected class ScrollBar
extends JScrollBar
implements UIResource
{
@@ -660,8 +660,5 @@ public class JScrollPane
direction);
}
}
-
-
}
-
}
diff --git a/libjava/javax/swing/JSpinner.java b/libjava/javax/swing/JSpinner.java
index 271c5119f22..ddb990d416c 100644
--- a/libjava/javax/swing/JSpinner.java
+++ b/libjava/javax/swing/JSpinner.java
@@ -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 @@ import javax.swing.plaf.SpinnerUI;
* way to manipulate the value.
*
* @author Ka-Hing Cheung
- * @version 1.0
+ *
+ * @since 1.4
*/
public class JSpinner extends JComponent
{
@@ -286,9 +287,6 @@ public class JSpinner extends JComponent
private JComponent editor;
/** DOCUMENT ME! */
- private EventListenerList listenerList = new EventListenerList();
-
- /** DOCUMENT ME! */
private ChangeListener listener = new ChangeListener()
{
public void stateChanged(ChangeEvent evt)
diff --git a/libjava/javax/swing/JTable.java b/libjava/javax/swing/JTable.java
index 09aff0b8e68..35764829d25 100644
--- a/libjava/javax/swing/JTable.java
+++ b/libjava/javax/swing/JTable.java
@@ -1864,4 +1864,14 @@ public class JTable extends JComponent
{
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));
+ }
}
diff --git a/libjava/javax/swing/JWindow.java b/libjava/javax/swing/JWindow.java
index 85829319cc1..13ac454a5be 100644
--- a/libjava/javax/swing/JWindow.java
+++ b/libjava/javax/swing/JWindow.java
@@ -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 @@ public class JWindow extends Window implements Accessible, RootPaneContainer
{
private static final long serialVersionUID = 5420698392125238833L;
- private boolean checking;
-
protected JRootPane rootPane;
+ protected boolean rootPaneCheckingEnabled;
protected AccessibleContext accessibleContext;
public JWindow()
@@ -176,12 +175,12 @@ public class JWindow extends Window implements Accessible, RootPaneContainer
protected boolean isRootPaneCheckingEnabled()
{
- return checking;
+ return rootPaneCheckingEnabled;
}
protected void setRootPaneCheckingEnabled(boolean enabled)
{
- checking = enabled;
+ rootPaneCheckingEnabled = enabled;
}
public void update(Graphics g)