Refreshes List on settings change

Wolfsblvt · Aug 16, 2016 · ff1f5cf · ff1f5cf
1 parent 386b9be
commit ff1f5cf
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/src/me/corriekay/pokegoutil/windows/MenuBar.java b/src/me/corriekay/pokegoutil/windows/MenuBar.java
@@ -18,7 +18,7 @@ public class MenuBar extends JMenuBar {
     private final PokemonGo go;
     private ConfigNew config = ConfigNew.getConfig();
 
-    public MenuBar(PokemonGo go) {
+    public MenuBar(PokemonGo go, PokemonTab pokemonTab) {
         this.go = go;
 
         JMenu file, settings, help;
@@ -63,12 +63,20 @@ public MenuBar(PokemonGo go) {
 
         JCheckBoxMenuItem includeFamily = new JCheckBoxMenuItem("Include Family On Searchbar");
         includeFamily.setSelected(config.getBool(ConfigKey.INCLUDE_FAMILY));
-        includeFamily.addItemListener(e -> config.setBool(ConfigKey.INCLUDE_FAMILY, includeFamily.isSelected()));
+        includeFamily.addItemListener(e -> {
+            config.setBool(ConfigKey.INCLUDE_FAMILY, includeFamily.isSelected());
+            if (!pokemonTab.getSelectedPokemon().isEmpty()) {
+                SwingUtilities.invokeLater(pokemonTab::refreshList);
+            }
+        });
         settings.add(includeFamily);
 
         JCheckBoxMenuItem alternativeIVCalculation = new JCheckBoxMenuItem("Use Alternative IV Calculation (weighted stats)");
         alternativeIVCalculation.setSelected(config.getBool(ConfigKey.ALTERNATIVE_IV_CALCULATION));
-        alternativeIVCalculation.addItemListener(e -> config.setBool(ConfigKey.ALTERNATIVE_IV_CALCULATION, alternativeIVCalculation.isSelected()));
+        alternativeIVCalculation.addItemListener(e -> {
+            config.setBool(ConfigKey.ALTERNATIVE_IV_CALCULATION, alternativeIVCalculation.isSelected());
+            SwingUtilities.invokeLater(pokemonTab::refreshList);
+        });
         settings.add(alternativeIVCalculation);
 
         add(settings);

diff --git a/src/me/corriekay/pokegoutil/windows/PokemonGoMainWindow.java b/src/me/corriekay/pokegoutil/windows/PokemonGoMainWindow.java
@@ -70,8 +70,9 @@ public void componentMoved(ComponentEvent e) {
         int posy = config.getInt(ConfigKey.WINDOW_POS_Y, pt.y);
         setLocation(posx, posy);
         setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-        setJMenuBar(new MenuBar(go));
-        tab.add("Pokémon", new PokemonTab(go));
+        PokemonTab pokemonTab = new PokemonTab(go);
+        setJMenuBar(new MenuBar(go, pokemonTab));
+        tab.add("Pokémon", pokemonTab);
 
         add(tab, BorderLayout.CENTER);
 

diff --git a/src/me/corriekay/pokegoutil/windows/PokemonTab.java b/src/me/corriekay/pokegoutil/windows/PokemonTab.java
@@ -597,7 +597,7 @@ private JPanel _buildPanelForOperation(String operation, ArrayList<Pokemon> poke
         return panel;
     }
 
-    private ArrayList<Pokemon> getSelectedPokemon() {
+    public ArrayList<Pokemon> getSelectedPokemon() {
         ArrayList<Pokemon> pokes = new ArrayList<>();
         PokemonTableModel model = (PokemonTableModel) pt.getModel();
         for (int i : pt.getSelectedRows()) {
@@ -609,7 +609,7 @@ private ArrayList<Pokemon> getSelectedPokemon() {
         return pokes;
     }
 
-    private void refreshList() {
+    public void refreshList() {
         List<Pokemon> pokes = new ArrayList<>();
         String search = searchBar.getText().replaceAll(" ", "").replaceAll("_", "").replaceAll("snek", "ekans").toLowerCase();
         String[] terms = search.split(";");