diff --git a/forge-gui-mobile/src/forge/deck/FDeckChooser.java b/forge-gui-mobile/src/forge/deck/FDeckChooser.java index 360fce30228..f3ee6bbe455 100644 --- a/forge-gui-mobile/src/forge/deck/FDeckChooser.java +++ b/forge-gui-mobile/src/forge/deck/FDeckChooser.java @@ -112,7 +112,7 @@ public class FDeckChooser extends FScreen { deckChooser.optionPane = new FOptionPane(null, null, title, null, container, ImmutableList.of(Forge.getLocalizer().getInstance().getMessage("lblOK"), Forge.getLocalizer().getInstance().getMessage("lblCancel")), 0, result -> { if (result == 0) { if (callback != null) { - callback.run(deckChooser.getDeck()); + callback.accept(deckChooser.getDeck()); } } }) { diff --git a/forge-gui-mobile/src/forge/deck/FDeckEditor.java b/forge-gui-mobile/src/forge/deck/FDeckEditor.java index 69f5a2e1728..41cb685e509 100644 --- a/forge-gui-mobile/src/forge/deck/FDeckEditor.java +++ b/forge-gui-mobile/src/forge/deck/FDeckEditor.java @@ -561,25 +561,22 @@ public class FDeckEditor extends TabPageScreen { if (editorConfig.getGameType() != null && editorConfig.hasInfiniteCardPool()) { addItem(new FMenuItem(localizer.getMessage("lblImportFromClipboard"), Forge.hdbuttons ? FSkinImage.HDIMPORT : FSkinImage.OPEN, e -> { FDeckImportDialog dialog = new FDeckImportDialog(!deck.isEmpty(), FDeckEditor.this.editorConfig); - dialog.setCallback(new Callback<>() { - @Override - public void run(Deck importedDeck) { - if (deck != null && importedDeck.hasName()) { - deck.setName(importedDeck.getName()); - setHeaderText(importedDeck.getName()); + dialog.setCallback(importedDeck -> { + if (deck != null && importedDeck.hasName()) { + deck.setName(importedDeck.getName()); + setHeaderText(importedDeck.getName()); + } + if (dialog.createNewDeck()) { + for (Entry section : importedDeck) { + DeckSectionPage page = getPageForSection(section.getKey()); + if (page != null) + page.setCards(section.getValue()); } - if (dialog.createNewDeck()) { - for (Entry section : importedDeck) { - DeckSectionPage page = getPageForSection(section.getKey()); - if (page != null) - page.setCards(section.getValue()); - } - } else { - for (Entry section : importedDeck) { - DeckSectionPage page = getPageForSection(section.getKey()); - if (page != null) - page.addCards(section.getValue()); - } + } else { + for (Entry section : importedDeck) { + DeckSectionPage page = getPageForSection(section.getKey()); + if (page != null) + page.addCards(section.getValue()); } } }); @@ -1828,16 +1825,13 @@ public class FDeckEditor extends TabPageScreen { sortedOptions.add(option); } } - GuiChoose.oneOrNone(Forge.getLocalizer().getMessage("lblSelectPreferredArt") + " " + card.getName(), sortedOptions, new Callback<>() { - @Override - public void run(PaperCard result) { - if (result != null) { - if (result != card) { - cardManager.replaceAll(card, result); - } - prefs.setPreferredArt(result.getEdition(), result.getArtIndex()); - CardPreferences.save(); + GuiChoose.oneOrNone(Forge.getLocalizer().getMessage("lblSelectPreferredArt") + " " + card.getName(), sortedOptions, result -> { + if (result != null) { + if (result != card) { + cardManager.replaceAll(card, result); } + prefs.setPreferredArt(result.getEdition(), result.getArtIndex()); + CardPreferences.save(); } }); })); diff --git a/forge-gui-mobile/src/forge/screens/settings/GuiDownloader.java b/forge-gui-mobile/src/forge/screens/settings/GuiDownloader.java index dbbccb30601..ea92bd04841 100644 --- a/forge-gui-mobile/src/forge/screens/settings/GuiDownloader.java +++ b/forge-gui-mobile/src/forge/screens/settings/GuiDownloader.java @@ -52,7 +52,7 @@ public class GuiDownloader extends FDialog { service.setCancel(true); hide(); if (callback != null) { - callback.run(getButton(0).getText() == "OK"); //determine result based on whether download finished + callback.accept(getButton(0).getText() == "OK"); //determine result based on whether download finished } } }; diff --git a/forge-gui-mobile/src/forge/toolbox/FFileChooser.java b/forge-gui-mobile/src/forge/toolbox/FFileChooser.java index 374b125b0a7..b8e0c2405fb 100644 --- a/forge-gui-mobile/src/forge/toolbox/FFileChooser.java +++ b/forge-gui-mobile/src/forge/toolbox/FFileChooser.java @@ -77,8 +77,8 @@ public class FFileChooser extends FDialog { refreshFileList(); return; } - } catch (Exception e) { - e.printStackTrace(); + } catch (Exception e1) { + e1.printStackTrace(); } FOptionPane.showErrorDialog(Forge.getLocalizer().getMessage("lblEnterFolderNameNotValid", result), Forge.getLocalizer().getMessage("lblInvalidName")); }); @@ -229,8 +229,8 @@ public class FFileChooser extends FDialog { return; } } - catch (Exception e) { - e.printStackTrace(); + catch (Exception e2) { + e2.printStackTrace(); } FOptionPane.showErrorDialog(Forge.getLocalizer().getMessage("lblEnterNameNotValid", result), Forge.getLocalizer().getMessage("lblInvalidName")); }); @@ -259,8 +259,8 @@ public class FFileChooser extends FDialog { return; } } - catch (Exception ex) { - ex.printStackTrace(); + catch (Exception e3) { + e3.printStackTrace(); } FOptionPane.showErrorDialog(Forge.getLocalizer().getMessage("lblCouldBotDeleteFile")); }