diff -Nru looks-2.2.1/src/core/com/jgoodies/looks/plastic/PlasticSpinnerUI.java looks-2.2.1/src-gil/core/com/jgoodies/looks/plastic/PlasticSpinnerUI.java
--- looks-2.2.1/src/core/com/jgoodies/looks/plastic/PlasticSpinnerUI.java 2008-09-24 14:23:40.000000000 +0200
+++ looks-2.2.1/src-gil/core/com/jgoodies/looks/plastic/PlasticSpinnerUI.java 2009-01-05 21:36:17.000000000 +0100
@@ -35,11 +35,16 @@
import java.awt.LayoutManager;
import javax.swing.*;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import javax.swing.JSpinner;
+import javax.swing.JTextField;
+import javax.swing.SwingConstants;
+import javax.swing.UIManager;
import javax.swing.border.EmptyBorder;
import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.basic.BasicSpinnerUI;
-import com.jgoodies.looks.common.ExtBasicArrowButtonHandler;
import com.jgoodies.looks.common.ExtBasicSpinnerLayout;
@@ -58,57 +63,6 @@
return new PlasticSpinnerUI();
}
-
- /**
- * The mouse/action listeners that are added to the spinner's
- * arrow buttons. These listeners are shared by all
- * spinner arrow buttons.
- *
- * @see #createNextButton
- * @see #createPreviousButton
- */
- private static final ExtBasicArrowButtonHandler nextButtonHandler
- = new ExtBasicArrowButtonHandler("increment", true);
- private static final ExtBasicArrowButtonHandler previousButtonHandler
- = new ExtBasicArrowButtonHandler("decrement", false);
-
-
- /**
- * Create a component that will replace the spinner models value
- * with the object returned by spinner.getPreviousValue.
- * By default the previousButton is a JButton
- * who's ActionListener updates it's JSpinner
- * ancestors model. If a previousButton isn't needed (in a subclass)
- * then override this method to return null.
- *
- * @return a component that will replace the spinners model with the
- * next value in the sequence, or null
- * @see #installUI
- * @see #createNextButton
- */
- protected Component createPreviousButton() {
- return new SpinnerArrowButton(SwingConstants.SOUTH, previousButtonHandler);
- }
-
-
- /**
- * Create a component that will replace the spinner models value
- * with the object returned by spinner.getNextValue.
- * By default the nextButton is a JButton
- * who's ActionListener updates it's JSpinner
- * ancestors model. If a nextButton isn't needed (in a subclass)
- * then override this method to return null.
- *
- * @return a component that will replace the spinners model with the
- * next value in the sequence, or null
- * @see #installUI
- * @see #createPreviousButton
- */
- protected Component createNextButton() {
- return new SpinnerArrowButton(SwingConstants.NORTH, nextButtonHandler);
- }
-
-
/**
* Create a LayoutManager that manages the editor,
* nextButton, and previousButton children
@@ -195,32 +149,4 @@
editorField.setBorder(new EmptyBorder(insets));
}
}
-
- /**
- * It differs from its superclass in that it uses the same formula as JDK
- * to calculate the arrow height.
- */
- private static final class SpinnerArrowButton extends PlasticArrowButton {
- private SpinnerArrowButton(int direction,
- ExtBasicArrowButtonHandler handler) {
- super(direction, UIManager.getInt("ScrollBar.width"), true);
- addActionListener(handler);
- addMouseListener(handler);
- }
-
- protected int calculateArrowHeight(int height, int width) {
- int arrowHeight = Math.min((height - 4) / 3, (width - 4) / 3);
- return Math.max(arrowHeight, 3);
- }
-
- protected int calculateArrowOffset() {
- return 1;
- }
-
- protected boolean isPaintingNorthBottom() {
- return true;
- }
-
- }
-
}
\ No newline at end of file
diff -Nru looks-2.2.1/src/core/com/jgoodies/looks/plastic/PlasticXPSpinnerUI.java looks-2.2.1/src-gil/core/com/jgoodies/looks/plastic/PlasticXPSpinnerUI.java
--- looks-2.2.1/src/core/com/jgoodies/looks/plastic/PlasticXPSpinnerUI.java 2008-09-24 14:23:40.000000000 +0200
+++ looks-2.2.1/src-gil/core/com/jgoodies/looks/plastic/PlasticXPSpinnerUI.java 2009-01-05 21:39:00.000000000 +0100
@@ -30,17 +30,8 @@
package com.jgoodies.looks.plastic;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Graphics;
-
import javax.swing.JComponent;
-import javax.swing.SwingConstants;
-import javax.swing.UIManager;
import javax.swing.plaf.ComponentUI;
-import javax.swing.plaf.metal.MetalLookAndFeel;
-
-import com.jgoodies.looks.common.ExtBasicArrowButtonHandler;
/**
@@ -56,205 +47,4 @@
public static ComponentUI createUI(JComponent b) {
return new PlasticXPSpinnerUI();
}
-
-
- /**
- * The mouse/action listeners that are added to the spinner's
- * arrow buttons. These listeners are shared by all
- * spinner arrow buttons.
- *
- * @see #createNextButton
- * @see #createPreviousButton
- */
- private static final ExtBasicArrowButtonHandler NEXT_BUTTON_HANDLER
- = new ExtBasicArrowButtonHandler("increment", true);
- private static final ExtBasicArrowButtonHandler PREVIOUS_BUTTON_HANDLER
- = new ExtBasicArrowButtonHandler("decrement", false);
-
-
- /**
- * Create a component that will replace the spinner models value
- * with the object returned by spinner.getPreviousValue.
- * By default the previousButton is a JButton
- * who's ActionListener updates it's JSpinner
- * ancestors model. If a previousButton isn't needed (in a subclass)
- * then override this method to return null.
- *
- * @return a component that will replace the spinners model with the
- * next value in the sequence, or null
- * @see #installUI
- * @see #createNextButton
- */
- protected Component createPreviousButton() {
- return new SpinnerXPArrowButton(SwingConstants.SOUTH, PREVIOUS_BUTTON_HANDLER);
- }
-
-
- /**
- * Create a component that will replace the spinner models value
- * with the object returned by spinner.getNextValue.
- * By default the nextButton is a JButton
- * who's ActionListener updates it's JSpinner
- * ancestors model. If a nextButton isn't needed (in a subclass)
- * then override this method to return null.
- *
- * @return a component that will replace the spinners model with the
- * next value in the sequence, or null
- * @see #installUI
- * @see #createPreviousButton
- */
- protected Component createNextButton() {
- return new SpinnerXPArrowButton(SwingConstants.NORTH, NEXT_BUTTON_HANDLER);
- }
-
-
- /**
- * It differs from its superclass in that it uses the same formula as JDK
- * to calculate the arrow height.
- */
- private static final class SpinnerXPArrowButton extends PlasticArrowButton {
-
- SpinnerXPArrowButton(int direction, ExtBasicArrowButtonHandler handler) {
- // If you change the value of the button width, don't forget
- // to change it in PlasticXPBorders#XPSpinnerBorder too.
- super(direction, UIManager.getInt("ScrollBar.width") - 1, false);
- addActionListener(handler);
- addMouseListener(handler);
- }
-
- protected int calculateArrowHeight(int height, int width) {
- int arrowHeight = Math.min((height - 4) / 3, (width - 4) / 3);
- return Math.max(arrowHeight, 3);
- }
-
- protected boolean isPaintingNorthBottom() {
- return true;
- }
-
- protected int calculateArrowOffset() {
- return 1;
- }
-
- protected void paintNorth(Graphics g, boolean leftToRight, boolean isEnabled,
- Color arrowColor, boolean isPressed,
- int width, int height, int w, int h, int arrowHeight, int arrowOffset,
- boolean paintBottom) {
- if (!isFreeStanding) {
- height += 1;
- g.translate(0, -1);
- if (!leftToRight) {
- width += 1;
- g.translate(-1, 0);
- } else {
- width += 2;
- }
- }
-
- // Draw the arrow
- g.setColor(arrowColor);
- int startY = 1 + ((h + 1) - arrowHeight) / 2; // KL was (h + 1)
- int startX = w / 2;
- // System.out.println( "startX :" + startX + " startY :"+startY);
- for (int line = 0; line < arrowHeight; line++) {
- g.fillRect(startX - line - arrowOffset, startY + line,
- 2 * (line + 1), 1);
- }
-
- paintNorthBorder(g, isEnabled, width, height, paintBottom);
-
- if (!isFreeStanding) {
- height -= 1;
- g.translate(0, 1);
- if (!leftToRight) {
- width -= 1;
- g.translate(1, 0);
- } else {
- width -= 2;
- }
- }
- }
-
- private void paintNorthBorder(Graphics g, boolean isEnabled, int w, int h, boolean paintBottom) {
- if (isEnabled) {
- boolean isPressed = model.isPressed() && model.isArmed();
- if (isPressed) {
- PlasticXPUtils.drawPressedButtonBorder(g, 0, 1, w - 2, h);
- } else {
- PlasticXPUtils.drawPlainButtonBorder(g, 0, 1, w - 2, h);
- }
- } else {
- PlasticXPUtils.drawDisabledButtonBorder(g, 0, 1, w - 2, h + 1);
- }
- // Paint one pixel on the arrow button's left hand side.
- g.setColor(isEnabled
- ? PlasticLookAndFeel.getControlDarkShadow()
- : MetalLookAndFeel.getControlShadow());
- g.fillRect(0, 1, 1, 1);
-
- if (paintBottom) {
- g.fillRect(0, h - 1, w - 1, 1);
- }
- }
-
-
- protected void paintSouth(Graphics g, boolean leftToRight, boolean isEnabled,
- Color arrowColor, boolean isPressed,
- int width, int height, int w, int h, int arrowHeight, int arrowOffset) {
-
- if (!isFreeStanding) {
- height += 1;
- if (!leftToRight) {
- width += 1;
- g.translate(-1, 0);
- } else {
- width += 2;
- }
- }
-
- // Draw the arrow
- g.setColor(arrowColor);
-
- int startY = (((h + 0) - arrowHeight) / 2) + arrowHeight - 2; // KL was h + 1
- int startX = w / 2;
-
- //System.out.println( "startX2 :" + startX + " startY2 :"+startY);
-
- for (int line = 0; line < arrowHeight; line++) {
- g.fillRect(startX - line - arrowOffset, startY - line,
- 2 * (line + 1), 1);
- }
-
- paintSouthBorder(g, isEnabled, width, height);
-
- if (!isFreeStanding) {
- height -= 1;
- if (!leftToRight) {
- width -= 1;
- g.translate(1, 0);
- } else {
- width -= 2;
- }
- }
- }
-
- private void paintSouthBorder(Graphics g, boolean isEnabled, int w, int h) {
- if (isEnabled) {
- boolean isPressed = model.isPressed() && model.isArmed();
- if (isPressed) {
- PlasticXPUtils.drawPressedButtonBorder(g, 0, -2, w - 2, h + 1);
- } else {
- PlasticXPUtils.drawPlainButtonBorder(g, 0, -2, w - 2, h + 1);
- }
- } else {
- PlasticXPUtils.drawDisabledButtonBorder(g, 0, -2, w-2, h + 1);
- }
- // Paint one pixel on the arrow button's left hand side.
- g.setColor(isEnabled
- ? PlasticLookAndFeel.getControlDarkShadow()
- : MetalLookAndFeel.getControlShadow());
- g.fillRect(0, h - 2, 1, 1);
- }
-
- }
-
}
\ No newline at end of file