Refactored showFinishText()

Wolfsblvt · Aug 13, 2016 · 18eced0 · 18eced0
1 parent 817d693
commit 18eced0
Show file tree

Hide file tree

Showing 2 changed files with 100 additions and 110 deletions.
diff --git a/src/me/corriekay/pokegoutil/windows/MenuBar.java b/src/me/corriekay/pokegoutil/windows/MenuBar.java
@@ -14,90 +14,90 @@
 @SuppressWarnings("serial")
 public class MenuBar extends JMenuBar {
 
-	private final PokemonGo go;
-
-	public MenuBar(PokemonGo go) {
-		this.go = go;
-
-		JMenu file, settings, help;
-
-		// File menu
-		file = new JMenu("File");
-
-		JMenuItem trainerStats = new JMenuItem("View Trainer Stats");
-		trainerStats.addActionListener(al -> {
-			try {
-				displayTrainerStats();
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-		});
-		file.add(trainerStats);
-
-		JMenuItem logout = new JMenuItem("Logout");
-		logout.addActionListener(al -> {
-			try {
-				logout();
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-		});
-		file.add(logout);
-
-		add(file);
-
-		// Settings menu
-		settings = new JMenu("Settings");
-
-		JCheckBoxMenuItem tAfterE = new JCheckBoxMenuItem("Transfer After Evolve");
-		tAfterE.setSelected(Config.getConfig().getBool("transfer.afterEvolve", false));
-		tAfterE.addItemListener(e -> Config.getConfig().setBool("transfer.afterEvolve", tAfterE.isSelected()));
-		settings.add(tAfterE);
-
-		JCheckBoxMenuItem doNotShowBulkPopup = new JCheckBoxMenuItem("Show Bulk Completion");
-		doNotShowBulkPopup.setSelected(Config.getConfig().getBool("popup.afterBulk", true));
-		doNotShowBulkPopup
-				.addItemListener(e -> Config.getConfig().setBool("popup.afterBulk", doNotShowBulkPopup.isSelected()));
-		settings.add(doNotShowBulkPopup);
-
-		add(settings);
-
-		// Help menu
-		help = new JMenu("Help");
-
-		JMenuItem about = new JMenuItem("About");
-		about.addActionListener(l -> JOptionPane.showMessageDialog(null,
-				"Version: " + BlossomsPoGoManager.VERSION + "\n\nAuthor: Corrie 'Blossom' Kay"
-						+ "\n\nThis work is protected under the"
-						+ "\nCreative Commons Attribution-"
-						+ "\nNonCommercial-ShareAlike 4.0"
-						+ "\nInternational license, which can"
-						+ "\nbe found here:"
-						+ "\nhttps://creativecommons.org/"
-						+ "\nlicenses/by-nc-sa/4.0/"
-						+ "\n\nThanks to Grover for providing"
-						+ "\nsuch a great API." + "\n\nThanks for Draseart for"
-						+ "\nthe icon art.",
-				"About Blossom's Pokémon Go Manager", JOptionPane.PLAIN_MESSAGE));
-		help.add(about);
-
-		add(help);
-	}
-
-	private void logout() throws Exception {
-		AccountController.logOff();
-	}
-
-	private void displayTrainerStats() throws Exception {
-		go.getInventories().updateInventories(true);
-		PlayerProfile pp = go.getPlayerProfile();
-		Stats stats = pp.getStats();
-		Object[] tstats = { "Trainer Name: " + pp.getPlayerData().getUsername(),
-				"Team: " + PokemonUtils.convertTeamColorToName(pp.getPlayerData().getTeamValue()),
-				"Level: " + stats.getLevel(), "XP: " + stats.getExperience() + " ("
-						+ (stats.getNextLevelXp() - stats.getExperience()) + " to next level)",
-				"Stardust: " + pp.getCurrency(Currency.STARDUST) };
-		JOptionPane.showMessageDialog(null, tstats, "Trainer Stats", JOptionPane.PLAIN_MESSAGE);
-	}
+    private final PokemonGo go;
+
+    public MenuBar(PokemonGo go) {
+        this.go = go;
+
+        JMenu file, settings, help;
+
+        // File menu
+        file = new JMenu("File");
+
+        JMenuItem trainerStats = new JMenuItem("View Trainer Stats");
+        trainerStats.addActionListener(al -> {
+            try {
+                displayTrainerStats();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        });
+        file.add(trainerStats);
+
+        JMenuItem logout = new JMenuItem("Logout");
+        logout.addActionListener(al -> {
+            try {
+                logout();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        });
+        file.add(logout);
+
+        add(file);
+
+        // Settings menu
+        settings = new JMenu("Settings");
+
+        JCheckBoxMenuItem tAfterE = new JCheckBoxMenuItem("Transfer After Evolve");
+        tAfterE.setSelected(Config.getConfig().getBool("transfer.afterEvolve", false));
+        tAfterE.addItemListener(e -> Config.getConfig().setBool("transfer.afterEvolve", tAfterE.isSelected()));
+        settings.add(tAfterE);
+
+        JCheckBoxMenuItem doNotShowBulkPopup = new JCheckBoxMenuItem("Show Bulk Completion");
+        doNotShowBulkPopup.setSelected(Config.getConfig().getBool("popup.afterBulk", true));
+        doNotShowBulkPopup
+                .addItemListener(e -> Config.getConfig().setBool("popup.afterBulk", doNotShowBulkPopup.isSelected()));
+        settings.add(doNotShowBulkPopup);
+
+        add(settings);
+
+        // Help menu
+        help = new JMenu("Help");
+
+        JMenuItem about = new JMenuItem("About");
+        about.addActionListener(l -> JOptionPane.showMessageDialog(null,
+                "Version: " + BlossomsPoGoManager.VERSION + "\n\nAuthor: Corrie 'Blossom' Kay"
+                        + "\n\nThis work is protected under the"
+                        + "\nCreative Commons Attribution-"
+                        + "\nNonCommercial-ShareAlike 4.0"
+                        + "\nInternational license, which can"
+                        + "\nbe found here:"
+                        + "\nhttps://creativecommons.org/"
+                        + "\nlicenses/by-nc-sa/4.0/"
+                        + "\n\nThanks to Grover for providing"
+                        + "\nsuch a great API." + "\n\nThanks for Draseart for"
+                        + "\nthe icon art.",
+                "About Blossom's Pokémon Go Manager", JOptionPane.PLAIN_MESSAGE));
+        help.add(about);
+
+        add(help);
+    }
+
+    private void logout() throws Exception {
+        AccountController.logOff();
+    }
+
+    private void displayTrainerStats() throws Exception {
+        go.getInventories().updateInventories(true);
+        PlayerProfile pp = go.getPlayerProfile();
+        Stats stats = pp.getStats();
+        Object[] tstats = {"Trainer Name: " + pp.getPlayerData().getUsername(),
+                "Team: " + PokemonUtils.convertTeamColorToName(pp.getPlayerData().getTeamValue()),
+                "Level: " + stats.getLevel(), "XP: " + stats.getExperience() + " ("
+                + (stats.getNextLevelXp() - stats.getExperience()) + " to next level)",
+                "Stardust: " + pp.getCurrency(Currency.STARDUST)};
+        JOptionPane.showMessageDialog(null, tstats, "Trainer Stats", JOptionPane.PLAIN_MESSAGE);
+    }
 
 }
diff --git a/src/me/corriekay/pokegoutil/windows/PokemonTab.java b/src/me/corriekay/pokegoutil/windows/PokemonTab.java
@@ -206,12 +206,18 @@ private void refreshPkmn() {
         System.out.println("Done refreshing Pokémon list");
     }
 
-    private String generateFinishedText(String message, int size, MutableInt success, MutableInt skipped, MutableInt err) {
-        return message +
+    private void showFinishedText(String message, int size, MutableInt success, MutableInt skipped, MutableInt err) {
+        String finishText = message +
                 "\nPokémon total: " + size +
                 "\nSuccessful: " + success.getValue() +
                 (skipped.getValue() > 0 ? "\nSkipped: " + skipped.getValue() : "") +
                 (err.getValue() > 0 ? "\nErrors: " + err.getValue() : "");
+
+        if (Config.getConfig().getBool("popup.afterBulk", true)) {
+            JOptionPane.showMessageDialog(null, finishText);
+        } else {
+            System.out.println(finishText);
+        }
     }
 
     private void renameSelected() {
@@ -259,10 +265,7 @@ private void renameSelected() {
             e.printStackTrace();
         }
         SwingUtilities.invokeLater(this::refreshList);
-		if (Config.getConfig().getBool("popup.afterBulk", true)) {
-			JOptionPane.showMessageDialog(null,
-					generateFinishedText("Pokémon batch rename complete!", selection.size(), success, skipped, err));
-		}
+        showFinishedText("Pokémon batch rename complete!", selection.size(), success, skipped, err);
     }
 
     private void transferSelected() {
@@ -316,10 +319,7 @@ private void transferSelected() {
                 e.printStackTrace();
             }
             SwingUtilities.invokeLater(this::refreshList);
-			if (Config.getConfig().getBool("popup.afterBulk", true)) {
-				JOptionPane.showMessageDialog(null, generateFinishedText("Pokémon batch transfer complete!",
-						selection.size(), success, skipped, err));
-			}
+            showFinishedText("Pokémon batch transfer complete!", selection.size(), success, skipped, err);
         }
     }
 
@@ -381,12 +381,9 @@ private void evolveSelected() {
                     e.printStackTrace();
                 }
                 SwingUtilities.invokeLater(this::refreshList);
-				if (Config.getConfig().getBool("popup.afterBulk", true)) {
-					JOptionPane.showMessageDialog(null,
-							generateFinishedText("Pokémon batch evolve"
-									+ ((Config.getConfig().getBool("transfer.afterEvolve", false)) ? "/transfer" : "")
-									+ " complete!", selection.size(), success, skipped, err));
-				}
+                showFinishedText("Pokémon batch evolve"
+                        + ((Config.getConfig().getBool("transfer.afterEvolve", false)) ? "/transfer" : "")
+                        + " complete!", selection.size(), success, skipped, err);
             }
         }
     }
@@ -445,10 +442,7 @@ private void powerUpSelected() {
                     e.printStackTrace();
                 }
                 SwingUtilities.invokeLater(this::refreshList);
-				if (Config.getConfig().getBool("popup.afterBulk", true)) {
-					JOptionPane.showMessageDialog(null, generateFinishedText("Pokémon batch powerup complete!",
-							selection.size(), success, skipped, err));
-				}
+                showFinishedText("Pokémon batch powerup complete!", selection.size(), success, skipped, err);
             }
         }
     }
@@ -495,11 +489,7 @@ private void toggleFavorite() {
                     e.printStackTrace();
                 }
                 SwingUtilities.invokeLater(this::refreshPkmn);
-				if (Config.getConfig().getBool("popup.afterBulk", true)) {
-					JOptionPane.showMessageDialog(null, generateFinishedText(
-							"Pokémon batch \"toggle favorite\" complete!", selection.size(), success, skipped, err));
-				}
-
+                showFinishedText("Pokémon batch \"toggle favorite\" complete!", selection.size(), success, skipped, err);
             }
         }
     }