external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 03:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Organize imports

Browse Source
This commit is contained in:
Leandro Doctors
2021-03-17 11:52:50 -03:00
parent f3fd57c014
commit 0978162bf5
994 changed files with 6511 additions and 3770 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
forge-gui-desktop/src/main/java/forge/GuiDesktop.java
View File

@@ -1,5 +1,24 @@
package forge;
import java.awt.Desktop;
import java.awt.Graphics2D;
import java.awt.Toolkit;
import java.awt.datatransfer.StringSelection;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.Collection;
import java.util.List;
import javax.swing.ImageIcon;
import javax.swing.JFileChooser;
import javax.swing.SwingUtilities;
import org.apache.commons.lang3.StringUtils;
import com.google.common.base.Function;
import forge.download.GuiDownloader;
@@ -21,24 +40,20 @@ import forge.model.FModel;
import forge.screens.deckeditor.CDeckEditorUI;
import forge.screens.deckeditor.controllers.CEditorQuestCardShop;
import forge.screens.match.CMatchUI;
import forge.sound.*;
import forge.sound.AltSoundSystem;
import forge.sound.AudioClip;
import forge.sound.AudioMusic;
import forge.sound.IAudioClip;
import forge.sound.IAudioMusic;
import forge.toolbox.FOptionPane;
import forge.toolbox.FSkin;
import forge.toolbox.FSkin.SkinImage;
import forge.util.*;
import org.apache.commons.lang3.StringUtils;
import javax.swing.*;
import java.awt.*;
import java.awt.datatransfer.StringSelection;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.Collection;
import java.util.List;
import forge.util.BuildInfo;
import forge.util.Callback;
import forge.util.FileUtil;
import forge.util.ImageFetcher;
import forge.util.OperatingSystem;
import forge.util.SwingImageFetcher;
public class GuiDesktop implements IGuiBase {
private ImageFetcher imageFetcher = new SwingImageFetcher();

27
forge-gui-desktop/src/main/java/forge/ImageCache.java
View File

@@ -17,6 +17,22 @@
*/
package forge;
import java.awt.AlphaComposite;
import java.awt.Color;
import java.awt.Graphics2D;
import java.awt.RenderingHints;
import java.awt.geom.RoundRectangle2D;
import java.awt.image.BufferedImage;
import java.io.File;
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import javax.imageio.ImageIO;
import org.apache.commons.lang3.StringUtils;
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader.InvalidCacheLoadException;
import com.google.common.cache.LoadingCache;
@@ -34,17 +50,6 @@ import forge.model.FModel;
import forge.toolbox.FSkin;
import forge.toolbox.FSkin.SkinIcon;
import forge.util.ImageUtil;
import org.apache.commons.lang3.StringUtils;
import javax.imageio.ImageIO;
import java.awt.*;
import java.awt.geom.RoundRectangle2D;
import java.awt.image.BufferedImage;
import java.io.File;
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
/**
* This class stores ALL card images in a cache with soft values. this means

12
forge-gui-desktop/src/main/java/forge/ImageLoader.java
View File

@@ -1,17 +1,17 @@
package forge;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
import javax.imageio.ImageIO;
import com.google.common.cache.CacheLoader;
import forge.gui.error.BugReporter;
import forge.localinstance.properties.ForgePreferences;
import forge.model.FModel;
import javax.imageio.ImageIO;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
final class ImageLoader extends CacheLoader<String, BufferedImage> {
@Override
public BufferedImage load(String key) {

2
forge-gui-desktop/src/main/java/forge/control/KeyboardShortcuts.java
View File

@@ -14,7 +14,6 @@ import javax.swing.InputMap;
import javax.swing.JComponent;
import javax.swing.KeyStroke;
import forge.toolbox.special.CardZoomer;
import org.apache.commons.lang3.StringUtils;
import forge.Singletons;
@@ -26,6 +25,7 @@ import forge.localinstance.properties.ForgePreferences.FPref;
import forge.model.FModel;
import forge.screens.home.settings.VSubmenuPreferences.KeyboardShortcutField;
import forge.screens.match.CMatchUI;
import forge.toolbox.special.CardZoomer;
import forge.util.Localizer;
/**

28
forge-gui-desktop/src/main/java/forge/deckchooser/FDeckChooser.java
View File

@@ -8,17 +8,28 @@ import java.util.List;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import com.google.common.base.Predicate;
import forge.deck.*;
import forge.game.GameFormat;
import forge.item.PaperCard;
import forge.util.Localizer;
import net.miginfocom.swing.MigLayout;
import org.apache.commons.lang3.StringUtils;
import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableList;
import forge.deck.ArchetypeDeckGenerator;
import forge.deck.ColorDeckGenerator;
import forge.deck.CommanderDeckGenerator;
import forge.deck.Deck;
import forge.deck.DeckFormat;
import forge.deck.DeckProxy;
import forge.deck.DeckType;
import forge.deck.DeckgenUtil;
import forge.deck.NetDeckArchiveBlock;
import forge.deck.NetDeckArchiveLegacy;
import forge.deck.NetDeckArchiveModern;
import forge.deck.NetDeckArchivePioneer;
import forge.deck.NetDeckArchiveStandard;
import forge.deck.NetDeckArchiveVintage;
import forge.deck.NetDeckCategory;
import forge.deck.RandomDeckGenerator;
import forge.game.GameFormat;
import forge.game.GameType;
import forge.game.player.RegisteredPlayer;
import forge.gamemodes.quest.QuestController;
@@ -27,6 +38,7 @@ import forge.gamemodes.quest.QuestEventChallenge;
import forge.gamemodes.quest.QuestUtil;
import forge.gui.FThreads;
import forge.gui.UiCommand;
import forge.item.PaperCard;
import forge.itemmanager.DeckManager;
import forge.itemmanager.ItemManagerConfig;
import forge.itemmanager.ItemManagerContainer;
@@ -36,6 +48,8 @@ import forge.model.FModel;
import forge.screens.match.controllers.CDetailPicture;
import forge.toolbox.FLabel;
import forge.toolbox.FOptionPane;
import forge.util.Localizer;
import net.miginfocom.swing.MigLayout;
@SuppressWarnings("serial")
public class FDeckChooser extends JPanel implements IDecksComboBoxListener {

33
forge-gui-desktop/src/main/java/forge/deckchooser/FDeckViewer.java
View File

@@ -1,5 +1,24 @@
package forge.deckchooser;
import java.awt.Dimension;
import java.awt.GraphicsConfiguration;
import java.awt.GraphicsDevice;
import java.awt.GraphicsEnvironment;
import java.awt.Toolkit;
import java.awt.datatransfer.StringSelection;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.geom.AffineTransform;
import java.util.ArrayList;
import java.util.List;
import java.util.Map.Entry;
import java.util.SortedMap;
import java.util.TreeMap;
import javax.swing.JPanel;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import forge.deck.CardPool;
import forge.deck.Deck;
import forge.deck.DeckSection;
@@ -21,20 +40,6 @@ import forge.util.Localizer;
import forge.view.FDialog;
import net.miginfocom.swing.MigLayout;
import javax.swing.*;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import java.awt.*;
import java.awt.datatransfer.StringSelection;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.geom.AffineTransform;
import java.util.ArrayList;
import java.util.List;
import java.util.Map.Entry;
import java.util.SortedMap;
import java.util.TreeMap;
@SuppressWarnings("serial")
public class FDeckViewer extends FDialog {
private final Deck deck;

2
forge-gui-desktop/src/main/java/forge/download/GuiDownloader.java
View File

@@ -24,7 +24,6 @@ import javax.swing.SwingConstants;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import net.miginfocom.swing.MigLayout;
import forge.gui.SOverlayUtils;
import forge.gui.UiCommand;
import forge.gui.download.GuiDownloadService;
@@ -39,6 +38,7 @@ import forge.toolbox.FSkin;
import forge.toolbox.FTextField;
import forge.toolbox.JXButtonPanel;
import forge.util.Callback;
import net.miginfocom.swing.MigLayout;
@SuppressWarnings("serial")
public class GuiDownloader extends DefaultBoundedRangeModel {

4
forge-gui-desktop/src/main/java/forge/error/BugReportDialog.java
View File

@@ -37,11 +37,11 @@ import javax.swing.JScrollPane;
import javax.swing.JTextArea;
import javax.swing.KeyStroke;
import forge.model.FModel;
import net.miginfocom.swing.MigLayout;
import forge.gui.WrapLayout;
import forge.gui.error.BugReporter;
import forge.localinstance.properties.ForgePreferences;
import forge.model.FModel;
import net.miginfocom.swing.MigLayout;
/**
* The class BugReportDialog. Enables showing and saving error messages that

25
forge-gui-desktop/src/main/java/forge/gui/CardListChooser.java
View File

@@ -18,6 +18,19 @@
package forge.gui;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.WindowEvent;
import java.awt.event.WindowFocusListener;
import java.awt.event.WindowListener;
import java.util.Collections;
import java.util.List;
import javax.swing.AbstractListModel;
import javax.swing.JList;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import forge.game.card.CardView;
import forge.item.PaperCard;
import forge.localinstance.properties.ForgePreferences.FPref;
@@ -26,17 +39,9 @@ import forge.toolbox.FButton;
import forge.toolbox.FLabel;
import forge.toolbox.FOptionPane;
import forge.toolbox.FScrollPane;
import forge.view.FDialog;
import forge.util.Localizer;
import forge.util.CardTranslation;
import javax.swing.*;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import java.awt.event.*;
import java.util.Collections;
import java.util.List;
import forge.util.Localizer;
import forge.view.FDialog;
/**
* A simple class that shows a list of cards in a dialog with preview in its

2
forge-gui-desktop/src/main/java/forge/gui/CardListViewer.java
View File

@@ -24,7 +24,6 @@ import java.awt.event.WindowEvent;
import java.awt.event.WindowFocusListener;
import java.util.Collections;
import java.util.List;
import forge.util.Localizer;
import javax.swing.AbstractListModel;
import javax.swing.Icon;
@@ -39,6 +38,7 @@ import forge.model.FModel;
import forge.toolbox.FButton;
import forge.toolbox.FLabel;
import forge.toolbox.FScrollPane;
import forge.util.Localizer;
import forge.view.FDialog;
/**

13
forge-gui-desktop/src/main/java/forge/gui/CardPicturePanel.java
View File

@@ -17,6 +17,13 @@
*/
package forge.gui;
import java.awt.BorderLayout;
import java.awt.image.BufferedImage;
import java.awt.image.ColorModel;
import java.awt.image.WritableRaster;
import javax.swing.JPanel;
import forge.ImageCache;
import forge.ImageKeys;
import forge.game.card.CardView.CardStateView;
@@ -30,12 +37,6 @@ import forge.toolbox.imaging.FImagePanel.AutoSizeImageMode;
import forge.toolbox.imaging.FImageUtil;
import forge.util.ImageFetcher;
import javax.swing.*;
import java.awt.*;
import java.awt.image.BufferedImage;
import java.awt.image.ColorModel;
import java.awt.image.WritableRaster;
/**
* Displays image associated with a card or inventory item.
*

4
forge-gui-desktop/src/main/java/forge/gui/DualListBox.java
View File

@@ -1,8 +1,8 @@
package forge.gui;
import java.awt.BorderLayout;
import java.awt.GridLayout;
import java.awt.FontMetrics;
import java.awt.GridLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.FocusAdapter;
@@ -36,8 +36,8 @@ import forge.toolbox.FLabel;
import forge.toolbox.FList;
import forge.toolbox.FPanel;
import forge.toolbox.FScrollPane;
import forge.view.FDialog;
import forge.util.Localizer;
import forge.view.FDialog;
// An input box for handling the order of choices.
// Left box has the original choices

5
forge-gui-desktop/src/main/java/forge/gui/FNetOverlay.java
View File

@@ -9,8 +9,6 @@ import java.awt.event.MouseEvent;
import javax.swing.ScrollPaneConstants;
import net.miginfocom.swing.MigLayout;
import org.apache.commons.lang3.StringUtils;
import forge.Singletons;
@@ -30,9 +28,10 @@ import forge.toolbox.FSkin;
import forge.toolbox.FTextArea;
import forge.toolbox.FTextField;
import forge.toolbox.SmartScroller;
import forge.util.Localizer;
import forge.view.FDialog;
import forge.view.FFrame;
import forge.util.Localizer;
import net.miginfocom.swing.MigLayout;
public enum FNetOverlay implements IOnlineChatInterface {

6
forge-gui-desktop/src/main/java/forge/gui/GuiChoose.java
View File

@@ -13,14 +13,14 @@ import javax.swing.WindowConstants;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import forge.card.CardStateName;
import forge.game.card.CardFaceView;
import org.apache.commons.lang3.StringUtils;
import com.google.common.base.Function;
import forge.card.CardStateName;
import forge.card.ICardFace;
import forge.game.card.Card;
import forge.game.card.CardFaceView;
import forge.game.card.CardView;
import forge.game.card.CardView.CardStateView;
import forge.item.InventoryItem;
@@ -28,8 +28,8 @@ import forge.item.PaperCard;
import forge.model.FModel;
import forge.screens.match.CMatchUI;
import forge.toolbox.FOptionPane;
import forge.view.arcane.ListCardArea;
import forge.util.Localizer;
import forge.view.arcane.ListCardArea;
public class GuiChoose {

8
forge-gui-desktop/src/main/java/forge/gui/GuiProgressBarWindow.java
View File

@@ -17,11 +17,13 @@
*/
package forge.gui;
import forge.view.FDialog;
import java.awt.Dimension;
import javax.swing.*;
import javax.swing.JPanel;
import javax.swing.JProgressBar;
import javax.swing.border.EmptyBorder;
import java.awt.*;
import forge.view.FDialog;
/**
* <p>

5
forge-gui-desktop/src/main/java/forge/gui/ImportDialog.java
View File

@@ -50,9 +50,6 @@ import javax.swing.event.ChangeListener;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import forge.util.TextUtil;
import net.miginfocom.swing.MigLayout;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
@@ -73,6 +70,8 @@ import forge.toolbox.FScrollPane;
import forge.toolbox.FSkin;
import forge.toolbox.FTextField;
import forge.toolbox.SmartScroller;
import forge.util.TextUtil;
import net.miginfocom.swing.MigLayout;
/**
* This class implements an overlay-based dialog that imports data from a user-selected directory

15
forge-gui-desktop/src/main/java/forge/gui/ImportSourceAnalyzer.java
View File

@@ -17,8 +17,18 @@
*/
package forge.gui;
import java.io.File;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import java.util.TreeMap;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import forge.card.CardEdition;
import forge.item.IPaperCard;
import forge.item.PaperCard;
@@ -26,11 +36,6 @@ import forge.localinstance.properties.ForgeConstants;
import forge.model.FModel;
import forge.util.FileUtil;
import forge.util.ImageUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
import java.io.File;
import java.util.*;
public class ImportSourceAnalyzer {

1
forge-gui-desktop/src/main/java/forge/gui/ListChooser.java
View File

@@ -44,7 +44,6 @@ import forge.toolbox.FList;
import forge.toolbox.FMouseAdapter;
import forge.toolbox.FOptionPane;
import forge.toolbox.FScrollPane;
import forge.util.Localizer;
/**

7
forge-gui-desktop/src/main/java/forge/gui/MouseUtil.java
View File

@@ -1,11 +1,12 @@
package forge.gui;
import forge.view.FView;
import java.awt.*;
import java.awt.Component;
import java.awt.Cursor;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import forge.view.FView;
public final class MouseUtil {
private static Cursor cursor;
private static int cursorLockCount;

2
forge-gui-desktop/src/main/java/forge/gui/SOverlayUtils.java
View File

@@ -9,7 +9,6 @@ import java.awt.event.ActionListener;
import javax.swing.JPanel;
import net.miginfocom.swing.MigLayout;
import forge.Singletons;
import forge.localinstance.assets.FSkinProp;
import forge.toolbox.FLabel;
@@ -17,6 +16,7 @@ import forge.toolbox.FOverlay;
import forge.toolbox.FPanel;
import forge.toolbox.FSkin;
import forge.toolbox.FSkin.SkinnedButton;
import net.miginfocom.swing.MigLayout;
/**
* All overlay interaction is handled here.

3
forge-gui-desktop/src/main/java/forge/gui/framework/DragCell.java
View File

@@ -13,8 +13,6 @@ import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.SwingConstants;
import net.miginfocom.swing.MigLayout;
import com.google.common.collect.Lists;
import forge.localinstance.assets.FSkinProp;
@@ -25,6 +23,7 @@ import forge.toolbox.FPanel;
import forge.toolbox.FSkin;
import forge.toolbox.FSkin.SkinImage;
import forge.view.FView;
import net.miginfocom.swing.MigLayout;
/**
* Top-level container in drag layout. A cell holds

7
forge-gui-desktop/src/main/java/forge/gui/framework/DragTab.java
View File

@@ -1,11 +1,12 @@
package forge.gui.framework;
import forge.toolbox.FSkin;
import forge.toolbox.FSkin.SkinnedLabel;
import java.awt.Dimension;
import java.awt.Graphics;
import javax.swing.border.EmptyBorder;
import java.awt.*;
import forge.toolbox.FSkin;
import forge.toolbox.FSkin.SkinnedLabel;
/**
* The tab label object in drag layout.

26
forge-gui-desktop/src/main/java/forge/gui/framework/EDocID.java
View File

@@ -4,7 +4,17 @@
package forge.gui.framework;
import com.google.common.collect.ObjectArrays;
import forge.screens.deckeditor.views.*;
import forge.screens.deckeditor.views.VAllDecks;
import forge.screens.deckeditor.views.VBrawlDecks;
import forge.screens.deckeditor.views.VCardCatalog;
import forge.screens.deckeditor.views.VCommanderDecks;
import forge.screens.deckeditor.views.VCurrentDeck;
import forge.screens.deckeditor.views.VDeckgen;
import forge.screens.deckeditor.views.VOathbreakerDecks;
import forge.screens.deckeditor.views.VProbabilities;
import forge.screens.deckeditor.views.VStatistics;
import forge.screens.deckeditor.views.VTinyLeadersDecks;
import forge.screens.home.gauntlet.VSubmenuGauntletBuild;
import forge.screens.home.gauntlet.VSubmenuGauntletContests;
import forge.screens.home.gauntlet.VSubmenuGauntletLoad;
@@ -13,12 +23,22 @@ import forge.screens.home.online.VSubmenuOnlineLobby;
import forge.screens.home.puzzle.VSubmenuPuzzleCreate;
import forge.screens.home.puzzle.VSubmenuPuzzleSolve;
import forge.screens.home.puzzle.VSubmenuTutorial;
import forge.screens.home.quest.*;
import forge.screens.home.quest.VSubmenuChallenges;
import forge.screens.home.quest.VSubmenuDuels;
import forge.screens.home.quest.VSubmenuQuestDecks;
import forge.screens.home.quest.VSubmenuQuestDraft;
import forge.screens.home.quest.VSubmenuQuestLoadData;
import forge.screens.home.quest.VSubmenuQuestPrefs;
import forge.screens.home.quest.VSubmenuQuestStart;
import forge.screens.home.sanctioned.VSubmenuConstructed;
import forge.screens.home.sanctioned.VSubmenuDraft;
import forge.screens.home.sanctioned.VSubmenuSealed;
import forge.screens.home.sanctioned.VSubmenuWinston;
import forge.screens.home.settings.*;
import forge.screens.home.settings.VSubmenuAchievements;
import forge.screens.home.settings.VSubmenuAvatars;
import forge.screens.home.settings.VSubmenuDownloaders;
import forge.screens.home.settings.VSubmenuPreferences;
import forge.screens.home.settings.VSubmenuReleaseNotes;
import forge.screens.workshop.views.VCardDesigner;
import forge.screens.workshop.views.VCardScript;
import forge.screens.workshop.views.VWorkshopCatalog;

6
forge-gui-desktop/src/main/java/forge/gui/framework/FScreen.java
View File

@@ -1,5 +1,7 @@
package forge.gui.framework;
import java.io.File;
import forge.Singletons;
import forge.localinstance.assets.FSkinProp;
import forge.localinstance.properties.FileLocation;
@@ -17,10 +19,8 @@ import forge.screens.workshop.VWorkshopUI;
import forge.toolbox.FOptionPane;
import forge.toolbox.FSkin;
import forge.toolbox.FSkin.SkinImage;
import forge.view.FView;
import forge.util.Localizer;
import java.io.File;
import forge.view.FView;
/**
* Definitions for Forge screens

11
forge-gui-desktop/src/main/java/forge/gui/framework/SOverflowUtil.java
View File

@@ -1,13 +1,16 @@
package forge.gui.framework;
import forge.view.FView;
import javax.swing.*;
import java.awt.*;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import javax.swing.JLabel;
import javax.swing.JPanel;
import forge.view.FView;
/**
* Package-private utilities for generic overflow behavior
* in title bar for any cell in layout.

18
forge-gui-desktop/src/main/java/forge/gui/framework/SRearrangingUtil.java
View File

@@ -1,5 +1,16 @@
package forge.gui.framework;
import java.awt.Container;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.awt.event.MouseMotionAdapter;
import java.awt.event.MouseMotionListener;
import java.util.ArrayList;
import java.util.List;
import javax.swing.JPanel;
import forge.gui.MouseUtil;
import forge.localinstance.assets.FSkinProp;
import forge.toolbox.FSkin;
@@ -7,13 +18,6 @@ import forge.toolbox.FSkin.SkinCursor;
import forge.toolbox.FSkin.SkinnedLayeredPane;
import forge.view.FView;
import javax.swing.*;
import java.awt.*;
import java.awt.event.*;
import java.util.ArrayList;
import java.util.List;
/**
* Package-private utilities for rearranging drag behavior using
* the draggable panels registered in FView.

27
forge-gui-desktop/src/main/java/forge/gui/framework/SResizingUtil.java
View File

@@ -1,5 +1,25 @@
package forge.gui.framework;
import java.awt.Component;
import java.awt.Cursor;
import java.awt.Rectangle;
import java.awt.event.ComponentAdapter;
import java.awt.event.ComponentEvent;
import java.awt.event.ComponentListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.awt.event.MouseMotionAdapter;
import java.awt.event.MouseMotionListener;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import javax.swing.JPanel;
import forge.gui.MouseUtil;
import forge.toolbox.FAbsolutePositioner;
import forge.toolbox.FOverlay;
@@ -8,13 +28,6 @@ import forge.view.FFrame;
import forge.view.FNavigationBar;
import forge.view.FView;
import javax.swing.*;
import java.awt.*;
import java.awt.event.*;
import java.util.*;
import java.util.List;
/**
* Package-private utilities for resizing drag behavior using
* the draggable panels registered in FView.

27
forge-gui-desktop/src/main/java/forge/itemmanager/CardManager.java
View File

@@ -1,22 +1,37 @@
package forge.itemmanager;
import java.util.HashMap;
import java.util.List;
import java.util.Map.Entry;
import javax.swing.JMenu;
import forge.game.GameFormat;
import forge.gamemodes.quest.QuestWorld;
import forge.gamemodes.quest.data.QuestPreferences;
import forge.gui.GuiUtils;
import forge.item.PaperCard;
import forge.itemmanager.filters.*;
import forge.itemmanager.filters.AdvancedSearchFilter;
import forge.itemmanager.filters.CardCMCFilter;
import forge.itemmanager.filters.CardCMCRangeFilter;
import forge.itemmanager.filters.CardColorFilter;
import forge.itemmanager.filters.CardFoilFilter;
import forge.itemmanager.filters.CardFormatFilter;
import forge.itemmanager.filters.CardPowerFilter;
import forge.itemmanager.filters.CardQuestWorldFilter;
import forge.itemmanager.filters.CardRatingFilter;
import forge.itemmanager.filters.CardSearchFilter;
import forge.itemmanager.filters.CardSetFilter;
import forge.itemmanager.filters.CardToughnessFilter;
import forge.itemmanager.filters.CardTypeFilter;
import forge.itemmanager.filters.FormatFilter;
import forge.itemmanager.filters.ItemFilter;
import forge.model.FModel;
import forge.screens.home.quest.DialogChooseFormats;
import forge.screens.home.quest.DialogChooseSets;
import forge.screens.match.controllers.CDetailPicture;
import forge.util.Localizer;
import javax.swing.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map.Entry;
/**
* ItemManager for cards
*

12
forge-gui-desktop/src/main/java/forge/itemmanager/DeckManager.java
View File

@@ -4,7 +4,9 @@ import java.awt.Component;
import java.awt.Graphics;
import java.awt.Rectangle;
import java.awt.event.MouseEvent;
import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import javax.swing.JMenu;
@@ -12,13 +14,10 @@ import javax.swing.JTable;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import forge.deck.Deck;
import forge.screens.deckeditor.controllers.CEditorConstructed;
import forge.screens.home.quest.DialogChooseFormats;
import forge.util.Localizer;
import org.apache.commons.lang3.StringUtils;
import forge.Singletons;
import forge.deck.Deck;
import forge.deck.DeckBase;
import forge.deck.DeckProxy;
import forge.deck.io.DeckPreferences;
@@ -47,12 +46,15 @@ import forge.model.FModel;
import forge.screens.deckeditor.CDeckEditorUI;
import forge.screens.deckeditor.SEditorIO;
import forge.screens.deckeditor.controllers.ACEditorBase;
import forge.screens.deckeditor.controllers.CEditorConstructed;
import forge.screens.deckeditor.controllers.CEditorLimited;
import forge.screens.deckeditor.controllers.CEditorQuest;
import forge.screens.home.quest.DialogChooseFormats;
import forge.screens.home.quest.DialogChooseSets;
import forge.screens.match.controllers.CDetailPicture;
import forge.toolbox.FOptionPane;
import forge.toolbox.FSkin;
import forge.util.Localizer;
/**
* ItemManager for decks

14
forge-gui-desktop/src/main/java/forge/itemmanager/ItemManager.java
View File

@@ -30,17 +30,20 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import javax.swing.*;
import javax.swing.JMenu;
import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import javax.swing.KeyStroke;
import javax.swing.SwingConstants;
import javax.swing.SwingUtilities;
import javax.swing.event.ListSelectionListener;
import javax.swing.event.PopupMenuEvent;
import javax.swing.event.PopupMenuListener;
import com.google.common.collect.Lists;
import net.miginfocom.swing.MigLayout;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import forge.gui.GuiUtils;
import forge.gui.UiCommand;
@@ -63,8 +66,9 @@ import forge.toolbox.FTextField;
import forge.toolbox.LayoutHelper;
import forge.util.Aggregates;
import forge.util.ItemPool;
import forge.util.ReflectionUtil;
import forge.util.Localizer;
import forge.util.ReflectionUtil;
import net.miginfocom.swing.MigLayout;
/**
* ItemManager.

6
forge-gui-desktop/src/main/java/forge/itemmanager/ItemManagerContainer.java
View File

@@ -17,11 +17,11 @@
*/
package forge.itemmanager;
import forge.toolbox.FSkin.SkinnedScrollPane;
import javax.swing.*;
import javax.swing.ScrollPaneConstants;
import javax.swing.border.Border;
import forge.toolbox.FSkin.SkinnedScrollPane;
/**
* Simple container pane meant to contain item managers.

4
forge-gui-desktop/src/main/java/forge/itemmanager/SpellShopManager.java
View File

@@ -1,11 +1,11 @@
package forge.itemmanager;
import javax.swing.JMenu;
import forge.item.InventoryItem;
import forge.itemmanager.filters.ItemFilter;
import forge.screens.match.controllers.CDetailPicture;
import javax.swing.*;
/**
* TODO: Write javadoc for this type.
*

4
forge-gui-desktop/src/main/java/forge/itemmanager/TokenManager.java
View File

@@ -1,12 +1,12 @@
package forge.itemmanager;
import javax.swing.JMenu;
import forge.item.PaperToken;
import forge.itemmanager.filters.ItemFilter;
import forge.itemmanager.filters.TokenSearchFilter;
import forge.screens.match.controllers.CDetailPicture;
import javax.swing.*;
public class TokenManager extends ItemManager<PaperToken> {
public TokenManager(final CDetailPicture cDetailPicture, final boolean wantUnique0) {
super(PaperToken.class, cDetailPicture, wantUnique0);

21
forge-gui-desktop/src/main/java/forge/itemmanager/filters/AdvancedSearchFilter.java
View File

@@ -6,13 +6,24 @@ import java.awt.event.ComponentAdapter;
import java.awt.event.ComponentEvent;
import java.awt.event.MouseEvent;
import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import javax.swing.ScrollPaneConstants;
import javax.swing.SwingConstants;
import org.apache.commons.lang3.ArrayUtils;
import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import forge.gui.GuiUtils;
import forge.gui.UiCommand;
import forge.gui.interfaces.IButton;
import forge.item.InventoryItem;
import forge.itemmanager.AdvancedSearch;
import forge.itemmanager.ItemManager;
import forge.itemmanager.AdvancedSearch.IFilterControl;
import forge.itemmanager.ItemManager;
import forge.toolbox.FLabel;
import forge.toolbox.FMouseAdapter;
import forge.toolbox.FOptionPane;
@@ -23,14 +34,6 @@ import forge.toolbox.FTextField;
import forge.toolbox.LayoutHelper;
import forge.util.Localizer;
import javax.swing.*;
import org.apache.commons.lang3.ArrayUtils;
import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
public class AdvancedSearchFilter<T extends InventoryItem> extends ItemFilter<T> {
private final AdvancedSearch.Model<T> model;

12
forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardCMCFilter.java
View File

@@ -1,18 +1,18 @@
package forge.itemmanager.filters;
import java.util.ArrayList;
import java.util.List;
import javax.swing.JPanel;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
import forge.card.CardRules;
import forge.item.PaperCard;
import forge.itemmanager.ItemManager;
import forge.itemmanager.SpellShopManager;
import forge.itemmanager.SItemManagerUtil.StatTypes;
import javax.swing.*;
import java.util.ArrayList;
import java.util.List;
import forge.itemmanager.SpellShopManager;
/**
* TODO: Write javadoc for this type.

6
forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardColorFilter.java
View File

@@ -1,14 +1,14 @@
package forge.itemmanager.filters;
import javax.swing.JPanel;
import com.google.common.base.Predicate;
import forge.item.PaperCard;
import forge.itemmanager.ItemManager;
import forge.itemmanager.SFilterUtil;
import forge.itemmanager.SpellShopManager;
import forge.itemmanager.SItemManagerUtil.StatTypes;
import javax.swing.*;
import forge.itemmanager.SpellShopManager;
public class CardColorFilter extends StatTypeFilter<PaperCard> {

4
forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardFoilFilter.java
View File

@@ -1,5 +1,7 @@
package forge.itemmanager.filters;
import javax.swing.JPanel;
import com.google.common.base.Predicate;
import forge.item.PaperCard;
@@ -7,8 +9,6 @@ import forge.itemmanager.ItemManager;
import forge.itemmanager.SFilterUtil;
import forge.itemmanager.SItemManagerUtil.StatTypes;
import javax.swing.*;
public class CardFoilFilter extends StatTypeFilter<PaperCard> {
public CardFoilFilter(ItemManager<? super PaperCard> itemManager0) {

1
forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardFormatFilter.java
View File

@@ -1,6 +1,7 @@
package forge.itemmanager.filters;
import java.util.List;
import com.google.common.base.Predicate;
import forge.game.GameFormat;

5
forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardRatingFilter.java
View File

@@ -1,14 +1,15 @@
package forge.itemmanager.filters;
import javax.swing.JPanel;
import com.google.common.base.Predicate;
import forge.item.PaperCard;
import forge.itemmanager.ItemManager;
import forge.itemmanager.SFilterUtil;
import forge.itemmanager.SItemManagerUtil.StatTypes;
import forge.model.FModel;
import javax.swing.*;
public class CardRatingFilter extends StatTypeFilter<PaperCard> {
public CardRatingFilter(ItemManager<? super PaperCard> itemManager0) {
super(itemManager0);

10
forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardSearchFilter.java
View File

@@ -1,5 +1,10 @@
package forge.itemmanager.filters;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import javax.swing.JPanel;
import com.google.common.base.Predicate;
import forge.gui.UiCommand;
@@ -12,11 +17,6 @@ import forge.toolbox.FLabel;
import forge.toolbox.FTextField;
import forge.toolbox.LayoutHelper;
import javax.swing.*;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
public class CardSearchFilter extends TextSearchFilter<PaperCard> {
private FComboBoxWrapper<String> cbSearchMode;

8
forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardSetFilter.java
View File

@@ -1,14 +1,14 @@
package forge.itemmanager.filters;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
import forge.game.GameFormat;
import forge.item.PaperCard;
import forge.itemmanager.ItemManager;
import forge.screens.home.quest.DialogChooseSets;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
/**
* TODO: Write javadoc for this type.
*

12
forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardTypeFilter.java
View File

@@ -1,18 +1,18 @@
package forge.itemmanager.filters;
import java.util.ArrayList;
import java.util.List;
import javax.swing.JPanel;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
import forge.card.CardRules;
import forge.item.PaperCard;
import forge.itemmanager.ItemManager;
import forge.itemmanager.SpellShopManager;
import forge.itemmanager.SItemManagerUtil.StatTypes;
import javax.swing.*;
import java.util.ArrayList;
import java.util.List;
import forge.itemmanager.SpellShopManager;
public class CardTypeFilter extends StatTypeFilter<PaperCard> {

4
forge-gui-desktop/src/main/java/forge/itemmanager/filters/DeckColorFilter.java
View File

@@ -1,5 +1,7 @@
package forge.itemmanager.filters;
import javax.swing.JPanel;
import com.google.common.base.Predicate;
import forge.deck.DeckProxy;
@@ -8,8 +10,6 @@ import forge.itemmanager.SFilterUtil;
import forge.itemmanager.SItemManagerUtil.StatTypes;
import forge.util.ItemPool;
import javax.swing.*;
public class DeckColorFilter extends StatTypeFilter<DeckProxy> {
public DeckColorFilter(ItemManager<? super DeckProxy> itemManager0) {

6
forge-gui-desktop/src/main/java/forge/itemmanager/filters/DeckFolderFilter.java
View File

@@ -1,13 +1,13 @@
package forge.itemmanager.filters;
import java.util.HashSet;
import java.util.Set;
import com.google.common.base.Predicate;
import forge.deck.DeckProxy;
import forge.itemmanager.ItemManager;
import java.util.HashSet;
import java.util.Set;
/**
* TODO: Write javadoc for this type.
*

2
forge-gui-desktop/src/main/java/forge/itemmanager/filters/DeckFormatFilter.java
View File

@@ -2,8 +2,8 @@ package forge.itemmanager.filters;
import com.google.common.base.Predicate;
import forge.game.GameFormat;
import forge.deck.DeckProxy;
import forge.game.GameFormat;
import forge.itemmanager.ItemManager;
import forge.itemmanager.SFilterUtil;
import forge.screens.home.quest.DialogChooseFormats;

8
forge-gui-desktop/src/main/java/forge/itemmanager/filters/DeckSetFilter.java
View File

@@ -1,14 +1,14 @@
package forge.itemmanager.filters;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
import forge.deck.DeckProxy;
import forge.game.GameFormat;
import forge.itemmanager.ItemManager;
import forge.screens.home.quest.DialogChooseSets;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
public class DeckSetFilter extends DeckFormatFilter {
private final Set<String> sets = new HashSet<>();

8
forge-gui-desktop/src/main/java/forge/itemmanager/filters/FormatFilter.java
View File

@@ -1,15 +1,15 @@
package forge.itemmanager.filters;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import forge.card.CardEdition;
import forge.game.GameFormat;
import forge.item.InventoryItem;
import forge.itemmanager.ItemManager;
import forge.model.FModel;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
public abstract class FormatFilter<T extends InventoryItem> extends ListLabelFilter<T> {
protected boolean allowReprints = true;

27
forge-gui-desktop/src/main/java/forge/itemmanager/filters/ItemFilter.java
View File

@@ -1,27 +1,34 @@
package forge.itemmanager.filters;
import java.awt.BasicStroke;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.RenderingHints;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.SwingUtilities;
import com.google.common.base.Predicate;
import forge.gui.framework.ILocalRepaint;
import forge.item.InventoryItem;
import forge.itemmanager.ItemManager;
import forge.toolbox.FSkin;
import forge.toolbox.FTextField;
import forge.toolbox.LayoutHelper;
import forge.toolbox.FSkin.Colors;
import forge.toolbox.FSkin.SkinColor;
import forge.toolbox.FSkin.SkinnedCheckBox;
import forge.toolbox.FSkin.SkinnedPanel;
import forge.toolbox.FTextField;
import forge.toolbox.LayoutHelper;
import forge.util.Localizer;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
public abstract class ItemFilter<T extends InventoryItem> {
public final static int PANEL_HEIGHT = 28;

5
forge-gui-desktop/src/main/java/forge/itemmanager/filters/ListLabelFilter.java
View File

@@ -1,5 +1,8 @@
package forge.itemmanager.filters;
import javax.swing.JPanel;
import javax.swing.SwingConstants;
import forge.item.InventoryItem;
import forge.itemmanager.ItemManager;
import forge.toolbox.FLabel;
@@ -7,8 +10,6 @@ import forge.toolbox.FTextField;
import forge.toolbox.LayoutHelper;
import forge.util.TextUtil;
import javax.swing.*;
/**
* TODO: Write javadoc for this type.
*

10
forge-gui-desktop/src/main/java/forge/itemmanager/filters/StatTypeFilter.java
View File

@@ -1,5 +1,10 @@
package forge.itemmanager.filters;
import java.util.HashMap;
import java.util.Map;
import javax.swing.JPanel;
import com.google.common.base.Predicates;
import forge.gui.UiCommand;
@@ -14,11 +19,6 @@ import forge.toolbox.FSkin;
import forge.util.ItemPool;
import forge.util.Localizer;
import javax.swing.*;
import java.util.HashMap;
import java.util.Map;
public abstract class StatTypeFilter<T extends InventoryItem> extends ToggleButtonsFilter<T> {
protected final Map<StatTypes, FLabel> buttonMap;

17
forge-gui-desktop/src/main/java/forge/itemmanager/filters/TextSearchFilter.java
View File

@@ -1,5 +1,14 @@
package forge.itemmanager.filters;
import java.awt.Component;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import javax.swing.JPanel;
import javax.swing.Timer;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
@@ -10,14 +19,6 @@ import forge.toolbox.FTextField;
import forge.toolbox.LayoutHelper;
import forge.util.Localizer;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
public class TextSearchFilter<T extends InventoryItem> extends ItemFilter<T> {
protected FTextField txtSearch;

9
forge-gui-desktop/src/main/java/forge/itemmanager/filters/TokenSearchFilter.java
View File

@@ -1,5 +1,10 @@
package forge.itemmanager.filters;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import javax.swing.JPanel;
import com.google.common.base.Predicate;
import forge.gui.UiCommand;
@@ -12,10 +17,6 @@ import forge.toolbox.FLabel;
import forge.toolbox.FTextField;
import forge.toolbox.LayoutHelper;
import javax.swing.*;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
public class TokenSearchFilter extends TextSearchFilter<PaperToken> {
private FComboBoxWrapper<String> cbSearchMode;

13
forge-gui-desktop/src/main/java/forge/itemmanager/filters/ValueRangeFilter.java
View File

@@ -1,5 +1,12 @@
package forge.itemmanager.filters;
import java.awt.Component;
import javax.swing.JPanel;
import javax.swing.JSpinner;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import com.google.common.base.Predicate;
import forge.card.CardRules;
@@ -13,12 +20,6 @@ import forge.toolbox.FTextField;
import forge.toolbox.LayoutHelper;
import forge.util.ComparableOp;
import javax.swing.*;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import java.awt.*;
public abstract class ValueRangeFilter<T extends InventoryItem> extends ItemFilter<T> {
private FLabel label;

9
forge-gui-desktop/src/main/java/forge/itemmanager/views/ColorSetRenderer.java
View File

@@ -1,13 +1,14 @@
package forge.itemmanager.views;
import java.awt.Component;
import java.awt.Graphics;
import javax.swing.JTable;
import forge.card.ColorSet;
import forge.card.mana.ManaCostShard;
import forge.toolbox.CardFaceSymbols;
import javax.swing.*;
import java.awt.*;
public class ColorSetRenderer extends ItemCellRenderer {
private static final long serialVersionUID = 1770527102334163549L;

11
forge-gui-desktop/src/main/java/forge/itemmanager/views/DeckQuantityRenderer.java
View File

@@ -17,17 +17,18 @@
*/
package forge.itemmanager.views;
import java.awt.Graphics;
import java.awt.Rectangle;
import java.awt.event.MouseEvent;
import javax.swing.SwingConstants;
import forge.item.InventoryItem;
import forge.localinstance.assets.FSkinProp;
import forge.screens.deckeditor.CDeckEditorUI;
import forge.toolbox.FSkin;
import forge.toolbox.FSkin.SkinImage;
import javax.swing.*;
import java.awt.*;
import java.awt.event.MouseEvent;
/**
* Displays deck quantity with +/- buttons
*/

11
forge-gui-desktop/src/main/java/forge/itemmanager/views/DeckStarRenderer.java
View File

@@ -17,6 +17,12 @@
*/
package forge.itemmanager.views;
import java.awt.Component;
import java.awt.Graphics;
import java.awt.event.MouseEvent;
import javax.swing.JTable;
import forge.deck.DeckProxy;
import forge.deck.io.DeckPreferences;
import forge.item.InventoryItem;
@@ -25,11 +31,6 @@ import forge.toolbox.FSkin;
import forge.toolbox.FSkin.SkinImage;
import forge.util.Localizer;
import javax.swing.*;
import java.awt.*;
import java.awt.event.MouseEvent;
/**
* Displays favorite icons
*/

5
forge-gui-desktop/src/main/java/forge/itemmanager/views/IntegerRenderer.java
View File

@@ -17,8 +17,9 @@
*/
package forge.itemmanager.views;
import javax.swing.*;
import java.awt.*;
import java.awt.Component;
import javax.swing.JTable;
/**
* A quick converter to avoid -1 and Integer.MAX_VALUE being displayed for unapplicable values.

12
forge-gui-desktop/src/main/java/forge/itemmanager/views/ItemView.java
View File

@@ -33,10 +33,6 @@ import javax.swing.event.ChangeListener;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import forge.toolbox.*;
import forge.util.Localizer;
import net.miginfocom.swing.MigLayout;
import org.apache.commons.lang3.CharUtils;
import org.apache.commons.lang3.StringUtils;
@@ -45,8 +41,16 @@ import forge.itemmanager.ColumnDef;
import forge.itemmanager.ItemManager;
import forge.itemmanager.ItemManagerConfig;
import forge.itemmanager.ItemManagerModel;
import forge.toolbox.FCheckBox;
import forge.toolbox.FLabel;
import forge.toolbox.FScrollPane;
import forge.toolbox.FScrollPanel;
import forge.toolbox.FSkin;
import forge.toolbox.FSkin.SkinColor;
import forge.toolbox.FSkin.SkinImage;
import forge.toolbox.ToolTipListener;
import forge.util.Localizer;
import net.miginfocom.swing.MigLayout;
public abstract class ItemView<T extends InventoryItem> {
private static final SkinColor BORDER_COLOR = FSkin.getColor(FSkin.Colors.CLR_TEXT);

9
forge-gui-desktop/src/main/java/forge/itemmanager/views/ManaCostRenderer.java
View File

@@ -17,16 +17,17 @@
*/
package forge.itemmanager.views;
import java.awt.Component;
import java.awt.Graphics;
import javax.swing.JTable;
import forge.card.CardRules;
import forge.card.CardSplitType;
import forge.card.mana.ManaCost;
import forge.card.mana.ManaCostShard;
import forge.toolbox.CardFaceSymbols;
import javax.swing.*;
import java.awt.*;
/**
* Displays mana cost as symbols.
*/

11
forge-gui-desktop/src/main/java/forge/itemmanager/views/StarRenderer.java
View File

@@ -17,6 +17,12 @@
*/
package forge.itemmanager.views;
import java.awt.Component;
import java.awt.Graphics;
import java.awt.event.MouseEvent;
import javax.swing.JTable;
import forge.gui.card.CardPreferences;
import forge.item.IPaperCard;
import forge.item.InventoryItem;
@@ -26,11 +32,6 @@ import forge.toolbox.FSkin.SkinImage;
import forge.util.CardTranslation;
import forge.util.Localizer;
import javax.swing.*;
import java.awt.*;
import java.awt.event.MouseEvent;
/**
* Displays favorite icons
*/

2
forge-gui-desktop/src/main/java/forge/menus/ForgeMenu.java
View File

@@ -16,8 +16,8 @@ import javax.swing.event.PopupMenuListener;
import forge.Singletons;
import forge.gui.GuiUtils;
import forge.screens.home.online.OnlineMenu;
import forge.util.ReflectionUtil;
import forge.util.Localizer;
import forge.util.ReflectionUtil;
public final class ForgeMenu {

20
forge-gui-desktop/src/main/java/forge/menus/HelpMenu.java
View File

@@ -1,20 +1,22 @@
package forge.menus;
import java.awt.Desktop;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyEvent;
import java.io.File;
import java.io.IOException;
import javax.swing.JMenu;
import javax.swing.JMenuItem;
import javax.swing.KeyStroke;
import forge.localinstance.properties.ForgeConstants;
import forge.toolbox.FOptionPane;
import forge.util.BuildInfo;
import forge.util.FileUtil;
import forge.util.Localizer;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyEvent;
import java.io.File;
import java.io.IOException;
public final class HelpMenu {
private HelpMenu() { }

3
forge-gui-desktop/src/main/java/forge/menus/IMenuProvider.java
View File

@@ -1,8 +1,9 @@
package forge.menus;
import javax.swing.*;
import java.util.List;
import javax.swing.JMenu;
/**
* By implementing this interface a class can add menus to the menu bar
* by calling the {@code MenuBarManager.SetupMenuBar()} method.

2
forge-gui-desktop/src/main/java/forge/menus/LayoutMenu.java
View File

@@ -24,9 +24,9 @@ import forge.localinstance.properties.ForgePreferences.FPref;
import forge.model.FModel;
import forge.toolbox.FSkin;
import forge.toolbox.FSkin.SkinnedMenuItem;
import forge.util.Localizer;
import forge.view.FFrame;
import forge.view.FView;
import forge.util.Localizer;
/**
* Returns a JMenu containing options associated with game screen layout.

11
forge-gui-desktop/src/main/java/forge/menus/MenuUtil.java
View File

@@ -1,15 +1,16 @@
package forge.menus;
import java.awt.Toolkit;
import java.io.IOException;
import javax.swing.JMenuItem;
import javax.swing.KeyStroke;
import forge.Singletons;
import forge.localinstance.assets.FSkinProp;
import forge.toolbox.FSkin;
import forge.toolbox.imaging.FImageUtil;
import javax.swing.*;
import java.awt.*;
import java.io.IOException;
public final class MenuUtil {
private MenuUtil() { }

8
forge-gui-desktop/src/main/java/forge/screens/bazaar/VBazaarUI.java
View File

@@ -1,5 +1,10 @@
package forge.screens.bazaar;
import javax.swing.JPanel;
import javax.swing.SwingConstants;
import javax.swing.SwingUtilities;
import javax.swing.border.Border;
import forge.gamemodes.quest.bazaar.QuestBazaarManager;
import forge.gui.GuiBase;
import forge.gui.UiCommand;
@@ -15,9 +20,6 @@ import forge.toolbox.FSkin.SkinImage;
import forge.view.FView;
import net.miginfocom.swing.MigLayout;
import javax.swing.*;
import javax.swing.border.Border;
/** Lays out containers and borders for resizeable layout and
* instantiates top-level controller for bazaar UI. */

10
forge-gui-desktop/src/main/java/forge/screens/deckeditor/AddBasicLandsDialog.java
View File

@@ -23,16 +23,18 @@ import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseEvent;
import java.awt.image.BufferedImage;
import java.text.NumberFormat;
import java.util.Map;
import java.util.Map.Entry;
import javax.swing.JOptionPane;
import javax.swing.SwingConstants;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import forge.ImageCache;
import forge.StaticData;
import forge.card.CardEdition;
@@ -53,12 +55,10 @@ import forge.toolbox.FLabel;
import forge.toolbox.FMouseAdapter;
import forge.toolbox.FOptionPane;
import forge.toolbox.FSkin;
import forge.toolbox.FTextField;
import forge.toolbox.FSkin.SkinnedPanel;
import forge.view.arcane.CardPanel;
import forge.toolbox.FTextField;
import forge.util.Localizer;
import java.awt.event.MouseEvent;
import java.util.Map;
import forge.view.arcane.CardPanel;
@SuppressWarnings("serial")

7
forge-gui-desktop/src/main/java/forge/screens/deckeditor/CDeckEditorUI.java
View File

@@ -36,7 +36,12 @@ import forge.gui.framework.FScreen;
import forge.gui.framework.ICDoc;
import forge.item.InventoryItem;
import forge.itemmanager.ItemManager;
import forge.screens.deckeditor.controllers.*;
import forge.screens.deckeditor.controllers.ACEditorBase;
import forge.screens.deckeditor.controllers.CEditorConstructed;
import forge.screens.deckeditor.controllers.CEditorQuestCardShop;
import forge.screens.deckeditor.controllers.CProbabilities;
import forge.screens.deckeditor.controllers.CStatistics;
import forge.screens.deckeditor.controllers.DeckController;
import forge.screens.deckeditor.views.VAllDecks;
import forge.screens.deckeditor.views.VBrawlDecks;
import forge.screens.deckeditor.views.VCardCatalog;

9
forge-gui-desktop/src/main/java/forge/screens/deckeditor/DeckImport.java
View File

@@ -20,13 +20,16 @@ package forge.screens.deckeditor;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.WindowEvent;
import java.util.*;
import java.util.List;
import javax.swing.BorderFactory;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import forge.deck.*;
import forge.deck.Deck;
import forge.deck.DeckBase;
import forge.deck.DeckImportController;
import forge.deck.DeckRecognizer;
import forge.deck.DeckRecognizer.TokenType;
import forge.item.InventoryItem;
import forge.screens.deckeditor.controllers.ACEditorBase;
@@ -38,8 +41,8 @@ import forge.toolbox.FLabel;
import forge.toolbox.FScrollPane;
import forge.toolbox.FSkin;
import forge.toolbox.FTextArea;
import forge.view.FDialog;
import forge.util.Localizer;
import forge.view.FDialog;
/**
*

10
forge-gui-desktop/src/main/java/forge/screens/deckeditor/SEditorIO.java
View File

@@ -1,9 +1,14 @@
package forge.screens.deckeditor;
import org.apache.commons.lang3.StringUtils;
import com.google.common.collect.ImmutableList;
import forge.Singletons;
import forge.deck.DeckProxy;
import forge.deck.io.DeckPreferences;
import forge.gui.framework.FScreen;
import forge.model.FModel;
import forge.screens.deckeditor.controllers.CAllDecks;
import forge.screens.deckeditor.controllers.DeckController;
import forge.screens.deckeditor.views.VAllDecks;
@@ -11,11 +16,6 @@ import forge.screens.deckeditor.views.VCurrentDeck;
import forge.toolbox.FOptionPane;
import forge.util.Localizer;
import org.apache.commons.lang3.StringUtils;
import com.google.common.collect.ImmutableList;
import forge.model.FModel;
/**
* Handles editor preferences saving and loading.
*

4
forge-gui-desktop/src/main/java/forge/screens/deckeditor/VDeckEditorUI.java
View File

@@ -1,12 +1,12 @@
package forge.screens.deckeditor;
import javax.swing.SwingUtilities;
import forge.Singletons;
import forge.gui.framework.FScreen;
import forge.gui.framework.IVTopLevelUI;
import forge.screens.deckeditor.views.VCardCatalog;
import javax.swing.*;
/**
/**
* Top level view class; instantiates and assembles

30
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java
View File

@@ -17,15 +17,34 @@
*/
package forge.screens.deckeditor.controllers;
import java.awt.Toolkit;
import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
import java.util.List;
import java.util.Map.Entry;
import javax.swing.JMenu;
import javax.swing.JPopupMenu;
import javax.swing.KeyStroke;
import javax.swing.SwingUtilities;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import forge.deck.*;
import forge.deck.CardPool;
import forge.deck.Deck;
import forge.deck.DeckBase;
import forge.deck.DeckFormat;
import forge.deck.DeckSection;
import forge.game.GameType;
import forge.gui.GuiChoose;
import forge.gui.GuiUtils;
import forge.gui.UiCommand;
import forge.gui.framework.*;
import forge.gui.framework.DragCell;
import forge.gui.framework.FScreen;
import forge.gui.framework.ICDoc;
import forge.gui.framework.IVDoc;
import forge.gui.framework.SRearrangingUtil;
import forge.item.InventoryItem;
import forge.item.PaperCard;
import forge.itemmanager.CardManager;
@@ -49,13 +68,6 @@ import forge.util.ItemPool;
import forge.util.Localizer;
import forge.view.FView;
import javax.swing.*;
import java.awt.*;
import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
import java.util.List;
import java.util.Map.Entry;
/**
* Maintains a generically typed architecture for various editing
* environments. A basic editor instance requires a card catalog, the

8
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CDeckEditor.java
View File

@@ -1,13 +1,15 @@
package forge.screens.deckeditor.controllers;
import forge.deck.*;
import java.util.EnumSet;
import forge.deck.CardPool;
import forge.deck.DeckBase;
import forge.deck.DeckSection;
import forge.game.GameType;
import forge.gui.framework.FScreen;
import forge.item.PaperCard;
import forge.screens.match.controllers.CDetailPicture;
import java.util.*;
public abstract class CDeckEditor<TModel extends DeckBase> extends ACEditorBase<PaperCard, TModel> {
protected CDeckEditor(FScreen screen0, CDetailPicture cDetailPicture0, GameType gameType0) {
super(screen0, cDetailPicture0, gameType0);

12
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorCommander.java
View File

@@ -17,6 +17,12 @@
*/
package forge.screens.deckeditor.controllers;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayList;
import java.util.List;
import java.util.Map.Entry;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
import com.google.common.base.Supplier;
@@ -43,12 +49,6 @@ import forge.screens.match.controllers.CDetailPicture;
import forge.toolbox.FComboBox;
import forge.util.ItemPool;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayList;
import java.util.List;
import java.util.Map.Entry;
/**
* Child controller for constructed deck editor UI.
* This is the least restrictive mode;

12
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorConstructed.java
View File

@@ -17,6 +17,12 @@
*/
package forge.screens.deckeditor.controllers;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayList;
import java.util.List;
import java.util.Map.Entry;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
import com.google.common.base.Supplier;
@@ -41,12 +47,6 @@ import forge.toolbox.FComboBox;
import forge.util.ItemPool;
import forge.util.Localizer;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayList;
import java.util.List;
import java.util.Map.Entry;
/**
* Child controller for constructed deck editor UI.
* This is the least restrictive mode;

14
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorDraftingProcess.java
View File

@@ -17,6 +17,9 @@
*/
package forge.screens.deckeditor.controllers;
import java.util.HashSet;
import java.util.Map.Entry;
import forge.Singletons;
import forge.deck.Deck;
import forge.deck.DeckGroup;
@@ -31,16 +34,19 @@ import forge.itemmanager.CardManager;
import forge.itemmanager.ItemManagerConfig;
import forge.model.FModel;
import forge.screens.deckeditor.CDeckEditorUI;
import forge.screens.deckeditor.views.*;
import forge.screens.deckeditor.views.VAllDecks;
import forge.screens.deckeditor.views.VBrawlDecks;
import forge.screens.deckeditor.views.VCommanderDecks;
import forge.screens.deckeditor.views.VCurrentDeck;
import forge.screens.deckeditor.views.VDeckgen;
import forge.screens.deckeditor.views.VOathbreakerDecks;
import forge.screens.deckeditor.views.VTinyLeadersDecks;
import forge.screens.home.sanctioned.CSubmenuDraft;
import forge.screens.match.controllers.CDetailPicture;
import forge.toolbox.FOptionPane;
import forge.util.ItemPool;
import forge.util.Localizer;
import java.util.HashSet;
import java.util.Map.Entry;
/**
* Updates the deck editor UI as necessary draft selection mode.
*

21
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorLimited.java
View File

@@ -17,6 +17,14 @@
*/
package forge.screens.deckeditor.controllers;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Map.Entry;
import java.util.Set;
import com.google.common.base.Supplier;
import forge.card.CardEdition;
@@ -34,18 +42,19 @@ import forge.itemmanager.ItemManagerConfig;
import forge.model.FModel;
import forge.screens.deckeditor.AddBasicLandsDialog;
import forge.screens.deckeditor.SEditorIO;
import forge.screens.deckeditor.views.*;
import forge.screens.deckeditor.views.VAllDecks;
import forge.screens.deckeditor.views.VBrawlDecks;
import forge.screens.deckeditor.views.VCommanderDecks;
import forge.screens.deckeditor.views.VCurrentDeck;
import forge.screens.deckeditor.views.VDeckgen;
import forge.screens.deckeditor.views.VOathbreakerDecks;
import forge.screens.deckeditor.views.VTinyLeadersDecks;
import forge.screens.home.sanctioned.CSubmenuDraft;
import forge.screens.home.sanctioned.CSubmenuSealed;
import forge.screens.match.controllers.CDetailPicture;
import forge.toolbox.FComboBox;
import forge.util.storage.IStorage;
import java.util.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.Map.Entry;
/**
* Child controller for limited deck editor UI.
*

19
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java
View File

@@ -17,6 +17,16 @@
*/
package forge.screens.deckeditor.controllers;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import javax.swing.KeyStroke;
import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
@@ -54,15 +64,6 @@ import forge.screens.match.controllers.CDetailPicture;
import forge.toolbox.FComboBox;
import forge.util.ItemPool;
import javax.swing.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
/**
* Child controller for quest deck editor UI.
* <br><br>

20
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestCardShop.java
View File

@@ -17,6 +17,12 @@
*/
package forge.screens.deckeditor.controllers;
import java.text.DecimalFormat;
import java.text.NumberFormat;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
import forge.deck.DeckBase;
import forge.game.GameType;
import forge.gamemodes.quest.QuestController;
@@ -25,26 +31,24 @@ import forge.gamemodes.quest.QuestUtil;
import forge.gui.UiCommand;
import forge.gui.framework.DragCell;
import forge.gui.framework.FScreen;
import forge.item.*;
import forge.item.InventoryItem;
import forge.itemmanager.ColumnDef;
import forge.itemmanager.ItemManagerConfig;
import forge.itemmanager.SpellShopManager;
import forge.itemmanager.views.ItemTableColumn;
import forge.localinstance.assets.FSkinProp;
import forge.model.FModel;
import forge.screens.deckeditor.views.*;
import forge.screens.deckeditor.views.VAllDecks;
import forge.screens.deckeditor.views.VCardCatalog;
import forge.screens.deckeditor.views.VCurrentDeck;
import forge.screens.deckeditor.views.VDeckgen;
import forge.screens.deckeditor.views.VProbabilities;
import forge.screens.home.quest.CSubmenuQuestDecks;
import forge.screens.match.controllers.CDetailPicture;
import forge.toolbox.FLabel;
import forge.toolbox.FSkin;
import forge.util.ItemPool;
import java.text.DecimalFormat;
import java.text.NumberFormat;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
/**
* Child controller for quest card shop UI.
*

12
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestDraftingProcess.java
View File

@@ -17,6 +17,8 @@
*/
package forge.screens.deckeditor.controllers;
import java.util.Map.Entry;
import forge.deck.Deck;
import forge.deck.DeckGroup;
import forge.deck.DeckSection;
@@ -29,15 +31,19 @@ import forge.gui.framework.FScreen;
import forge.item.PaperCard;
import forge.itemmanager.CardManager;
import forge.itemmanager.ItemManagerConfig;
import forge.screens.deckeditor.views.*;
import forge.screens.deckeditor.views.VAllDecks;
import forge.screens.deckeditor.views.VBrawlDecks;
import forge.screens.deckeditor.views.VCommanderDecks;
import forge.screens.deckeditor.views.VCurrentDeck;
import forge.screens.deckeditor.views.VDeckgen;
import forge.screens.deckeditor.views.VOathbreakerDecks;
import forge.screens.deckeditor.views.VTinyLeadersDecks;
import forge.screens.home.quest.CSubmenuQuestDraft;
import forge.screens.home.quest.VSubmenuQuestDraft;
import forge.screens.match.controllers.CDetailPicture;
import forge.util.ItemPool;
import forge.util.Localizer;
import java.util.Map.Entry;
/**
* Updates the deck editor UI as necessary draft selection mode.
*

12
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestLimited.java
View File

@@ -17,6 +17,12 @@
*/
package forge.screens.deckeditor.controllers;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import com.google.common.base.Function;
import com.google.common.base.Supplier;
@@ -44,12 +50,6 @@ import forge.screens.deckeditor.views.VDeckgen;
import forge.screens.home.quest.CSubmenuQuestDecks;
import forge.screens.match.controllers.CDetailPicture;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
/**
* Child controller for quest deck editor UI.
* <br><br>

12
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorTokenViewer.java
View File

@@ -1,6 +1,9 @@
package forge.screens.deckeditor.controllers;
import java.util.List;
import java.util.Map;
import forge.deck.DeckBase;
import forge.game.GameType;
import forge.gui.framework.DragCell;
@@ -8,14 +11,15 @@ import forge.gui.framework.FScreen;
import forge.item.PaperToken;
import forge.itemmanager.TokenManager;
import forge.model.FModel;
import forge.screens.deckeditor.views.*;
import forge.screens.deckeditor.views.VAllDecks;
import forge.screens.deckeditor.views.VCardCatalog;
import forge.screens.deckeditor.views.VCurrentDeck;
import forge.screens.deckeditor.views.VDeckgen;
import forge.screens.deckeditor.views.VProbabilities;
import forge.screens.home.quest.CSubmenuQuestDecks;
import forge.screens.match.controllers.CDetailPicture;
import forge.util.Localizer;
import java.util.List;
import java.util.Map;
public class CEditorTokenViewer extends ACEditorBase<PaperToken, DeckBase> {
private DragCell allDecksParent = null;

4
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorVariant.java
View File

@@ -17,6 +17,8 @@
*/
package forge.screens.deckeditor.controllers;
import java.util.Map.Entry;
import com.google.common.base.Predicate;
import com.google.common.base.Supplier;
import com.google.common.collect.Iterables;
@@ -40,8 +42,6 @@ import forge.util.ItemPool;
import forge.util.Localizer;
import forge.util.storage.IStorage;
import java.util.Map.Entry;
/**
* Child controller for constructed deck editor UI.
* This is the least restrictive mode;

4
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorWinstonProcess.java
View File

@@ -17,6 +17,8 @@
*/
package forge.screens.deckeditor.controllers;
import java.util.Map.Entry;
import forge.Singletons;
import forge.card.MagicColor;
import forge.deck.CardPool;
@@ -45,8 +47,6 @@ import forge.toolbox.FOptionPane;
import forge.util.ItemPool;
import forge.util.MyRandom;
import java.util.Map.Entry;
/**
* Updates the deck editor UI as necessary draft selection mode.
*

24
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/DeckController.java
View File

@@ -17,28 +17,32 @@
*/
package forge.screens.deckeditor.controllers;
import forge.StaticData;
import forge.deck.*;
import forge.item.PaperCard;
import forge.util.ItemPool;
import forge.util.Localizer;
import java.util.Date;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
import com.google.common.base.Supplier;
import forge.StaticData;
import forge.deck.CardPool;
import forge.deck.Deck;
import forge.deck.DeckBase;
import forge.deck.DeckProxy;
import forge.deck.DeckSection;
import forge.item.PaperCard;
import forge.screens.deckeditor.menus.DeckFileMenu;
import forge.screens.deckeditor.views.VCurrentDeck;
import forge.screens.home.gauntlet.VSubmenuGauntletBuild;
import forge.screens.home.gauntlet.VSubmenuGauntletContests;
import forge.screens.home.gauntlet.VSubmenuGauntletQuick;
import forge.screens.home.sanctioned.VSubmenuConstructed;
import forge.util.ItemPool;
import forge.util.Localizer;
import forge.util.storage.IStorage;
import java.util.Date;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.Map;
public class DeckController<T extends DeckBase> {
private T model;
private boolean saved;

18
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/DeckHtmlSerializer.java
View File

@@ -1,5 +1,16 @@
package forge.screens.deckeditor.controllers;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.TreeMap;
import forge.deck.Deck;
import forge.item.PaperCard;
import forge.localinstance.properties.ForgeConstants;
@@ -9,13 +20,6 @@ import freemarker.template.DefaultObjectWrapper;
import freemarker.template.Template;
import freemarker.template.TemplateException;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.util.*;
import java.util.Map.Entry;
public class DeckHtmlSerializer {
public static void writeDeckHtml(final Deck d, final File f) {
try {

3
forge-gui-desktop/src/main/java/forge/screens/deckeditor/menus/CDeckEditorUIMenus.java
View File

@@ -1,9 +1,10 @@
package forge.screens.deckeditor.menus;
import javax.swing.*;
import java.util.ArrayList;
import java.util.List;
import javax.swing.JMenu;
/**
* Gets the menus associated with the Game screen.
*

13
forge-gui-desktop/src/main/java/forge/screens/deckeditor/menus/DeckFileMenu.java
View File

@@ -1,5 +1,12 @@
package forge.screens.deckeditor.menus;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyEvent;
import javax.swing.JMenu;
import javax.swing.JSeparator;
import forge.localinstance.assets.FSkinProp;
import forge.menus.MenuUtil;
import forge.screens.deckeditor.CDeckEditorUI;
@@ -7,12 +14,6 @@ import forge.screens.deckeditor.views.VCurrentDeck;
import forge.toolbox.FSkin.SkinnedMenuItem;
import forge.util.Localizer;
import javax.swing.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyEvent;
/**
* Returns a JMenu containing options associated with current game.
* <p>

4
forge-gui-desktop/src/main/java/forge/screens/deckeditor/views/VAllDecks.java
View File

@@ -1,5 +1,7 @@
package forge.screens.deckeditor.views;
import javax.swing.JPanel;
import forge.deck.io.DeckPreferences;
import forge.game.GameType;
import forge.gui.framework.DragCell;
@@ -13,8 +15,6 @@ import forge.screens.match.controllers.CDetailPicture;
import forge.util.Localizer;
import net.miginfocom.swing.MigLayout;
import javax.swing.*;
/**
* Assembles Swing components of all deck viewer in deck editor.
*

4
forge-gui-desktop/src/main/java/forge/screens/deckeditor/views/VBrawlDecks.java
View File

@@ -1,5 +1,7 @@
package forge.screens.deckeditor.views;
import javax.swing.JPanel;
import forge.deck.io.DeckPreferences;
import forge.game.GameType;
import forge.gui.framework.DragCell;
@@ -13,8 +15,6 @@ import forge.screens.match.controllers.CDetailPicture;
import forge.util.Localizer;
import net.miginfocom.swing.MigLayout;
import javax.swing.*;
/**
* Assembles Swing components of all deck viewer in deck editor.
*

4
forge-gui-desktop/src/main/java/forge/screens/deckeditor/views/VCardCatalog.java
View File

@@ -1,5 +1,7 @@
package forge.screens.deckeditor.views;
import javax.swing.JPanel;
import forge.gui.framework.DragCell;
import forge.gui.framework.DragTab;
import forge.gui.framework.EDocID;
@@ -11,8 +13,6 @@ import forge.screens.deckeditor.controllers.CCardCatalog;
import forge.util.Localizer;
import net.miginfocom.swing.MigLayout;
import javax.swing.*;
/**
* Assembles Swing components of card catalog in deck editor.
*

4
forge-gui-desktop/src/main/java/forge/screens/deckeditor/views/VCommanderDecks.java
View File

@@ -1,5 +1,7 @@
package forge.screens.deckeditor.views;
import javax.swing.JPanel;
import forge.deck.io.DeckPreferences;
import forge.game.GameType;
import forge.gui.framework.DragCell;
@@ -13,8 +15,6 @@ import forge.screens.match.controllers.CDetailPicture;
import forge.util.Localizer;
import net.miginfocom.swing.MigLayout;
import javax.swing.*;
/**
* Assembles Swing components of all deck viewer in deck editor.
*

4
forge-gui-desktop/src/main/java/forge/screens/deckeditor/views/VCurrentDeck.java
View File

@@ -3,8 +3,6 @@ package forge.screens.deckeditor.views;
import javax.swing.JPanel;
import javax.swing.SwingConstants;
import forge.util.Localizer;
import net.miginfocom.swing.MigLayout;
import forge.gui.framework.DragCell;
import forge.gui.framework.DragTab;
import forge.gui.framework.EDocID;
@@ -17,6 +15,8 @@ import forge.screens.deckeditor.controllers.CCurrentDeck;
import forge.toolbox.FLabel;
import forge.toolbox.FSkin;
import forge.toolbox.FTextField;
import forge.util.Localizer;
import net.miginfocom.swing.MigLayout;
/**
* Assembles Swing components of current deck being edited in deck editor.

4
forge-gui-desktop/src/main/java/forge/screens/deckeditor/views/VOathbreakerDecks.java
View File

@@ -1,5 +1,7 @@
package forge.screens.deckeditor.views;
import javax.swing.JPanel;
import forge.deck.io.DeckPreferences;
import forge.game.GameType;
import forge.gui.framework.DragCell;
@@ -13,8 +15,6 @@ import forge.screens.match.controllers.CDetailPicture;
import forge.util.Localizer;
import net.miginfocom.swing.MigLayout;
import javax.swing.*;
/**
* Assembles Swing components of all deck viewer in deck editor.
*

2
forge-gui-desktop/src/main/java/forge/screens/deckeditor/views/VProbabilities.java
View File

@@ -9,7 +9,6 @@ import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.SwingConstants;
import net.miginfocom.swing.MigLayout;
import forge.deck.DeckBase;
import forge.gui.framework.DragCell;
import forge.gui.framework.DragTab;
@@ -24,6 +23,7 @@ import forge.toolbox.FLabel;
import forge.toolbox.FScrollPane;
import forge.toolbox.FSkin;
import forge.util.Localizer;
import net.miginfocom.swing.MigLayout;
/**
* Assembles Swing components of deck editor analysis tab.

2
forge-gui-desktop/src/main/java/forge/screens/deckeditor/views/VStatistics.java
View File

@@ -4,7 +4,6 @@ import java.awt.Font;
import javax.swing.JPanel;
import net.miginfocom.swing.MigLayout;
import forge.gui.framework.DragCell;
import forge.gui.framework.DragTab;
import forge.gui.framework.EDocID;
@@ -16,6 +15,7 @@ import forge.toolbox.FScrollPane;
import forge.toolbox.FSkin;
import forge.toolbox.FSkin.SkinImage;
import forge.util.Localizer;
import net.miginfocom.swing.MigLayout;
/**
* Assembles Swing components of deck editor analysis tab.

4
forge-gui-desktop/src/main/java/forge/screens/deckeditor/views/VTinyLeadersDecks.java
View File

@@ -1,5 +1,7 @@
package forge.screens.deckeditor.views;
import javax.swing.JPanel;
import forge.deck.io.DeckPreferences;
import forge.game.GameType;
import forge.gui.framework.DragCell;
@@ -13,8 +15,6 @@ import forge.screens.match.controllers.CDetailPicture;
import forge.util.Localizer;
import net.miginfocom.swing.MigLayout;
import javax.swing.*;
/**
* Assembles Swing components of all deck viewer in deck editor.
*

11
forge-gui-desktop/src/main/java/forge/screens/home/LblGroup.java
View File

@@ -1,5 +1,12 @@
package forge.screens.home;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import forge.gui.framework.ILocalRepaint;
import forge.localinstance.properties.ForgePreferences.FPref;
import forge.model.FModel;
@@ -7,10 +14,6 @@ import forge.toolbox.FSkin;
import forge.toolbox.FSkin.SkinColor;
import forge.toolbox.FSkin.SkinnedLabel;
import java.awt.*;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
/**
* Custom JLabel for title of menu item groups.
* Handles repainting and listening for hover and click events.

9
forge-gui-desktop/src/main/java/forge/screens/home/LblHeader.java
View File

@@ -1,13 +1,14 @@
package forge.screens.home;
import java.awt.Graphics;
import java.awt.Graphics2D;
import javax.swing.border.EmptyBorder;
import forge.toolbox.FSkin;
import forge.toolbox.FSkin.SkinColor;
import forge.toolbox.FSkin.SkinnedLabel;
import javax.swing.border.EmptyBorder;
import java.awt.*;
/**
* Standardized header label for top of menu display panel.
*/

10
forge-gui-desktop/src/main/java/forge/screens/home/LblMenuItem.java
View File

@@ -1,15 +1,17 @@
package forge.screens.home;
import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import forge.gui.framework.ICDoc;
import forge.gui.framework.ILocalRepaint;
import forge.toolbox.FSkin;
import forge.toolbox.FSkin.SkinColor;
import forge.toolbox.FSkin.SkinnedLabel;
import java.awt.*;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
/**
* Custom JLabel for an item in the menu. Handles listening
* and repainting for hover and select events.

Some files were not shown because too many files have changed in this diff Show More