jdk-sandbox: comparison jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaSpinnerUI.java

equal deleted inserted replaced

-:61884618e67d
+:8ac51e1179da
 *
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
 package com.apple.laf;
 import java.awt.*;
 import java.awt.event.*;
 import java.beans.*;
 import com.apple.laf.AquaUtils.RecyclableSingleton;
 import com.apple.laf.AquaUtils.RecyclableSingletonFromDefaultConstructor;
 /**
-* This is originally derived from BasicSpinnerUI, but they made everything private
+* This is originally derived from BasicSpinnerUI, but they made everything
-* so we can't subclass!
+* private so we can't subclass!
 */
 public class AquaSpinnerUI extends SpinnerUI {
 private static final RecyclableSingleton<? extends PropertyChangeListener> propertyChangeListener
 = new RecyclableSingletonFromDefaultConstructor<>(PropertyChangeHandler.class);
 static PropertyChangeListener getPropertyChangeListener() {
 return propertyChangeListener.get();
 }
 private static final RecyclableSingleton<ArrowButtonHandler> nextButtonHandler
 = new RecyclableSingleton<ArrowButtonHandler>() {
 @Override
 protected ArrowButtonHandler getInstance() {
 return new ArrowButtonHandler("increment", true);
 }
 };
 static ArrowButtonHandler getNextButtonHandler() {
 return nextButtonHandler.get();
 }
 private static final RecyclableSingleton<ArrowButtonHandler> previousButtonHandler
 = new RecyclableSingleton<ArrowButtonHandler>() {
 @Override
 protected ArrowButtonHandler getInstance() {
 return new ArrowButtonHandler("decrement", false);
 }
 };
 static ArrowButtonHandler getPreviousButtonHandler() {
 return previousButtonHandler.get();
 }
 private JSpinner spinner;
 spinner.add(c, s);
 }
 }
 boolean wasOpaque;
 @Override
 public void installUI(final JComponent c) {
-this.spinner = (JSpinner)c;
+this.spinner = (JSpinner) c;
 installDefaults();
 installListeners();
 next = createNextButton();
 prev = createPreviousButton();
 spinPainter = new SpinPainter(next, prev);
 updateEnabledState();
 installKeyboardActions();
 // this doesn't work because JSpinner calls setOpaque(true) directly in it's constructor
 //    LookAndFeel.installProperty(spinner, "opaque", Boolean.FALSE);
 // ...so we have to handle the is/was opaque ourselves
 wasOpaque = spinner.isOpaque();
 spinner.setOpaque(false);
 }
 return spinner.getEditor().getBaselineResizeBehavior();
 }
 @SuppressWarnings("serial") // Superclass is not serializable across versions
 class TransparentButton extends JButton implements SwingConstants {
 boolean interceptRepaints = false;
 public TransparentButton() {
 super();
 setFocusable(false);
 // otherwise we can't talk to our containing class
 interceptRepaints = true;
 }
 @Override
-public void paint(final Graphics g) {}
+public void paint(final Graphics g) {
+}
 @Override
 public void repaint() {
 // only intercept repaints if we are after this has been initialized
 // otherwise we can't talk to our containing class
 if (interceptRepaints) {
-if (spinPainter == null) return;
+if (spinPainter == null) {
+return;
+}
 spinPainter.repaint();
 }
 super.repaint();
 }
 }
 fixupEditor(newEditor);
 spinner.add(newEditor, "Editor");
 }
 protected void fixupEditor(final JComponent editor) {
-if (!(editor instanceof DefaultEditor)) return;
+if (!(editor instanceof DefaultEditor)) {
+return;
+}
 editor.setOpaque(false);
 editor.setInheritsPopupMenu(true);
 if (editor.getFont() instanceof UIResource) {
 editor.setFont(new FontUIResource(spinner.getFont()));
 }
-final JFormattedTextField editorTextField = ((DefaultEditor)editor).getTextField();
+final JFormattedTextField editorTextField = ((DefaultEditor) editor).getTextField();
 if (editorTextField.getFont() instanceof UIResource) {
 editorTextField.setFont(new FontUIResource(spinner.getFont()));
 }
 final InputMap spinnerInputMap = getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
 final InputMap editorInputMap = editorTextField.getInputMap();
 for (int counter = c.getComponentCount() - 1; counter >= 0; counter--) {
 final Component child = c.getComponent(counter);
 child.setEnabled(enabled);
 if (child instanceof Container) {
-updateEnabledState((Container)child, enabled);
+updateEnabledState((Container) child, enabled);
 }
 }
 }
 private void installKeyboardActions() {
 SwingUtilities.replaceUIActionMap(spinner, getActionMap());
 }
 private InputMap getInputMap(final int condition) {
 if (condition == JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT) {
-return (InputMap)UIManager.get("Spinner.ancestorInputMap");
+return (InputMap) UIManager.get("Spinner.ancestorInputMap");
 }
 return null;
 }
 private ActionMap getActionMap() {
-ActionMap map = (ActionMap)UIManager.get("Spinner.actionMap");
+ActionMap map = (ActionMap) UIManager.get("Spinner.actionMap");
 if (map == null) {
 map = createActionMap();
 if (map != null) {
 UIManager.getLookAndFeelDefaults().put("Spinner.actionMap", map);
 return map;
 }
 @SuppressWarnings("serial") // Superclass is not serializable across versions
 private static class ArrowButtonHandler extends AbstractAction implements MouseListener {
 final javax.swing.Timer autoRepeatTimer;
 final boolean isNext;
 JSpinner spinner = null;
 ArrowButtonHandler(final String name, final boolean isNext) {
 }
 private JSpinner eventToSpinner(final AWTEvent e) {
 Object src = e.getSource();
 while ((src instanceof Component) && !(src instanceof JSpinner)) {
-src = ((Component)src).getParent();
+src = ((Component) src).getParent();
 }
-return (src instanceof JSpinner) ? (JSpinner)src : null;
+return (src instanceof JSpinner) ? (JSpinner) src : null;
 }
 @Override
 public void actionPerformed(final ActionEvent e) {
 if (!(e.getSource() instanceof javax.swing.Timer)) {
 // Most likely resulting from being in ActionMap.
 spinner = eventToSpinner(e);
 }
-if (spinner == null) return;
+if (spinner == null) {
+return;
+}
 try {
 final int calendarField = getCalendarField(spinner);
 spinner.commitEdit();
 if (calendarField != -1) {
-((SpinnerDateModel)spinner.getModel()).setCalendarField(calendarField);
+((SpinnerDateModel) spinner.getModel()).setCalendarField(calendarField);
 }
 final Object value = (isNext) ? spinner.getNextValue() : spinner.getPreviousValue();
 if (value != null) {
 spinner.setValue(value);
 select(spinner);
 * If the spinner's editor is a DateEditor, this selects the field
 * associated with the value that is being incremented.
 */
 private void select(final JSpinner spinnerComponent) {
 final JComponent editor = spinnerComponent.getEditor();
-if (!(editor instanceof JSpinner.DateEditor)) return;
+if (!(editor instanceof JSpinner.DateEditor)) {
+return;
-final JSpinner.DateEditor dateEditor = (JSpinner.DateEditor)editor;
+}
+final JSpinner.DateEditor dateEditor = (JSpinner.DateEditor) editor;
 final JFormattedTextField ftf = dateEditor.getTextField();
 final Format format = dateEditor.getFormat();
 Object value;
-if (format == null || (value = spinnerComponent.getValue()) == null) return;
+if (format == null || (value = spinnerComponent.getValue()) == null) {
+return;
+}
 final SpinnerDateModel model = dateEditor.getModel();
 final DateFormat.Field field = DateFormat.Field.ofCalendarField(model.getCalendarField());
-if (field == null) return;
+if (field == null) {
+return;
+}
 try {
 final AttributedCharacterIterator iterator = format.formatToCharacterIterator(value);
 if (!select(ftf, iterator, field) && field == DateFormat.Field.HOUR0) {
 select(ftf, iterator, DateFormat.Field.HOUR1);
 }
-} catch (final IllegalArgumentException iae) {}
+} catch (final IllegalArgumentException iae) {
+}
 }
 /**
-* Selects the passed in field, returning true if it is found,
+* Selects the passed in field, returning true if it is found, false
-* false otherwise.
+* otherwise.
 */
 private boolean select(final JFormattedTextField ftf, final AttributedCharacterIterator iterator, final DateFormat.Field field) {
 final int max = ftf.getDocument().getLength();
 iterator.first();
 do {
-final Map<Attribute,Object> attrs = iterator.getAttributes();
+final Map<Attribute, Object> attrs = iterator.getAttributes();
-if (attrs == null || !attrs.containsKey(field)) continue;
+if (attrs == null || !attrs.containsKey(field)) {
+continue;
+}
 final int start = iterator.getRunStart(field);
 final int end = iterator.getRunLimit(field);
 if (start != -1 && end != -1 && start <= max && end <= max) {
 ftf.select(start, end);
 } while (iterator.next() != CharacterIterator.DONE);
 return false;
 }
 /**
-* Returns the calendarField under the start of the selection, or
+* Returns the calendarField under the start of the selection, or -1 if
-* -1 if there is no valid calendar field under the selection (or
+* there is no valid calendar field under the selection (or the spinner
-* the spinner isn't editing dates.
+* isn't editing dates.
 */
 private int getCalendarField(final JSpinner spinnerComponent) {
 final JComponent editor = spinnerComponent.getEditor();
-if (!(editor instanceof JSpinner.DateEditor)) return -1;
+if (!(editor instanceof JSpinner.DateEditor)) {
+return -1;
-final JSpinner.DateEditor dateEditor = (JSpinner.DateEditor)editor;
+}
+final JSpinner.DateEditor dateEditor = (JSpinner.DateEditor) editor;
 final JFormattedTextField ftf = dateEditor.getTextField();
 final int start = ftf.getSelectionStart();
 final JFormattedTextField.AbstractFormatter formatter = ftf.getFormatter();
-if (!(formatter instanceof InternationalFormatter)) return -1;
+if (!(formatter instanceof InternationalFormatter)) {
+return -1;
-final Format.Field[] fields = ((InternationalFormatter)formatter).getFields(start);
+}
+final Format.Field[] fields = ((InternationalFormatter) formatter).getFields(start);
 for (final Field element : fields) {
-if (!(element instanceof DateFormat.Field)) continue;
+if (!(element instanceof DateFormat.Field)) {
+continue;
+}
 int calendarField;
 if (element == DateFormat.Field.HOUR1) {
 calendarField = Calendar.HOUR;
 } else {
-calendarField = ((DateFormat.Field)element).getCalendarField();
+calendarField = ((DateFormat.Field) element).getCalendarField();
 }
 if (calendarField != -1) {
 return calendarField;
 }
 return -1;
 }
 @Override
 public void mousePressed(final MouseEvent e) {
-if (!SwingUtilities.isLeftMouseButton(e) || !e.getComponent().isEnabled()) return;
+if (!SwingUtilities.isLeftMouseButton(e) || !e.getComponent().isEnabled()) {
+return;
+}
 spinner = eventToSpinner(e);
 autoRepeatTimer.start();
 focusSpinnerIfNecessary();
 }
 autoRepeatTimer.stop();
 spinner = null;
 }
 @Override
-public void mouseClicked(final MouseEvent e) {}
+public void mouseClicked(final MouseEvent e) {
-@Override
+}
-public void mouseEntered(final MouseEvent e) {}
 @Override
-public void mouseExited(final MouseEvent e) {}
+public void mouseEntered(final MouseEvent e) {
+}
+@Override
+public void mouseExited(final MouseEvent e) {
+}
 /**
-* Requests focus on a child of the spinner if the spinner doesn't
+* Requests focus on a child of the spinner if the spinner doesn't have
-* have focus.
+* focus.
 */
 private void focusSpinnerIfNecessary() {
 final Component fo = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner();
-if (!spinner.isRequestFocusEnabled() || (fo != null && (SwingUtilities.isDescendingFrom(fo, spinner)))) return;
+if (!spinner.isRequestFocusEnabled() || (fo != null && (SwingUtilities.isDescendingFrom(fo, spinner)))) {
+return;
+}
 Container root = spinner;
 if (!root.isFocusCycleRoot()) {
 root = root.getFocusCycleRootAncestor();
 }
-if (root == null) return;
+if (root == null) {
+return;
+}
 final FocusTraversalPolicy ftp = root.getFocusTraversalPolicy();
 final Component child = ftp.getComponentAfter(root, spinner);
 if (child != null && SwingUtilities.isDescendingFrom(child, spinner)) {
 child.requestFocus();
 }
 }
 @SuppressWarnings("serial") // Superclass is not serializable across versions
 class SpinPainter extends JComponent {
 final AquaPainter<JRSUIState> painter = AquaPainter.create(JRSUIStateFactory.getSpinnerArrows());
 ButtonModel fTopModel;
 ButtonModel fBottomModel;
 return kPreferredSize;
 }
 }
 /**
-* A simple layout manager for the editor and the next/previous buttons.
+* A simple layout manager for the editor and the next/previous buttons. See
-* See the AquaSpinnerUI javadoc for more information about exactly
+* the AquaSpinnerUI javadoc for more information about exactly how the
-* how the components are arranged.
+* components are arranged.
 */
 static class SpinnerLayout implements LayoutManager {
 private Component nextButton = null;
 private Component previousButton = null;
 private Component editor = null;
 private Component painter = null;
 setBounds(painter, buttonsX, painterTop, buttonsWidth, painterD.height);
 }
 }
 /**
-* Detect JSpinner property changes we're interested in and delegate.  Subclasses
+* Detect JSpinner property changes we're interested in and delegate.
-* shouldn't need to replace the default propertyChangeListener (although they
+* Subclasses shouldn't need to replace the default propertyChangeListener
-* can by overriding createPropertyChangeListener) since all of the interesting
+* (although they can by overriding createPropertyChangeListener) since all
-* property changes are delegated to protected methods.
+* of the interesting property changes are delegated to protected methods.
 */
 static class PropertyChangeHandler implements PropertyChangeListener {
 @Override
 public void propertyChange(final PropertyChangeEvent e) {
 final String propertyName = e.getPropertyName();
-final JSpinner spinner = (JSpinner)(e.getSource());
+final JSpinner spinner = (JSpinner) (e.getSource());
 final SpinnerUI spinnerUI = spinner.getUI();
 if (spinnerUI instanceof AquaSpinnerUI) {
-final AquaSpinnerUI ui = (AquaSpinnerUI)spinnerUI;
+final AquaSpinnerUI ui = (AquaSpinnerUI) spinnerUI;
 if ("editor".equals(propertyName)) {
-final JComponent oldEditor = (JComponent)e.getOldValue();
+final JComponent oldEditor = (JComponent) e.getOldValue();
-final JComponent newEditor = (JComponent)e.getNewValue();
+final JComponent newEditor = (JComponent) e.getNewValue();
 ui.replaceEditor(oldEditor, newEditor);
 ui.updateEnabledState();
+} else if ("componentOrientation".equals(propertyName)) {
+ComponentOrientation o
+= (ComponentOrientation) e.getNewValue();
+if (o != e.getOldValue()) {
+JComponent editor = spinner.getEditor();
+if (editor != null) {
+editor.applyComponentOrientation(o);
+}
+spinner.revalidate();
+spinner.repaint();
+}
 } else if ("enabled".equals(propertyName)) {
 ui.updateEnabledState();
 } else if (JComponent.TOOL_TIP_TEXT_KEY.equals(propertyName)) {
 ui.updateToolTipTextForChildren(spinner);
 } else if ("font".equals(propertyName)) {
 JComponent editor = spinner.getEditor();
 if (editor instanceof JSpinner.DefaultEditor) {
-JTextField tf =
+JTextField tf
-((JSpinner.DefaultEditor) editor).getTextField();
+= ((JSpinner.DefaultEditor) editor).getTextField();
 if (tf != null) {
 if (tf.getFont() instanceof UIResource) {
 tf.setFont(new FontUIResource(spinner.getFont()));
 }
 }
 void updateToolTipTextForChildren(final JComponent spinnerComponent) {
 final String toolTipText = spinnerComponent.getToolTipText();
 final Component[] children = spinnerComponent.getComponents();
 for (final Component element : children) {
 if (element instanceof JSpinner.DefaultEditor) {
-final JTextField tf = ((JSpinner.DefaultEditor)element).getTextField();
+final JTextField tf = ((JSpinner.DefaultEditor) element).getTextField();
 if (tf != null) {
 tf.setToolTipText(toolTipText);
 }
 } else if (element instanceof JComponent) {
-((JComponent)element).setToolTipText(toolTipText);
+((JComponent) element).setToolTipText(toolTipText);
 }
 }
 }
 }

changeset 35674	8ac51e1179da
parent 32669	8ff453aa551b