From 4485e46801ab69f6892c6422385bae8dd623cbf6 Mon Sep 17 00:00:00 2001 From: drdev Date: Sun, 27 Oct 2013 05:27:51 +0000 Subject: [PATCH] Remove unused FComboBox properties --- .../forge/gui/deckchooser/DecksComboBox.java | 1 - .../home/sanctioned/VSubmenuConstructed.java | 1 - .../java/forge/gui/toolbox/FComboBox.java | 78 +------------------ .../forge/gui/toolbox/FComboBoxPanel.java | 2 +- .../forge/gui/toolbox/FComboBoxWrapper.java | 2 +- 5 files changed, 5 insertions(+), 79 deletions(-) diff --git a/src/main/java/forge/gui/deckchooser/DecksComboBox.java b/src/main/java/forge/gui/deckchooser/DecksComboBox.java index 409facad71d..a20bb502858 100644 --- a/src/main/java/forge/gui/deckchooser/DecksComboBox.java +++ b/src/main/java/forge/gui/deckchooser/DecksComboBox.java @@ -45,7 +45,6 @@ public class DecksComboBox extends FComboBox { private DeckType selectedDeckType = null; public DecksComboBox() { - setButtonVisible(true); FSkin.get(this).setFont(FSkin.getBoldFont(14)); setTextAlignment(TextAlignment.CENTER); addActionListener(getDeckTypeComboListener()); diff --git a/src/main/java/forge/gui/home/sanctioned/VSubmenuConstructed.java b/src/main/java/forge/gui/home/sanctioned/VSubmenuConstructed.java index 8d266b5af12..7d525903697 100644 --- a/src/main/java/forge/gui/home/sanctioned/VSubmenuConstructed.java +++ b/src/main/java/forge/gui/home/sanctioned/VSubmenuConstructed.java @@ -43,7 +43,6 @@ public enum VSubmenuConstructed implements IVSubmenu { // CTR private VSubmenuConstructed() { FSkin.get(lblTitle).setBackground(FSkin.getColor(FSkin.Colors.CLR_THEME2)); - cboGamePlayers.setButtonVisible(true); cboGamePlayers.setTextAlignment(TextAlignment.CENTER); FSkin.get(cboGamePlayers).setFont(FSkin.getBoldFont(16)); } diff --git a/src/main/java/forge/gui/toolbox/FComboBox.java b/src/main/java/forge/gui/toolbox/FComboBox.java index 4f12de424a2..de097224e6f 100644 --- a/src/main/java/forge/gui/toolbox/FComboBox.java +++ b/src/main/java/forge/gui/toolbox/FComboBox.java @@ -1,17 +1,9 @@ package forge.gui.toolbox; -import java.awt.BorderLayout; -import java.awt.Color; import java.awt.Component; -import java.awt.Cursor; -import java.awt.Dimension; import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.LayoutManager; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; - -import javax.swing.BorderFactory; import javax.swing.ComboBoxModel; import javax.swing.DefaultListCellRenderer; import javax.swing.JButton; @@ -24,13 +16,9 @@ import javax.swing.SwingConstants; import javax.swing.UIManager; import javax.swing.border.Border; import javax.swing.border.EmptyBorder; -import javax.swing.border.LineBorder; import javax.swing.plaf.basic.BasicComboBoxUI; import javax.swing.plaf.basic.ComboPopup; -import forge.gui.MouseUtil; -import forge.gui.MouseUtil.MouseCursor; - @SuppressWarnings("serial") public class FComboBox extends JComboBox { @@ -44,9 +32,6 @@ public class FComboBox extends JComboBox { } private TextAlignment textAlignment = TextAlignment.LEFT; - private boolean showComboButton = true; - private MouseAdapter mouseListener = null; - // CTR public FComboBox() { super(); @@ -64,65 +49,12 @@ public class FComboBox extends JComboBox { private void initialize() { setUI(new FComboBoxUI()); setBorder(getDefaultBorder()); - setMouseListener(); } private Border getDefaultBorder() { return UIManager.getBorder("ComboBox.border"); } - private Color getBorderColor() { - Border thisBorder = getDefaultBorder(); - if (thisBorder != null && thisBorder instanceof LineBorder) { - return ((LineBorder)thisBorder).getLineColor(); - } else { - return getForeground(); - } - } - - public void setButtonVisible(boolean isVisible) { - showComboButton = isVisible; - initialize(); - } - - private void setMouseListener() { - if (mouseListener != null) { - removeMouseListener(mouseListener); - } - if (!showComboButton) { - mouseListener = new MouseAdapter() { - @Override - public void mouseEntered(MouseEvent e) { - setMouseCursor(Cursor.HAND_CURSOR); - setBorderHighlight(true); - } - @Override - public void mouseExited(MouseEvent e) { - setMouseCursor(Cursor.DEFAULT_CURSOR); - setBorderHighlight(false); - } - }; - addMouseListener(mouseListener); - } - } - - private void setBorderHighlight(boolean highlight) { - if (isEnabled()) { - if (highlight) { - setBorder(BorderFactory.createLineBorder(getForeground(), 2)); - } else { - setBorder(BorderFactory.createLineBorder(getBorderColor(), 1)); - } - } - } - - private void setMouseCursor(int cursor) { - // Testing... - //SwingUtilities.getWindowAncestor(this).setCursor(Cursor.getPredefinedCursor(cursor)); - // Forge... - MouseUtil.setMouseCursor(MouseCursor.fromInt(cursor)); - } - public void setTextAlignment(TextAlignment align) { textAlignment = align; } @@ -136,8 +68,8 @@ public class FComboBox extends JComboBox { int shapeHeight = 10; int x = getWidth() - shapeWidth - 8; int y = getHeight() / 2 - 2; - int[] xPoints = {x, x + shapeWidth, x + (shapeWidth/2)}; - int[] yPoints = {y, y, y + (shapeHeight/2)}; + int[] xPoints = {x, x + shapeWidth, x + (shapeWidth / 2)}; + int[] yPoints = {y, y, y + (shapeHeight / 2)}; g2d.fillPolygon(xPoints, yPoints, 3); } @@ -145,11 +77,7 @@ public class FComboBox extends JComboBox { @Override protected LayoutManager createLayoutManager() { - if (!showComboButton) { - return new BorderLayout(); - } else { - return super.createLayoutManager(); - } + return super.createLayoutManager(); } @Override diff --git a/src/main/java/forge/gui/toolbox/FComboBoxPanel.java b/src/main/java/forge/gui/toolbox/FComboBoxPanel.java index fa13f390951..05fb66b56f3 100644 --- a/src/main/java/forge/gui/toolbox/FComboBoxPanel.java +++ b/src/main/java/forge/gui/toolbox/FComboBoxPanel.java @@ -23,7 +23,7 @@ import forge.properties.ForgePreferences.FPref; @SuppressWarnings("serial") public class FComboBoxPanel extends JPanel { - private static ArrayList> allPanels = new ArrayList>(); + private static final ArrayList> allPanels = new ArrayList>(); public static void refreshAllSkins() { for (FComboBoxPanel panel : allPanels) { diff --git a/src/main/java/forge/gui/toolbox/FComboBoxWrapper.java b/src/main/java/forge/gui/toolbox/FComboBoxWrapper.java index 8b8ea1c8caf..ac56969e313 100644 --- a/src/main/java/forge/gui/toolbox/FComboBoxWrapper.java +++ b/src/main/java/forge/gui/toolbox/FComboBoxWrapper.java @@ -17,7 +17,7 @@ import javax.swing.ListCellRenderer; */ public class FComboBoxWrapper { - private static ArrayList> allWrappers = new ArrayList>(); + private static final ArrayList> allWrappers = new ArrayList>(); public static void refreshAllSkins() { for (FComboBoxWrapper wrapper : allWrappers) {