mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-17 19:28:01 +00:00
fix a bunch of Java warnings
This commit is contained in:
@@ -144,7 +144,7 @@ public class Card extends GameEntity implements Comparable<Card> {
|
|||||||
private Player owner = null;
|
private Player owner = null;
|
||||||
private ArrayList<Object> controllerObjects = new ArrayList<Object>();
|
private ArrayList<Object> controllerObjects = new ArrayList<Object>();
|
||||||
private String imageName = "";
|
private String imageName = "";
|
||||||
private String rarity = "";
|
//private String rarity = "";
|
||||||
private String text = "";
|
private String text = "";
|
||||||
private String manaCost = "";
|
private String manaCost = "";
|
||||||
private String echoCost = "";
|
private String echoCost = "";
|
||||||
|
|||||||
@@ -32,7 +32,6 @@ import forge.card.CardRules;
|
|||||||
import forge.card.CardPoolView;
|
import forge.card.CardPoolView;
|
||||||
import forge.card.CardPrinted;
|
import forge.card.CardPrinted;
|
||||||
import forge.card.CardType;
|
import forge.card.CardType;
|
||||||
import forge.gui.deckeditor.TableModel;
|
|
||||||
|
|
||||||
import net.miginfocom.swing.MigLayout;
|
import net.miginfocom.swing.MigLayout;
|
||||||
|
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ import net.slightlymagic.maxmtg.Predicate;
|
|||||||
public class ReadBoosterPack implements NewConstants {
|
public class ReadBoosterPack implements NewConstants {
|
||||||
|
|
||||||
|
|
||||||
private List<CardPrinted> mythics;
|
//private List<CardPrinted> mythics;
|
||||||
private List<CardPrinted> rares;
|
private List<CardPrinted> rares;
|
||||||
private List<CardPrinted> uncommons;
|
private List<CardPrinted> uncommons;
|
||||||
private List<CardPrinted> commons;
|
private List<CardPrinted> commons;
|
||||||
@@ -39,7 +39,7 @@ public class ReadBoosterPack implements NewConstants {
|
|||||||
* <p>Constructor for ReadBoosterPack.</p>
|
* <p>Constructor for ReadBoosterPack.</p>
|
||||||
*/
|
*/
|
||||||
public ReadBoosterPack() {
|
public ReadBoosterPack() {
|
||||||
mythics = CardPrinted.Predicates.Presets.isMythicRare.select(CardDb.instance().getAllUniqueCards());
|
//mythics = CardPrinted.Predicates.Presets.isMythicRare.select(CardDb.instance().getAllUniqueCards());
|
||||||
rares = CardPrinted.Predicates.Presets.isRare.select(CardDb.instance().getAllUniqueCards());
|
rares = CardPrinted.Predicates.Presets.isRare.select(CardDb.instance().getAllUniqueCards());
|
||||||
commons = CardPrinted.Predicates.Presets.isCommon.select(CardDb.instance().getAllUniqueCards());
|
commons = CardPrinted.Predicates.Presets.isCommon.select(CardDb.instance().getAllUniqueCards());
|
||||||
uncommons = CardPrinted.Predicates.Presets.isUncommon.select(CardDb.instance().getAllUniqueCards());
|
uncommons = CardPrinted.Predicates.Presets.isUncommon.select(CardDb.instance().getAllUniqueCards());
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ import javax.swing.*;
|
|||||||
import net.slightlymagic.maxmtg.Predicate;
|
import net.slightlymagic.maxmtg.Predicate;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Stack;
|
import java.util.Stack;
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ import java.io.IOException;
|
|||||||
import javax.swing.JButton;
|
import javax.swing.JButton;
|
||||||
import javax.swing.JFileChooser;
|
import javax.swing.JFileChooser;
|
||||||
import javax.swing.JOptionPane;
|
import javax.swing.JOptionPane;
|
||||||
import javax.swing.JPanel;
|
|
||||||
import javax.swing.filechooser.FileFilter;
|
import javax.swing.filechooser.FileFilter;
|
||||||
|
|
||||||
import net.miginfocom.swing.MigLayout;
|
import net.miginfocom.swing.MigLayout;
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package forge.gui.deckeditor;
|
|||||||
import java.awt.Container;
|
import java.awt.Container;
|
||||||
import java.awt.Font;
|
import java.awt.Font;
|
||||||
import java.awt.Frame;
|
import java.awt.Frame;
|
||||||
import java.awt.GridLayout;
|
|
||||||
import java.awt.event.ActionEvent;
|
import java.awt.event.ActionEvent;
|
||||||
import java.awt.event.MouseAdapter;
|
import java.awt.event.MouseAdapter;
|
||||||
import java.awt.event.MouseEvent;
|
import java.awt.event.MouseEvent;
|
||||||
@@ -16,8 +15,6 @@ import javax.swing.JButton;
|
|||||||
import javax.swing.JCheckBox;
|
import javax.swing.JCheckBox;
|
||||||
import javax.swing.JComboBox;
|
import javax.swing.JComboBox;
|
||||||
import javax.swing.JLabel;
|
import javax.swing.JLabel;
|
||||||
import javax.swing.JPanel;
|
|
||||||
import javax.swing.JScrollPane;
|
|
||||||
import javax.swing.JTextField;
|
import javax.swing.JTextField;
|
||||||
import javax.swing.event.DocumentEvent;
|
import javax.swing.event.DocumentEvent;
|
||||||
import javax.swing.event.DocumentListener;
|
import javax.swing.event.DocumentListener;
|
||||||
|
|||||||
@@ -1,29 +1,15 @@
|
|||||||
package forge.gui.deckeditor;
|
package forge.gui.deckeditor;
|
||||||
|
|
||||||
import java.awt.Color;
|
|
||||||
import java.awt.Dimension;
|
|
||||||
import java.awt.Rectangle;
|
|
||||||
import java.awt.event.ActionEvent;
|
import java.awt.event.ActionEvent;
|
||||||
import java.awt.event.ItemEvent;
|
import java.awt.event.ItemEvent;
|
||||||
import java.awt.event.ItemListener;
|
import java.awt.event.ItemListener;
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import javax.swing.BorderFactory;
|
|
||||||
import javax.swing.JFrame;
|
import javax.swing.JFrame;
|
||||||
import javax.swing.JLabel;
|
|
||||||
import javax.swing.JOptionPane;
|
import javax.swing.JOptionPane;
|
||||||
import javax.swing.JScrollPane;
|
|
||||||
import javax.swing.JTable;
|
|
||||||
import javax.swing.border.TitledBorder;
|
|
||||||
import javax.swing.event.TableModelEvent;
|
|
||||||
import javax.swing.event.TableModelListener;
|
|
||||||
|
|
||||||
import net.slightlymagic.maxmtg.Predicate;
|
import net.slightlymagic.maxmtg.Predicate;
|
||||||
|
|
||||||
import forge.Constant;
|
|
||||||
import forge.GUI_DeckAnalysis;
|
import forge.GUI_DeckAnalysis;
|
||||||
import forge.card.CardPool;
|
|
||||||
import forge.card.CardPrinted;
|
|
||||||
import forge.card.CardRules;
|
import forge.card.CardRules;
|
||||||
import forge.card.CardPoolView;
|
import forge.card.CardPoolView;
|
||||||
|
|
||||||
|
|||||||
@@ -17,9 +17,6 @@ import forge.properties.NewConstants;
|
|||||||
import forge.view.swing.OldGuiNewGame;
|
import forge.view.swing.OldGuiNewGame;
|
||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
import javax.swing.border.TitledBorder;
|
|
||||||
import javax.swing.event.TableModelEvent;
|
|
||||||
import javax.swing.event.TableModelListener;
|
|
||||||
import java.awt.*;
|
import java.awt.*;
|
||||||
import java.awt.event.*;
|
import java.awt.event.*;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ public class DeckEditorMenu extends JMenuBar implements NewConstants {
|
|||||||
|
|
||||||
private String currentDeckName;
|
private String currentDeckName;
|
||||||
private String currentGameType;
|
private String currentGameType;
|
||||||
private String currentDeckPlayerType;
|
//private String currentDeckPlayerType;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <p>Setter for the field <code>currentGameType</code>.</p>
|
* <p>Setter for the field <code>currentGameType</code>.</p>
|
||||||
@@ -741,7 +741,7 @@ public class DeckEditorMenu extends JMenuBar implements NewConstants {
|
|||||||
*/
|
*/
|
||||||
public final void showSealedDeck(final Deck deck) {
|
public final void showSealedDeck(final Deck deck) {
|
||||||
setDeckData(deck.getName(), true);
|
setDeckData(deck.getName(), true);
|
||||||
currentDeckPlayerType = deck.getMetadata("PlayerType");
|
//currentDeckPlayerType = deck.getMetadata("PlayerType");
|
||||||
deckDisplay.setDecks(deck.getSideboard(), deck.getMain());
|
deckDisplay.setDecks(deck.getSideboard(), deck.getMain());
|
||||||
}//showSealedDeck()
|
}//showSealedDeck()
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package forge.gui.deckeditor;
|
|||||||
import forge.AllZone;
|
import forge.AllZone;
|
||||||
import forge.Command;
|
import forge.Command;
|
||||||
import forge.Constant;
|
import forge.Constant;
|
||||||
import forge.card.CardDb;
|
|
||||||
import forge.card.CardPool;
|
import forge.card.CardPool;
|
||||||
import forge.card.CardPoolView;
|
import forge.card.CardPoolView;
|
||||||
import forge.card.CardPrinted;
|
import forge.card.CardPrinted;
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ import java.util.HashMap;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Map.Entry;
|
import java.util.Map.Entry;
|
||||||
import java.util.TreeMap;
|
|
||||||
|
|
||||||
import javax.swing.JButton;
|
import javax.swing.JButton;
|
||||||
import javax.swing.JLabel;
|
import javax.swing.JLabel;
|
||||||
|
|||||||
@@ -135,7 +135,7 @@ public final class TableWithCards {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void addCard(final CardPrinted card) {
|
public void addCard(final CardPrinted card) {
|
||||||
int n = table.getSelectedRow();
|
//int n = table.getSelectedRow();
|
||||||
pool.add(card);
|
pool.add(card);
|
||||||
if (isUnfiltered()) { model.addCard(card); }
|
if (isUnfiltered()) { model.addCard(card); }
|
||||||
updateView();
|
updateView();
|
||||||
|
|||||||
Reference in New Issue
Block a user