Remember the previously selected character + restore

src/uk/co/md87/evetool/ConfigManager.java

@@ -66,8 +66,12 @@ public class ConfigManager {
         return configFile.getKeyDomain("general").get(key);
     }
 
-    public int getGeneralSettingInt(final String key) {
-        return Integer.parseInt(configFile.getKeyDomain("general-int").get(key));
+    public int getGeneralSettingInt(final String key, final int fallback) {
+        try {
+            return Integer.parseInt(configFile.getKeyDomain("general-int").get(key));
+        } catch (NumberFormatException ex) {
+            return fallback;
+        }
     }
 
     public void setGeneralSetting(final String key, final String value) {

src/uk/co/md87/evetool/ui/MainWindow.java

@@ -83,7 +83,7 @@ public class MainWindow extends JFrame {
         this.contextPanel = new ContextPanel();
 
         pages = new TreeMap<String, ContentPanel.Page>();
-        pages.put("Overview", new OverviewPage(this, manager, factory));
+        pages.put("Overview", new OverviewPage(this, manager, factory, config));
         pages.put("Skills", new SkillPage(this, manager, factory));
         pages.put("Ships", new ShipsPage(this, manager, factory));
 
@@ -134,6 +134,8 @@ public class MainWindow extends JFrame {
 
         menuPanel.setSelectedChar(newChar);
         setTitle("EVE Tool - " + newChar.getCharInfo().getName());
+
+        config.setGeneralSetting("selectedChar", newChar.getCharInfo().getId());
     }
 
     public ContextPanel getContextPanel() {

src/uk/co/md87/evetool/ui/pages/OverviewPage.java

@@ -48,6 +48,7 @@ import net.miginfocom.swing.MigLayout;
 import uk.co.md87.evetool.Account;
 import uk.co.md87.evetool.AccountManager;
 import uk.co.md87.evetool.ApiFactory;
+import uk.co.md87.evetool.ConfigManager;
 import uk.co.md87.evetool.api.EveApi;
 import uk.co.md87.evetool.ui.ContentPanel.Page;
 import uk.co.md87.evetool.ui.ContextPanel;
@@ -76,15 +77,17 @@ public class OverviewPage extends Page implements AccountManager.AccountListener
     private final MainWindow window;
     private final ApiFactory factory;
     private final AccountManager manager;
+    private final ConfigManager config;
     private final Map<Account, EveApi> apis = new HashMap<Account, EveApi>();
     private final Map<Account, JPanel> panels = new HashMap<Account, JPanel>();
     private final List<AccountChar> chars = new ArrayList<AccountChar>();
 
     public OverviewPage(final MainWindow window, final AccountManager manager,
-            final ApiFactory factory) {
+            final ApiFactory factory, final ConfigManager config) {
         this.window = window;
         this.factory = factory;
         this.manager = manager;
+        this.config = config;
 
         setLayout(new MigLayout("fillx"));
 
@@ -152,8 +155,10 @@ public class OverviewPage extends Page implements AccountManager.AccountListener
 
         panels.put(account, panel);
         apis.put(account, account.getApi(factory));
+
+        int selectChar = config.getGeneralSettingInt("selectedChar", -1);
         
-        new AccountUpdateWorker(this, apis.get(account), panel).execute();
+        new AccountUpdateWorker(this, window, apis.get(account), panel, selectChar).execute();
     }
 
     /** {@inheritDoc} */

src/uk/co/md87/evetool/ui/workers/AccountUpdateWorker.java

@@ -37,6 +37,7 @@ import uk.co.md87.evetool.api.ApiResponse;
 import uk.co.md87.evetool.api.EveApi;
 import uk.co.md87.evetool.api.wrappers.CharacterList;
 import uk.co.md87.evetool.api.wrappers.data.BasicCharInfo;
+import uk.co.md87.evetool.ui.MainWindow;
 import uk.co.md87.evetool.ui.data.AccountChar;
 import uk.co.md87.evetool.ui.pages.OverviewPage;
 
@@ -57,13 +58,18 @@ public class AccountUpdateWorker extends SwingWorker<ApiResponse<CharacterList>,
     private final OverviewPage page;
     private final EveApi api;
     private final JPanel target;
+    private final MainWindow window;
+    private final int selectChar;
 
-    public AccountUpdateWorker(final OverviewPage page, final EveApi api, final JPanel panel) {
+    public AccountUpdateWorker(final OverviewPage page, final MainWindow window,
+            final EveApi api, final JPanel panel, final int selectChar) {
         super();
 
         this.page = page;
         this.api = api;
+        this.window = window;
         this.target = panel;
+        this.selectChar = selectChar;
     }
 
     /** {@inheritDoc} */
@@ -112,6 +118,10 @@ public class AccountUpdateWorker extends SwingWorker<ApiResponse<CharacterList>,
                     new CharacterSkillUpdateWorker(newApi, ac).execute();
 
                     portrait.addMouseListener(new PortraitMouseListener(page, ac));
+
+                    if (character.getId() == selectChar) {
+                        window.setSelectedChar(ac);
+                    }
                 }
             } else {
                 target.removeAll();