added dependency 2 org.apache.commons.lang3 (for StringUtils.join)

@GuiFilter just removed duplicated code
This commit is contained in:
Maxmtg
2011-08-25 09:52:44 +00:00
parent c2a188addd
commit 4373bd84ff
2 changed files with 36 additions and 204 deletions

View File

@@ -582,6 +582,11 @@
<artifactId>ant-commons-logging</artifactId> <artifactId>ant-commons-logging</artifactId>
<version>1.8.2</version> <version>1.8.2</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.0.1</version>
</dependency>
<dependency> <dependency>
<groupId>commons-discovery</groupId> <groupId>commons-discovery</groupId>
<artifactId>commons-discovery</artifactId> <artifactId>commons-discovery</artifactId>

View File

@@ -2,6 +2,7 @@ package forge;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.Font; import java.awt.Font;
import java.awt.event.KeyAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.awt.event.WindowAdapter; import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent; import java.awt.event.WindowEvent;
@@ -71,6 +72,15 @@ public class GuiFilter extends javax.swing.JDialog {
initGUI(); initGUI();
} }
private KeyAdapter fnKeyPressed = new KeyAdapter() {
@Override
public void keyPressed(final java.awt.event.KeyEvent e) {
if (e.getKeyCode() == java.awt.event.KeyEvent.VK_ENTER) {
filterCardTable();
}
}
};
/** /**
* <p> * <p>
* initGUI. * initGUI.
@@ -111,15 +121,7 @@ public class GuiFilter extends javax.swing.JDialog {
private JTextField getNameTextField() { private JTextField getNameTextField() {
if (nameTextField == null) { if (nameTextField == null) {
nameTextField = new JTextField(30); nameTextField = new JTextField(30);
nameTextField.addKeyListener(new java.awt.event.KeyAdapter() { nameTextField.addKeyListener(fnKeyPressed);
@Override
public void keyPressed(final java.awt.event.KeyEvent e) {
if (e.getKeyCode() == java.awt.event.KeyEvent.VK_ENTER) {
filterCardTable();
}
}
});
} }
return nameTextField; return nameTextField;
} }
@@ -187,21 +189,7 @@ public class GuiFilter extends javax.swing.JDialog {
* @return a {@link javax.swing.JCheckBox} object. * @return a {@link javax.swing.JCheckBox} object.
*/ */
private JCheckBox getJCheckBoxBlue() { private JCheckBox getJCheckBoxBlue() {
if (jCheckBoxBlue == null) { if (jCheckBoxBlue == null) { initCheckBox(jCheckBoxBlue = new JCheckBox(), "Blue" ); }
jCheckBoxBlue = new JCheckBox();
jCheckBoxBlue.setText("Blue");
jCheckBoxBlue.setSelected(true);
jCheckBoxBlue.setBackground(gray);
jCheckBoxBlue.addKeyListener(new java.awt.event.KeyAdapter() {
@Override
public void keyPressed(final java.awt.event.KeyEvent e) {
if (e.getKeyCode() == java.awt.event.KeyEvent.VK_ENTER) {
filterCardTable();
}
}
});
}
return jCheckBoxBlue; return jCheckBoxBlue;
} }
@@ -213,21 +201,7 @@ public class GuiFilter extends javax.swing.JDialog {
* @return a {@link javax.swing.JCheckBox} object. * @return a {@link javax.swing.JCheckBox} object.
*/ */
private JCheckBox getJCheckBoxGreen() { private JCheckBox getJCheckBoxGreen() {
if (jCheckBoxGreen == null) { if (jCheckBoxGreen == null) { initCheckBox(jCheckBoxGreen = new JCheckBox(), "Green"); }
jCheckBoxGreen = new JCheckBox();
jCheckBoxGreen.setText("Green");
jCheckBoxGreen.setSelected(true);
jCheckBoxGreen.setBackground(gray);
jCheckBoxGreen.addKeyListener(new java.awt.event.KeyAdapter() {
@Override
public void keyPressed(final java.awt.event.KeyEvent e) {
if (e.getKeyCode() == java.awt.event.KeyEvent.VK_ENTER) {
filterCardTable();
}
}
});
}
return jCheckBoxGreen; return jCheckBoxGreen;
} }
@@ -239,21 +213,7 @@ public class GuiFilter extends javax.swing.JDialog {
* @return a {@link javax.swing.JCheckBox} object. * @return a {@link javax.swing.JCheckBox} object.
*/ */
private JCheckBox getJCheckBoxRed() { private JCheckBox getJCheckBoxRed() {
if (jCheckBoxRed == null) { if (jCheckBoxRed == null) { initCheckBox(jCheckBoxRed = new JCheckBox(), "Red"); }
jCheckBoxRed = new JCheckBox();
jCheckBoxRed.setText("Red");
jCheckBoxRed.setSelected(true);
jCheckBoxRed.setBackground(gray);
jCheckBoxRed.addKeyListener(new java.awt.event.KeyAdapter() {
@Override
public void keyPressed(final java.awt.event.KeyEvent e) {
if (e.getKeyCode() == java.awt.event.KeyEvent.VK_ENTER) {
filterCardTable();
}
}
});
}
return jCheckBoxRed; return jCheckBoxRed;
} }
@@ -265,21 +225,7 @@ public class GuiFilter extends javax.swing.JDialog {
* @return a {@link javax.swing.JCheckBox} object. * @return a {@link javax.swing.JCheckBox} object.
*/ */
private JCheckBox getJCheckBoxWhite() { private JCheckBox getJCheckBoxWhite() {
if (jCheckBoxWhite == null) { if (jCheckBoxWhite == null) { initCheckBox(jCheckBoxWhite = new JCheckBox(), "White"); }
jCheckBoxWhite = new JCheckBox();
jCheckBoxWhite.setText("White");
jCheckBoxWhite.setSelected(true);
jCheckBoxWhite.setBackground(gray);
jCheckBoxWhite.addKeyListener(new java.awt.event.KeyAdapter() {
@Override
public void keyPressed(final java.awt.event.KeyEvent e) {
if (e.getKeyCode() == java.awt.event.KeyEvent.VK_ENTER) {
filterCardTable();
}
}
});
}
return jCheckBoxWhite; return jCheckBoxWhite;
} }
@@ -291,21 +237,7 @@ public class GuiFilter extends javax.swing.JDialog {
* @return a {@link javax.swing.JCheckBox} object. * @return a {@link javax.swing.JCheckBox} object.
*/ */
private JCheckBox getJCheckBoxColorless() { private JCheckBox getJCheckBoxColorless() {
if (jCheckBoxColorless == null) { if (jCheckBoxColorless == null) { initCheckBox(jCheckBoxColorless = new JCheckBox(), "Colorless"); }
jCheckBoxColorless = new JCheckBox();
jCheckBoxColorless.setText("Colorless");
jCheckBoxColorless.setSelected(true);
jCheckBoxColorless.setBackground(gray);
jCheckBoxColorless.addKeyListener(new java.awt.event.KeyAdapter() {
@Override
public void keyPressed(final java.awt.event.KeyEvent e) {
if (e.getKeyCode() == java.awt.event.KeyEvent.VK_ENTER) {
filterCardTable();
}
}
});
}
return jCheckBoxColorless; return jCheckBoxColorless;
} }
@@ -338,21 +270,7 @@ public class GuiFilter extends javax.swing.JDialog {
* @return a {@link javax.swing.JCheckBox} object. * @return a {@link javax.swing.JCheckBox} object.
*/ */
private JCheckBox getJCheckBoxBlack() { private JCheckBox getJCheckBoxBlack() {
if (jCheckBoxBlack == null) { if (jCheckBoxBlack == null) { initCheckBox(jCheckBoxBlack = new JCheckBox(), "Black"); }
jCheckBoxBlack = new JCheckBox();
jCheckBoxBlack.setText("Black");
jCheckBoxBlack.setBackground(gray);
jCheckBoxBlack.setSelected(true);
jCheckBoxBlack.addKeyListener(new java.awt.event.KeyAdapter() {
@Override
public void keyPressed(final java.awt.event.KeyEvent e) {
if (e.getKeyCode() == java.awt.event.KeyEvent.VK_ENTER) {
filterCardTable();
}
}
});
}
return jCheckBoxBlack; return jCheckBoxBlack;
} }
@@ -421,21 +339,7 @@ public class GuiFilter extends javax.swing.JDialog {
* @return a {@link javax.swing.JCheckBox} object. * @return a {@link javax.swing.JCheckBox} object.
*/ */
private JCheckBox getJCheckBoxSorcery() { private JCheckBox getJCheckBoxSorcery() {
if (jCheckBoxSorcery == null) { if (jCheckBoxSorcery == null) { initCheckBox(jCheckBoxSorcery = new JCheckBox(), "Sorcery"); }
jCheckBoxSorcery = new JCheckBox();
jCheckBoxSorcery.setText("Sorcery");
jCheckBoxSorcery.setSelected(true);
jCheckBoxSorcery.setBackground(gray);
jCheckBoxSorcery.addKeyListener(new java.awt.event.KeyAdapter() {
@Override
public void keyPressed(final java.awt.event.KeyEvent e) {
if (e.getKeyCode() == java.awt.event.KeyEvent.VK_ENTER) {
filterCardTable();
}
}
});
}
return jCheckBoxSorcery; return jCheckBoxSorcery;
} }
@@ -447,21 +351,7 @@ public class GuiFilter extends javax.swing.JDialog {
* @return a {@link javax.swing.JCheckBox} object. * @return a {@link javax.swing.JCheckBox} object.
*/ */
private JCheckBox getJCheckBoxPlaneswalker() { private JCheckBox getJCheckBoxPlaneswalker() {
if (jCheckBoxPlaneswalker == null) { if (jCheckBoxPlaneswalker == null) { initCheckBox(jCheckBoxPlaneswalker = new JCheckBox(), "Planeswalker"); }
jCheckBoxPlaneswalker = new JCheckBox();
jCheckBoxPlaneswalker.setText("Planeswalker");
jCheckBoxPlaneswalker.setSelected(true);
jCheckBoxPlaneswalker.setBackground(gray);
jCheckBoxPlaneswalker.addKeyListener(new java.awt.event.KeyAdapter() {
@Override
public void keyPressed(final java.awt.event.KeyEvent e) {
if (e.getKeyCode() == java.awt.event.KeyEvent.VK_ENTER) {
filterCardTable();
}
}
});
}
return jCheckBoxPlaneswalker; return jCheckBoxPlaneswalker;
} }
@@ -473,21 +363,7 @@ public class GuiFilter extends javax.swing.JDialog {
* @return a {@link javax.swing.JCheckBox} object. * @return a {@link javax.swing.JCheckBox} object.
*/ */
private JCheckBox getJCheckBoxLand() { private JCheckBox getJCheckBoxLand() {
if (jCheckBoxLand == null) { if (jCheckBoxLand == null) { initCheckBox(jCheckBoxLand = new JCheckBox(), "Land"); }
jCheckBoxLand = new JCheckBox();
jCheckBoxLand.setText("Land");
jCheckBoxLand.setSelected(true);
jCheckBoxLand.setBackground(gray);
jCheckBoxLand.addKeyListener(new java.awt.event.KeyAdapter() {
@Override
public void keyPressed(final java.awt.event.KeyEvent e) {
if (e.getKeyCode() == java.awt.event.KeyEvent.VK_ENTER) {
filterCardTable();
}
}
});
}
return jCheckBoxLand; return jCheckBoxLand;
} }
@@ -499,21 +375,7 @@ public class GuiFilter extends javax.swing.JDialog {
* @return a {@link javax.swing.JCheckBox} object. * @return a {@link javax.swing.JCheckBox} object.
*/ */
private JCheckBox getJCheckBoxInstant() { private JCheckBox getJCheckBoxInstant() {
if (jCheckBoxInstant == null) { if (jCheckBoxInstant == null) { initCheckBox(jCheckBoxInstant = new JCheckBox(), "Instant"); }
jCheckBoxInstant = new JCheckBox();
jCheckBoxInstant.setText("Instant");
jCheckBoxInstant.setSelected(true);
jCheckBoxInstant.setBackground(gray);
jCheckBoxInstant.addKeyListener(new java.awt.event.KeyAdapter() {
@Override
public void keyPressed(final java.awt.event.KeyEvent e) {
if (e.getKeyCode() == java.awt.event.KeyEvent.VK_ENTER) {
filterCardTable();
}
}
});
}
return jCheckBoxInstant; return jCheckBoxInstant;
} }
@@ -525,21 +387,7 @@ public class GuiFilter extends javax.swing.JDialog {
* @return a {@link javax.swing.JCheckBox} object. * @return a {@link javax.swing.JCheckBox} object.
*/ */
private JCheckBox getJCheckBoxEnchant() { private JCheckBox getJCheckBoxEnchant() {
if (jCheckBoxEnchant == null) { if (jCheckBoxEnchant == null) { initCheckBox(jCheckBoxEnchant = new JCheckBox(), "Enchant"); }
jCheckBoxEnchant = new JCheckBox();
jCheckBoxEnchant.setText("Enchant");
jCheckBoxEnchant.setSelected(true);
jCheckBoxEnchant.setBackground(gray);
jCheckBoxEnchant.addKeyListener(new java.awt.event.KeyAdapter() {
@Override
public void keyPressed(final java.awt.event.KeyEvent e) {
if (e.getKeyCode() == java.awt.event.KeyEvent.VK_ENTER) {
filterCardTable();
}
}
});
}
return jCheckBoxEnchant; return jCheckBoxEnchant;
} }
@@ -551,21 +399,7 @@ public class GuiFilter extends javax.swing.JDialog {
* @return a {@link javax.swing.JCheckBox} object. * @return a {@link javax.swing.JCheckBox} object.
*/ */
private JCheckBox getJCheckBoxCreature() { private JCheckBox getJCheckBoxCreature() {
if (jCheckBoxCreature == null) { if (jCheckBoxCreature == null) { initCheckBox(jCheckBoxCreature = new JCheckBox(), "Creature"); }
jCheckBoxCreature = new JCheckBox();
jCheckBoxCreature.setText("Creature");
jCheckBoxCreature.setSelected(true);
jCheckBoxCreature.setBackground(gray);
jCheckBoxCreature.addKeyListener(new java.awt.event.KeyAdapter() {
@Override
public void keyPressed(final java.awt.event.KeyEvent e) {
if (e.getKeyCode() == java.awt.event.KeyEvent.VK_ENTER) {
filterCardTable();
}
}
});
}
return jCheckBoxCreature; return jCheckBoxCreature;
} }
@@ -577,24 +411,17 @@ public class GuiFilter extends javax.swing.JDialog {
* @return a {@link javax.swing.JCheckBox} object. * @return a {@link javax.swing.JCheckBox} object.
*/ */
private JCheckBox getJCheckBoxArtifact() { private JCheckBox getJCheckBoxArtifact() {
if (jCheckBoxArtifact == null) { if (jCheckBoxArtifact == null) { initCheckBox(jCheckBoxArtifact = new JCheckBox(), "Artifact"); }
jCheckBoxArtifact = new JCheckBox();
jCheckBoxArtifact.setText("Artifact");
jCheckBoxArtifact.setSelected(true);
jCheckBoxArtifact.setBackground(gray);
jCheckBoxArtifact.addKeyListener(new java.awt.event.KeyAdapter() {
@Override
public void keyPressed(final java.awt.event.KeyEvent e) {
if (e.getKeyCode() == java.awt.event.KeyEvent.VK_ENTER) {
filterCardTable();
}
}
});
}
return jCheckBoxArtifact; return jCheckBoxArtifact;
} }
private void initCheckBox(final JCheckBox box, final String text) {
box.setText(text);
box.setSelected(true);
box.setBackground(gray);
box.addKeyListener(fnKeyPressed);
}
/** /**
* <p> * <p>
* getCardTextField. * getCardTextField.