Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move translation classes into non-ui magic.translate package.

master
lodici 2015-08-06 09:49:09 +01:00
parent d11cc997a1
commit 107824818f
103 changed files with 117 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/magic/data/CardLegality.java
View File

@ -1,6 +1,6 @@
package magic.data;
import magic.ui.UiString;
import magic.translate.UiString;
public enum CardLegality {
Legal(CardLegalityStrings._S1),

2
src/magic/model/MagicPlayerZone.java
View File

@ -1,7 +1,7 @@
package magic.model;
import magic.data.MagicIcon;
import magic.ui.UiString;
import magic.translate.UiString;
public enum MagicPlayerZone {

4
src/magic/model/choice/MagicPlayChoice.java
View File

@ -17,8 +17,8 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import magic.model.IUIGameController;
import magic.ui.StringContext;
import magic.ui.UiString;
import magic.translate.StringContext;
import magic.translate.UiString;
public class MagicPlayChoice extends MagicChoice {

4
src/magic/model/player/AiProfile.java
View File

@ -2,8 +2,8 @@ package magic.model.player;
import java.util.Properties;
import magic.ai.MagicAIImpl;
import magic.ui.StringContext;
import magic.ui.UiString;
import magic.translate.StringContext;
import magic.translate.UiString;
public class AiProfile extends PlayerProfile {

2
src/magic/ui/StringContext.java → src/magic/translate/StringContext.java
View File

@ -1,4 +1,4 @@
package magic.ui;
package magic.translate;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;

3
src/magic/ui/UiString.java → src/magic/translate/UiString.java
View File

@ -1,5 +1,6 @@
package magic.ui;
package magic.translate;
import magic.translate.StringContext;
import groovy.json.StringEscapeUtils;
import java.io.File;
import java.io.FileInputStream;

2
src/magic/ui/CardFilterPanel.java
View File

@ -1,5 +1,7 @@
package magic.ui;
import magic.translate.UiString;
import magic.translate.StringContext;
import java.awt.Color;
import java.awt.Component;
import java.awt.Cursor;

1
src/magic/ui/CardFilterTextField.java
View File

@ -1,5 +1,6 @@
package magic.ui;
import magic.translate.UiString;
import java.awt.Color;
import java.awt.Font;
import java.awt.event.ActionEvent;

1
src/magic/ui/DuelDecksPanel.java
View File

@ -1,5 +1,6 @@
package magic.ui;
import magic.translate.UiString;
import java.awt.Color;
import java.awt.Component;
import java.awt.Dimension;

1
src/magic/ui/ImageDropTargetListener.java
View File

@ -1,5 +1,6 @@
package magic.ui;
import magic.translate.UiString;
import magic.ui.utility.GraphicsUtils;
import java.awt.datatransfer.DataFlavor;
import java.awt.datatransfer.Transferable;

1
src/magic/ui/ImportWorker.java
View File

@ -1,5 +1,6 @@
package magic.ui;
import magic.translate.UiString;
import java.io.File;
import java.io.FileFilter;
import java.io.IOException;

1
src/magic/ui/MagarenaDirectoryChooser.java
View File

@ -1,5 +1,6 @@
package magic.ui;
import magic.translate.UiString;
import java.nio.file.Path;
import javax.swing.JFileChooser;
import magic.utility.MagicFileSystem;

1
src/magic/ui/MagicFrame.java
View File

@ -1,5 +1,6 @@
package magic.ui;
import magic.translate.UiString;
import java.awt.Dimension;
import java.awt.Frame;
import java.awt.Toolkit;

1
src/magic/ui/ScreenController.java
View File

@ -1,5 +1,6 @@
package magic.ui;
import magic.translate.UiString;
import magic.ui.utility.MagicStyle;
import java.util.Stack;
import javax.swing.JComponent;

1
src/magic/ui/ScreenOptionsOverlay.java
View File

@ -1,5 +1,6 @@
package magic.ui;
import magic.translate.UiString;
import magic.ui.utility.MagicStyle;
import java.awt.Color;
import java.awt.Component;

2
src/magic/ui/SwingGameController.java
View File

@ -1,5 +1,7 @@
package magic.ui;
import magic.translate.UiString;
import magic.translate.StringContext;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.KeyEventDispatcher;

1
src/magic/ui/UiExceptionHandler.java
View File

@ -1,5 +1,6 @@
package magic.ui;
import magic.translate.UiString;
import magic.ui.utility.GraphicsUtils;
import java.awt.Component;
import java.awt.Desktop;

2
src/magic/ui/deck/editor/CardPoolViewPanel.java
View File

@ -18,7 +18,7 @@ import magic.model.MagicCardDefinition;
import magic.model.MagicDeck;
import magic.ui.MagicSound;
import magic.ui.ScreenController;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.cardtable.BasicDeckTablePanel;
import magic.ui.cardtable.CardTablePanel;
import magic.ui.dialog.RandomDeckGeneratorDialog;

2
src/magic/ui/deck/editor/CardQuantityActionPanel.java
View File

@ -8,7 +8,7 @@ import javax.swing.JPanel;
import javax.swing.SwingConstants;
import magic.data.MagicIcon;
import magic.ui.IconImages;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.screen.widget.ActionBarButton;
import magic.ui.widget.FontsAndBorders;
import net.miginfocom.swing.MigLayout;

4
src/magic/ui/deck/editor/CardsLegalityPanel.java
View File

@ -27,8 +27,8 @@ import magic.data.MagicIcon;
import magic.model.MagicCardDefinition;
import magic.model.MagicDeck;
import magic.ui.IconImages;
import magic.ui.UiString;
import magic.ui.StringContext;
import magic.translate.UiString;
import magic.translate.StringContext;
import magic.ui.widget.FontsAndBorders;
import net.miginfocom.swing.MigLayout;

2
src/magic/ui/deck/editor/DeckEditorScreenPanel.java
View File

@ -7,7 +7,7 @@ import magic.model.MagicCardDefinition;
import magic.model.MagicDeck;
import magic.model.MagicDeckConstructionRule;
import magic.ui.ScreenController;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.utility.GraphicsUtils;
import magic.utility.MagicSystem;
import net.miginfocom.swing.MigLayout;

2
src/magic/ui/deck/editor/DeckPanel.java
View File

@ -15,7 +15,7 @@ import magic.model.MagicCardDefinition;
import magic.model.MagicDeck;
import magic.ui.MagicSound;
import magic.ui.ScreenController;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.cardtable.CardTablePanel;
import magic.ui.cardtable.DeckTablePanel;
import magic.ui.screen.widget.ActionBarButton;

4
src/magic/ui/deck/editor/FilteredCardPoolPanel.java
View File

@ -9,9 +9,9 @@ import javax.swing.JTable;
import magic.model.MagicCardDefinition;
import magic.ui.CardFilterPanel;
import magic.ui.ICardFilterPanelListener;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.cardtable.CardTablePanel;
import magic.ui.StringContext;
import magic.translate.StringContext;
import net.miginfocom.swing.MigLayout;
@SuppressWarnings("serial")

2
src/magic/ui/deck/editor/FormatsLegalityPanel.java
View File

@ -21,7 +21,7 @@ import magic.data.MagicPredefinedFormat;
import magic.data.MagicIcon;
import magic.model.MagicDeck;
import magic.ui.IconImages;
import magic.ui.UiString;
import magic.translate.UiString;
import net.miginfocom.swing.MigLayout;
@SuppressWarnings("serial")

2
src/magic/ui/deck/editor/LegalityPanel.java
View File

@ -13,7 +13,7 @@ import magic.data.MagicIcon;
import magic.model.MagicCardDefinition;
import magic.model.MagicDeck;
import magic.ui.IconImages;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.cardtable.CardTablePanel;
import magic.ui.screen.widget.ActionBarButton;
import magic.ui.widget.TexturedPanel;

2
src/magic/ui/deck/editor/MainViewsPanel.java
View File

@ -11,7 +11,7 @@ import magic.model.MagicCardDefinition;
import magic.model.MagicDeck;
import magic.ui.MagicSound;
import magic.ui.ScreenController;
import magic.ui.UiString;
import magic.translate.UiString;
import net.miginfocom.swing.MigLayout;
@SuppressWarnings("serial")

2
src/magic/ui/dialog/AboutDialog.java
View File

@ -16,7 +16,7 @@ import magic.ui.IconImages;
import magic.ui.URLUtils;
import magic.ui.MagicFrame;
import magic.ui.ScreenController;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.dialog.button.SaveButton;
import magic.ui.widget.LinkLabel;
import magic.utility.MagicSystem;

2
src/magic/ui/dialog/AiPropertiesDialog.java
View File

@ -15,7 +15,7 @@ import magic.model.player.AiProfile;
import magic.model.player.PlayerProfile;
import magic.ui.MagicFrame;
import magic.ui.ScreenController;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.dialog.button.CancelButton;
import magic.ui.dialog.button.SaveButton;
import magic.ui.widget.SliderPanel;

2
src/magic/ui/dialog/DeckChooserDialog.java
View File

@ -16,7 +16,7 @@ import javax.swing.SwingUtilities;
import magic.data.DeckType;
import magic.firemind.FiremindJsonReader;
import magic.ui.ScreenController;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.dialog.button.CancelButton;
import magic.ui.dialog.button.SaveButton;
import magic.ui.widget.FontsAndBorders;

2
src/magic/ui/dialog/DecksFilterDialog.java
View File

@ -22,7 +22,7 @@ import javax.swing.SwingUtilities;
import javax.swing.text.NumberFormatter;
import magic.ui.MagicFrame;
import magic.ui.ScreenController;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.widget.FontsAndBorders;
import magic.ui.widget.deck.DeckFilter;
import magic.ui.widget.deck.DeckFilter.NumericFilter;

2
src/magic/ui/dialog/DownloadImagesDialog.java
View File

@ -24,7 +24,7 @@ import javax.swing.SwingUtilities;
import magic.model.MagicCardDefinition;
import magic.ui.MagicFrame;
import magic.ui.ScreenController;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.dialog.button.CancelButton;
import magic.ui.widget.FontsAndBorders;
import magic.ui.widget.downloader.HQImagesDownloadPanel;

2
src/magic/ui/dialog/DuelPropertiesDialog.java
View File

@ -15,7 +15,7 @@ import javax.swing.JPanel;
import magic.data.MagicFormat;
import magic.ui.MagicFrame;
import magic.ui.ScreenController;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.dialog.button.CancelButton;
import magic.ui.dialog.button.SaveButton;
import magic.ui.widget.SliderPanel;

2
src/magic/ui/dialog/DuelSidebarLayoutDialog.java
View File

@ -13,7 +13,7 @@ import javax.swing.ListSelectionModel;
import magic.data.GeneralConfig;
import magic.model.IUIGameController;
import magic.ui.MagicFrame;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.theme.Theme;
import magic.ui.utility.MagicStyle;
import magic.ui.dialog.button.CancelButton;

1
src/magic/ui/dialog/FiremindWorkerDialog.java
View File

@ -1,5 +1,6 @@
package magic.ui.dialog;
import magic.translate.UiString;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyEvent;

2
src/magic/ui/dialog/RandomDeckGeneratorDialog.java
View File

@ -13,7 +13,7 @@ import javax.swing.event.ChangeListener;
import magic.data.DeckGenerator;
import magic.ui.MagicFrame;
import magic.ui.ScreenController;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.dialog.button.CancelButton;
import magic.ui.dialog.button.SaveButton;
import magic.ui.widget.FontsAndBorders;

2
src/magic/ui/dialog/button/CancelButton.java
View File

@ -2,7 +2,7 @@ package magic.ui.dialog.button;
import magic.data.MagicIcon;
import magic.ui.IconImages;
import magic.ui.UiString;
import magic.translate.UiString;
@SuppressWarnings("serial")
public class CancelButton extends MagicDialogButton {

2
src/magic/ui/dialog/button/SaveButton.java
View File

@ -2,7 +2,7 @@ package magic.ui.dialog.button;
import magic.data.MagicIcon;
import magic.ui.IconImages;
import magic.ui.UiString;
import magic.translate.UiString;
@SuppressWarnings("serial")
public class SaveButton extends MagicDialogButton {

2
src/magic/ui/duel/choice/ColorChoicePanel.java
View File

@ -12,7 +12,7 @@ import magic.model.MagicColor;
import magic.model.MagicSource;
import magic.ui.IconImages;
import magic.ui.SwingGameController;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.duel.viewer.UserActionPanel;
import magic.ui.widget.FontsAndBorders;
import magic.ui.widget.TextLabel;

2
src/magic/ui/duel/choice/ManaCostXChoicePanel.java
View File

@ -12,7 +12,7 @@ import magic.model.IGameController;
import magic.model.MagicSource;
import magic.ui.IconImages;
import magic.ui.SwingGameController;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.duel.viewer.UserActionPanel;
import magic.ui.widget.FontsAndBorders;
import magic.ui.widget.TextLabel;

2
src/magic/ui/duel/choice/MayChoicePanel.java
View File

@ -14,7 +14,7 @@ import magic.model.IGameController;
import magic.model.MagicSource;
import magic.ui.IconImages;
import magic.ui.SwingGameController;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.duel.viewer.UserActionPanel;
import magic.ui.widget.FontsAndBorders;
import magic.ui.widget.TextLabel;

2
src/magic/ui/duel/choice/ModeChoicePanel.java
View File

@ -12,7 +12,7 @@ import javax.swing.JPanel;
import magic.model.IGameController;
import magic.model.MagicSource;
import magic.ui.SwingGameController;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.duel.viewer.UserActionPanel;
import magic.ui.widget.FontsAndBorders;
import magic.ui.widget.TextLabel;

2
src/magic/ui/duel/choice/MultiKickerChoicePanel.java
View File

@ -13,7 +13,7 @@ import magic.model.MagicManaCost;
import magic.model.MagicSource;
import magic.ui.IconImages;
import magic.ui.SwingGameController;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.duel.viewer.UserActionPanel;
import magic.ui.widget.FontsAndBorders;
import magic.ui.widget.TextLabel;

2
src/magic/ui/duel/choice/PlayChoicePanel.java
View File

@ -13,7 +13,7 @@ import magic.model.IGameController;
import magic.model.MagicSource;
import magic.model.choice.MagicPlayChoiceResult;
import magic.ui.SwingGameController;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.duel.viewer.UserActionPanel;
import magic.ui.widget.FontsAndBorders;
import magic.ui.widget.TextLabel;

2
src/magic/ui/duel/dialog/EndGameMessagePanel.java
View File

@ -9,7 +9,7 @@ import magic.model.MagicGame;
import magic.model.MagicPlayer;
import magic.ui.SwingGameController;
import magic.ui.IconImages;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.theme.Theme;
import magic.ui.widget.FontsAndBorders;
import magic.ui.widget.TexturedPanel;

2
src/magic/ui/duel/viewer/DeckDescriptionViewer.java
View File

@ -11,7 +11,7 @@ import javax.swing.JScrollPane;
import javax.swing.JTextArea;
import magic.model.MagicDeck;
import magic.model.DuelPlayerConfig;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.theme.ThemeFactory;
import magic.ui.widget.FontsAndBorders;
import magic.ui.widget.TexturedPanel;

2
src/magic/ui/duel/viewer/DeckStatisticsViewer.java
View File

@ -17,7 +17,7 @@ import magic.model.DuelPlayerConfig;
import magic.model.MagicColor;
import magic.model.MagicDeck;
import magic.ui.IconImages;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.theme.ThemeFactory;
import magic.ui.widget.FontsAndBorders;
import magic.ui.widget.TexturedPanel;

2
src/magic/ui/duel/viewer/LogBookViewer.java
View File

@ -19,7 +19,7 @@ import magic.data.GeneralConfig;
import magic.model.MagicLogBook;
import magic.model.MagicMessage;
import magic.ui.ScreenController;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.widget.FontsAndBorders;
import magic.ui.widget.MessagePanel;
import magic.ui.widget.TitleBar;

2
src/magic/ui/duel/viewer/NewTurnPanel.java
View File

@ -6,7 +6,7 @@ import javax.swing.JLabel;
import javax.swing.JPanel;
import magic.model.MagicGame;
import magic.ui.IconImages;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.utility.MagicStyle;
import magic.ui.theme.Theme;
import net.miginfocom.swing.MigLayout;

2
src/magic/ui/duel/viewer/PhaseStepViewer.java
View File

@ -6,7 +6,7 @@ import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.SwingConstants;
import magic.model.phase.MagicPhaseType;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.utility.MagicStyle;
import net.miginfocom.swing.MigLayout;

4
src/magic/ui/duel/viewer/PlayerZoneViewer.java
View File

@ -13,8 +13,8 @@ import javax.swing.event.ChangeListener;
import java.awt.BorderLayout;
import magic.model.MagicPlayerZone;
import magic.ui.ScreenController;
import magic.ui.StringContext;
import magic.ui.UiString;
import magic.translate.StringContext;
import magic.translate.UiString;
import magic.ui.utility.MagicStyle;
@SuppressWarnings("serial")

2
src/magic/ui/duel/viewer/StackViewer.java
View File

@ -18,7 +18,7 @@ import javax.swing.ScrollPaneConstants;
import javax.swing.Scrollable;
import javax.swing.SwingUtilities;
import magic.ui.SwingGameController;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.theme.ThemeFactory;
import magic.ui.widget.FontsAndBorders;
import magic.ui.widget.PanelButton;

4
src/magic/ui/duel/viewer/TurnTitlePanel.java
View File

@ -16,10 +16,10 @@ import javax.swing.SwingUtilities;
import magic.data.MagicIcon;
import magic.model.MagicGame;
import magic.ui.IconImages;
import magic.ui.StringContext;
import magic.translate.StringContext;
import magic.ui.utility.MagicStyle;
import magic.ui.SwingGameController;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.screen.interfaces.IOptionsMenu;
import magic.ui.screen.widget.ActionBarButton;
import magic.ui.theme.Theme;

2
src/magic/ui/explorer/CardDecksPanel.java
View File

@ -27,7 +27,7 @@ import magic.utility.DeckUtils;
import magic.model.MagicCardDefinition;
import magic.model.MagicDeck;
import magic.ui.ScreenController;
import magic.ui.UiString;
import magic.translate.UiString;
import net.miginfocom.swing.MigLayout;
import static magic.utility.DeckUtils.DECK_EXTENSION;
import static magic.utility.DeckUtils.getDeckFolder;

2
src/magic/ui/explorer/CardPanel.java
View File

@ -12,7 +12,7 @@ import javax.swing.ScrollPaneConstants;
import magic.data.GeneralConfig;
import magic.model.MagicCardDefinition;
import magic.ui.CardImagesProvider;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.duel.viewer.CardViewer;
import magic.ui.utility.GraphicsUtils;
import net.miginfocom.swing.MigLayout;

2
src/magic/ui/explorer/ExplorerPanel.java
View File

@ -19,7 +19,7 @@ import magic.ui.CardFilterPanel;
import magic.ui.utility.GraphicsUtils;
import magic.ui.ICardFilterPanelListener;
import magic.ui.ScreenController;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.cardtable.CardTable;
import magic.ui.cardtable.ICardSelectionListener;
import magic.utility.MagicSystem;

4
src/magic/ui/player/AiPlayerJList.java
View File

@ -2,8 +2,8 @@ package magic.ui.player;
import magic.model.player.AiProfile;
import magic.model.player.PlayerProfile;
import magic.ui.StringContext;
import magic.ui.UiString;
import magic.translate.StringContext;
import magic.translate.UiString;
@SuppressWarnings("serial")
public class AiPlayerJList extends PlayersJList {

4
src/magic/ui/player/DuelPlayerDeckPanel.java
View File

@ -11,8 +11,8 @@ import javax.swing.SwingConstants;
import magic.data.DeckType;
import magic.model.MagicColor;
import magic.model.MagicDeckProfile;
import magic.ui.StringContext;
import magic.ui.UiString;
import magic.translate.StringContext;
import magic.translate.UiString;
import magic.ui.utility.GraphicsUtils;
import magic.ui.dialog.DeckChooserDialog;
import magic.ui.screen.interfaces.IThemeStyle;

4
src/magic/ui/player/PlayerMiniStatsPanel.java
View File

@ -7,8 +7,8 @@ import javax.swing.JPanel;
import javax.swing.SwingConstants;
import javax.swing.border.Border;
import magic.model.player.PlayerStatistics;
import magic.ui.StringContext;
import magic.ui.UiString;
import magic.translate.StringContext;
import magic.translate.UiString;
import magic.ui.widget.FontsAndBorders;
import net.miginfocom.swing.MigLayout;

2
src/magic/ui/player/PlayerStatsPanel.java
View File

@ -4,7 +4,7 @@ import java.awt.Color;
import javax.swing.JLabel;
import javax.swing.JPanel;
import magic.model.player.PlayerStatistics;
import magic.ui.UiString;
import magic.translate.UiString;
import net.miginfocom.swing.MigLayout;
@SuppressWarnings("serial")

2
src/magic/ui/prefs/PreferencesDialog.java
View File

@ -42,7 +42,7 @@ import javax.swing.event.ChangeListener;
import javax.swing.text.NumberFormatter;
import magic.data.GeneralConfig;
import magic.data.MagicIcon;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.CachedImagesProvider;
import magic.ui.IconImages;
import magic.ui.URLUtils;

2
src/magic/ui/prefs/TranslationPanel.java
View File

@ -25,7 +25,7 @@ import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import javax.swing.SwingUtilities;
import magic.data.GeneralConfig;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.exception.DesktopNotSupportedException;
import magic.ui.ScreenController;
import magic.ui.URLUtils;

2
src/magic/ui/screen/AvatarImagesScreen.java
View File

@ -51,7 +51,7 @@ import magic.ui.theme.PlayerAvatar;
import magic.ui.theme.Theme;
import magic.ui.utility.GraphicsUtils;
import magic.ui.ImageFileIO;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.widget.FontsAndBorders;
import magic.ui.widget.TexturedPanel;
import magic.utility.MagicFileSystem;

2
src/magic/ui/screen/CardExplorerScreen.java
View File

@ -18,7 +18,7 @@ import magic.data.MagicSetDefinitions;
import magic.ui.explorer.ExplorerPanel;
import magic.ui.MagicFrame;
import magic.ui.ScreenOptionsOverlay;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.dialog.DownloadImagesDialog;
import magic.ui.screen.interfaces.IActionBar;
import magic.ui.screen.interfaces.IOptionsMenu;

2
src/magic/ui/screen/CardScriptScreen.java
View File

@ -24,7 +24,7 @@ import magic.exception.DesktopNotSupportedException;
import magic.model.MagicCardDefinition;
import magic.ui.utility.DesktopUtils;
import magic.ui.ScreenController;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.screen.interfaces.IActionBar;
import magic.ui.screen.interfaces.IStatusBar;
import magic.ui.screen.interfaces.IWikiPage;

2
src/magic/ui/screen/CardZoneScreen.java
View File

@ -13,7 +13,7 @@ import java.awt.Dimension;
import java.util.Collections;
import java.util.List;
import magic.ui.CardImagesProvider;
import magic.ui.UiString;
import magic.translate.UiString;
@SuppressWarnings("serial")
public class CardZoneScreen

2
src/magic/ui/screen/DeckEditorScreen.java
View File

@ -23,7 +23,7 @@ import magic.ui.MagicFileChoosers;
import magic.ui.MagicFrame;
import magic.ui.ScreenController;
import magic.ui.ScreenOptionsOverlay;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.dialog.DownloadImagesDialog;
import magic.ui.deck.editor.DeckEditorScreenPanel;
import magic.ui.deck.editor.IDeckEditorListener;

4
src/magic/ui/screen/DeckTiledCardsScreen.java
View File

@ -27,8 +27,8 @@ import java.util.List;
import java.util.Set;
import magic.data.MagicIcon;
import magic.ui.CardImagesProvider;
import magic.ui.UiString;
import magic.ui.StringContext;
import magic.translate.UiString;
import magic.translate.StringContext;
@SuppressWarnings("serial")
public class DeckTiledCardsScreen

2
src/magic/ui/screen/DeckViewScreen.java
View File

@ -12,7 +12,7 @@ import magic.model.MagicCardDefinition;
import magic.ui.IconImages;
import magic.model.MagicDeck;
import magic.ui.ScreenController;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.screen.interfaces.IActionBar;
import magic.ui.screen.interfaces.IDeckConsumer;
import magic.ui.screen.interfaces.IStatusBar;

2
src/magic/ui/screen/DecksScreen.java
View File

@ -15,7 +15,7 @@ import magic.data.MagicIcon;
import magic.ui.IconImages;
import magic.model.MagicDeck;
import magic.ui.ScreenController;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.cardtable.CardTable;
import magic.ui.dialog.DecksFilterDialog;
import magic.ui.screen.interfaces.IActionBar;

2
src/magic/ui/screen/DuelDecksScreen.java
View File

@ -18,7 +18,7 @@ import magic.ui.IconImages;
import magic.ui.MagicFrame;
import magic.ui.ScreenController;
import magic.ui.ScreenOptionsOverlay;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.screen.interfaces.IActionBar;
import magic.ui.screen.interfaces.IOptionsMenu;
import magic.ui.screen.interfaces.IStatusBar;

2
src/magic/ui/screen/DuelGameScreen.java
View File

@ -11,7 +11,7 @@ import magic.model.MagicGame;
import magic.ui.MagicFrame;
import magic.ui.ScreenController;
import magic.ui.ScreenOptionsOverlay;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.duel.DuelLayeredPane;
import magic.ui.duel.DuelPanel;
import magic.ui.screen.interfaces.IOptionsMenu;

2
src/magic/ui/screen/GameLogScreen.java
View File

@ -11,7 +11,7 @@ import magic.data.MagicIcon;
import magic.ui.utility.DesktopUtils;
import magic.ui.IconImages;
import magic.ui.ScreenController;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.screen.interfaces.IStatusBar;
import magic.ui.screen.widget.ActionBarButton;
import magic.ui.screen.widget.MenuButton;

2
src/magic/ui/screen/HelpMenuScreen.java
View File

@ -6,7 +6,7 @@ import javax.swing.JLabel;
import javax.swing.JPanel;
import magic.ui.ScreenController;
import magic.ui.URLUtils;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.screen.widget.MenuPanel;
import magic.ui.widget.KeysStripPanel;
import net.miginfocom.swing.MigLayout;

2
src/magic/ui/screen/ImportScreen.java
View File

@ -18,7 +18,7 @@ import magic.ui.ImportWorker;
import magic.ui.MagarenaDirectoryChooser;
import magic.ui.ScreenController;
import magic.ui.URLUtils;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.screen.widget.MenuButton;
import magic.ui.screen.widget.MenuPanel;
import magic.ui.theme.ThemeFactory;

2
src/magic/ui/screen/KeywordsScreen.java
View File

@ -14,7 +14,7 @@ import javax.swing.Scrollable;
import javax.swing.SwingUtilities;
import magic.data.KeywordDefinitions.KeywordDefinition;
import magic.data.KeywordDefinitions;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.screen.interfaces.IActionBar;
import magic.ui.screen.interfaces.IStatusBar;
import magic.ui.screen.widget.MenuButton;

2
src/magic/ui/screen/MainMenuScreen.java
View File

@ -13,7 +13,7 @@ import magic.game.state.GameLoader;
import magic.game.state.GameStateFileReader;
import magic.ui.IconImages;
import magic.ui.ScreenController;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.screen.interfaces.IWikiPage;
import magic.ui.screen.widget.ActionBarButton;
import magic.ui.screen.widget.MenuPanel;

2
src/magic/ui/screen/MulliganScreen.java
View File

@ -19,7 +19,7 @@ import magic.model.MagicPlayer;
import magic.ui.CardImagesProvider;
import magic.ui.IconImages;
import magic.ui.ScreenController;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.canvas.cards.CardsCanvas.LayoutMode;
import magic.ui.canvas.cards.CardsCanvas;
import magic.ui.duel.choice.MulliganChoicePanel;

2
src/magic/ui/screen/NewDuelSettingsScreen.java
View File

@ -19,7 +19,7 @@ import magic.model.player.PlayerProfiles;
import magic.ui.utility.GraphicsUtils;
import magic.ui.MagicFrame;
import magic.ui.ScreenController;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.screen.interfaces.IActionBar;
import magic.ui.screen.interfaces.IStatusBar;
import magic.ui.screen.interfaces.IWikiPage;

2
src/magic/ui/screen/SampleHandScreen.java
View File

@ -15,7 +15,7 @@ import magic.model.MagicDeck;
import magic.model.MagicRandom;
import magic.ui.CardImagesProvider;
import magic.ui.IconImages;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.canvas.cards.CardsCanvas.LayoutMode;
import magic.ui.canvas.cards.CardsCanvas;
import magic.ui.screen.interfaces.IActionBar;

2
src/magic/ui/screen/SelectAiPlayerScreen.java
View File

@ -10,7 +10,7 @@ import magic.model.player.AiProfile;
import magic.model.player.IPlayerProfileListener;
import magic.model.player.PlayerProfile;
import magic.model.player.PlayerProfiles;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.dialog.AiPropertiesDialog;
import magic.ui.player.AiPlayerJList;
import magic.ui.screen.interfaces.IStatusBar;

2
src/magic/ui/screen/SelectHumanPlayerScreen.java
View File

@ -11,7 +11,7 @@ import magic.model.player.HumanProfile;
import magic.model.player.IPlayerProfileListener;
import magic.model.player.PlayerProfile;
import magic.model.player.PlayerProfiles;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.player.HumanPlayerJList;
import magic.ui.screen.interfaces.IStatusBar;

2
src/magic/ui/screen/SelectPlayerScreen.java
View File

@ -28,7 +28,7 @@ import magic.model.player.PlayerProfile;
import magic.model.player.PlayerProfiles;
import magic.ui.IconImages;
import magic.ui.ScreenController;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.screen.interfaces.IActionBar;
import magic.ui.screen.interfaces.IAvatarImageConsumer;
import magic.ui.screen.interfaces.IThemeStyle;

2
src/magic/ui/screen/SettingsMenuScreen.java
View File

@ -6,7 +6,7 @@ import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.SwingUtilities;
import magic.data.GeneralConfig;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.ScreenController;
import magic.ui.dialog.DownloadImagesDialog;
import magic.ui.dialog.FiremindWorkerDialog;

2
src/magic/ui/screen/StartScreen.java
View File

@ -8,7 +8,7 @@ import javax.swing.JPanel;
import javax.swing.SwingUtilities;
import magic.data.GeneralConfig;
import magic.ui.ScreenController;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.screen.widget.MenuPanel;
import magic.utility.MagicFileSystem;
import magic.utility.MagicSystem;

2
src/magic/ui/screen/TextFileReaderScreen.java
View File

@ -6,7 +6,7 @@ import java.util.List;
import javax.swing.JScrollPane;
import javax.swing.JTextArea;
import javax.swing.SwingUtilities;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.screen.interfaces.IActionBar;
import magic.ui.screen.widget.MenuButton;
import magic.ui.widget.FontsAndBorders;

4
src/magic/ui/screen/widget/CaptionPanel.java
View File

@ -16,8 +16,8 @@ import java.awt.event.ActionEvent;
import magic.data.GeneralConfig;
import magic.data.MagicIcon;
import magic.ui.ScreenController;
import magic.ui.StringContext;
import magic.ui.UiString;
import magic.translate.StringContext;
import magic.translate.UiString;
@SuppressWarnings("serial")
public class CaptionPanel extends JPanel {

2
src/magic/ui/screen/widget/DuelSettingsPanel.java
View File

@ -13,7 +13,7 @@ import magic.data.MagicFormat;
import magic.ui.utility.GraphicsUtils;
import magic.ui.IconImages;
import magic.ui.MagicFrame;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.dialog.DuelPropertiesDialog;
import magic.ui.screen.interfaces.IThemeStyle;
import magic.ui.theme.Theme;

2
src/magic/ui/screen/widget/SampleHandActionButton.java
View File

@ -6,7 +6,7 @@ import magic.data.MagicIcon;
import magic.model.MagicDeck;
import magic.ui.IconImages;
import magic.ui.ScreenController;
import magic.ui.UiString;
import magic.translate.UiString;
@SuppressWarnings("serial")
public final class SampleHandActionButton extends ActionBarButton {

2
src/magic/ui/screen/widget/StatusBar.java
View File

@ -9,7 +9,7 @@ import javax.swing.JLabel;
import javax.swing.JPanel;
import magic.data.MagicIcon;
import magic.ui.IconImages;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.screen.AbstractScreen;
import magic.ui.screen.interfaces.IOptionsMenu;
import magic.ui.screen.interfaces.IStatusBar;

2
src/magic/ui/utility/DesktopUtils.java
View File

@ -4,7 +4,7 @@ import java.awt.Desktop;
import java.io.File;
import java.io.IOException;
import magic.exception.DesktopNotSupportedException;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.utility.MagicFileSystem;
import static magic.utility.MagicFileSystem.getDataPath;
import magic.utility.MagicSystem;

2
src/magic/ui/widget/ColorButton.java
View File

@ -9,7 +9,7 @@ import java.awt.event.MouseEvent;
import javax.swing.AbstractAction;
import javax.swing.JButton;
import javax.swing.JColorChooser;
import magic.ui.UiString;
import magic.translate.UiString;
@SuppressWarnings("serial")
public class ColorButton extends JButton {

2
src/magic/ui/widget/DirectoryChooser.java
View File

@ -13,7 +13,7 @@ import javax.swing.JFileChooser;
import javax.swing.JPanel;
import javax.swing.JTextField;
import magic.ui.ScreenController;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.utility.DesktopUtils;
import net.miginfocom.swing.MigLayout;

2
src/magic/ui/widget/KeysStripPanel.java
View File

@ -3,7 +3,7 @@ package magic.ui.widget;
import java.awt.Color;
import java.awt.Dimension;
import javax.swing.JLabel;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.screen.interfaces.IThemeStyle;
import magic.ui.theme.Theme;
import magic.ui.utility.MagicStyle;

2
src/magic/ui/widget/alerter/MissingImagesAlertButton.java
View File

@ -6,7 +6,7 @@ import javax.swing.SwingUtilities;
import magic.data.CardDefinitions;
import magic.data.GeneralConfig;
import magic.ui.ScreenController;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.dialog.DownloadImagesDialog;
@SuppressWarnings("serial")

2
src/magic/ui/widget/alerter/NewVersionAlertButton.java
View File

@ -8,7 +8,7 @@ import magic.data.GeneralConfig;
import magic.ui.URLUtils;
import magic.data.json.NewVersionJsonParser;
import magic.ui.ScreenController;
import magic.ui.UiString;
import magic.translate.UiString;
@SuppressWarnings("serial")
public class NewVersionAlertButton extends AlertButton {

2
src/magic/ui/widget/deck/DeckFilter.java
View File

@ -2,7 +2,7 @@ package magic.ui.widget.deck;
import magic.model.MagicCardDefinition;
import magic.model.MagicDeck;
import magic.ui.UiString;
import magic.translate.UiString;
public class DeckFilter {

2
src/magic/ui/widget/deck/DeckPicker.java
View File

@ -33,7 +33,7 @@ import magic.exception.InvalidDeckException;
import magic.firemind.FiremindJsonReader;
import magic.model.MagicDeck;
import magic.ui.ScreenController;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.dialog.DecksFilterDialog;
import magic.ui.screen.interfaces.IDeckConsumer;
import magic.ui.theme.Theme;

2
src/magic/ui/widget/deck/DeckStatusPanel.java
View File

@ -6,7 +6,7 @@ import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.SwingConstants;
import magic.model.MagicDeck;
import magic.ui.UiString;
import magic.translate.UiString;
import net.miginfocom.swing.MigLayout;
@SuppressWarnings("serial")

2
src/magic/ui/widget/downloader/ImageDownloadPanel.java
View File

@ -27,7 +27,7 @@ import magic.data.GeneralConfig;
import magic.data.MagicIcon;
import magic.ui.IconImages;
import magic.model.MagicCardDefinition;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.dialog.IImageDownloadListener;
import magic.utility.MagicFileSystem;
import magic.utility.MagicFileSystem.DataPath;

2
src/magic/ui/widget/downloader/PlayableDownloadPanel.java
View File

@ -8,7 +8,7 @@ import javax.swing.SwingUtilities;
import magic.data.CardDefinitions;
import magic.data.GeneralConfig;
import magic.model.MagicCardDefinition;
import magic.ui.UiString;
import magic.translate.UiString;
import magic.ui.dialog.IImageDownloadListener;
import magic.utility.MagicFileSystem;

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