setTitle.
* * @param message a {@link java.lang.String} object. */ - public void setTitle(String message); + void setTitle(String message); } diff --git a/src/main/java/forge/gui/deckeditor/DeckEditor.java b/src/main/java/forge/gui/deckeditor/DeckEditor.java index 22309891a04..de786983cb7 100644 --- a/src/main/java/forge/gui/deckeditor/DeckEditor.java +++ b/src/main/java/forge/gui/deckeditor/DeckEditor.java @@ -5,12 +5,8 @@ import java.awt.Font; import java.awt.Frame; import java.awt.GridLayout; import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.KeyEvent; -import java.awt.event.KeyListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.util.ArrayList; @@ -25,20 +21,16 @@ import javax.swing.JScrollPane; import javax.swing.JTextField; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; -import javax.swing.event.UndoableEditEvent; -import javax.swing.event.UndoableEditListener; import javax.swing.text.BadLocationException; import javax.swing.text.Document; import org.apache.commons.lang3.StringUtils; -import org.eclipse.swt.widgets.Combo; import net.miginfocom.swing.MigLayout; import net.slightlymagic.maxmtg.Predicate; import net.slightlymagic.maxmtg.Predicate.StringOp; import forge.Command; import forge.Constant; -import forge.Gui_ProgressBarWindow; import forge.SetInfoUtil; import forge.card.CardRules; import forge.card.CardDb; diff --git a/src/main/java/forge/gui/deckeditor/DeckEditorBase.java b/src/main/java/forge/gui/deckeditor/DeckEditorBase.java index eeee291d006..2f2ff27a2f8 100644 --- a/src/main/java/forge/gui/deckeditor/DeckEditorBase.java +++ b/src/main/java/forge/gui/deckeditor/DeckEditorBase.java @@ -1,56 +1,29 @@ package forge.gui.deckeditor; import java.awt.Color; -import java.awt.Component; -import java.awt.Container; -import java.awt.Image; -import java.awt.Point; import java.awt.event.ActionEvent; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; import java.util.List; import javax.swing.BorderFactory; -import javax.swing.JCheckBox; -import javax.swing.JFileChooser; import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JOptionPane; -import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JTable; -import javax.swing.SwingUtilities; -import javax.swing.border.Border; -import javax.swing.border.EtchedBorder; import javax.swing.border.TitledBorder; -import javax.swing.event.MouseInputListener; import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; -import javax.swing.filechooser.FileFilter; - -import arcane.ui.CardPanel; import net.slightlymagic.maxmtg.Predicate; -import forge.Card; import forge.Constant; import forge.GUI_DeckAnalysis; -import forge.GuiDisplayUtil; -import forge.ImageCache; -import forge.ImagePreviewPanel; import forge.card.CardPool; import forge.card.CardPrinted; import forge.card.CardRules; import forge.card.CardPoolView; -import forge.gui.game.CardDetailPanel; -import forge.gui.game.CardPicturePanel; -import forge.properties.ForgeProps; -import forge.properties.NewConstants; public abstract class DeckEditorBase extends JFrame implements DeckDisplay { private static final long serialVersionUID = -401223933343539977L; diff --git a/src/main/java/forge/gui/deckeditor/DeckEditorMenu.java b/src/main/java/forge/gui/deckeditor/DeckEditorMenu.java index 7e29153b3e4..7e4b2adbffc 100644 --- a/src/main/java/forge/gui/deckeditor/DeckEditorMenu.java +++ b/src/main/java/forge/gui/deckeditor/DeckEditorMenu.java @@ -6,12 +6,9 @@ import forge.Card; import forge.CardList; import forge.Command; import forge.Constant; -import forge.Constant.GameType; -import forge.card.CardRules; import forge.card.CardDb; import forge.card.CardPool; import forge.card.CardPoolView; -import forge.card.CardPrinted; import forge.deck.Deck; import forge.deck.DeckManager; import forge.deck.DownloadDeck; @@ -33,12 +30,8 @@ import java.net.Proxy; import java.net.URL; import java.nio.channels.FileChannel; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; -//import java.util.HashMap; -//import java.util.Map; -import java.util.Map.Entry; /** *Gui_DeckEditor_Menu class.
diff --git a/src/main/java/forge/gui/deckeditor/DeckEditorQuest.java b/src/main/java/forge/gui/deckeditor/DeckEditorQuest.java index dd5418d7bb2..86c87d266fc 100644 --- a/src/main/java/forge/gui/deckeditor/DeckEditorQuest.java +++ b/src/main/java/forge/gui/deckeditor/DeckEditorQuest.java @@ -1,54 +1,22 @@ package forge.gui.deckeditor; import forge.AllZone; -import forge.Card; -import forge.CardList; import forge.Command; import forge.Constant; -import forge.GUI_DeckAnalysis; -import forge.GuiDisplayUtil; -import forge.ImageCache; -import forge.ImagePreviewPanel; -import forge.MyRandom; -import forge.Constant.GameType; -import forge.Constant.Runtime; -import forge.card.CardRules; -import forge.card.CardDb; import forge.card.CardPool; import forge.card.CardPoolView; import forge.card.CardPrinted; import forge.deck.Deck; import forge.error.ErrorViewer; -import forge.gui.game.CardDetailPanel; -import forge.gui.game.CardPicturePanel; -import forge.properties.ForgeProps; import forge.properties.NewConstants; import forge.view.swing.OldGuiNewGame; import javax.swing.*; -import javax.swing.border.Border; -import javax.swing.border.EtchedBorder; -import javax.swing.border.TitledBorder; -import javax.swing.event.MouseInputAdapter; -import javax.swing.event.MouseInputListener; -import javax.swing.event.TableModelEvent; -import javax.swing.event.TableModelListener; -import javax.swing.filechooser.FileFilter; - -import net.slightlymagic.maxmtg.Predicate; import java.awt.*; import java.awt.event.*; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.util.Collection; -import java.util.Collections; import java.util.List; import java.util.ArrayList; -import java.util.Map.Entry; -import java.util.Random; //import forge.quest.data.QuestBoosterPack; diff --git a/src/main/java/forge/gui/deckeditor/DeckEditorQuestMenu.java b/src/main/java/forge/gui/deckeditor/DeckEditorQuestMenu.java index 7519b39aa70..121208312f9 100644 --- a/src/main/java/forge/gui/deckeditor/DeckEditorQuestMenu.java +++ b/src/main/java/forge/gui/deckeditor/DeckEditorQuestMenu.java @@ -4,11 +4,8 @@ package forge.gui.deckeditor; import forge.AllZone; import forge.Command; import forge.Constant; -import forge.Constant.GameType; -import forge.card.CardCoreType; import forge.card.CardRules; import forge.card.CardDb; -import forge.card.CardRules.Predicates; import forge.card.CardPool; import forge.card.CardPoolView; import forge.card.CardPrinted; @@ -17,15 +14,11 @@ import forge.deck.DeckManager; import forge.error.ErrorViewer; import forge.gui.GuiUtils; import forge.gui.ListChooser; -import forge.quest.data.QuestBattleManager; import javax.swing.*; -import javax.swing.event.ListSelectionEvent; -import javax.swing.event.ListSelectionListener; import javax.swing.filechooser.FileFilter; import org.apache.commons.lang3.StringUtils; -import org.apache.tools.ant.taskdefs.PathConvert.MapEntry; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -38,7 +31,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Map.Entry; -import java.util.Stack; //presumes AllZone.getQuestData() is not null @@ -49,18 +41,18 @@ import java.util.Stack; * @version $Id$ */ public class DeckEditorQuestMenu extends JMenuBar { - /** ConstantserialVersionUID=-4052319220021158574L */
+ /** Constant serialVersionUID=-4052319220021158574L. */
private static final long serialVersionUID = -4052319220021158574L;
//this should be false in the public version
//if true, the Quest Deck editor will let you edit the computer's decks
private final boolean canEditComputerDecks;
- /** Constant deckEditorName="Deck Editor" */
+ /** Constant deckEditorName="Deck Editor". */
private static final String deckEditorName = "Deck Editor";
//used for import and export, try to made the gui user friendly
- /** Constant previousDirectory */
+ /** Constant previousDirectory. */
private static File previousDirectory = null;
private Command exitCommand;
@@ -77,13 +69,16 @@ public class DeckEditorQuestMenu extends JMenuBar {
* @param d a {@link forge.gui.deckeditor.DeckDisplay} object.
* @param exit a {@link forge.Command} object.
*/
- public DeckEditorQuestMenu(DeckDisplay d, Command exit) {
+ public DeckEditorQuestMenu(final DeckDisplay d, final Command exit) {
//is a file named "edit" in this directory
- //lame but it works, I don't like 2 versions of MTG Forge floating around
+ //lame but it works, I don't like 2 versions of Forge floating around
//one that lets you edit the AI decks and one that doesn't
File f = new File("edit");
- if (f.exists()) canEditComputerDecks = true;
- else canEditComputerDecks = false;
+ if (f.exists()) {
+ canEditComputerDecks = true;
+ } else {
+ canEditComputerDecks = false;
+ }
deckDisplay = d;
d.setTitle(deckEditorName);
@@ -103,26 +98,26 @@ public class DeckEditorQuestMenu extends JMenuBar {
* @param menu a {@link javax.swing.JMenu} object.
* @param isHumanMenu a boolean.
*/
- private void addImportExport(JMenu menu, final boolean isHumanMenu) {
+ private void addImportExport(final JMenu menu, final boolean isHumanMenu) {
JMenuItem import2 = new JMenuItem("Import");
JMenuItem export = new JMenuItem("Export");
import2.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent a) {
- importDeck();//importDeck(isHumanMenu);
+ public void actionPerformed(final ActionEvent a) {
+ importDeck(); //importDeck(isHumanMenu);
}
- });//import
+ }); //import
export.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent a) {
+ public void actionPerformed(final ActionEvent a) {
exportDeck();
}
- });//export
+ }); //export
menu.add(import2);
menu.add(export);
- }//addImportExport()
+ } //addImportExport()
/**
* exportDeck.
@@ -130,7 +125,9 @@ public class DeckEditorQuestMenu extends JMenuBar { private void exportDeck() { File filename = getExportFilename(); - if (filename == null) return; + if (filename == null) { + return; + } //write is an Object variable because you might just //write one Deck object @@ -151,7 +148,7 @@ public class DeckEditorQuestMenu extends JMenuBar { exportDeckText(getExportDeckText(deck), filename.getAbsolutePath()); - }//exportDeck() + } //exportDeck() /** *exportDeckText.
@@ -159,7 +156,7 @@ public class DeckEditorQuestMenu extends JMenuBar { * @param deckText a {@link java.lang.String} object. * @param filename a {@link java.lang.String} object. */ - private void exportDeckText(String deckText, String filename) { + private void exportDeckText(final String deckText, String filename) { //remove ".deck" extension int cut = filename.indexOf("."); @@ -176,24 +173,23 @@ public class DeckEditorQuestMenu extends JMenuBar { throw new RuntimeException("Gui_Quest_DeckEditor_Menu : exportDeckText() error, " + ex.getMessage() + " : " + Arrays.toString(ex.getStackTrace())); } - }//exportDeckText() + } //exportDeckText() - /** *getExportDeckText.
* * @param aDeck a {@link forge.deck.Deck} object. * @return a {@link java.lang.String} object. */ - private String getExportDeckText(Deck aDeck) { + private String getExportDeckText(final Deck aDeck) { //convert Deck into CardList CardPoolView all = aDeck.getMain(); //sort by card name - Collections.sort( all.getOrderedList(), TableSorter.byNameThenSet ); + Collections.sort(all.getOrderedList(), TableSorter.byNameThenSet); StringBuffer sb = new StringBuffer(); String newLine = "\r\n"; - + sb.append(String.format("%d Total Cards%n%n", all.countAll())); //creatures @@ -217,8 +213,7 @@ public class DeckEditorQuestMenu extends JMenuBar { sb.append(newLine); return sb.toString(); - }//getExportDeckText - + } //getExportDeckText /** *getFileFilter.
@@ -228,7 +223,7 @@ public class DeckEditorQuestMenu extends JMenuBar { private FileFilter getFileFilter() { FileFilter filter = new FileFilter() { @Override - public boolean accept(File f) { + public boolean accept(final File f) { return f.getName().endsWith(".dck") || f.isDirectory(); } @@ -239,7 +234,7 @@ public class DeckEditorQuestMenu extends JMenuBar { }; return filter; - }//getFileFilter() + } //getFileFilter() /** *getExportFilename.
@@ -264,12 +259,15 @@ public class DeckEditorQuestMenu extends JMenuBar { previousDirectory = file.getParentFile(); - if (check.endsWith(".deck")) return file; - else return new File(check + ".deck"); + if (check.endsWith(".deck")) { + return file; + } else { + return new File(check + ".deck"); + } } return null; - }//getExportFilename() + } //getExportFilename() /** *importDeck.
@@ -299,8 +297,8 @@ public class DeckEditorQuestMenu extends JMenuBar { } } - }//importDeck() - + } //importDeck() + /** *getImportFilename.
* @@ -319,7 +317,7 @@ public class DeckEditorQuestMenu extends JMenuBar { } return null; - }//openFileDialog() + } //openFileDialog() @@ -391,7 +389,7 @@ public class DeckEditorQuestMenu extends JMenuBar { }; private final ActionListener saveDeckActionListener = new ActionListener() { - public void actionPerformed(ActionEvent a) { + public void actionPerformed(final ActionEvent a) { String name = currentDeck.getName(); //check to see if name is set @@ -399,7 +397,9 @@ public class DeckEditorQuestMenu extends JMenuBar { name = getUserInput_GetDeckName(questData.getDeckNames()); //check if user cancels - if (name.equals("")) return; + if (name.equals("")) { + return; + } } setPlayerDeckName(name); @@ -409,14 +409,16 @@ public class DeckEditorQuestMenu extends JMenuBar { questData.addDeck(deck); } - }; + }; private final ActionListener copyDeckActionListener = new ActionListener() { - public void actionPerformed(ActionEvent a) { + public void actionPerformed(final ActionEvent a) { String name = getUserInput_GetDeckName(questData.getDeckNames()); //check if user cancels - if (name.equals("")) return; + if (name.equals("")) { + return; + } setPlayerDeckName(name); @@ -426,14 +428,18 @@ public class DeckEditorQuestMenu extends JMenuBar { questData.addDeck(deck); } }; - + private final ActionListener deleteDeckActionListener = new ActionListener() { - public void actionPerformed(ActionEvent a) { - if (currentDeck.getName().equals("")) return; + public void actionPerformed(final ActionEvent a) { + if (currentDeck.getName().equals("")) { + return; + } int check = JOptionPane.showConfirmDialog(null, "Do you really want to delete this deck?", "Delete", JOptionPane.YES_NO_OPTION); - if (check == JOptionPane.NO_OPTION) return; //stop here + if (check == JOptionPane.NO_OPTION) { + return; //stop here + } questData.removeDeck(currentDeck.getName()); @@ -499,7 +505,7 @@ public class DeckEditorQuestMenu extends JMenuBar { this.add(deckMenu); } - + /** *convertCardPoolToDeck.
* @@ -519,7 +525,7 @@ public class DeckEditorQuestMenu extends JMenuBar { * * @param deckName a {@link java.lang.String} object. */ - public void setPlayerDeckName(String deckName) { + public final void setPlayerDeckName(final String deckName) { //the gui uses this, Gui_Quest_DeckEditor currentDeck = new Deck(Constant.GameType.Sealed); currentDeck.setName(deckName); @@ -552,10 +558,12 @@ public class DeckEditorQuestMenu extends JMenuBar { * @param nameList a {@link java.util.List} object. * @return a {@link java.lang.String} object. */ - private String getUserInput_GetDeckName(Listclose.
*/ - public void close() { + public final void close() { exitCommand.execute(); } @@ -605,10 +615,8 @@ public class DeckEditorQuestMenu extends JMenuBar { * * @return a {@link java.lang.String} object. */ - public String getDeckName() { + public final String getDeckName() { return currentDeck.getName(); } - - } diff --git a/src/main/java/forge/gui/deckeditor/Gui_BoosterDraft.java b/src/main/java/forge/gui/deckeditor/Gui_BoosterDraft.java index 71bc228d45f..01baef2c6f1 100644 --- a/src/main/java/forge/gui/deckeditor/Gui_BoosterDraft.java +++ b/src/main/java/forge/gui/deckeditor/Gui_BoosterDraft.java @@ -2,25 +2,19 @@ package forge.gui.deckeditor; import forge.AllZone; import forge.BoosterDraft; -import forge.CardList; import forge.Constant; import forge.FileUtil; import forge.HttpUtil; -import forge.Constant.GameType; -import forge.Constant.Runtime; import forge.card.CardPoolView; import forge.card.CardPrinted; import forge.deck.Deck; import forge.deck.DeckManager; import forge.error.ErrorViewer; -import forge.gui.game.CardDetailPanel; -import forge.gui.game.CardPicturePanel; import forge.properties.ForgeProps; import forge.properties.NewConstants; import forge.view.swing.OldGuiNewGame; import javax.swing.*; -import javax.swing.border.Border; import javax.swing.border.TitledBorder; import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; @@ -28,7 +22,6 @@ import java.awt.*; import java.awt.event.*; import java.util.ArrayList; import java.util.List; -import java.util.Random; /** diff --git a/src/main/java/forge/gui/deckeditor/TableModel.java b/src/main/java/forge/gui/deckeditor/TableModel.java index 4d25cf9179b..1d6abb65cf7 100644 --- a/src/main/java/forge/gui/deckeditor/TableModel.java +++ b/src/main/java/forge/gui/deckeditor/TableModel.java @@ -11,8 +11,6 @@ import javax.swing.table.TableColumnModel; import net.slightlymagic.braids.util.lambda.Lambda1; -import forge.Card; -import forge.SetInfoUtil; import forge.card.CardPool; import forge.card.CardPoolView; import forge.card.CardPrinted; @@ -21,7 +19,6 @@ import java.awt.event.*; import java.util.Collections; import java.util.List; import java.util.Map.Entry; -import java.util.Stack; /** diff --git a/src/main/java/forge/quest/data/QuestBoosterPack.java b/src/main/java/forge/quest/data/QuestBoosterPack.java index 4f88a86acbe..e9bcab9d07d 100644 --- a/src/main/java/forge/quest/data/QuestBoosterPack.java +++ b/src/main/java/forge/quest/data/QuestBoosterPack.java @@ -1,7 +1,5 @@ package forge.quest.data; -import forge.Card; -import forge.CardFilter; import forge.Constant; import forge.card.CardDb; import forge.card.CardPrinted; @@ -10,18 +8,13 @@ import forge.card.CardRules; import forge.properties.NewConstants; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.List; -import java.util.NoSuchElementException; import org.apache.commons.lang3.StringUtils; -import net.slightlymagic.braids.util.generator.GeneratorFunctions; import net.slightlymagic.maxmtg.Predicate; -import com.google.code.jyield.Generator; - // The BoosterPack generates cards for the Card Pool in Quest Mode /** *QuestBoosterPack class.
@@ -101,24 +94,21 @@ public class QuestBoosterPack implements NewConstants { return names; } - - /** * Create the list of card names at random from the given pool. * - * @param allCards the card pool to use - * @param num how many card names to add to the result - * @param rarity only allow cards of this rarity - * @param color may be null; if not null, only cards of this color may be added - * @param colorOrder we shuffle this as a side effect of calling this method + * @param source an IterableQuestUtil class.
* @@ -22,7 +19,7 @@ public class QuestUtil { * @param qd a {@link forge.quest.data.QuestData} object. * @return a {@link forge.CardList} object. */ - public static CardList getComputerCreatures(QuestData qd) { + public static CardList getComputerCreatures(final QuestData qd) { return new CardList(); } @@ -33,7 +30,7 @@ public class QuestUtil { * @param qa a {@link forge.Quest_Assignment} object. * @return a {@link forge.CardList} object. */ - public static CardList getComputerCreatures(QuestData qd, Quest_Assignment qa) { + public static CardList getComputerCreatures(final QuestData qd, Quest_Assignment qa) { CardList list = new CardList(); if (qa != null) { ArrayList