diff options
| author | Lillian Angel <langel@redhat.com> | 2006-01-04 17:02:32 +0000 |
|---|---|---|
| committer | Lillian Angel <langel@redhat.com> | 2006-01-04 17:02:32 +0000 |
| commit | c62efcd94324a0abdc131f3103b10568f1e83fb4 (patch) | |
| tree | d1cb46ea73b11f06932ebe5ab9951d47af41429b | |
| parent | 1baaacb6a29d788aca623aa997f23289d09e9ff6 (diff) | |
| download | classpath-c62efcd94324a0abdc131f3103b10568f1e83fb4.tar.gz | |
2006-01-04 Lillian Angel <langel@redhat.com>
PR classpath/25473
PR classpath/25479
* javax/swing/JTree.java
(JTree): Because some L&F defaults have been updated,
the selectionMode for the tree needed to be set to SINGLE.
* javax/swing/plaf/basic/BasicFileChooserUI.java:
Initialized accessoryPanel.
* javax/swing/plaf/metal/MetalFileChooserUI.java
(installComponents): Added accessoryPanel to the filechooser.
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | javax/swing/JTree.java | 1 | ||||
| -rw-r--r-- | javax/swing/plaf/basic/BasicFileChooserUI.java | 2 | ||||
| -rw-r--r-- | javax/swing/plaf/metal/MetalFileChooserUI.java | 3 |
4 files changed, 15 insertions, 3 deletions
@@ -1,3 +1,15 @@ +2006-01-04 Lillian Angel <langel@redhat.com> + + PR classpath/25473 + PR classpath/25479 + * javax/swing/JTree.java + (JTree): Because some L&F defaults have been updated, + the selectionMode for the tree needed to be set to SINGLE. + * javax/swing/plaf/basic/BasicFileChooserUI.java: + Initialized accessoryPanel. + * javax/swing/plaf/metal/MetalFileChooserUI.java + (installComponents): Added accessoryPanel to the filechooser. + 2006-01-04 Dalibor Topic <robilad@kaffe.org> * configure.ac: Added AX_CREATE_STDINT_H diff --git a/javax/swing/JTree.java b/javax/swing/JTree.java index 4422a1933..cfcb2291b 100644 --- a/javax/swing/JTree.java +++ b/javax/swing/JTree.java @@ -1481,6 +1481,7 @@ public class JTree extends JComponent implements Scrollable, Accessible setRootVisible(true); setModel(model); setSelectionModel(new EmptySelectionModel()); + selectionModel.setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION); } /** diff --git a/javax/swing/plaf/basic/BasicFileChooserUI.java b/javax/swing/plaf/basic/BasicFileChooserUI.java index 60ec8d8c5..30e3156b4 100644 --- a/javax/swing/plaf/basic/BasicFileChooserUI.java +++ b/javax/swing/plaf/basic/BasicFileChooserUI.java @@ -669,7 +669,7 @@ public class BasicFileChooserUI extends FileChooserUI JButton accept; /** An optional accessory panel. */ - JPanel accessoryPanel; + JPanel accessoryPanel = new JPanel(); /** A property change listener. */ PropertyChangeListener propertyChangeListener; diff --git a/javax/swing/plaf/metal/MetalFileChooserUI.java b/javax/swing/plaf/metal/MetalFileChooserUI.java index 8a3e82def..2afe4cfa5 100644 --- a/javax/swing/plaf/metal/MetalFileChooserUI.java +++ b/javax/swing/plaf/metal/MetalFileChooserUI.java @@ -1350,6 +1350,7 @@ public class MetalFileChooserUI buttonPanel.add(cancelButton); bottomPanel.add(buttonPanel); fc.add(bottomPanel, BorderLayout.SOUTH); + fc.add(getAccessoryPanel(), BorderLayout.EAST); } /** @@ -1509,7 +1510,6 @@ public class MetalFileChooserUI { fileList.setModel(getModel()); fileListPanel.removeAll(); - scrollPane.setViewport(new JViewport()); scrollPane.getViewport().setView(fileList); } fileListPanel.add(scrollPane); @@ -1579,7 +1579,6 @@ public class MetalFileChooserUI while (rc > size) mod.removeRow(--rc); - scrollPane.setViewport(new JViewport()); scrollPane.getViewport().setView(fileTable); scrollPane.setColumnHeaderView(fileTable.getTableHeader()); scrollPane.getViewport().setScrollMode(JViewport.BACKINGSTORE_SCROLL_MODE); |