diff options
Diffstat (limited to 'libjava/javax/swing/plaf/basic')
30 files changed, 434 insertions, 374 deletions
diff --git a/libjava/javax/swing/plaf/basic/BasicButtonListener.java b/libjava/javax/swing/plaf/basic/BasicButtonListener.java index 2b4be67697c..48451c2373a 100644 --- a/libjava/javax/swing/plaf/basic/BasicButtonListener.java +++ b/libjava/javax/swing/plaf/basic/BasicButtonListener.java @@ -1,4 +1,4 @@ -/* BasicButtonListener.java +/* BasicButtonListener.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,6 +35,7 @@ this exception to your version of the library, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ + package javax.swing.plaf.basic; import java.awt.event.ActionEvent; @@ -58,12 +59,19 @@ public class BasicButtonListener implements MouseListener, MouseMotionListener, FocusListener, ChangeListener, PropertyChangeListener { + public BasicButtonListener(AbstractButton b) + { + // Do nothing here. + } + public void propertyChange(PropertyChangeEvent e) { } + protected void checkOpacity(AbstractButton b) { } + public void focusGained(FocusEvent e) { if (e.getSource() instanceof AbstractButton) @@ -86,6 +94,7 @@ public class BasicButtonListener button.repaint(); } } + public void installKeyboardActions(JComponent c) { c.getActionMap().put("pressed", @@ -114,20 +123,25 @@ public class BasicButtonListener } }); } + public void uninstallKeyboardActions(JComponent c) { c.getActionMap().put("pressed", null); c.getActionMap().put("released", null); } + public void stateChanged(ChangeEvent e) { } + public void mouseMoved(MouseEvent e) { } + public void mouseDragged(MouseEvent e) { } + public void mouseClicked(MouseEvent e) { } @@ -152,7 +166,6 @@ public class BasicButtonListener } } - /** * Accept a mouse release event and set the button's * "pressed" property to <code>true</code>, if the model @@ -175,7 +188,6 @@ public class BasicButtonListener } } - /** * Accept a mouse enter event and set the button's "rollover" property to * <code>true</code>, if the button's "rolloverEnabled" property is diff --git a/libjava/javax/swing/plaf/basic/BasicButtonUI.java b/libjava/javax/swing/plaf/basic/BasicButtonUI.java index ed04d281254..ed352e76794 100644 --- a/libjava/javax/swing/plaf/basic/BasicButtonUI.java +++ b/libjava/javax/swing/plaf/basic/BasicButtonUI.java @@ -1,5 +1,5 @@ -/* BasicButtonUI.java - Copyright (C) 2002, 2004 Free Software Foundation, Inc. +/* BasicButtonUI.java -- + Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,6 +35,7 @@ this exception to your version of the library, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ + package javax.swing.plaf.basic; import java.awt.Color; @@ -133,10 +134,10 @@ public class BasicButtonUI extends ButtonUI protected BasicButtonListener createButtonListener(AbstractButton b) { - return new BasicButtonListener(); + return new BasicButtonListener(b); } - public void installListeners(AbstractButton b) + protected void installListeners(AbstractButton b) { listener = createButtonListener(b); b.addChangeListener(listener); @@ -146,7 +147,7 @@ public class BasicButtonUI extends ButtonUI b.addMouseMotionListener(listener); } - public void uninstallListeners(AbstractButton b) + protected void uninstallListeners(AbstractButton b) { b.removeChangeListener(listener); b.removePropertyChangeListener(listener); diff --git a/libjava/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java b/libjava/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java index a0cf5a43fec..5d7bbcd2c33 100644 --- a/libjava/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java +++ b/libjava/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java @@ -98,7 +98,7 @@ public class BasicCheckBoxMenuItemUI extends BasicMenuItemUI */ public void processMouseEvent(JMenuItem item, MouseEvent e, MenuElement[] path, - MenuSelectionManager manager) + MenuSelectionManager manager) { } } diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxEditor.java b/libjava/javax/swing/plaf/basic/BasicComboBoxEditor.java index b306af71d1d..a55e13c954c 100644 --- a/libjava/javax/swing/plaf/basic/BasicComboBoxEditor.java +++ b/libjava/javax/swing/plaf/basic/BasicComboBoxEditor.java @@ -46,7 +46,6 @@ import java.awt.event.FocusListener; import javax.swing.ComboBoxEditor; import javax.swing.JTextField; import javax.swing.border.EmptyBorder; -import javax.swing.plaf.UIResource; /** * This is a component that is responsible for displaying/editting selected diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxRenderer.java b/libjava/javax/swing/plaf/basic/BasicComboBoxRenderer.java index 5dc0f489e20..9f61e0d18e2 100644 --- a/libjava/javax/swing/plaf/basic/BasicComboBoxRenderer.java +++ b/libjava/javax/swing/plaf/basic/BasicComboBoxRenderer.java @@ -50,7 +50,6 @@ import javax.swing.UIDefaults; import javax.swing.UIManager; import javax.swing.border.Border; import javax.swing.border.EmptyBorder; -import javax.swing.plaf.UIResource; /** * This class is renderer for the combo box. diff --git a/libjava/javax/swing/plaf/basic/BasicComboBoxUI.java b/libjava/javax/swing/plaf/basic/BasicComboBoxUI.java index 3ba13a2a1e1..9044ed76c86 100644 --- a/libjava/javax/swing/plaf/basic/BasicComboBoxUI.java +++ b/libjava/javax/swing/plaf/basic/BasicComboBoxUI.java @@ -1,5 +1,5 @@ /* BasicComboBoxUI.java -- - Copyright (C) 2004 Free Software Foundation, Inc. + Copyright (C) 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -80,6 +80,7 @@ import javax.swing.plaf.ComponentUI; * UI Delegate for JComboBox * * @author Olga Rodimina + * @author Robert Schuster */ public class BasicComboBoxUI extends ComboBoxUI { @@ -783,22 +784,25 @@ public class BasicComboBoxUI extends ComboBoxUI { Object currentValue = comboBox.getSelectedItem(); boolean isPressed = arrowButton.getModel().isPressed(); - if (currentValue != null) - { - Component comp = comboBox.getRenderer() + + /* Gets the component to be drawn for the current value. + * If there is currently no selected item we will take an empty + * String as replacement. + */ + Component comp = comboBox.getRenderer() .getListCellRendererComponent(listBox, - currentValue, + (currentValue != null ? currentValue : ""), -1, isPressed, hasFocus); - if (! comboBox.isEnabled()) + if (! comboBox.isEnabled()) comp.setEnabled(false); - g.translate(borderInsets.left, borderInsets.top); + g.translate(borderInsets.left, borderInsets.top); comp.setBounds(0, 0, bounds.width, bounds.height); comp.paint(g); g.translate(-borderInsets.left, -borderInsets.top); - } + comboBox.revalidate(); } else @@ -1142,7 +1146,7 @@ public class BasicComboBoxUI extends ComboBoxUI */ public void propertyChange(PropertyChangeEvent e) { - if (e.getPropertyName().equals(JComboBox.ENABLED_CHANGED_PROPERTY)) + if (e.getPropertyName().equals("enabled")) { arrowButton.setEnabled(comboBox.isEnabled()); @@ -1150,7 +1154,7 @@ public class BasicComboBoxUI extends ComboBoxUI comboBox.getEditor().getEditorComponent().setEnabled(comboBox .isEnabled()); } - else if (e.getPropertyName().equals(JComboBox.EDITABLE_CHANGED_PROPERTY)) + else if (e.getPropertyName().equals("editable")) { if (comboBox.isEditable()) { @@ -1166,7 +1170,7 @@ public class BasicComboBoxUI extends ComboBoxUI comboBox.revalidate(); comboBox.repaint(); } - else if (e.getPropertyName().equals(JComboBox.MODEL_CHANGED_PROPERTY)) + else if (e.getPropertyName().equals("dataModel")) { // remove ListDataListener from old model and add it to new model ComboBoxModel oldModel = (ComboBoxModel) e.getOldValue(); diff --git a/libjava/javax/swing/plaf/basic/BasicComboPopup.java b/libjava/javax/swing/plaf/basic/BasicComboPopup.java index bec7f058f9d..2acc21fa7d4 100644 --- a/libjava/javax/swing/plaf/basic/BasicComboPopup.java +++ b/libjava/javax/swing/plaf/basic/BasicComboPopup.java @@ -1,5 +1,5 @@ /* BasicComboPopup.java -- - Copyright (C) 2004 Free Software Foundation, Inc. + Copyright (C) 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -938,13 +938,13 @@ public class BasicComboPopup extends JPopupMenu implements ComboPopup public void propertyChange(PropertyChangeEvent e) { - if (e.getPropertyName().equals(JComboBox.RENDERER_CHANGED_PROPERTY)) + if (e.getPropertyName().equals("renderer")) { list.setCellRenderer((ListCellRenderer) e.getNewValue()); revalidate(); repaint(); } - if (e.getPropertyName().equals(JComboBox.MODEL_CHANGED_PROPERTY)) + if (e.getPropertyName().equals("dataModel")) { list.setModel((ComboBoxModel) e.getNewValue()); revalidate(); diff --git a/libjava/javax/swing/plaf/basic/BasicEditorPaneUI.java b/libjava/javax/swing/plaf/basic/BasicEditorPaneUI.java new file mode 100644 index 00000000000..18cacab1149 --- /dev/null +++ b/libjava/javax/swing/plaf/basic/BasicEditorPaneUI.java @@ -0,0 +1,68 @@ +/* BasicEditorPaneUI.java -- + Copyright (C) 2004 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + + +package javax.swing.plaf.basic; + +import javax.swing.JComponent; +import javax.swing.plaf.ComponentUI; +import javax.swing.text.Element; +import javax.swing.text.PlainView; +import javax.swing.text.View; + +public class BasicEditorPaneUI extends BasicTextUI +{ + public static ComponentUI createUI(JComponent comp) + { + return new BasicEditorPaneUI(); + } + + public BasicEditorPaneUI() + { + // Do nothing here. + } + + public View create(Element elem) + { + return new PlainView(elem); + } + + protected String getPropertyPrefix() + { + return "EditorPane"; + } +} diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java index 36bb4ec2e93..fd2832a4073 100644 --- a/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java +++ b/libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java @@ -288,6 +288,14 @@ public class BasicInternalFrameTitlePane extends JComponent protected class TitlePaneLayout implements LayoutManager { /** + * Creates a new <code>TitlePaneLayout</code> object. + */ + public TitlePaneLayout() + { + // Do nothing. + } + + /** * This method is called when adding a Component to the Container. * * @param name The name to reference the added Component by. diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI.java b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI.java index 990a3e3f9e0..594bb7ecf93 100644 --- a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI.java +++ b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI.java @@ -821,7 +821,7 @@ public class BasicInternalFrameUI extends InternalFrameUI if (e instanceof MouseEvent) { MouseEvent me = SwingUtilities.convertMouseEvent(frame.getRootPane() - .getGlassPane(), + .getGlassPane(), (MouseEvent) e, frame.getRootPane() .getGlassPane()); @@ -1105,7 +1105,7 @@ public class BasicInternalFrameUI extends InternalFrameUI installDefaults(); installListeners(); - installComponents(); + installComponents(); installKeyboardActions(); frame.setOpaque(true); @@ -1122,7 +1122,7 @@ public class BasicInternalFrameUI extends InternalFrameUI public void uninstallUI(JComponent c) { uninstallKeyboardActions(); - uninstallComponents(); + uninstallComponents(); uninstallListeners(); uninstallDefaults(); diff --git a/libjava/javax/swing/plaf/basic/BasicLabelUI.java b/libjava/javax/swing/plaf/basic/BasicLabelUI.java index 46d012ddd58..b278f1f593b 100644 --- a/libjava/javax/swing/plaf/basic/BasicLabelUI.java +++ b/libjava/javax/swing/plaf/basic/BasicLabelUI.java @@ -176,12 +176,12 @@ public class BasicLabelUI extends LabelUI implements PropertyChangeListener if (icon != null) icon.paintIcon(b, g, ir.x, ir.y); if (text != null && ! text.equals("")) - { - if (b.isEnabled()) - paintEnabledText(b, g, text, tr.x, tr.y + fm.getAscent()); - else - paintDisabledText(b, g, text, tr.x, tr.y + fm.getAscent()); - } + { + if (b.isEnabled()) + paintEnabledText(b, g, text, tr.x, tr.y + fm.getAscent()); + else + paintDisabledText(b, g, text, tr.x, tr.y + fm.getAscent()); + } g.setFont(saved_font); } diff --git a/libjava/javax/swing/plaf/basic/BasicListUI.java b/libjava/javax/swing/plaf/basic/BasicListUI.java index 50bbb819f62..b39421798fa 100644 --- a/libjava/javax/swing/plaf/basic/BasicListUI.java +++ b/libjava/javax/swing/plaf/basic/BasicListUI.java @@ -686,7 +686,7 @@ public class BasicListUI extends ListUI { Rectangle bounds = getCellBounds(list, row, row); if (bounds.intersects(clip)) - paintCell(g, row, bounds, render, model, sel, lead); + paintCell(g, row, bounds, render, model, sel, lead); } } diff --git a/libjava/javax/swing/plaf/basic/BasicMenuBarUI.java b/libjava/javax/swing/plaf/basic/BasicMenuBarUI.java index a1920fb5e31..bed2d051cc3 100644 --- a/libjava/javax/swing/plaf/basic/BasicMenuBarUI.java +++ b/libjava/javax/swing/plaf/basic/BasicMenuBarUI.java @@ -1,5 +1,5 @@ /* BasicMenuBarUI.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. @@ -294,9 +294,9 @@ public class BasicMenuBarUI extends MenuBarUI */ public void propertyChange(PropertyChangeEvent e) { - if (e.getPropertyName().equals(JMenuBar.BORDER_PAINTED_CHANGED_PROPERTY)) + if (e.getPropertyName().equals("borderPainted")) menuBar.repaint(); - if (e.getPropertyName().equals(JMenuBar.MARGIN_CHANGED_PROPERTY)) + if (e.getPropertyName().equals("margin")) menuBar.repaint(); } } diff --git a/libjava/javax/swing/plaf/basic/BasicMenuItemUI.java b/libjava/javax/swing/plaf/basic/BasicMenuItemUI.java index da3f5598d05..ff48a74f074 100644 --- a/libjava/javax/swing/plaf/basic/BasicMenuItemUI.java +++ b/libjava/javax/swing/plaf/basic/BasicMenuItemUI.java @@ -619,9 +619,9 @@ public class BasicMenuItemUI extends MenuItemUI textRect.y + fm.getAscent()); else - BasicGraphicsUtils.drawString(g, text, 0, textRect.x, - textRect.y + fm.getAscent()); - } + BasicGraphicsUtils.drawString(g, text, 0, textRect.x, + textRect.y + fm.getAscent()); + } } /** @@ -760,7 +760,7 @@ public class BasicMenuItemUI extends MenuItemUI FontMetrics fm = g.getFontMetrics(acceleratorFont); if (menuItem.isEnabled()) - g.setColor(acceleratorForeground); + g.setColor(acceleratorForeground); else // FIXME: should fix this to use 'disabledForeground', but its // default value in BasicLookAndFeel is null. diff --git a/libjava/javax/swing/plaf/basic/BasicMenuUI.java b/libjava/javax/swing/plaf/basic/BasicMenuUI.java index 98af9546a4b..7cd16f9e75e 100644 --- a/libjava/javax/swing/plaf/basic/BasicMenuUI.java +++ b/libjava/javax/swing/plaf/basic/BasicMenuUI.java @@ -299,7 +299,7 @@ public class BasicMenuUI extends BasicMenuItemUI if (i) if this menu is a submenu in some other menu (ii) or if this menu is in a menu bar and some other menu in a menu bar was just selected. (If nothing was selected, menu should be pressed before - it will be selected) + it will be selected) */ JMenu menu = (JMenu) menuItem; if (! menu.isTopLevelMenu() @@ -328,15 +328,15 @@ public class BasicMenuUI extends BasicMenuItemUI MenuSelectionManager manager = MenuSelectionManager.defaultManager(); JMenu menu = (JMenu) menuItem; manager.processMouseEvent(e); - + // Menu should be displayed when the menu is pressed only if // it is top-level menu if (menu.isTopLevelMenu()) { if (menu.getPopupMenu().isVisible()) - // If menu is visible and menu button was pressed.. - // then need to cancel the menu - manager.clearSelectedPath(); + // If menu is visible and menu button was pressed.. + // then need to cancel the menu + manager.clearSelectedPath(); else { // Display the menu diff --git a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI.java b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI.java index 609fd11ab8a..7d5e0149388 100644 --- a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI.java +++ b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI.java @@ -847,17 +847,17 @@ public class BasicOptionPaneUI extends OptionPaneUI addIcon(messageArea); JPanel rightSide = new JPanel() - { - public Dimension getPreferredSize() - { + { + public Dimension getPreferredSize() + { int w = Math.max(optionPane.getSize().width, minimumWidth); - Insets i = optionPane.getInsets(); - Dimension orig = super.getPreferredSize(); - Dimension value = new Dimension(w - i.left - i.right - iconSize, - orig.height); - return value; - } - }; + Insets i = optionPane.getInsets(); + Dimension orig = super.getPreferredSize(); + Dimension value = new Dimension(w - i.left - i.right - iconSize, + orig.height); + return value; + } + }; rightSide.setLayout(new GridBagLayout()); GridBagConstraints con = createConstraints(); diff --git a/libjava/javax/swing/plaf/basic/BasicProgressBarUI.java b/libjava/javax/swing/plaf/basic/BasicProgressBarUI.java index 9398ab86c1b..1feb2c4ce45 100644 --- a/libjava/javax/swing/plaf/basic/BasicProgressBarUI.java +++ b/libjava/javax/swing/plaf/basic/BasicProgressBarUI.java @@ -1,5 +1,5 @@ /* BasicProgressBarUI.java -- - Copyright (C) 2004 Free Software Foundation, Inc. + Copyright (C) 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -103,7 +103,7 @@ public class BasicProgressBarUI extends ProgressBarUI { // Only need to listen for indeterminate changes. // All other things are done on a repaint. - if (e.getPropertyName().equals(JProgressBar.INDETERMINATE_CHANGED_PROPERTY)) + if (e.getPropertyName().equals("inderterminate")) if (((Boolean) e.getNewValue()).booleanValue()) startAnimationTimer(); else @@ -467,7 +467,7 @@ public class BasicProgressBarUI extends ProgressBarUI /** * This method increments the animation index. */ - public void incrementAnimationIndex() + protected void incrementAnimationIndex() { animationIndex++; //numFrames is like string length, it should be named numFrames or something diff --git a/libjava/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java b/libjava/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java index 3b17f3608d0..55cfdc033e5 100644 --- a/libjava/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java +++ b/libjava/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java @@ -66,11 +66,11 @@ public class BasicRadioButtonMenuItemUI extends BasicMenuItemUI /** * Factory method to create a BasicRadioButtonMenuItemUI for the given {@link * JComponent}, which should be a JRadioButtonMenuItem. - * + * * @param b The {@link JComponent} a UI is being created for. - * + * * @return A BasicRadioButtonMenuItemUI for the {@link JComponent}. - */ + */ public static ComponentUI createUI(JComponent b) { return new BasicRadioButtonMenuItemUI(); @@ -96,7 +96,7 @@ public class BasicRadioButtonMenuItemUI extends BasicMenuItemUI */ public void processMouseEvent(JMenuItem item, MouseEvent e, MenuElement[] path, - MenuSelectionManager manager) + MenuSelectionManager manager) { } } diff --git a/libjava/javax/swing/plaf/basic/BasicRootPaneUI.java b/libjava/javax/swing/plaf/basic/BasicRootPaneUI.java index 110200e58ab..4923b90b265 100644 --- a/libjava/javax/swing/plaf/basic/BasicRootPaneUI.java +++ b/libjava/javax/swing/plaf/basic/BasicRootPaneUI.java @@ -49,17 +49,17 @@ import javax.swing.plaf.RootPaneUI; public class BasicRootPaneUI extends RootPaneUI implements PropertyChangeListener { - public static ComponentUI createUI(JComponent x) - { - return new BasicRootPaneUI(); - } + public static ComponentUI createUI(JComponent x) + { + return new BasicRootPaneUI(); + } - public void installUI(JComponent c) - { - c.setOpaque(true); + public void installUI(JComponent c) + { + c.setOpaque(true); c.setBackground(UIManager.getColor("control")); - super.installUI(c); - } + super.installUI(c); + } public void propertyChange(PropertyChangeEvent event) { diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI.java b/libjava/javax/swing/plaf/basic/BasicScrollBarUI.java index 446726e8bf8..36939b21da0 100644 --- a/libjava/javax/swing/plaf/basic/BasicScrollBarUI.java +++ b/libjava/javax/swing/plaf/basic/BasicScrollBarUI.java @@ -1,5 +1,5 @@ /* BasicScrollBarUI.java -- - Copyright (C) 2004 Free Software Foundation, Inc. + Copyright (C) 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -142,13 +142,13 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager, */ public void propertyChange(PropertyChangeEvent e) { - if (e.getPropertyName().equals(JScrollBar.MODEL_CHANGED_PROPERTY)) + if (e.getPropertyName().equals("model")) { ((BoundedRangeModel) e.getOldValue()).removeChangeListener(modelListener); scrollbar.getModel().addChangeListener(modelListener); getThumbBounds(); } - else if (e.getPropertyName().equals(JScrollBar.ORIENTATION_CHANGED_PROPERTY)) + else if (e.getPropertyName().equals("orientation")) { incrButton.removeMouseListener(buttonListener); decrButton.removeMouseListener(buttonListener); diff --git a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI.java b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI.java index 4d70412479a..b4618b2f7bf 100644 --- a/libjava/javax/swing/plaf/basic/BasicScrollPaneUI.java +++ b/libjava/javax/swing/plaf/basic/BasicScrollPaneUI.java @@ -53,11 +53,11 @@ import javax.swing.plaf.ScrollPaneUI; public class BasicScrollPaneUI extends ScrollPaneUI implements ScrollPaneConstants { - - public static ComponentUI createUI(final JComponent c) - { - return new BasicScrollPaneUI(); - } + + public static ComponentUI createUI(final JComponent c) + { + return new BasicScrollPaneUI(); + } protected void installDefaults(JScrollPane p) { @@ -77,9 +77,9 @@ public class BasicScrollPaneUI extends ScrollPaneUI p.setBorder(null); } - public void installUI(final JComponent c) - { - super.installUI(c); + public void installUI(final JComponent c) + { + super.installUI(c); this.installDefaults((JScrollPane)c); } @@ -87,29 +87,29 @@ public class BasicScrollPaneUI extends ScrollPaneUI { super.uninstallUI(c); this.uninstallDefaults((JScrollPane)c); - } - + } + - public Dimension getMinimumSize(JComponent c) - { - JScrollPane p = (JScrollPane ) c; - ScrollPaneLayout sl = (ScrollPaneLayout) p.getLayout(); - return sl.minimumLayoutSize(c); - } - - public Dimension getPreferredSize(JComponent c) - { - JScrollPane p = (JScrollPane ) c; - ScrollPaneLayout sl = (ScrollPaneLayout) p.getLayout(); - return sl.preferredLayoutSize(c); - } - - - public void paint(Graphics g, JComponent c) - { - // do nothing; the normal painting-of-children algorithm, along with - // ScrollPaneLayout, does all the relevant work. - } + public Dimension getMinimumSize(JComponent c) + { + JScrollPane p = (JScrollPane ) c; + ScrollPaneLayout sl = (ScrollPaneLayout) p.getLayout(); + return sl.minimumLayoutSize(c); + } + + public Dimension getPreferredSize(JComponent c) + { + JScrollPane p = (JScrollPane ) c; + ScrollPaneLayout sl = (ScrollPaneLayout) p.getLayout(); + return sl.preferredLayoutSize(c); + } + + + public void paint(Graphics g, JComponent c) + { + // do nothing; the normal painting-of-children algorithm, along with + // ScrollPaneLayout, does all the relevant work. + } } diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI.java b/libjava/javax/swing/plaf/basic/BasicSliderUI.java index 648e332639b..a08acc9bdad 100644 --- a/libjava/javax/swing/plaf/basic/BasicSliderUI.java +++ b/libjava/javax/swing/plaf/basic/BasicSliderUI.java @@ -1,5 +1,5 @@ /* BasicSliderUI.java -- - Copyright (C) 2004 Free Software Foundation, Inc. + Copyright (C) 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -139,7 +139,7 @@ public class BasicSliderUI extends SliderUI /** * Helper class that listens to the {@link JSlider}'s model for changes. */ - protected class ChangeHandler implements ChangeListener + public class ChangeHandler implements ChangeListener { /** * Called when the slider's model has been altered. The UI delegate should @@ -182,7 +182,7 @@ public class BasicSliderUI extends SliderUI /** * Helper class that listens for focus events. */ - protected class FocusHandler implements FocusListener + public class FocusHandler implements FocusListener { /** * Called when the {@link JSlider} has gained focus. It should repaint @@ -211,7 +211,7 @@ public class BasicSliderUI extends SliderUI * Helper class that listens for changes to the properties of the {@link * JSlider}. */ - protected class PropertyChangeHandler implements PropertyChangeListener + public class PropertyChangeHandler implements PropertyChangeListener { /** * Called when one of the properties change. The UI should recalculate any @@ -222,15 +222,15 @@ public class BasicSliderUI extends SliderUI public void propertyChange(PropertyChangeEvent e) { // Check for orientation changes. - if (e.getPropertyName().equals(JSlider.ORIENTATION_CHANGED_PROPERTY)) + if (e.getPropertyName().equals("orientation")) recalculateIfOrientationChanged(); - else if (e.getPropertyName().equals(JSlider.MODEL_CHANGED_PROPERTY)) - { - BoundedRangeModel oldModel = (BoundedRangeModel) e.getOldValue(); - oldModel.removeChangeListener(changeListener); - slider.getModel().addChangeListener(changeListener); - calculateThumbLocation(); - } + else if (e.getPropertyName().equals("model")) + { + BoundedRangeModel oldModel = (BoundedRangeModel) e.getOldValue(); + oldModel.removeChangeListener(changeListener); + slider.getModel().addChangeListener(changeListener); + calculateThumbLocation(); + } // elif the componentOrientation changes (this is a bound property, // just undocumented) we change leftToRightCache. In Sun's @@ -247,7 +247,7 @@ public class BasicSliderUI extends SliderUI * for listening to the timer and moving the thumb in the proper direction * every interval. */ - protected class ScrollListener implements ActionListener + public class ScrollListener implements ActionListener { /** Indicates which direction the thumb should scroll. */ private transient int direction; @@ -346,15 +346,15 @@ public class BasicSliderUI extends SliderUI currentMouseX = e.getX(); currentMouseY = e.getY(); if (slider.getValueIsAdjusting()) - { - int value; - if (slider.getOrientation() == JSlider.HORIZONTAL) - value = valueForXPosition(currentMouseX) - offset; - else - value = valueForYPosition(currentMouseY) - offset; - - slider.setValue(value); - } + { + int value; + if (slider.getOrientation() == JSlider.HORIZONTAL) + value = valueForXPosition(currentMouseX) - offset; + else + value = valueForYPosition(currentMouseY) - offset; + + slider.setValue(value); + } } /** @@ -391,7 +391,7 @@ public class BasicSliderUI extends SliderUI value = findClosestTick(value); // If the thumb is hit, then we don't need to set the timers to move it. - if (!thumbRect.contains(e.getPoint())) + if (! thumbRect.contains(e.getPoint())) { // The mouse has hit some other part of the slider. // The value moves no matter where in the slider you hit. @@ -403,8 +403,8 @@ public class BasicSliderUI extends SliderUI else { slider.setValueIsAdjusting(true); - offset = value - slider.getValue(); - } + offset = value - slider.getValue(); + } } /** @@ -419,11 +419,11 @@ public class BasicSliderUI extends SliderUI currentMouseY = e.getY(); if (slider.getValueIsAdjusting()) - { - slider.setValueIsAdjusting(false); - if (slider.getSnapToTicks()) - slider.setValue(findClosestTick(slider.getValue())); - } + { + slider.setValueIsAdjusting(false); + if (slider.getSnapToTicks()) + slider.setValue(findClosestTick(slider.getValue())); + } if (scrollTimer != null) scrollTimer.stop(); } @@ -862,22 +862,22 @@ public class BasicSliderUI extends SliderUI public Dimension getPreferredHorizontalSize() { Insets insets = slider.getInsets(); - + // The width should cover all the labels (which are usually the // deciding factor of the width) int width = getWidthOfWidestLabel() * (slider.getLabelTable() == null ? 0 : slider.getLabelTable() .size()); - + // If there are not enough labels. // This number is pretty much arbitrary, but it looks nice. if (width < 200) width = 200; - + // We can only draw inside of the focusRectangle, so we have to // pad it with insets. width += insets.left + insets.right + focusInsets.left + focusInsets.right; - + // Height is determined by the thumb, the ticks and the labels. int height = thumbHeight; @@ -887,10 +887,10 @@ public class BasicSliderUI extends SliderUI if (slider.getPaintLabels()) height += getHeightOfTallestLabel(); - + height += insets.top + insets.bottom + focusInsets.top + focusInsets.bottom; - + return new Dimension(width, height); } @@ -903,19 +903,19 @@ public class BasicSliderUI extends SliderUI public Dimension getPreferredVerticalSize() { Insets insets = slider.getInsets(); - + int height = getHeightOfTallestLabel() * (slider.getLabelTable() == null ? 0 : slider.getLabelTable() .size()); - + if (height < 200) height = 200; - + height += insets.top + insets.bottom + focusInsets.top + focusInsets.bottom; int width = thumbHeight; - + if (slider.getPaintTicks() && slider.getMajorTickSpacing() > 0 || slider.getMinorTickSpacing() > 0) width += tickHeight; @@ -924,7 +924,7 @@ public class BasicSliderUI extends SliderUI width += getWidthOfWidestLabel(); width += insets.left + insets.right + focusInsets.left + focusInsets.right; - + return new Dimension(width, height); } @@ -960,7 +960,7 @@ public class BasicSliderUI extends SliderUI * @return The dimensions of the preferred size. */ public Dimension getPreferredSize(JComponent c) - { + { if (slider.getOrientation() == JSlider.HORIZONTAL) return getPreferredHorizontalSize(); else @@ -1000,22 +1000,22 @@ public class BasicSliderUI extends SliderUI else return getPreferredVerticalSize(); } - + /** * This method calculates all the sizes of the rectangles by delegating to * the helper methods calculateXXXRect. */ - protected void calculateGeometry() - { - calculateFocusRect(); - calculateContentRect(); - calculateThumbSize(); - calculateTrackBuffer(); - calculateTrackRect(); - calculateTickRect(); - calculateLabelRect(); - calculateThumbLocation(); - } + protected void calculateGeometry() + { + calculateFocusRect(); + calculateContentRect(); + calculateThumbSize(); + calculateTrackBuffer(); + calculateTrackRect(); + calculateTickRect(); + calculateLabelRect(); + calculateThumbLocation(); + } /** * This method calculates the size and position of the focusRect. This @@ -1412,7 +1412,7 @@ public class BasicSliderUI extends SliderUI leftToRightCache = slider.getComponentOrientation() != ComponentOrientation.RIGHT_TO_LEFT; // FIXME: This next line is only here because the above line is here. calculateThumbLocation(); - + if (slider.getPaintTrack()) paintTrack(g); if (slider.getPaintTicks()) @@ -1573,8 +1573,8 @@ public class BasicSliderUI extends SliderUI { double loc = tickRect.x; double increment = (max == min) ? 0 - : majorSpace * (double) tickRect.width / (max - - min); + : majorSpace * (double) tickRect.width / (max + - min); if (drawInverted()) { loc += tickRect.width; @@ -1590,8 +1590,8 @@ public class BasicSliderUI extends SliderUI { double loc = tickRect.height + tickRect.y; double increment = (max == min) ? 0 - : -majorSpace * (double) tickRect.height / (max - - min); + : -majorSpace * (double) tickRect.height / (max + - min); if (drawInverted()) { loc = tickRect.y; @@ -1610,8 +1610,8 @@ public class BasicSliderUI extends SliderUI { double loc = tickRect.x; double increment = (max == min) ? 0 - : minorSpace * (double) tickRect.width / (max - - min); + : minorSpace * (double) tickRect.width / (max + - min); if (drawInverted()) { loc += tickRect.width; @@ -1627,8 +1627,8 @@ public class BasicSliderUI extends SliderUI { double loc = tickRect.height + tickRect.y; double increment = (max == min) ? 0 - : -minorSpace * (double) tickRect.height / (max - - min); + : -minorSpace * (double) tickRect.height / (max + - min); if (drawInverted()) { loc = tickRect.y; @@ -1800,13 +1800,13 @@ public class BasicSliderUI extends SliderUI Dimension dim = label.getPreferredSize(); int w = (int) dim.getWidth(); int h = (int) dim.getHeight(); - + int max = slider.getMaximum(); int min = slider.getMinimum(); if (value > max || value < min) return; - + // value // | // ------------ @@ -2027,7 +2027,7 @@ public class BasicSliderUI extends SliderUI protected void scrollDueToClickInTrack(int dir) { scrollTimer.stop(); - + scrollListener.setDirection(dir); scrollListener.setScrollByBlock(true); diff --git a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider.java b/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider.java index 1ee1bb6d993..987f86bdb1b 100644 --- a/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider.java +++ b/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider.java @@ -160,6 +160,7 @@ public class BasicSplitPaneDivider extends Container */ private transient int currentDividerLocation = 1; + /** DOCUMENT ME! */ private transient Border tmpBorder = new Border() { public Insets getBorderInsets(Component c) diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI.java b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI.java index 7073086aae5..a533f0820aa 100644 --- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI.java +++ b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI.java @@ -1,5 +1,5 @@ -/* BasicTabbedPaneUI.java - Copyright (C) 2002, 2004 Free Software Foundation, Inc. +/* BasicTabbedPaneUI.java -- + Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,6 +35,7 @@ this exception to your version of the library, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ + package javax.swing.plaf.basic; import java.awt.Color; @@ -75,7 +76,6 @@ import javax.swing.plaf.TabbedPaneUI; import javax.swing.plaf.UIResource; import javax.swing.text.View; - /** * This is the Basic Look and Feel's UI delegate for JTabbedPane. */ @@ -84,7 +84,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants /** * A helper class that handles focus. */ - protected class FocusHandler extends FocusAdapter + public class FocusHandler extends FocusAdapter { /** * This method is called when the component gains focus. @@ -112,7 +112,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants * sets the index appropriately. In SCROLL_TAB_MODE, this class also * handles the mouse clicks on the scrolling buttons. */ - protected class MouseHandler extends MouseAdapter + public class MouseHandler extends MouseAdapter { /** * This method is called when the mouse is pressed. The index cannot @@ -184,13 +184,13 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants */ public void propertyChange(PropertyChangeEvent e) { - if (e.getPropertyName().equals(JTabbedPane.TAB_LAYOUT_POLICY_CHANGED_PROPERTY)) + if (e.getPropertyName().equals("tabLayoutPolicy")) { layoutManager = createLayoutManager(); tabPane.setLayout(layoutManager); } - else if (e.getPropertyName().equals(JTabbedPane.TAB_PLACEMENT_CHANGED_PROPERTY) + else if (e.getPropertyName().equals("tabPlacement") && tabPane.getTabLayoutPolicy() == JTabbedPane.SCROLL_TAB_LAYOUT) { incrButton = createIncreaseButton(); @@ -1459,7 +1459,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants * * @return A layout manager given the tab layout policy. */ - public LayoutManager createLayoutManager() + protected LayoutManager createLayoutManager() { if (tabPane.getTabLayoutPolicy() == JTabbedPane.WRAP_TAB_LAYOUT) return new TabbedPaneLayout(); diff --git a/libjava/javax/swing/plaf/basic/BasicTableHeaderUI.java b/libjava/javax/swing/plaf/basic/BasicTableHeaderUI.java index ea7dfc0cd6d..ebc702ad393 100644 --- a/libjava/javax/swing/plaf/basic/BasicTableHeaderUI.java +++ b/libjava/javax/swing/plaf/basic/BasicTableHeaderUI.java @@ -191,8 +191,8 @@ public class BasicTableHeaderUI int spacing = 0; if (header.getTable() != null - && header.getTable().getInterCellSpacing() != null) - spacing = header.getTable().getInterCellSpacing().width; + && header.getTable().getIntercellSpacing() != null) + spacing = header.getTable().getIntercellSpacing().width; for (int i = 0; i < ncols; ++i) { diff --git a/libjava/javax/swing/plaf/basic/BasicTableUI.java b/libjava/javax/swing/plaf/basic/BasicTableUI.java index eb0054bb645..9be6d60e918 100644 --- a/libjava/javax/swing/plaf/basic/BasicTableUI.java +++ b/libjava/javax/swing/plaf/basic/BasicTableUI.java @@ -104,45 +104,12 @@ public class BasicTableUI { Point begin, curr; - private int getRowForPoint(Point p) - { - int y0 = table.getLocation().y; - int nrows = table.getRowCount(); - Dimension gap = table.getInterCellSpacing(); - int height = table.getRowHeight() + (gap == null ? 0 : gap.height); - int y = p.y; - for (int i = 0; i < nrows; ++i) - { - if (0 <= y && y < height) - return i; - y -= height; - } - return -1; - } - - private int getColForPoint(Point p) - { - int x0 = table.getLocation().x; - int ncols = table.getColumnCount(); - Dimension gap = table.getInterCellSpacing(); - TableColumnModel cols = table.getColumnModel(); - int x = p.x; - for (int i = 0; i < ncols; ++i) - { - int width = cols.getColumn(i).getWidth() + (gap == null ? 0 : gap.width); - if (0 <= x && x < width) - return i; - x -= width; - } - return -1; - } - private void updateSelection() { if (table.getRowSelectionAllowed()) { - int lo_row = getRowForPoint(begin); - int hi_row = getRowForPoint(curr); + int lo_row = table.rowAtPoint(begin); + int hi_row = table.rowAtPoint(curr); ListSelectionModel rowModel = table.getSelectionModel(); if (lo_row != -1 && hi_row != -1) rowModel.setSelectionInterval(lo_row, hi_row); @@ -150,8 +117,8 @@ public class BasicTableUI if (table.getColumnSelectionAllowed()) { - int lo_col = getColForPoint(begin); - int hi_col = getColForPoint(curr); + int lo_col = table.columnAtPoint(begin); + int hi_col = table.columnAtPoint(curr); ListSelectionModel colModel = table.getColumnModel().getSelectionModel(); if (lo_col != -1 && hi_col != -1) colModel.setSelectionInterval(lo_col, hi_col); @@ -294,7 +261,7 @@ public class BasicTableUI int x = x0; int y = y0; - Dimension gap = table.getInterCellSpacing(); + Dimension gap = table.getIntercellSpacing(); int ymax = clip.y + clip.height; int xmax = clip.x + clip.width; diff --git a/libjava/javax/swing/plaf/basic/BasicTextPaneUI.java b/libjava/javax/swing/plaf/basic/BasicTextPaneUI.java index 615c74b2bff..ac20a0a990c 100644 --- a/libjava/javax/swing/plaf/basic/BasicTextPaneUI.java +++ b/libjava/javax/swing/plaf/basic/BasicTextPaneUI.java @@ -38,23 +38,22 @@ exception statement from your version. */ package javax.swing.plaf.basic; -import java.beans.PropertyChangeEvent; - import javax.swing.JComponent; import javax.swing.plaf.ComponentUI; import javax.swing.text.Element; import javax.swing.text.PlainView; import javax.swing.text.View; -public class BasicTextPaneUI extends BasicTextUI +public class BasicTextPaneUI extends BasicEditorPaneUI { - public static ComponentUI createUI(JComponent comp) + public BasicTextPaneUI() { - return new BasicTextPaneUI(); + // Do nothing here. } - public BasicTextPaneUI() + public static ComponentUI createUI(JComponent comp) { + return new BasicTextPaneUI(); } public View create(Element elem) diff --git a/libjava/javax/swing/plaf/basic/BasicTextUI.java b/libjava/javax/swing/plaf/basic/BasicTextUI.java index b3d03dbae68..a94ca2bb420 100644 --- a/libjava/javax/swing/plaf/basic/BasicTextUI.java +++ b/libjava/javax/swing/plaf/basic/BasicTextUI.java @@ -1,5 +1,5 @@ -/* BasicTextUI.java - Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. +/* BasicTextUI.java -- + Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -94,7 +94,7 @@ public abstract class BasicTextUI extends TextUI { } } - + private class RootView extends View { private View view; @@ -104,6 +104,8 @@ public abstract class BasicTextUI extends TextUI super(null); } + // View methods. + public ViewFactory getViewFactory() { // FIXME: Handle EditorKit somehow. @@ -111,8 +113,8 @@ public abstract class BasicTextUI extends TextUI } public void setView(View v) - { - if (view != null) + { + if (view != null) view.setParent(null); if (v != null) @@ -122,17 +124,17 @@ public abstract class BasicTextUI extends TextUI } public Container getContainer() - { + { return textComponent; } - + public float getPreferredSpan(int axis) { if (view != null) return view.getPreferredSpan(axis); return Integer.MAX_VALUE; - } + } public void paint(Graphics g, Shape s) { @@ -140,9 +142,12 @@ public abstract class BasicTextUI extends TextUI view.paint(g, s); } - protected Rectangle modelToView(int position, Shape a, Position.Bias bias) + public Shape modelToView(int position, Shape a, Position.Bias bias) throws BadLocationException { + if (view == null) + return null; + return ((PlainView) view).modelToView(position, a, bias).getBounds(); } } @@ -183,7 +188,7 @@ public abstract class BasicTextUI extends TextUI { return textComponent; } - + public void installUI(final JComponent c) { super.installUI(c); @@ -327,11 +332,12 @@ public abstract class BasicTextUI extends TextUI rootView.setView(null); textComponent.removePropertyChangeListener(updateHandler); - textComponent = null; uninstallDefaults(); uninstallListeners(); uninstallKeyboardActions(); + + textComponent = null; } protected void uninstallDefaults() @@ -360,7 +366,7 @@ public abstract class BasicTextUI extends TextUI return new Dimension((int) w, (int) h); } - + public final void paint(Graphics g, JComponent c) { paintSafely(g); @@ -442,13 +448,13 @@ public abstract class BasicTextUI extends TextUI public View create(Element elem) { - // subclasses have to implement this to get this functionality + // Subclasses have to implement this to get this functionality. return null; } public View create(Element elem, int p0, int p1) { - // subclasses have to implement this to get this functionality + // Subclasses have to implement this to get this functionality. return null; } diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarUI.java b/libjava/javax/swing/plaf/basic/BasicToolBarUI.java index 8315fc05f09..fad0108e096 100644 --- a/libjava/javax/swing/plaf/basic/BasicToolBarUI.java +++ b/libjava/javax/swing/plaf/basic/BasicToolBarUI.java @@ -1,5 +1,5 @@ /* BasicToolBarUI.java -- - Copyright (C) 2004 Free Software Foundation, Inc. + Copyright (C) 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -92,40 +92,40 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants private static Border rolloverBorder; /** The last known BorderLayout constraint before floating. */ - protected String constraintBeforeFloating; + protected String constraintBeforeFloating; /** The last known orientation of the JToolBar before floating. */ private int lastGoodOrientation; /** The color of the border when it is dockable. */ - protected Color dockingBorderColor; + protected Color dockingBorderColor; /** The background color of the JToolBar when it is dockable. */ - protected Color dockingColor; + protected Color dockingColor; /** The docking listener responsible for mouse events on the JToolBar. */ - protected MouseInputListener dockingListener; + protected MouseInputListener dockingListener; /** The window used for dragging the JToolBar. */ - protected BasicToolBarUI.DragWindow dragWindow; + protected BasicToolBarUI.DragWindow dragWindow; /** The color of the border when it is not dockable. */ - protected Color floatingBorderColor; + protected Color floatingBorderColor; /** The background color of the JToolBar when it is not dockable. */ - protected Color floatingColor; + protected Color floatingColor; /** The index of the focused component. */ - protected int focusedCompIndex; + protected int focusedCompIndex; /** The PropertyChangeListener for the JToolBar. */ - protected PropertyChangeListener propertyListener; + protected PropertyChangeListener propertyListener; /** The JToolBar this UI delegate is responsible for. */ - protected JToolBar toolBar; + protected JToolBar toolBar; /** The Container listener for the JToolBar. */ - protected ContainerListener toolBarContListener; + protected ContainerListener toolBarContListener; /** The Focus listener for the JToolBar. */ protected FocusListener toolBarFocusListener; @@ -152,11 +152,11 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants private transient int cachedOrientation; /** - * This method creates a new BasicToolBarUI object for the given JToolBar. + * This method creates a new <code>BasicToolBarUI</code> object for the given JToolBar. */ public BasicToolBarUI() { - super(); + // Do nothing here. } /** @@ -168,13 +168,10 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants * * @return Whether the JToolBar can dock. */ - protected boolean canDock(Component c, Point p) - { - if (areaOfClick(c, p) != -1) - return true; - - return false; - } + public boolean canDock(Component c, Point p) + { + return areaOfClick(c, p) != -1; + } /** * This helper method returns the position of the JToolBar if it can dock. @@ -219,10 +216,10 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants * * @return A new DockingListener for the JToolBar. */ - protected MouseInputListener createDockingListener() - { + protected MouseInputListener createDockingListener() + { return new DockingListener(toolBar); - } + } /** * This method creates a new DragWindow for the given JToolBar. @@ -231,10 +228,10 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants * * @return A new DragWindow. */ - protected BasicToolBarUI.DragWindow createDragWindow(JToolBar toolbar) - { + protected BasicToolBarUI.DragWindow createDragWindow(JToolBar toolbar) + { return new DragWindow(); - } + } /** * This method creates a new floating frame for the JToolBar. By default, @@ -245,11 +242,11 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants * * @return A new floating frame. */ - protected JFrame createFloatingFrame(JToolBar toolbar) - { + protected JFrame createFloatingFrame(JToolBar toolbar) + { // FIXME: Though deprecated, this should still work. - return null; - } + return null; + } /** * This method creates a new floating window for the JToolBar. This is the @@ -259,21 +256,21 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants * * @return A new floating window. */ - protected RootPaneContainer createFloatingWindow(JToolBar toolbar) - { + protected RootPaneContainer createFloatingWindow(JToolBar toolbar) + { // This one is used by default though. return new ToolBarDialog(); - } + } /** * This method creates a new WindowListener for the JToolBar. * * @return A new WindowListener. */ - protected WindowListener createFrameListener() - { + protected WindowListener createFrameListener() + { return new FrameListener(); - } + } /** * This method creates a new nonRolloverBorder for JButtons when the @@ -281,20 +278,20 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants * * @return A new NonRolloverBorder. */ - protected Border createNonRolloverBorder() - { + protected Border createNonRolloverBorder() + { return new EtchedBorderUIResource(); - } + } /** * This method creates a new PropertyChangeListener for the JToolBar. * * @return A new PropertyChangeListener. */ - protected PropertyChangeListener createPropertyListener() - { + protected PropertyChangeListener createPropertyListener() + { return new PropertyListener(); - } + } /** * This method creates a new rollover border for JButtons when the @@ -302,8 +299,8 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants * * @return A new rollover border. */ - protected Border createRolloverBorder() - { + protected Border createRolloverBorder() + { return new EtchedBorderUIResource() { public void paintBorder(Component c, Graphics g, int x, int y, @@ -316,27 +313,27 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants } } }; - } + } /** * This method creates a new Container listener for the JToolBar. * * @return A new Container listener. */ - protected ContainerListener createToolBarContListener() - { + protected ContainerListener createToolBarContListener() + { return new ToolBarContListener(); - } + } /** * This method creates a new FocusListener for the JToolBar. * * @return A new FocusListener for the JToolBar. */ - protected FocusListener createToolBarFocusListener() - { + protected FocusListener createToolBarFocusListener() + { return new ToolBarFocusListener(); - } + } /** * This method creates a new UI delegate for the given JComponent. @@ -357,8 +354,8 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants * @param position The mouse cursor coordinates relative to the JToolBar. * @param origin The screen position of the JToolBar. */ - protected void dragTo(Point position, Point origin) - { + protected void dragTo(Point position, Point origin) + { int loc = areaOfClick(origParent, SwingUtilities.convertPoint(toolBar, position, origParent)); @@ -390,7 +387,7 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants { w = cachedBounds.height; h = cachedBounds.width; - } + } Point p = dragWindow.getOffset(); Insets insets = toolBar.getInsets(); @@ -414,8 +411,8 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants * @param origin The screen position of the JToolBar before the drag session * started. */ - protected void floatAt(Point position, Point origin) - { + protected void floatAt(Point position, Point origin) + { Point p = new Point(position); int aoc = areaOfClick(origParent, SwingUtilities.convertPoint(toolBar, p, origParent)); @@ -434,7 +431,7 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants { floatFrame.hide(); newParent = origParent; - } + } String constraint; switch (aoc) @@ -499,9 +496,9 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants * @return The docking color. */ public Color getDockingColor() - { - return dockingColor; - } + { + return dockingColor; + } /** * This method returns the Color which is displayed when over a floating @@ -510,9 +507,9 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants * @return The color which is displayed when over a floating area. */ public Color getFloatingColor() - { - return floatingColor; - } + { + return floatingColor; + } /** * This method returns the maximum size of the given JComponent for this UI. @@ -522,9 +519,9 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants * @return The maximum size for this UI. */ public Dimension getMaximumSize(JComponent c) - { + { return getPreferredSize(c); - } + } /** * This method returns the minimum size of the given JComponent for this UI. @@ -534,9 +531,9 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants * @return The minimum size for this UI. */ public Dimension getMinimumSize(JComponent c) - { + { return getPreferredSize(c); - } + } /** * This method returns the preferred size of the given JComponent for this @@ -547,15 +544,15 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants * @return The preferred size for this UI. */ public Dimension getPreferredSize(JComponent c) - { + { return toolBar.getLayout().preferredLayoutSize(c); - } + } /** * This method installs the needed components for the JToolBar. */ - protected void installComponents() - { + protected void installComponents() + { floatFrame = (Window) createFloatingWindow(toolBar); dragWindow = createDragWindow(toolBar); @@ -569,13 +566,13 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants borders = new Hashtable(); fillHashtable(); - } + } /** * This method installs the defaults as specified by the look and feel. */ - protected void installDefaults() - { + protected void installDefaults() + { UIDefaults defaults = UIManager.getLookAndFeelDefaults(); toolBar.setBorder(new ToolBarBorder()); @@ -588,24 +585,24 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants floatingBorderColor = defaults.getColor("ToolBar.floatingForeground"); floatingColor = defaults.getColor("ToolBar.floatingBackground"); - } + } /** * This method installs the keyboard actions for the JToolBar as specified * by the look and feel. */ - protected void installKeyboardActions() - { + protected void installKeyboardActions() + { // FIXME: implement. - } + } /** * This method installs listeners for the JToolBar. * * @param toolbar The JToolBar to register listeners for. */ - protected void installListeners(JToolBar toolbar) - { + protected void installListeners(JToolBar toolbar) + { dockingListener = createDockingListener(); toolBar.addMouseListener(dockingListener); toolBar.addMouseMotionListener(dockingListener); @@ -630,13 +627,13 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants * @param c The JComponent whose children need to have non rollover borders * installed. */ - protected void installNonRolloverBorders(JComponent c) - { + protected void installNonRolloverBorders(JComponent c) + { Component[] components = toolBar.getComponents(); for (int i = 0; i < components.length; i++) setBorderToNonRollover(components[i]); - } + } /** * This method installs normal (or their original) borders for each @@ -645,13 +642,13 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants * @param c The JComponent whose children need to have their original * borders installed. */ - protected void installNormalBorders(JComponent c) - { + protected void installNormalBorders(JComponent c) + { Component[] components = toolBar.getComponents(); for (int i = 0; i < components.length; i++) setBorderToNormal(components[i]); - } + } /** * This method install rollover borders for each component inside the given @@ -660,13 +657,13 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants * @param c The JComponent whose children need to have rollover borders * installed. */ - protected void installRolloverBorders(JComponent c) - { + protected void installRolloverBorders(JComponent c) + { Component[] components = toolBar.getComponents(); for (int i = 0; i < components.length; i++) setBorderToRollover(components[i]); - } + } /** * This method fills the borders hashtable with a list of components that @@ -694,20 +691,20 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants * * @param c The JComponent to install a UI for. */ - public void installUI(JComponent c) - { - super.installUI(c); + public void installUI(JComponent c) + { + super.installUI(c); - if (c instanceof JToolBar) - { - toolBar = (JToolBar) c; - toolBar.setOpaque(true); + if (c instanceof JToolBar) + { + toolBar = (JToolBar) c; + toolBar.setOpaque(true); installDefaults(); installComponents(); - installListeners(toolBar); + installListeners(toolBar); installKeyboardActions(); - } - } + } + } /** * This method returns whether the JToolBar is floating. @@ -715,9 +712,9 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants * @return Whether the JToolBar is floating. */ public boolean isFloating() - { + { return floatFrame.isVisible(); - } + } /** * This method returns whether rollover borders have been set. @@ -725,9 +722,9 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants * @return Whether rollover borders have been set. */ public boolean isRolloverBorders() - { + { return toolBar.isRollover(); - } + } /** * This method navigates in the given direction giving focus to the next @@ -735,10 +732,10 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants * * @param direction The direction to give focus to. */ - protected void navigateFocusedComp(int direction) - { + protected void navigateFocusedComp(int direction) + { // FIXME: Implement. - } + } /** * This method sets the border of the given component to a non rollover @@ -746,45 +743,45 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants * * @param c The Component whose border needs to be set. */ - protected void setBorderToNonRollover(Component c) - { + protected void setBorderToNonRollover(Component c) + { if (c instanceof JButton) { JButton b = (JButton) c; b.setRolloverEnabled(false); b.setBorder(nonRolloverBorder); } - } + } /** * This method sets the border of the given component to its original value. * * @param c The Component whose border needs to be set. */ - protected void setBorderToNormal(Component c) - { + protected void setBorderToNormal(Component c) + { if (c instanceof JButton) { JButton b = (JButton) c; Border border = (Border) borders.get(b); b.setBorder(border); } - } + } /** * This method sets the border of the given component to a rollover border. * * @param c The Component whose border needs to be set. */ - protected void setBorderToRollover(Component c) - { + protected void setBorderToRollover(Component c) + { if (c instanceof JButton) { JButton b = (JButton) c; b.setRolloverEnabled(true); b.setBorder(rolloverBorder); } - } + } /** * This method sets the docking color. @@ -792,9 +789,9 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants * @param c The docking color. */ public void setDockingColor(Color c) - { - dockingColor = c; - } + { + dockingColor = c; + } /** * This method sets the floating property for the JToolBar. @@ -816,9 +813,9 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants * @param c The floating color. */ public void setFloatingColor(Color c) - { + { floatingColor = c; - } + } /** * This method sets the floating location of the JToolBar. @@ -866,7 +863,7 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants * This method uninstall UI installed components from the JToolBar. */ protected void uninstallComponents() - { + { installNormalBorders(toolBar); borders = null; rolloverBorder = null; @@ -890,21 +887,21 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants dockingColor = null; floatingBorderColor = null; floatingColor = null; - } + } /** * This method uninstalls keyboard actions installed by the UI. */ protected void uninstallKeyboardActions() - { + { // FIXME: implement. - } + } /** * This method uninstalls listeners installed by the UI. */ protected void uninstallListeners() - { + { toolBar.removeFocusListener(toolBarFocusListener); toolBarFocusListener = null; @@ -917,7 +914,7 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants toolBar.removeMouseMotionListener(dockingListener); toolBar.removeMouseListener(dockingListener); dockingListener = null; - } + } /** * This method uninstalls the UI. @@ -925,7 +922,7 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants * @param c The JComponent that is having this UI removed. */ public void uninstallUI(JComponent c) - { + { uninstallKeyboardActions(); uninstallListeners(); uninstallComponents(); @@ -937,7 +934,7 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants * This is the MouseHandler class that allows the user to drag the JToolBar * in and out of the parent and dock it if it can. */ - protected class DockingListener implements MouseInputListener + public class DockingListener implements MouseInputListener { /** Whether the JToolBar is being dragged. */ protected boolean isDragging; @@ -1032,7 +1029,7 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants { if (e.getX() > insets.left) return; - } + } else { if (e.getY() > insets.top) @@ -1221,7 +1218,7 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants public void propertyChange(PropertyChangeEvent e) { // FIXME: need name properties so can change floatFrame title. - if (e.getPropertyName().equals(JToolBar.ROLLOVER_CHANGED_PROPERTY)) + if (e.getPropertyName().equals("rollover")) setRolloverBorders(toolBar.isRollover()); } } diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI.java b/libjava/javax/swing/plaf/basic/BasicTreeUI.java index 93e3900750a..db74f067ef0 100644 --- a/libjava/javax/swing/plaf/basic/BasicTreeUI.java +++ b/libjava/javax/swing/plaf/basic/BasicTreeUI.java @@ -45,14 +45,13 @@ import java.awt.Graphics; import java.awt.Rectangle; import javax.swing.JComponent; +import javax.swing.JTree; import javax.swing.UIDefaults; import javax.swing.UIManager; import javax.swing.plaf.ComponentUI; -import javax.swing.JTree; import javax.swing.plaf.TreeUI; -import javax.swing.tree.DefaultTreeCellRenderer; -import javax.swing.tree.TreePath; import javax.swing.tree.TreeModel; +import javax.swing.tree.TreePath; /** * A delegate providing the user interface for <code>JTree</code> |