diff --git a/src/main/java/forge/gui/DialogMigrateProfile.java b/src/main/java/forge/gui/ImportDialog.java similarity index 99% rename from src/main/java/forge/gui/DialogMigrateProfile.java rename to src/main/java/forge/gui/ImportDialog.java index 3e08583cab5..424c7b244a9 100644 --- a/src/main/java/forge/gui/DialogMigrateProfile.java +++ b/src/main/java/forge/gui/ImportDialog.java @@ -58,7 +58,7 @@ import org.apache.commons.lang3.tuple.Pair; import forge.Command; import forge.error.BugReporter; -import forge.gui.MigrationSourceAnalyzer.OpType; +import forge.gui.ImportSourceAnalyzer.OpType; import forge.gui.toolbox.FButton; import forge.gui.toolbox.FCheckBox; import forge.gui.toolbox.FLabel; @@ -75,7 +75,7 @@ import forge.properties.NewConstants; * into the correct locations in the user and cache directories. There is a lot of I/O and data * processing done in this class, so most operations are asynchronous. */ -public class DialogMigrateProfile { +public class ImportDialog { private final FButton _btnStart; private final FButton _btnCancel; private final FLabel _btnChooseDir; @@ -86,7 +86,7 @@ public class DialogMigrateProfile { private volatile boolean _cancel; @SuppressWarnings("serial") - public DialogMigrateProfile(String forcedSrcDir, final Runnable onDialogClose) { + public ImportDialog(String forcedSrcDir, final Runnable onDialogClose) { _topPanel = new FPanel(new MigLayout("insets dialog, gap 0, center, wrap, fill")); _topPanel.setOpaque(false); _topPanel.setBackgroundTexture(FSkin.getIcon(FSkin.Backgrounds.BG_TEXTURE)); @@ -476,7 +476,7 @@ public class DialogMigrateProfile { selections.put(entry.getKey(), entry.getValue().getRight()); } - MigrationSourceAnalyzer.AnalysisCallback cb = new MigrationSourceAnalyzer.AnalysisCallback() { + ImportSourceAnalyzer.AnalysisCallback cb = new ImportSourceAnalyzer.AnalysisCallback() { @Override public boolean checkCancel() { return _cancel; } @@ -487,7 +487,7 @@ public class DialogMigrateProfile { } }; - final MigrationSourceAnalyzer msa = new MigrationSourceAnalyzer(_srcDir, cb); + final ImportSourceAnalyzer msa = new ImportSourceAnalyzer(_srcDir, cb); final int numFilesToAnalyze = msa.getNumFilesToAnalyze(); // update only once every half-second so we're not flooding the UI with updates diff --git a/src/main/java/forge/gui/MigrationSourceAnalyzer.java b/src/main/java/forge/gui/ImportSourceAnalyzer.java similarity index 99% rename from src/main/java/forge/gui/MigrationSourceAnalyzer.java rename to src/main/java/forge/gui/ImportSourceAnalyzer.java index f471d9fdf9f..7643a95d6f8 100644 --- a/src/main/java/forge/gui/MigrationSourceAnalyzer.java +++ b/src/main/java/forge/gui/ImportSourceAnalyzer.java @@ -39,7 +39,7 @@ import forge.item.IPaperCard; import forge.properties.NewConstants; import forge.util.FileUtil; -public class MigrationSourceAnalyzer { +public class ImportSourceAnalyzer { public static enum OpType { CONSTRUCTED_DECK, DRAFT_DECK, @@ -69,7 +69,7 @@ public class MigrationSourceAnalyzer { private int _numFilesAnalyzed; - public MigrationSourceAnalyzer(String source, AnalysisCallback cb) { + public ImportSourceAnalyzer(String source, AnalysisCallback cb) { _source = new File(source); _cb = cb; diff --git a/src/main/java/forge/gui/home/settings/CSubmenuDownloaders.java b/src/main/java/forge/gui/home/settings/CSubmenuDownloaders.java index 6e4cbb21d03..3a2f10aef2f 100644 --- a/src/main/java/forge/gui/home/settings/CSubmenuDownloaders.java +++ b/src/main/java/forge/gui/home/settings/CSubmenuDownloaders.java @@ -4,7 +4,7 @@ import javax.swing.SwingUtilities; import forge.Command; import forge.error.BugReporter; -import forge.gui.DialogMigrateProfile; +import forge.gui.ImportDialog; import forge.gui.download.GuiDownloadPicturesLQ; import forge.gui.download.GuiDownloadPrices; import forge.gui.download.GuiDownloadQuestImages; @@ -34,7 +34,7 @@ public enum CSubmenuDownloaders implements ICDoc { private final Command cmdHowToPlay = new Command() { @Override public void execute() { VSubmenuDownloaders.SINGLETON_INSTANCE.showHowToPlay(); } }; private final Command cmdImportPictures = new Command() { @Override - public void execute() { new DialogMigrateProfile(null, null); } }; + public void execute() { new ImportDialog(null, null); } }; private final Command cmdReportBug = new Command() { @Override public void execute() { BugReporter.reportBug(null); } }; diff --git a/src/main/java/forge/view/FView.java b/src/main/java/forge/view/FView.java index 393c4530504..258397f3c2f 100644 --- a/src/main/java/forge/view/FView.java +++ b/src/main/java/forge/view/FView.java @@ -35,7 +35,7 @@ import com.google.common.collect.Lists; import forge.Singletons; import forge.control.FControl; import forge.control.RestartUtil; -import forge.gui.DialogMigrateProfile; +import forge.gui.ImportDialog; import forge.gui.SOverlayUtils; import forge.gui.deckeditor.VDeckEditorUI; import forge.gui.framework.DragCell; @@ -159,7 +159,7 @@ public enum FView { // if we have any data to migrate, pop up the migration dialog if (_addRemainingFiles(null, resDirs, profileDirs, doNotDeleteDirs)) { - new DialogMigrateProfile("res", new Runnable() { + new ImportDialog("res", new Runnable() { @Override public void run() { // remove known cruft files, yes this is ugly, but it's also temporary for (String cruftFile : Lists.newArrayList("decks/SkieraCube-cards_not_supported_yet.txt", "decks/cube/ArabianExtended.dck", "decks/cube/GtcGuildBoros.dck", "decks/cube/GtcGuildDimir.dck", "decks/cube/GtcGuildGruul.dck", "decks/cube/GtcGuildOrzhov.dck", "decks/cube/GtcGuildSimic.dck", "decks/cube/GtcPromoBoros.dck", "decks/cube/GtcPromoDimir.dck", "decks/cube/GtcPromoGruul.dck", "decks/cube/GtcPromoOrzhov.dck", "decks/cube/GtcPromoSimic.dck", "decks/cube/JuzamjediCube.dck", "decks/cube/RtRGuildAzorius.dck", "decks/cube/RtRGuildGolgari.dck", "decks/cube/RtRGuildIzzet.dck", "decks/cube/RtRGuildRakdos.dck", "decks/cube/RtRGuildSelesnya.dck", "decks/cube/RtRPromoAzorius.dck", "decks/cube/RtRPromoGolgari.dck", "decks/cube/RtRPromoIzzet.dck", "decks/cube/RtRPromoRakdos.dck", "decks/cube/RtRPromoSelesnya.dck", "decks/cube/SkieraCube.dck", "gauntlet/LOCKED_DotP Preconstructed.dat", "gauntlet/LOCKED_Swimming With Sharks.dat", "layouts/editor_default.xml", "layouts/home_default.xml", "layouts/match_default.xml", "pics/snow_covered_forest1.jpg", "pics/snow_covered_forest2.jpg", "pics/snow_covered_forest3.jpg", "pics/snow_covered_island1.jpg", "pics/snow_covered_island2.jpg", "pics/snow_covered_island3.jpg", "pics/snow_covered_mountain1.jpg", "pics/snow_covered_mountain2.jpg", "pics/snow_covered_mountain3.jpg", "pics/snow_covered_plains1.jpg", "pics/snow_covered_plains2.jpg", "pics/snow_covered_plains3.jpg", "pics/snow_covered_swamp1.jpg", "pics/snow_covered_swamp2.jpg", "pics/snow_covered_swamp3.jpg", "pics/VAN/Birds of Paradise Avatar.full.jpg", "pics/VAN/Erhnam Djinn Avatar.full.jpg", "pics/VAN/Goblin Warchief Avatar.full.jpg", "pics/VAN/Grinning Demon Avatar.full.jpg", "pics/VAN/Platinum Angel Avatar.full.jpg", "pics/VAN/Prodigal Sorcerer Avatar.full.jpg", "pics/VAN/Rith, the Awakener Avatar.full.jpg", "pics/VAN/Royal Assassin Avatar.full.jpg", "pics/VAN/Serra Angel Avatar.full.jpg", "pics/VAN/Tradewind Rider Avatar.full.jpg", "pics_product/10E.jpg", "pics_product/2ED.jpg", "pics_product/3ED.jpg", "pics_product/4ED.jpg", "pics_product/5DN.jpg", "pics_product/5ED.jpg", "pics_product/6ED.jpg", "pics_product/7ED.jpg", "pics_product/8ED.jpg", "pics_product/9ED.jpg", "pics_product/ALA.jpg", "pics_product/ALL.jpg", "pics_product/APC.jpg", "pics_product/ARB.jpg", "pics_product/ARN.jpg", "pics_product/ATQ.jpg", "pics_product/BOK.jpg", "pics_product/CFX.jpg", "pics_product/CHK.jpg", "pics_product/CHR.jpg", "pics_product/CSP.jpg", "pics_product/DIS.jpg", "pics_product/DKA.jpg", "pics_product/DRK.jpg", "pics_product/DST.jpg", "pics_product/EVE.jpg", "pics_product/EXO.jpg", "pics_product/FEM.jpg", "pics_product/FUT.jpg", "pics_product/GPT.jpg", "pics_product/HML.jpg", "pics_product/ICE.jpg", "pics_product/INV.jpg", "pics_product/ISD.jpg", "pics_product/JUD.jpg", "pics_product/LEA.jpg", "pics_product/LEB.jpg", "pics_product/LEG.jpg", "pics_product/LGN.jpg", "pics_product/LRW.jpg", "pics_product/M10.jpg", "pics_product/M11.jpg", "pics_product/M12.jpg", "pics_product/MBS.jpg", "pics_product/MIR.jpg", "pics_product/MMQ.jpg", "pics_product/MOR.jpg", "pics_product/MRD.jpg", "pics_product/NMS.jpg", "pics_product/NPH.jpg", "pics_product/ODY.jpg", "pics_product/ONS.jpg", "pics_product/PCY.jpg", "pics_product/PLC.jpg", "pics_product/PLS.jpg", "pics_product/PO2.jpg", "pics_product/POR.jpg", "pics_product/PTK.jpg", "pics_product/RAV.jpg", "pics_product/ROE.jpg", "pics_product/S99.jpg", "pics_product/SCG.jpg", "pics_product/SHM.jpg", "pics_product/SOK.jpg", "pics_product/SOM.jpg", "pics_product/STH.jpg", "pics_product/TMP.jpg", "pics_product/TOR.jpg", "pics_product/TSP.jpg", "pics_product/UDS.jpg", "pics_product/ULG.jpg", "pics_product/USG.jpg", "pics_product/VIS.jpg", "pics_product/WTH.jpg", "pics_product/WWK.jpg", "pics_product/ZEN.jpg", "pics_product/booster/7E.png", "pics_product/booster/AP.png", "pics_product/booster/DPA.png", "pics_product/booster/EX.png", "pics_product/booster/IN.png", "pics_product/booster/MI.png", "pics_product/booster/OD.png", "pics_product/booster/PS.png", "pics_product/booster/ST.png", "pics_product/booster/TE.png", "pics_product/booster/UD.png", "pics_product/booster/UL.png", "pics_product/booster/UZ.png", "pics_product/booster/VI.png", "pics_product/booster/WL.png", "preferences/.project", "preferences/editor.default.preferences", "preferences/main.properties", "quest/quest.preferences", "quest/quest.properties")) {