SwingColorAlphaWidget: Simplify code

* remove duplicate static methods which got copied from SwingColorWidget
to SwingColorAlphaWidget
* make them package private in SwingColorWidget and reference to it

Author: frauzufall

src/main/java/org/scijava/ui/swing/widget/SwingColorAlphaWidget.java

@@ -39,20 +39,13 @@
 import javax.swing.BoxLayout;
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
-import javax.swing.JColorChooser;
-import javax.swing.JDialog;
 import javax.swing.JPanel;
-import javax.swing.colorchooser.AbstractColorChooserPanel;
 import java.awt.Color;
-import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.Graphics;
-import java.awt.HeadlessException;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.image.BufferedImage;
-import java.util.Arrays;
-import java.util.Comparator;
 
 /**
  * Swing implementation of color chooser widget including alpha.
@@ -64,26 +57,14 @@
 public class SwingColorAlphaWidget extends SwingInputWidget<ColorRGBA> implements
 	ActionListener, InputWidget<ColorRGBA, JPanel>
 {
-
-	private static final int SWATCH_WIDTH = 64, SWATCH_HEIGHT = 16;
-
-	private static final String HSB_CLASS_NAME =
-		"javax.swing.colorchooser.DefaultHSBChooserPanel";
-
-	protected static final String RGB_CLASS_NAME =
-		"javax.swing.colorchooser.DefaultRGBChooserPanel";
-
-	protected static final String SWATCHES_CLASS_NAME =
-		"javax.swing.colorchooser.DefaultSwatchChooserPanel";
-
 	private JButton choose;
 	private Color color;
 
 	// -- ActionListener methods --
 
 	@Override
 	public void actionPerformed(final ActionEvent e) {
-		final Color choice = showColorDialog(choose, "Select a color", color);
+		final Color choice = SwingColorWidget.showColorDialog(choose, "Select a color", color);
 		if (choice == null) return;
 		color = choice;
 		updateModel();
@@ -126,88 +107,6 @@ public boolean supports(final WidgetModel model) {
 		return super.supports(model) && model.isType(ColorRGBA.class);
 	}
 
-	// -- Utility methods --
-
-	/**
-	 * This method is identical to
-	 * {@link JColorChooser#showDialog(Component, String, Color)} except that it
-	 * reorders the panels of the color chooser to be more desirable. It uses
-	 * (HSB, RGB, Swatches) rather than the default of (Swatches, HSB, RGB).
-	 */
-	public static Color showColorDialog(final Component component,
-		final String title, final Color initialColor) throws HeadlessException
-	{
-		final JColorChooser pane = createColorChooser(initialColor);
-
-		class ColorTracker implements ActionListener {
-
-			private final JColorChooser chooser;
-			private Color color;
-
-			public ColorTracker(final JColorChooser c) {
-				chooser = c;
-			}
-
-			@Override
-			public void actionPerformed(final ActionEvent e) {
-				color = chooser.getColor();
-			}
-
-			public Color getColor() {
-				return color;
-			}
-		}
-		final ColorTracker ok = new ColorTracker(pane);
-
-		final JDialog dialog =
-			JColorChooser.createDialog(component, title, true, pane, ok, null);
-
-		dialog.setVisible(true);
-
-		return ok.getColor();
-	}
-
-	// -- Helper methods --
-
-	/**
-	 * Creates a new {@link JColorChooser} with panels in a desirable order.
-	 * <p>
-	 * All of this code exists solely to reorder the panels from (Swatches, HSB,
-	 * RGB) to (HSB, RGB, Swatches) since we believe the HSB tab is the most
-	 * commonly useful.
-	 * </p>
-	 */
-	private static JColorChooser createColorChooser(final Color initialColor) {
-		final JColorChooser chooser =
-			new JColorChooser(initialColor != null ? initialColor : Color.white);
-
-		// get the list of panels
-		final AbstractColorChooserPanel[] panels =
-			chooser.getChooserPanels().clone();
-
-		// sort panels into the desired order
-		Arrays.sort(panels, new Comparator<Object>() {
-
-			@Override
-			public int compare(final Object o1, final Object o2) {
-				return value(o1) - value(o2);
-			}
-
-			private int value(final Object o) {
-				final String className = o.getClass().getName();
-				if (className.equals(HSB_CLASS_NAME)) return 1;
-				if (className.equals(RGB_CLASS_NAME)) return 2;
-				if (className.equals(SWATCHES_CLASS_NAME)) return 3;
-				return 4;
-			}
-		});
-
-		// reset the panels to match the sorted list
-		chooser.setChooserPanels(panels);
-
-		return chooser;
-	}
-
 	// -- AbstractUIInputWidget methods ---
 
 	@Override
@@ -216,7 +115,7 @@ public void doRefresh() {
 		color = AWTColors.getColor(value);
 
 		final BufferedImage image =
-			new BufferedImage(SWATCH_WIDTH, SWATCH_HEIGHT, BufferedImage.TYPE_INT_ARGB);
+			new BufferedImage(SwingColorWidget.SWATCH_WIDTH, SwingColorWidget.SWATCH_HEIGHT, BufferedImage.TYPE_INT_ARGB);
 		final Graphics g = image.getGraphics();
 		g.setColor(color);
 		g.fillRect(0, 0, image.getWidth(), image.getHeight());

src/main/java/org/scijava/ui/swing/widget/SwingColorWidget.java

@@ -65,7 +65,8 @@ public class SwingColorWidget extends SwingInputWidget<ColorRGB> implements
 	ActionListener, ColorWidget<JPanel>
 {
 
-	private static final int SWATCH_WIDTH = 64, SWATCH_HEIGHT = 16;
+	static final int SWATCH_WIDTH = 64;
+	static final int SWATCH_HEIGHT = 16;
 
 	private static final String HSB_CLASS_NAME =
 		"javax.swing.colorchooser.DefaultHSBChooserPanel";
@@ -177,7 +178,7 @@ public Color getColor() {
 	 * commonly useful.
 	 * </p>
 	 */
-	private static JColorChooser createColorChooser(final Color initialColor) {
+	static JColorChooser createColorChooser(final Color initialColor) {
 		final JColorChooser chooser =
 			new JColorChooser(initialColor != null ? initialColor : Color.white);