Fully implement AccountManager, overview UI now supports multiple accounts

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

@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2009 Chris Smith
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package uk.co.md87.evetool;
+
+import uk.co.md87.evetool.api.EveApi;
+
+/**
+ * Represents one user account, with a user ID and an API key.
+ *
+ * @author chris
+ */
+public class Account {
+
+    /** The user ID for this account. */
+    private final int id;
+
+    /** The API key for this account. */
+    private final String key;
+
+    /**
+     * Creates a new account with the specified details.
+     *
+     * @param id The user ID for the account
+     * @param key The API key for the account
+     */
+    public Account(final int id, final String key) {
+        this.id = id;
+        this.key = key;
+    }
+
+    /**
+     * Retrieves the user ID associated with this account.
+     *
+     * @return This account's user ID
+     */
+    public int getId() {
+        return id;
+    }
+
+    /**
+     * Retrieves the API key associated with this account.
+     *
+     * @return This account's API key
+     */
+    public String getKey() {
+        return key;
+    }
+
+    /**
+     * Uses the specified API factory to create a new instance of the EVE Api
+     * and initialises its ID and Key settings to those of this account.
+     *
+     * @param factory The API factory to use
+     * @return An API instance for this account
+     */
+    public EveApi getApi(final ApiFactory factory) {
+        final EveApi api = factory.getApi();
+        api.setUserID(id);
+        api.setApiKey(key);
+
+        return api;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String toString() {
+        return "[" + id + " - " + key.substring(0, 6) + "...]";
+    }
+
+}

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

@@ -23,6 +23,14 @@
 package uk.co.md87.evetool;
 
 import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * Manages accounts that have been added to the tool.
@@ -31,11 +39,141 @@ import java.sql.Connection;
  */
 public class AccountManager {
 
+    /** Logger to use for this class. */
+    private static final Logger LOGGER = Logger.getLogger(AccountManager.class.getName());
+
+    /** A list of known accounts. */
+    private final List<Account> accounts = new ArrayList<Account>();
+
+    /** A list of listeners. */
+    private final List<AccountListener> listeners = new ArrayList<AccountListener>();
+
     /** The SQL connection to use. */
     private final Connection conn;
 
+    /** The SQL statement to use to insert new accounts. */
+    private PreparedStatement insertStm;
+
+    /**
+     * Creates a new account manager which will use the specified DB connection.
+     *
+     * @param conn The database connection to use
+     */
     public AccountManager(final Connection conn) {
         this.conn = conn;
+
+        try {
+            this.insertStm = conn.prepareStatement("INSERT INTO accounts " +
+                    "(account_userid, account_key) VALUES (?, ?)");
+        } catch (SQLException ex) {
+            LOGGER.log(Level.SEVERE, "Unable to prepare account statement", ex);
+        }
+
+        loadAccounts();
+    }
+
+    /**
+     * Retrieves a list of all known accounts.
+     * 
+     * @return A list of known accounts
+     */
+    public List<Account> getAccounts() {
+        return new ArrayList<Account>(accounts);
+    }
+
+    /**
+     * Retrieves a list of all known accounts, and registers the specified
+     * {@link AccountListener}. Any account added before, during or after this
+     * method call is guaranteed to either be present in the returned list, or
+     * have an accountAdded listener fired for it.
+     *
+     * @param listener The listener to be added
+     * @return A list of known accounts
+     */
+    public synchronized List<Account> getAccounts(final AccountListener listener) {
+        addListener(listener);
+        
+        return new ArrayList<Account>(accounts);
+    }
+
+    /**
+     * Adds a new account with the specified details.
+     * 
+     * @param id The user ID of the account owner
+     * @param key The API key for the account
+     */
+    public void addAccount(final int id, final String key) {
+        try {
+            insertStm.setInt(1, id);
+            insertStm.setString(2, key);
+            insertStm.execute();
+
+            addAccount(new Account(id, key));
+        } catch (SQLException ex) {
+            LOGGER.log(Level.SEVERE, "Unable to add account", ex);
+        }
     }
 
+    /**
+     * Registers the specified listener with this account manager.
+     *
+     * @param listener The listener to be registered
+     */
+    public void addListener(final AccountListener listener) {
+        synchronized (listeners) {
+            listeners.add(listener);
+        }
+    }
+
+    /**
+     * Adds an account to the list of known accounts and fires the
+     * appropriate listeners.
+     *
+     * @param account The account to be added
+     */
+    protected synchronized void addAccount(final Account account) {
+        LOGGER.log(Level.FINE, "Adding account: " + account);
+
+        accounts.add(account);
+
+        synchronized (listeners) {
+            for (AccountListener listener : listeners) {
+                listener.accountAdded(account);
+            }
+        }
+    }
+
+    /**
+     * Loads all accounts in the database.
+     */
+    protected void loadAccounts() {
+        try {
+            final Statement statement = conn.createStatement();
+            final ResultSet set = statement.executeQuery("SELECT account_userid, "
+                    + "account_key FROM accounts");
+
+            while (set.next()) {
+                final int id = set.getInt("ACCOUNT_USERID");
+                final String key = set.getString("ACCOUNT_KEY");
+                addAccount(new Account(id, key));
+            }
+        } catch (SQLException ex) {
+            LOGGER.log(Level.SEVERE, "Error loading accounts", ex);
+        }
+    }
+
+    /**
+     * Interfaces implemented by objects who wish to be notified when accounts
+     * are modified.
+     */
+    public static interface AccountListener {
+
+        /**
+         * Called when a new account has been added.
+         *
+         * @param account The account that was added.
+         */
+        void accountAdded(final Account account);
+
+    }
 }

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

@@ -34,6 +34,7 @@ import uk.co.md87.evetool.api.EveApi;
  * Factory class to create instances of the {@link EveApi} class. Uses an
  * embedded Derby database server by default.
  *
+ * TODO: Make non-static
  * @author chris
  */
 public class ApiFactory {

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

@@ -52,13 +52,17 @@ public class Main {
         initLogging();
         readVersion();
         initTables();
-        
-        final EveApi api = ApiFactory.getApi();
-        api.setApiKey("yaISaqXrSnaQPnRSFi4ODeWjSzWu2gNq1h6F0tVevtSGr5dzoEkZ6YrzHeBzzgNg");
-        api.setUserID("403848");
-        api.setCharID("113499922");
 
-        new MainWindow(api).setVisible(true);
+        final AccountManager manager = new AccountManager(ApiFactory.getConnection());
+
+        if (manager.getAccounts().isEmpty()) {
+            // TODO: Remove me before release!
+
+            manager.addAccount(403848,
+                    "yaISaqXrSnaQPnRSFi4ODeWjSzWu2gNq1h6F0tVevtSGr5dzoEkZ6YrzHeBzzgNg");
+        }
+        
+        new MainWindow(manager, new ApiFactory()).setVisible(true);
     }
 
     /**

src/uk/co/md87/evetool/api/EveApi.java

@@ -60,10 +60,10 @@ public class EveApi {
     private final ApiDownloader downloader;
     
     /** The client's user ID, if specified. */
-    private String userID;
+    private int userID;
 
     /** The client's character ID, if specified. */
-    private String charID;
+    private int charID;
 
     /** The client's API key, if specified. */
     private String apiKey;
@@ -77,7 +77,7 @@ public class EveApi {
     public EveApi(final Connection sqlConnection) {
         this.conn = sqlConnection;
         
-        new TableCreator(conn, "../db/", TABLES).checkTables();
+        new TableCreator(conn, "../db/", TABLES).checkTables(); // TODO: Only do this once?
 
         this.downloader = new ApiDownloader(new DBCache(conn), new ApiParser());
     }
@@ -97,7 +97,7 @@ public class EveApi {
      *
      * @param charID The user's chosen character ID
      */
-    public void setCharID(final String charID) {
+    public void setCharID(final int charID) {
         this.charID = charID;
         downloader.setCharID(charID);
     }
@@ -107,7 +107,7 @@ public class EveApi {
      *
      * @param userID The user's user ID
      */
-    public void setUserID(final String userID) {
+    public void setUserID(final int userID) {
         this.userID = userID;
         downloader.setUserID(userID);
     }

src/uk/co/md87/evetool/api/io/ApiDownloader.java

@@ -48,8 +48,8 @@ public class ApiDownloader {
     private final ApiCache cache;
     private final ApiParser parser;
 
-    private String userID = null;
-    private String charID = null;
+    private int userID = -1;
+    private int charID = -1;
     private String apiKey = null;
 
     public ApiDownloader(final ApiCache cache, final ApiParser parser) {
@@ -58,29 +58,29 @@ public class ApiDownloader {
     }
 
     public ApiDownloader(final ApiCache cache, final ApiParser parser,
-            final String userID, final String apiKey) {
+            final int userID, final String apiKey) {
         this(cache, parser);
         this.userID = userID;
         this.apiKey = apiKey;
     }
 
     public ApiDownloader(final ApiCache cache, final ApiParser parser,
-            final String userID, final String apiKey, final String charID) {
+            final int userID, final String apiKey, final int charID) {
         this(cache, parser, userID, apiKey);
         this.charID = charID;
     }
 
     protected void addArgs(final Map<String, String> args) {
-        if (userID != null) {
-            args.put("userID", userID);
+        if (userID != -1) {
+            args.put("userID", String.valueOf(userID));
         }
 
         if (apiKey != null) {
             args.put("apiKey", apiKey);
         }
 
-        if (charID != null) {
-            args.put("characterID", charID);
+        if (charID != -1) {
+            args.put("characterID", String.valueOf(charID));
         }
     }
 
@@ -130,11 +130,11 @@ public class ApiDownloader {
         this.apiKey = apiKey;
     }
 
-    public void setCharID(String charID) {
+    public void setCharID(int charID) {
         this.charID = charID;
     }
 
-    public void setUserID(String userID) {
+    public void setUserID(int userID) {
         this.userID = userID;
     }
 

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

@@ -26,7 +26,8 @@ import java.awt.CardLayout;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 
-import uk.co.md87.evetool.api.EveApi;
+import uk.co.md87.evetool.AccountManager;
+import uk.co.md87.evetool.ApiFactory;
 import uk.co.md87.evetool.ui.pages.OverviewPage;
 
 /**
@@ -35,11 +36,11 @@ import uk.co.md87.evetool.ui.pages.OverviewPage;
  */
 public class ContentPanel extends JPanel {
 
-    public ContentPanel(final EveApi api) {
+    public ContentPanel(final AccountManager manager, final ApiFactory factory) {
         super(new CardLayout());
 
         //setBackground(Color.BLUE);
-        add(new OverviewPage(api), "push, grow");
+        add(new OverviewPage(manager, factory), "push, grow");
         add(new JLabel("Main content2", JLabel.CENTER), "push, grow");
     }
 

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

@@ -31,7 +31,8 @@ import javax.swing.JFrame;
 
 import javax.swing.UIManager;
 import net.miginfocom.swing.MigLayout;
-import uk.co.md87.evetool.api.EveApi;
+import uk.co.md87.evetool.AccountManager;
+import uk.co.md87.evetool.ApiFactory;
 
 /**
  *
@@ -40,14 +41,16 @@ import uk.co.md87.evetool.api.EveApi;
  */
 public class MainWindow extends JFrame {
 
-    private final EveApi api;
+    private final AccountManager manager;
+    private final ApiFactory factory;
 
-    public MainWindow(final EveApi api) {
+    public MainWindow(final AccountManager manager, final ApiFactory factory) {
         super("EVE Tool - Initialising...");
 
         UIManager.put("swing.boldMetal", false);
 
-        this.api = api;
+        this.factory = factory;
+        this.manager = manager;
         
         setLayout(new MigLayout("insets 0, fill, wrap 2", "[]0[fill,grow]",
                 "[fill,grow]0[]"));
@@ -65,7 +68,7 @@ public class MainWindow extends JFrame {
 
     protected void addComponents() {
         add(new MenuPanel(), "width 201!");
-        add(new ContentPanel(api));
+        add(new ContentPanel(manager, factory));
         add(new StatusPanel(), "growx, span, height 30!");
     }
 

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

@@ -28,8 +28,12 @@ import java.util.Map;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 
+import javax.swing.SwingUtilities;
 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.api.EveApi;
 import uk.co.md87.evetool.ui.workers.AccountUpdateWorker;
 
@@ -38,31 +42,47 @@ import uk.co.md87.evetool.ui.workers.AccountUpdateWorker;
  * TODO: Document OverviewPage
  * @author chris
  */
-public class OverviewPage extends JPanel {
+public class OverviewPage extends JPanel implements AccountManager.AccountListener {
 
-    private final EveApi api;
-    private final Map<String, JPanel> panels = new HashMap<String, JPanel>();
+    private final ApiFactory factory;
+    private final Map<Account, EveApi> apis = new HashMap<Account, EveApi>();
+    private final Map<Account, JPanel> panels = new HashMap<Account, JPanel>();
 
-    public OverviewPage(final EveApi api) {
-        this.api = api;
+    public OverviewPage(final AccountManager manager, final ApiFactory factory) {
+        this.factory = factory;
 
         setLayout(new MigLayout("fillx"));
-        add(new JLabel("Account 1 - 403848"), "span, wrap");
+
+        for (Account account : manager.getAccounts(this)) {
+            addAccount(account);
+        }
+    }
+
+    protected void addAccount(final Account account) {
+        // TODO: Number them or reformat or something
+        add(new JLabel("Account N - " + account.getId()), "span, wrap");
 
         final JPanel panel = new JPanel(new MigLayout(" fillx", "[|fill,grow|fill,grow]"));
         panel.add(new JLabel("Loading..."), "span");
-        panels.put("Account 1", panel);
         add(panel, "growx, wrap");
 
-        new AccountUpdateWorker("Account 1",this).execute();
+        panels.put(account, panel);
+        apis.put(account, account.getApi(factory));
+        
+        new AccountUpdateWorker(apis.get(account), panel).execute();
     }
 
-    public EveApi getApi() {
-        return api;
-    }
+    /** {@inheritDoc} */
+    @Override
+    public void accountAdded(final Account account) {
+        SwingUtilities.invokeLater(new Runnable() {
 
-    public Map<String, JPanel> getPanels() {
-        return panels;
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                addAccount(account);
+            }
+        });
     }
 
 }

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

@@ -27,10 +27,12 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javax.swing.JLabel;
+import javax.swing.JPanel;
 import javax.swing.JSeparator;
 import javax.swing.SwingWorker;
 
 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.pages.OverviewPage;
@@ -42,20 +44,21 @@ import uk.co.md87.evetool.ui.pages.OverviewPage;
  */
 public class AccountUpdateWorker extends SwingWorker<ApiResponse<CharacterList>, Object> {
 
-    private final String account;
-    private final OverviewPage overview;
+    private final EveApi api;
+    private final JPanel target;
 
-    public AccountUpdateWorker(final String account, OverviewPage overview) {
+    public AccountUpdateWorker(final EveApi api, final JPanel panel) {
         super();
-        this.overview = overview;
-        this.account = account;
+        
+        this.api = api;
+        this.target = panel;
     }
 
     /** {@inheritDoc} */
     @Override
     protected ApiResponse<CharacterList> doInBackground() throws Exception {
         Logger.getLogger(OverviewPage.class.getName()).log(Level.FINEST, "doInBackground()");
-        return overview.getApi().getCharacterList();
+        return api.getCharacterList();
     }
 
     @Override
@@ -65,14 +68,14 @@ public class AccountUpdateWorker extends SwingWorker<ApiResponse<CharacterList>,
             final ApiResponse<CharacterList> res = get();
             System.out.println(Thread.currentThread().getName());
             if (res.wasSuccessful()) {
-                overview.getPanels().get(account).removeAll();
+                target.removeAll();
                 boolean first = true;
 
                 for (BasicCharInfo character : res.getResult()) {
                     if (first) {
                         first = false;
                     } else {
-                        overview.getPanels().get(account).add(new JSeparator(),
+                        target.add(new JSeparator(),
                                 "span, growx, pushx, gaptop 5, gapbottom 5");
                     }
 
@@ -80,25 +83,20 @@ public class AccountUpdateWorker extends SwingWorker<ApiResponse<CharacterList>,
                     final JLabel nameLabel = new JLabel(character.getName());
                     nameLabel.setFont(nameLabel.getFont().deriveFont(Font.BOLD));
                     
-                    overview.getPanels().get(account)
-                            .add(portrait, "spany 2, height 64!, width 64!");
-                    overview.getPanels().get(account)
-                            .add(nameLabel, "height 20!");
-                    overview.getPanels().get(account)
-                            .add(new JLabel(character.getCorp().getName(), JLabel.RIGHT), "wrap");
-                    overview.getPanels().get(account)
-                            .add(new JLabel("Training XXXX to level 5 " +
+                    target.add(portrait, "spany 2, height 64!, width 64!");
+                    target.add(nameLabel, "height 20!");
+                    target.add(new JLabel(character.getCorp().getName(), JLabel.RIGHT), "wrap");
+                    target.add(new JLabel("Training XXXX to level 5 " +
                             "(3 years 1 second...)"), "gaptop 20, height 20!");
-                    overview.getPanels().get(account)
-                            .add(new JLabel("1,333,337 ISK", JLabel.RIGHT), "wrap");
+                    target.add(new JLabel("1,333,337 ISK", JLabel.RIGHT), "wrap");
 
                     new PortraitLoaderWorker(character.getId(), portrait, 64).execute();
                 }
             } else {
-                overview.getPanels().get(account).removeAll();
-                overview.getPanels().get(account).add(new JLabel("Error!: " + res.getError()));
+                target.removeAll();
+                target.add(new JLabel("Error!: " + res.getError()));
             }
-            overview.getPanels().get(account).revalidate();
+            target.revalidate();
         } catch (Exception ex) {
             Logger.getLogger(OverviewPage.class.getName()).log(Level.SEVERE, null, ex);
         }