diff options
Diffstat (limited to 'libjava/javax/swing/plaf')
10 files changed, 316 insertions, 112 deletions
diff --git a/libjava/javax/swing/plaf/basic/BasicArrowButton.java b/libjava/javax/swing/plaf/basic/BasicArrowButton.java index b124501..8354d06 100644 --- a/libjava/javax/swing/plaf/basic/BasicArrowButton.java +++ b/libjava/javax/swing/plaf/basic/BasicArrowButton.java @@ -163,7 +163,7 @@ public class BasicArrowButton extends JButton implements SwingConstants /** The color the arrow is painted in if disabled and the bottom and * right edges of the button. */ - private transient Color shadow = Color.BLACK; + private transient Color shadow = Color.gray; /** The color the arrow is painted in if enabled and the bottom and * right edges of the button. */ @@ -350,30 +350,30 @@ public class BasicArrowButton extends JButton implements SwingConstants { Polygon arrow; double dsize = (double) size; - + + int one = (int) (dsize * 1 / 10); int two = (int) (dsize * 2 / 10); - int three = (int) (dsize * 3 / 10); - int five = (int) (dsize * 5 / 10); - int seven = (int) (dsize * 7 / 10); + int five = (int) (dsize * 5 / 10); int eight = (int) (dsize * 8 / 10); + switch (direction) { case NORTH: - arrow = new Polygon(new int[] { two, five, eight }, - new int[] { seven, three, seven }, 3); + arrow = new Polygon(new int[] { eight, five, one }, + new int[] { eight, one, eight }, 3); break; case SOUTH: - arrow = new Polygon(new int[] { two, five, eight }, - new int[] { three, seven, three }, 3); + arrow = new Polygon(new int[] { eight, five, two }, + new int[] { two, eight, two }, 3); break; case EAST: case RIGHT: - arrow = new Polygon(new int[] { three, seven, three }, + arrow = new Polygon(new int[] { two, eight, two }, new int[] { two, five, eight }, 3); break; case WEST: case LEFT: - arrow = new Polygon(new int[] { seven, three, seven }, + arrow = new Polygon(new int[] { eight, two, eight }, new int[] { two, five, eight }, 3); break; default: diff --git a/libjava/javax/swing/plaf/basic/BasicButtonListener.java b/libjava/javax/swing/plaf/basic/BasicButtonListener.java index 4dafc7e..2b4be67 100644 --- a/libjava/javax/swing/plaf/basic/BasicButtonListener.java +++ b/libjava/javax/swing/plaf/basic/BasicButtonListener.java @@ -37,6 +37,7 @@ exception statement from your version. */ package javax.swing.plaf.basic; +import java.awt.event.ActionEvent; import java.awt.event.FocusEvent; import java.awt.event.FocusListener; import java.awt.event.InputEvent; @@ -46,6 +47,7 @@ import java.awt.event.MouseMotionListener; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; +import javax.swing.AbstractAction; import javax.swing.AbstractButton; import javax.swing.ButtonModel; import javax.swing.JComponent; @@ -64,8 +66,14 @@ public class BasicButtonListener } public void focusGained(FocusEvent e) { + if (e.getSource() instanceof AbstractButton) + { + AbstractButton button = (AbstractButton) e.getSource(); + if (button.isFocusPainted()) + button.repaint(); + } } - + public void focusLost(FocusEvent e) { if (e.getSource() instanceof AbstractButton) @@ -73,13 +81,43 @@ public class BasicButtonListener AbstractButton button = (AbstractButton) e.getSource(); ButtonModel model = button.getModel(); model.setArmed(false); + + if (button.isFocusPainted()) + button.repaint(); } } public void installKeyboardActions(JComponent c) { + c.getActionMap().put("pressed", + new AbstractAction() + { + public void actionPerformed(ActionEvent e) + { + AbstractButton button = (AbstractButton) e.getSource(); + ButtonModel model = button.getModel(); + // It is important that these transitions happen in this order. + model.setArmed(true); + model.setPressed(true); + } + }); + + c.getActionMap().put("released", + new AbstractAction() + { + public void actionPerformed(ActionEvent e) + { + AbstractButton button = (AbstractButton) e.getSource(); + ButtonModel model = button.getModel(); + // It is important that these transitions happen in this order. + model.setPressed(false); + model.setArmed(false); + } + }); } public void uninstallKeyboardActions(JComponent c) { + c.getActionMap().put("pressed", null); + c.getActionMap().put("released", null); } public void stateChanged(ChangeEvent e) { @@ -105,7 +143,7 @@ public class BasicButtonListener { AbstractButton button = (AbstractButton) e.getSource(); ButtonModel model = button.getModel(); - if ((e.getModifiers() & InputEvent.BUTTON1_MASK) != 0) + if ((e.getModifiersEx() & InputEvent.BUTTON1_DOWN_MASK) != 0) { // It is important that these transitions happen in this order. model.setArmed(true); @@ -128,7 +166,7 @@ public class BasicButtonListener { AbstractButton button = (AbstractButton) e.getSource(); ButtonModel model = button.getModel(); - if ((e.getModifiers() & InputEvent.BUTTON1_MASK) != 0) + if ((e.getModifiersEx() & InputEvent.BUTTON1_DOWN_MASK) != 0) { // It is important that these transitions happen in this order. model.setPressed(false); @@ -156,7 +194,7 @@ public class BasicButtonListener model.setRollover(true); if (model.isPressed() - && (e.getModifiers() & InputEvent.BUTTON1_MASK) != 0) + && (e.getModifiersEx() & InputEvent.BUTTON1_DOWN_MASK) != 0) model.setArmed(true); else model.setArmed(false); diff --git a/libjava/javax/swing/plaf/basic/BasicButtonUI.java b/libjava/javax/swing/plaf/basic/BasicButtonUI.java index 9134fb2..df7ac42 100644 --- a/libjava/javax/swing/plaf/basic/BasicButtonUI.java +++ b/libjava/javax/swing/plaf/basic/BasicButtonUI.java @@ -50,6 +50,7 @@ import java.awt.Stroke; import javax.swing.AbstractButton; import javax.swing.ButtonModel; import javax.swing.Icon; +import javax.swing.InputMap; import javax.swing.JComponent; import javax.swing.SwingUtilities; import javax.swing.UIDefaults; @@ -59,13 +60,21 @@ import javax.swing.plaf.ComponentUI; public class BasicButtonUI extends ButtonUI { - /** A constant used to pad out elements in the button's layout and - preferred size calculations. */ - int defaultTextIconGap = 4; + /** + * A constant used to pad out elements in the button's layout and + * preferred size calculations. + */ + protected int defaultTextIconGap = 4; - /** A constant added to the defaultTextIconGap to adjust the text - within this particular button. */ - int defaultTextShiftOffset = 0; + /** + * A constant added to the defaultTextIconGap to adjust the text + * within this particular button. + */ + protected int defaultTextShiftOffset = 0; + + private int textShiftOffset; + + private Color focusColor; /** * Factory method to create an instance of BasicButtonUI for a given @@ -85,14 +94,32 @@ public class BasicButtonUI extends ButtonUI return defaultTextIconGap; } + protected void clearTextShiftOffset() + { + textShiftOffset = 0; + } + + protected int getTextShiftOffset() + { + return textShiftOffset; + } + + protected void setTextShiftOffset() + { + textShiftOffset = defaultTextShiftOffset; + } + protected void installDefaults(AbstractButton b) { UIDefaults defaults = UIManager.getLookAndFeelDefaults(); + focusColor = defaults.getColor("Button.focus"); b.setForeground(defaults.getColor("Button.foreground")); b.setBackground(defaults.getColor("Button.background")); b.setMargin(defaults.getInsets("Button.margin")); b.setBorder(defaults.getBorder("Button.border")); b.setIconTextGap(defaults.getInt("Button.textIconGap")); + b.setInputMap(JComponent.WHEN_FOCUSED, + (InputMap) defaults.get("Button.focusInputMap")); b.setOpaque(true); } @@ -133,10 +160,12 @@ public class BasicButtonUI extends ButtonUI protected void installKeyboardActions(AbstractButton b) { + listener.installKeyboardActions(b); } protected void uninstallKeyboardActions(AbstractButton b) { + listener.uninstallKeyboardActions(b); } /** @@ -271,22 +300,12 @@ public class BasicButtonUI extends ButtonUI { if (b.hasFocus() && b.isFocusPainted()) { - Graphics2D g2 = (Graphics2D) g; - Stroke saved_stroke = g2.getStroke(); - Color saved_color = g2.getColor(); - float dashes[] = new float[] {1.0f, 1.0f}; - BasicStroke s = new BasicStroke(1.0f, - BasicStroke.CAP_SQUARE, - BasicStroke.JOIN_MITER, - 10, dashes, 0.0f); - g2.setStroke(s); - g2.setColor(Color.BLACK); - g2.drawRect(vr.x + 2, - vr.y + 2, - vr.width - 4, - vr.height - 4); - g2.setStroke(saved_stroke); - g2.setColor(saved_color); + Color saved_color = g.getColor(); + g.setColor(focusColor); + Rectangle focusRect = ir.union(tr); + g.drawRect(focusRect.x, focusRect.y, + focusRect.width, focusRect.height); + g.setColor(saved_color); } } diff --git a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI.java b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI.java index d394b95..7101d42 100644 --- a/libjava/javax/swing/plaf/basic/BasicInternalFrameUI.java +++ b/libjava/javax/swing/plaf/basic/BasicInternalFrameUI.java @@ -765,7 +765,7 @@ public class BasicInternalFrameUI extends InternalFrameUI lastComponentEntered); MouseEvent exited = new MouseEvent(lastComponentEntered, MouseEvent.MOUSE_EXITED, - me.getWhen(), me.getModifiers(), + me.getWhen(), me.getModifiersEx(), tp.x, tp.y, me.getClickCount(), me.isPopupTrigger(), me.getButton()); @@ -787,7 +787,7 @@ public class BasicInternalFrameUI extends InternalFrameUI MouseEvent entered = new MouseEvent(lastComponentEntered, MouseEvent.MOUSE_ENTERED, me.getWhen(), - me.getModifiers(), cp.x, + me.getModifiersEx(), cp.x, cp.y, me.getClickCount(), me.isPopupTrigger(), me.getButton()); diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel.java b/libjava/javax/swing/plaf/basic/BasicLookAndFeel.java index 324fa01..689cd8f 100644 --- a/libjava/javax/swing/plaf/basic/BasicLookAndFeel.java +++ b/libjava/javax/swing/plaf/basic/BasicLookAndFeel.java @@ -41,6 +41,7 @@ package javax.swing.plaf.basic; import java.awt.Color; import java.awt.Dimension; import java.awt.Font; +import java.awt.event.InputEvent; import java.awt.event.KeyEvent; import java.io.Serializable; import java.util.Enumeration; @@ -131,6 +132,7 @@ public abstract class BasicLookAndFeel extends LookAndFeel "SeparatorUI", "javax.swing.plaf.basic.BasicSeparatorUI", "SliderUI", "javax.swing.plaf.basic.BasicSliderUI", "SplitPaneUI", "javax.swing.plaf.basic.BasicSplitPaneUI", + "SpinnerUI", "javax.swing.plaf.basic.BasicSpinnerUI", "StandardDialogUI", "javax.swing.plaf.basic.BasicStandardDialogUI", "TabbedPaneUI", "javax.swing.plaf.basic.BasicTabbedPaneUI", "TableHeaderUI", "javax.swing.plaf.basic.BasicTableHeaderUI", @@ -246,6 +248,7 @@ public abstract class BasicLookAndFeel extends LookAndFeel "SPACE", "pressed", "released SPACE", "released" }), + "Button.focus", midPurple, "Button.font", new FontUIResource("Dialog", Font.PLAIN, 12), "Button.foreground", new ColorUIResource(Color.black), "Button.highlight", new ColorUIResource(Color.white), @@ -820,7 +823,14 @@ public abstract class BasicLookAndFeel extends LookAndFeel "TextField.keyBindings", new JTextComponent.KeyBinding[] { new JTextComponent.KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), - "notify-field-accept")}, + "notify-field-accept"), + new JTextComponent.KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, + InputEvent.SHIFT_DOWN_MASK), + "selection-backward"), + new JTextComponent.KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, + InputEvent.SHIFT_DOWN_MASK), + "selection-forward"), + }, "TextField.margin", new InsetsUIResource(0, 0, 0, 0), "TextField.selectionBackground", new ColorUIResource(lightPurple), "TextField.selectionForeground", new ColorUIResource(Color.black), @@ -881,7 +891,7 @@ public abstract class BasicLookAndFeel extends LookAndFeel "ToolBar.font", new FontUIResource("Dialog", Font.PLAIN, 12), "ToolBar.foreground", new ColorUIResource(Color.black), "ToolBar.separatorSize", new DimensionUIResource(20, 20), - "ToolTip.background", new ColorUIResource(Color.white), + "ToolTip.background", new ColorUIResource(122, 178, 241), "ToolTip.border", new BorderUIResource.LineBorderUIResource(Color.lightGray), "ToolTip.font", new FontUIResource("SansSerif", Font.PLAIN, 12), "ToolTip.foreground", new ColorUIResource(Color.black), diff --git a/libjava/javax/swing/plaf/basic/BasicPopupMenuUI.java b/libjava/javax/swing/plaf/basic/BasicPopupMenuUI.java index f5b3e24..35fb005 100644 --- a/libjava/javax/swing/plaf/basic/BasicPopupMenuUI.java +++ b/libjava/javax/swing/plaf/basic/BasicPopupMenuUI.java @@ -163,6 +163,7 @@ public class BasicPopupMenuUI extends PopupMenuUI popupMenu.setBorder(defaults.getBorder("PopupMenu.border")); popupMenu.setFont(defaults.getFont("PopupMenu.font")); popupMenu.setForeground(defaults.getColor("PopupMenu.foreground")); + popupMenu.setOpaque(true); } /** @@ -228,11 +229,11 @@ public class BasicPopupMenuUI extends PopupMenuUI } /** - * This method returns the minimum size of the JPopupMenu. + * This method returns the minimum size of the JPopupMenu. * - * @param c The JComponent to find a size for. + * @param c The JComponent to find a size for. * - * @return The minimum size. + * @return The minimum size. */ public Dimension getMinimumSize(JComponent c) { @@ -264,13 +265,13 @@ public class BasicPopupMenuUI extends PopupMenuUI } /** - * Return true if given mouse event is a platform popup trigger, - * and false otherwise + * Return true if given mouse event is a platform popup trigger, and false + * otherwise * * @param e MouseEvent that is to be checked for popup trigger event * - * @return true if given mouse event is a platform popup trigger, - * and false otherwise + * @return true if given mouse event is a platform popup trigger, and false + * otherwise */ public boolean isPopupTrigger(MouseEvent e) { @@ -334,25 +335,25 @@ public class BasicPopupMenuUI extends PopupMenuUI path[0] = popupMenu; Component[] comps = popupMenu.getComponents(); if (comps.length != 0 && comps[0] instanceof MenuElement) - path[1] = (MenuElement) comps[0]; - manager.setSelectedPath(path); + { + path[1] = (MenuElement) comps[0]; + manager.setSelectedPath(path); + } } } } /** - * ComponentListener that listens to Component Events fired by the - * top - level window to which popup menu belongs. If top-level - * window was resized, moved or hidded then popup menu will - * be hidded and selected path of current menu hierarchy will be set - * to null. - * + * ComponentListener that listens to Component Events fired by the top - + * level window to which popup menu belongs. If top-level window was + * resized, moved or hidded then popup menu will be hidded and selected + * path of current menu hierarchy will be set to null. */ private class TopWindowListener implements ComponentListener { /** - * This method is invoked when top-level window is resized. - * This method closes current menu hierarchy. + * This method is invoked when top-level window is resized. This method + * closes current menu hierarchy. * * @param e The ComponentEvent */ @@ -363,8 +364,8 @@ public class BasicPopupMenuUI extends PopupMenuUI } /** - * This method is invoked when top-level window is moved. - * This method closes current menu hierarchy. + * This method is invoked when top-level window is moved. This method + * closes current menu hierarchy. * * @param e The ComponentEvent */ @@ -375,8 +376,8 @@ public class BasicPopupMenuUI extends PopupMenuUI } /** - * This method is invoked when top-level window is shown - * This method does nothing by default. + * This method is invoked when top-level window is shown This method does + * nothing by default. * * @param e The ComponentEvent */ @@ -387,8 +388,8 @@ public class BasicPopupMenuUI extends PopupMenuUI } /** - * This method is invoked when top-level window is hidden - * This method closes current menu hierarchy. + * This method is invoked when top-level window is hidden This method + * closes current menu hierarchy. * * @param e The ComponentEvent */ diff --git a/libjava/javax/swing/plaf/basic/BasicSliderUI.java b/libjava/javax/swing/plaf/basic/BasicSliderUI.java index 7334b2e..b5c95cb 100644 --- a/libjava/javax/swing/plaf/basic/BasicSliderUI.java +++ b/libjava/javax/swing/plaf/basic/BasicSliderUI.java @@ -1226,6 +1226,7 @@ public class BasicSliderUI extends SliderUI if (slider.getLabelTable() == null) return 0; + Dimension pref; for (Enumeration list = slider.getLabelTable().elements(); list.hasMoreElements();) { @@ -1233,8 +1234,9 @@ public class BasicSliderUI extends SliderUI if (! (comp instanceof Component)) continue; label = (Component) comp; - if (label.getWidth() > widest) - widest = label.getWidth(); + pref = label.getPreferredSize(); + if (pref != null && pref.width > widest) + widest = pref.width; } return widest; } @@ -1252,7 +1254,7 @@ public class BasicSliderUI extends SliderUI if (slider.getLabelTable() == null) return 0; - + Dimension pref; for (Enumeration list = slider.getLabelTable().elements(); list.hasMoreElements();) { @@ -1260,8 +1262,9 @@ public class BasicSliderUI extends SliderUI if (! (comp instanceof Component)) continue; label = (Component) comp; - if (label.getHeight() > tallest) - tallest = label.getHeight(); + pref = label.getPreferredSize(); + if (pref != null && pref.height > tallest) + tallest = pref.height; } return tallest; } diff --git a/libjava/javax/swing/plaf/basic/BasicTextUI.java b/libjava/javax/swing/plaf/basic/BasicTextUI.java index 817a5e4..2ccf2fa 100644 --- a/libjava/javax/swing/plaf/basic/BasicTextUI.java +++ b/libjava/javax/swing/plaf/basic/BasicTextUI.java @@ -46,8 +46,16 @@ import java.awt.Insets; import java.awt.Point; import java.awt.Rectangle; import java.awt.Shape; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import javax.swing.Action; +import javax.swing.ActionMap; +import javax.swing.InputMap; import javax.swing.JComponent; +import javax.swing.SwingUtilities; +import javax.swing.UIDefaults; +import javax.swing.UIManager; import javax.swing.plaf.ComponentUI; import javax.swing.plaf.TextUI; import javax.swing.plaf.UIResource; @@ -61,7 +69,9 @@ import javax.swing.text.EditorKit; import javax.swing.text.Element; import javax.swing.text.Highlighter; import javax.swing.text.JTextComponent; +import javax.swing.text.Keymap; import javax.swing.text.PlainDocument; +import javax.swing.text.PlainView; import javax.swing.text.Position; import javax.swing.text.View; import javax.swing.text.ViewFactory; @@ -88,14 +98,18 @@ public abstract class BasicTextUI extends TextUI private class RootView extends View { - private JTextComponent textComponent; private View view; - public RootView(JTextComponent parent) - { - super(null); - textComponent = parent; - } + public RootView() + { + super(null); + } + + public ViewFactory getViewFactory() + { + // FIXME: Handle EditorKit somehow. + return BasicTextUI.this; + } public void setView(View v) { @@ -123,17 +137,34 @@ public abstract class BasicTextUI extends TextUI public void paint(Graphics g, Shape s) { - System.out.println("Michael: BasicTextUI.RootView.paint"); - if (view != null) view.paint(g, s); - } + } + + protected Rectangle modelToView(int position, Shape a, Position.Bias bias) + throws BadLocationException + { + return ((PlainView) view).modelToView(position, a, bias).getBounds(); + } + } + + class UpdateHandler implements PropertyChangeListener + { + public void propertyChange(PropertyChangeEvent event) + { + if (event.getPropertyName().equals("document")) + { + // Document changed. + modelChanged(); + } + } } - RootView rootView; + static EditorKit kit = new DefaultEditorKit(); + + RootView rootView = new RootView(); JTextComponent textComponent; - int gap = 3; - EditorKit kit = new DefaultEditorKit(); + UpdateHandler updateHandler = new UpdateHandler(); public BasicTextUI() { @@ -164,12 +195,12 @@ public abstract class BasicTextUI extends TextUI Document doc = textComponent.getDocument(); if (doc == null) { - doc = new PlainDocument(); + doc = getEditorKit(textComponent).createDefaultDocument(); textComponent.setDocument(doc); - } - - rootView = new RootView(textComponent); - setView(create(doc.getDefaultRootElement())); + } + + textComponent.addPropertyChangeListener(updateHandler); + modelChanged(); installDefaults(); installListeners(); @@ -178,20 +209,115 @@ public abstract class BasicTextUI extends TextUI protected void installDefaults() { + Caret caret = textComponent.getCaret(); + if (caret == null) + { + caret = createCaret(); + textComponent.setCaret(caret); + } + + Highlighter highlighter = textComponent.getHighlighter(); + if (highlighter == null) + textComponent.setHighlighter(createHighlighter()); + + String prefix = getPropertyPrefix(); + UIDefaults defaults = UIManager.getLookAndFeelDefaults(); + textComponent.setBackground(defaults.getColor(prefix + ".background")); + textComponent.setForeground(defaults.getColor(prefix + ".foreground")); + textComponent.setMargin(defaults.getInsets(prefix + ".margin")); + textComponent.setBorder(defaults.getBorder(prefix + ".border")); + textComponent.setFont(defaults.getFont(prefix + ".font")); + + caret.setBlinkRate(defaults.getInt(prefix + ".caretBlinkRate")); } protected void installListeners() { + // Do nothing here. + } + + protected String getKeymapName() + { + return "BasicTextUI"; + } + + protected Keymap createKeymap() + { + String prefix = getPropertyPrefix(); + UIDefaults defaults = UIManager.getLookAndFeelDefaults(); + JTextComponent.KeyBinding[] bindings = + (JTextComponent.KeyBinding[]) defaults.get(prefix + ".keyBindings"); + Keymap km = JTextComponent.addKeymap(getKeymapName(), + JTextComponent.getKeymap(JTextComponent.DEFAULT_KEYMAP)); + JTextComponent.loadKeymap(km, bindings, textComponent.getActions()); + return km; } protected void installKeyboardActions() + { + // load any bindings for the older Keymap interface + Keymap km = JTextComponent.getKeymap(getKeymapName()); + if (km == null) + km = createKeymap(); + textComponent.setKeymap(km); + + // load any bindings for the newer InputMap / ActionMap interface + SwingUtilities.replaceUIInputMap(textComponent, + JComponent.WHEN_FOCUSED, + getInputMap(JComponent.WHEN_FOCUSED)); + SwingUtilities.replaceUIActionMap(textComponent, getActionMap()); + } + + InputMap getInputMap(int condition) + { + String prefix = getPropertyPrefix(); + UIDefaults defaults = UIManager.getLookAndFeelDefaults(); + switch (condition) + { + case JComponent.WHEN_IN_FOCUSED_WINDOW: + // FIXME: is this the right string? nobody seems to use it. + return (InputMap) defaults.get(prefix + ".windowInputMap"); + case JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT: + return (InputMap) defaults.get(prefix + ".ancestorInputMap"); + default: + case JComponent.WHEN_FOCUSED: + return (InputMap) defaults.get(prefix + ".focusInputMap"); + } + } + + ActionMap getActionMap() + { + String prefix = getPropertyPrefix(); + UIDefaults defaults = UIManager.getLookAndFeelDefaults(); + ActionMap am = (ActionMap) defaults.get(prefix + ".actionMap"); + if (am == null) + { + am = createActionMap(); + defaults.put(prefix + ".actionMap", am); + } + return am; + } + + ActionMap createActionMap() { + Action[] actions = textComponent.getActions(); + ActionMap am = new ActionMap(); + for (int i = 0; i < actions.length; ++i) + { + String name = (String) actions[i].getValue(Action.NAME); + if (name != null) + am.put(name, actions[i]); + } + return am; } - public void uninstallUI(final JComponent c) + public void uninstallUI(final JComponent component) { - super.uninstallUI(c); - rootView = null; + super.uninstallUI(component); + rootView.setView(null); + + textComponent.removePropertyChangeListener(updateHandler); + textComponent = null; uninstallDefaults(); uninstallListeners(); @@ -200,14 +326,17 @@ public abstract class BasicTextUI extends TextUI protected void uninstallDefaults() { + // Do nothing here. } protected void uninstallListeners() { + // Do nothing here. } protected void uninstallKeyboardActions() { + // Do nothing here. } protected abstract String getPropertyPrefix(); @@ -235,18 +364,19 @@ public abstract class BasicTextUI extends TextUI if (textComponent.isOpaque()) paintBackground(g); - rootView.paint(g, getVisibleEditorRect()); - - if (highlighter != null) + if (highlighter != null + && textComponent.getSelectionStart() != textComponent.getSelectionEnd()) highlighter.paint(g); + rootView.paint(g, getVisibleEditorRect()); + if (caret != null) caret.paint(g); } protected void paintBackground(Graphics g) { - g.setColor(Color.WHITE); // FIXME: set background color + g.setColor(textComponent.getBackground()); g.fillRect(0, 0, textComponent.getWidth(), textComponent.getHeight()); } @@ -281,13 +411,13 @@ public abstract class BasicTextUI extends TextUI public Rectangle modelToView(JTextComponent t, int pos) throws BadLocationException { - return modelToView(t, pos, null); + return modelToView(t, pos, Position.Bias.Forward); } public Rectangle modelToView(JTextComponent t, int pos, Position.Bias bias) throws BadLocationException { - return null; + return rootView.modelToView(pos, getVisibleEditorRect(), bias).getBounds(); } public int viewToModel(JTextComponent t, Point pt) @@ -331,4 +461,11 @@ public abstract class BasicTextUI extends TextUI rootView.setView(view); view.setParent(rootView); } + + protected void modelChanged() + { + ViewFactory factory = rootView.getViewFactory(); + Element elem = textComponent.getDocument().getDefaultRootElement(); + setView(factory.create(elem)); + } } diff --git a/libjava/javax/swing/plaf/basic/BasicToggleButtonUI.java b/libjava/javax/swing/plaf/basic/BasicToggleButtonUI.java index a319b0b..1dc6423 100644 --- a/libjava/javax/swing/plaf/basic/BasicToggleButtonUI.java +++ b/libjava/javax/swing/plaf/basic/BasicToggleButtonUI.java @@ -43,12 +43,10 @@ import javax.swing.plaf.ComponentUI; public class BasicToggleButtonUI extends BasicButtonUI { - - public static ComponentUI createUI(final JComponent c) { - return new BasicToggleButtonUI(); - } -} - - + public static ComponentUI createUI(final JComponent component) + { + return new BasicToggleButtonUI(); + } +} diff --git a/libjava/javax/swing/plaf/basic/BasicToolBarUI.java b/libjava/javax/swing/plaf/basic/BasicToolBarUI.java index 4fb142b..99e4475 100644 --- a/libjava/javax/swing/plaf/basic/BasicToolBarUI.java +++ b/libjava/javax/swing/plaf/basic/BasicToolBarUI.java @@ -157,13 +157,11 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants /** * This method creates a new BasicToolBarUI object for the given JToolBar. - * - * @param b The JToolBar to represent with this UI. */ - public BasicToolBarUI(JToolBar b) - { - super(); - } + public BasicToolBarUI() + { + super(); + } /** * This method returns whether the JToolBar can dock at the given position. @@ -351,10 +349,10 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants * * @return A new UI delegate. */ - public static ComponentUI createUI(JComponent c) - { - return new BasicToolBarUI((JToolBar) c); - } + public static ComponentUI createUI(JComponent c) + { + return new BasicToolBarUI(); + } /** * This method is called to drag the DragWindow around when the JToolBar is |