Add addaccount dialog

Make all path references absolute so they work from a jar

build.xml

@@ -78,4 +78,19 @@
             <arg value="git-describe --tags >build/classes/uk/co/md87/evetool/version.txt"/>
         </exec>
     </target>
+
+    <target name="-post-jar">
+        <jar destfile="dist/evetool.jar" compress="${jar.compress}" update="true">
+<!-- derby.jar  jaxen-core.jar  jaxen-jdom.jar  jdom.jar  miglayout-3.6.2.jar  saxpath.jar  xalan.jar  xerces.jar  xml-apis.jar -->
+            <zipfileset src="dist/lib/derby.jar" includes="**/*.class,META-INF/services/**,**/*.properties"/>
+            <zipfileset src="dist/lib/jaxen-core.jar" includes="**/*.class,**/*.properties"/>
+            <zipfileset src="dist/lib/jaxen-jdom.jar" includes="**/*.class,**/*.properties"/>
+            <zipfileset src="dist/lib/jdom.jar" includes="**/*.class,**/*.properties"/>
+            <zipfileset src="dist/lib/miglayout-3.6.2.jar" includes="**/*.class,**/*.properties"/>
+            <zipfileset src="dist/lib/saxpath.jar" includes="**/*.class,**/*.properties"/>
+            <zipfileset src="dist/lib/xalan.jar" includes="**/*.class,**/*.properties"/>
+            <zipfileset src="dist/lib/xerces.jar" includes="**/*.class,**/*.properties"/>
+            <zipfileset src="dist/lib/xml-apis.jar" includes="**/*.class,**/*.properties"/>
+        </jar>
+    </target>
 </project>

nbproject/project.properties

@@ -30,7 +30,7 @@ file.reference.xalan.jar=lib/xalan.jar
 file.reference.xerces.jar=lib/xerces.jar
 file.reference.xml-apis.jar=lib/xml-apis.jar
 includes=**
-jar.compress=false
+jar.compress=true
 javac.classpath=\
     ${file.reference.jaxen-core.jar}:\
     ${file.reference.jaxen-jdom.jar}:\
@@ -74,8 +74,7 @@ run.classpath=\
 run.jvmargs=
 run.test.classpath=\
     ${javac.test.classpath}:\
-    ${build.test.classes.dir}:\
-    
+    ${build.test.classes.dir}
 source.encoding=UTF-8
 src.dir=src
 test.src.dir=test

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

@@ -57,13 +57,6 @@ public class Main {
         initTables();
 
         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

@@ -85,7 +85,7 @@ public class EveApi implements Cloneable {
         this.conn = sqlConnection;
 
         if (!checkedTables) {
-            new TableCreator(conn, "../db/", TABLES).checkTables();
+            new TableCreator(conn, "/uk/co/md87/evetool/api/db/", TABLES).checkTables();
             checkedTables = true;
         }
 

src/uk/co/md87/evetool/ui/components/AddButton.java

@@ -57,7 +57,8 @@ public class AddButton extends JButton {
         setForeground(Color.WHITE);
 
         try {
-            setIcon(new ImageIcon(ImageIO.read(getClass().getResource("../res/plus.png"))));
+            setIcon(new ImageIcon(ImageIO.read(getClass()
+                    .getResource("/uk/co/md87/evetool/ui/res/plus.png"))));
         } catch (IOException ex) {
             // TODO: Do something with ex
         }

src/uk/co/md87/evetool/ui/components/FilterButton.java

@@ -57,7 +57,8 @@ public class FilterButton extends JButton {
         setForeground(Color.WHITE);
 
         try {
-            setIcon(new ImageIcon(ImageIO.read(getClass().getResource("../res/filter.png"))));
+            setIcon(new ImageIcon(ImageIO.read(getClass()
+                    .getResource("/uk/co/md87/evetool/ui/res/filter.png"))));
         } catch (IOException ex) {
             // TODO: Do something with ex
         }

src/uk/co/md87/evetool/ui/components/SkillPanel.java

@@ -54,13 +54,17 @@ public class SkillPanel extends JPanel {
 
     static {
         try {
-            completeImage = ImageIO.read(SkillPanel.class.getResource("../res/icon50_14.png"))
+            completeImage = ImageIO.read(SkillPanel.class
+                    .getResource("/uk/co/md87/evetool/ui/res/icon50_14.png"))
                     .getScaledInstance(48, 48, Image.SCALE_SMOOTH);
-            trainingImage = ImageIO.read(SkillPanel.class.getResource("../res/icon50_12.png"))
+            trainingImage = ImageIO.read(SkillPanel.class
+                    .getResource("/uk/co/md87/evetool/ui/res/icon50_12.png"))
                     .getScaledInstance(48, 48, Image.SCALE_SMOOTH);
-            normalImage = ImageIO.read(SkillPanel.class.getResource("../res/icon50_13.png"))
+            normalImage = ImageIO.read(SkillPanel.class
+                    .getResource("/uk/co/md87/evetool/ui/res/icon50_13.png"))
                     .getScaledInstance(48, 48, Image.SCALE_SMOOTH);
-            untrainedImage = ImageIO.read(SkillPanel.class.getResource("../res/icon50_11.png"))
+            untrainedImage = ImageIO.read(SkillPanel.class
+                    .getResource("/uk/co/md87/evetool/ui/res/icon50_11.png"))
                     .getScaledInstance(48, 48, Image.SCALE_SMOOTH);
         } catch (IOException ex) {
             // Do nothing

src/uk/co/md87/evetool/ui/data/AccountChar.java

@@ -79,7 +79,8 @@ public class AccountChar extends ListableImpl {
             this.balance.setText(String.format("%,.2f", sheet.getResult().getBalance()));
 
             if (sheet.getResult().getSkillPoints() > sheet.getResult().getClone().getSpLimit()) {
-                name.setIcon(new ImageIcon(getClass().getResource("../res/error.png")));
+                name.setIcon(new ImageIcon(getClass()
+                        .getResource("/uk/co/md87/evetool/ui/res/error.png")));
                 name.setToolTipText(
                         String.format("Character's clone is %,d SP too low",
                         sheet.getResult().getSkillPoints()

src/uk/co/md87/evetool/ui/data/TrainedSkillInfoSurrogate.java

@@ -27,16 +27,16 @@ public class TrainedSkillInfoSurrogate extends ListableImpl {
     static {
         try {
             completeImage = ImageIO.read(TrainedSkillInfoSurrogate.class
-                    .getResource("../res/icon50_14.png"))
+                    .getResource("/uk/co/md87/evetool/ui/res/icon50_14.png"))
                     .getScaledInstance(48, 48, Image.SCALE_SMOOTH);
             trainingImage = ImageIO.read(TrainedSkillInfoSurrogate.class
-                    .getResource("../res/icon50_12.png"))
+                    .getResource("/uk/co/md87/evetool/ui/res/icon50_12.png"))
                     .getScaledInstance(48, 48, Image.SCALE_SMOOTH);
             normalImage = ImageIO.read(TrainedSkillInfoSurrogate.class
-                    .getResource("../res/icon50_13.png"))
+                    .getResource("/uk/co/md87/evetool/ui/res/icon50_13.png"))
                     .getScaledInstance(48, 48, Image.SCALE_SMOOTH);
             untrainedImage = ImageIO.read(TrainedSkillInfoSurrogate.class
-                    .getResource("../res/icon50_11.png"))
+                    .getResource("/uk/co/md87/evetool/ui/res/icon50_11.png"))
                     .getScaledInstance(48, 48, Image.SCALE_SMOOTH);
         } catch (IOException ex) {
             // Do nothing

src/uk/co/md87/evetool/ui/dialogs/addaccount/AddAccountDialog.java

@@ -0,0 +1,99 @@
+/*
+ * 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.ui.dialogs.addaccount;
+
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JTextField;
+import net.miginfocom.swing.MigLayout;
+import uk.co.md87.evetool.AccountManager;
+
+/**
+ * Allows the user to add a new account.
+ * 
+ * @author chris
+ */
+public class AddAccountDialog extends JDialog implements ActionListener {
+
+    /**
+     * A version number for this class. It should be changed whenever the class
+     * structure is changed (or anything else that would prevent serialized
+     * objects being unserialized with the new class).
+     */
+    private static final long serialVersionUID = 10;
+
+    private final JTextField userID, apiKey;
+
+    private final JButton addButton, cancelButton;
+
+    private final AccountManager manager;
+
+    public AddAccountDialog(final Window owner, final AccountManager manager) {
+        super(owner, "Add new account", ModalityType.APPLICATION_MODAL);
+
+        this.manager = manager;
+
+        setLayout(new MigLayout("wrap 2, fill", "[fill,grow 10|fill,grow 30,200]", "[fill]"));
+
+        userID = new JTextField();
+        apiKey = new JTextField();
+
+        add(new JLabel("User ID:", JLabel.RIGHT));
+        add(userID);
+
+        add(new JLabel("API Key:", JLabel.RIGHT));
+        add(apiKey);
+
+        addButton = new JButton("Add");
+        cancelButton = new JButton("Cancel");
+
+        addButton.addActionListener(this);
+        cancelButton.addActionListener(this);
+
+        add(addButton, "span, split");
+        add(cancelButton);
+
+        setResizable(false);
+        pack();
+
+        setLocationRelativeTo(owner);
+    }
+
+    public void actionPerformed(final ActionEvent e) {
+        if (e.getSource() == addButton) {
+            final int enteredUserID = Integer.parseInt(userID.getText());
+            final String enteredKey = apiKey.getText();
+
+            manager.addAccount(enteredUserID, enteredKey);
+
+            dispose();
+        } else if (e.getSource() == cancelButton) {
+            dispose();
+        }
+    }
+
+}

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

@@ -55,6 +55,7 @@ import uk.co.md87.evetool.ui.MainWindow;
 import uk.co.md87.evetool.ui.components.AddButton;
 import uk.co.md87.evetool.ui.components.FilterButton;
 import uk.co.md87.evetool.ui.data.AccountChar;
+import uk.co.md87.evetool.ui.dialogs.addaccount.AddAccountDialog;
 import uk.co.md87.evetool.ui.workers.AccountUpdateWorker;
 
 /**
@@ -74,6 +75,7 @@ public class OverviewPage extends Page implements AccountManager.AccountListener
 
     private final MainWindow window;
     private final ApiFactory factory;
+    private final AccountManager manager;
     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>();
@@ -82,6 +84,7 @@ public class OverviewPage extends Page implements AccountManager.AccountListener
             final ApiFactory factory) {
         this.window = window;
         this.factory = factory;
+        this.manager = manager;
 
         setLayout(new MigLayout("fillx"));
 
@@ -118,18 +121,18 @@ public class OverviewPage extends Page implements AccountManager.AccountListener
         headerP.add(header, "growx");
 
         try {
-            final JButton editButton = new JButton(new ImageIcon(ImageIO
-                    .read(getClass().getResource("../res/edit-inactive.png"))));
+            final JButton editButton = new JButton(new ImageIcon(ImageIO.read(
+                    getClass().getResource("/uk/co/md87/evetool/ui/res/edit-inactive.png"))));
             editButton.setRolloverIcon(new ImageIcon(ImageIO
-                    .read(getClass().getResource("../res/edit.png"))));
+                    .read(getClass().getResource("/uk/co/md87/evetool/ui/res/edit.png"))));
             editButton.setBorder(BorderFactory.createEmptyBorder());
             editButton.setOpaque(false);
             editButton.setContentAreaFilled(false);
 
-            final JButton delButton = new JButton(new ImageIcon(ImageIO
-                    .read(getClass().getResource("../res/close-inactive.png"))));
-            delButton.setRolloverIcon(new ImageIcon(ImageIO
-                    .read(getClass().getResource("../res/close-active.png"))));
+            final JButton delButton = new JButton(new ImageIcon(ImageIO.read(
+                    getClass().getResource("/uk/co/md87/evetool/ui/res/close-inactive.png"))));
+            delButton.setRolloverIcon(new ImageIcon(ImageIO.read(
+                    getClass().getResource("/uk/co/md87/evetool/ui/res/close-active.png"))));
             delButton.setBorder(BorderFactory.createEmptyBorder());
             delButton.setOpaque(false);
             delButton.setContentAreaFilled(false);
@@ -169,7 +172,11 @@ public class OverviewPage extends Page implements AccountManager.AccountListener
     /** {@inheritDoc} */
     @Override
     public void actionPerformed(final ActionEvent e) {
-        updateCharacters();
+        if (e.getSource() instanceof AddButton) {
+            new AddAccountDialog(window, manager).setVisible(true);
+        } else {
+            updateCharacters();
+        }
     }
 
     @Override
@@ -179,7 +186,10 @@ public class OverviewPage extends Page implements AccountManager.AccountListener
 
     @Override
     public void activated(final ContextPanel context) {
-        context.add(new AddButton("Add account"), "growy");
+        final AddButton addButton = new AddButton("Add account");
+        addButton.addActionListener(this);
+        
+        context.add(addButton, "growy");
         context.add(new FilterButton(), "growy, al right");
     }