Implement ships page

src/uk/co/md87/evetool/api/wrappers/CharacterSheet.java

@@ -34,6 +34,7 @@ import uk.co.md87.evetool.api.wrappers.data.BasicCharInfo;
 import uk.co.md87.evetool.api.wrappers.data.BasicCloneInfo;
 import uk.co.md87.evetool.api.wrappers.data.BasicCorpInfo;
 import uk.co.md87.evetool.api.wrappers.data.Implant;
+import uk.co.md87.evetool.api.wrappers.data.SkillRequirement;
 import uk.co.md87.evetool.api.wrappers.data.TrainedSkillInfo;
 
 /**
@@ -51,7 +52,7 @@ public class CharacterSheet {
     private final List<Implant> implants;
     private final Map<Attribute, Integer> baseAttributes;
     private final Map<Attribute, Double> attributes;
-    private final List<TrainedSkillInfo> skills;
+    private final Map<Integer, TrainedSkillInfo> skills;
     private final List<Integer> certificates;
 
     private final BasicCharInfo charInfo;
@@ -73,7 +74,7 @@ public class CharacterSheet {
         this.baseAttributes = new HashMap<Attribute, Integer>();
         parseAttributes(resultElement.getChild("attributes"));
 
-        this.skills = new ArrayList<TrainedSkillInfo>();
+        this.skills = new HashMap<Integer, TrainedSkillInfo>();
         parseSkills(resultElement.getRowset("skills"));
 
         this.certificates = new ArrayList<Integer>();
@@ -93,7 +94,7 @@ public class CharacterSheet {
     public long getSkillPoints() {
         long res = 0;
 
-        for (TrainedSkillInfo skill : getSkills()) {
+        for (TrainedSkillInfo skill : getSkills().values()) {
             res += skill.getSP();
         }
 
@@ -101,7 +102,7 @@ public class CharacterSheet {
     }
 
     public void associateSkills(final SkillList skilltree) {
-        for (TrainedSkillInfo skill : skills) {
+        for (TrainedSkillInfo skill : skills.values()) {
             skill.setSkill(skilltree.getSkillById(skill.getId()));
         }
 
@@ -139,7 +140,7 @@ public class CharacterSheet {
             final int id = row.getNumericAttribute("typeID");
             final int level = row.getNumericAttribute("level");
             final int sp = row.getNumericAttribute("skillpoints");
-            skills.add(new TrainedSkillInfo(this, id, level, sp));
+            skills.put(id, new TrainedSkillInfo(this, id, level, sp));
         }
     }
 
@@ -169,7 +170,7 @@ public class CharacterSheet {
     protected int getSkillBonus(final String name) {
         int count = 0;
 
-        for (TrainedSkillInfo skill : skills) {
+        for (TrainedSkillInfo skill : skills.values()) {
             if (skill.getSkillInfo() != null) {
                 for (Map.Entry<String, String> bonus : skill.getSkillInfo()
                         .getBonuses().entrySet()) {
@@ -239,10 +240,21 @@ public class CharacterSheet {
         return race;
     }
 
-    public List<TrainedSkillInfo> getSkills() {
+    public Map<Integer, TrainedSkillInfo> getSkills() {
         return skills;
     }
 
+    public boolean hasSkills(final List<SkillRequirement> reqs) {
+        for (SkillRequirement req : reqs) {
+            if (!skills.containsKey(req.getSkillId()) ||
+                    skills.get(req.getSkillId()).getLevel() < req.getRequiredLevel()) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
     /** {@inheritDoc} */
     @Override
     public String toString() {

src/uk/co/md87/evetool/api/wrappers/ShipList.java

@@ -56,7 +56,7 @@ public class ShipList {
                 final int graphicID = ship.getNumericAttribute("graphicID");
                 final List<SkillRequirement> reqs = new ArrayList<SkillRequirement>();
                 
-                final int[][] values = new int[ship.getRowset("attributes").size()][2];
+                final int[][] values = new int[ship.getRowset("attributes").size() / 2][2];
                 for (ApiElement req : ship.getRowset("attributes")) {
                     String atName = req.getStringAttribute("attributeName").substring(13);
 
@@ -68,7 +68,7 @@ public class ShipList {
                         atName = atName.substring(0, atName.length() - 5);
                     }
 
-                    int number = Integer.parseInt(atName);
+                    int number = Integer.parseInt(atName) - 1;
                     values[number][index] = req.getNumericAttribute("value");
                 }
 

src/uk/co/md87/evetool/api/wrappers/data/SkillRequirement.java

@@ -65,4 +65,10 @@ public class SkillRequirement {
         return skillId;
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public String toString() {
+        return "[" + skillId + "@" + requiredLevel + "]";
+    }
+
 }

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

@@ -44,6 +44,7 @@ import uk.co.md87.evetool.ApiFactory;
 import uk.co.md87.evetool.ui.ContentPanel.Page;
 import uk.co.md87.evetool.ui.data.AccountChar;
 import uk.co.md87.evetool.ui.pages.OverviewPage;
+import uk.co.md87.evetool.ui.pages.ShipsPage;
 import uk.co.md87.evetool.ui.pages.SkillPage;
 
 /**
@@ -80,6 +81,7 @@ public class MainWindow extends JFrame {
         pages = new TreeMap<String, ContentPanel.Page>();
         pages.put("Overview", new OverviewPage(this, manager, factory));
         pages.put("Skills", new SkillPage(this, manager, factory));
+        pages.put("Ships", new ShipsPage(this, manager, factory));
 
         this.menuPanel = new MenuPanel(this, pages);
         this.contentPanel = new ContentPanel(this, manager, factory, pages);

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

@@ -0,0 +1,55 @@
+/*
+ * 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.data;
+
+import uk.co.md87.evetool.api.wrappers.CharacterSheet;
+import uk.co.md87.evetool.api.wrappers.data.BasicShipInfo;
+import uk.co.md87.evetool.ui.listable.ListableImpl;
+import uk.co.md87.evetool.ui.listable.Retrievable;
+
+/**
+ *
+ * TODO: Document BasicShipInfoSurrogate
+ * @author chris
+ */
+public class BasicShipInfoSurrogate extends ListableImpl {
+
+    private final BasicShipInfo info;
+    private final CharacterSheet sheet;
+
+    public BasicShipInfoSurrogate(final BasicShipInfo info, final CharacterSheet sheet) {
+        this.info = info;
+        this.sheet = sheet;
+    }
+
+    @Retrievable(deferred=true)
+    public BasicShipInfo getInfo() {
+        return info;
+    }
+
+    @Retrievable
+    public boolean canFly() {
+        return sheet.hasSkills(info.getRequirements());
+    }
+
+}

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

@@ -1,6 +1,23 @@
 /*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
+ * 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.data;

src/uk/co/md87/evetool/ui/dialogs/listableconfig/ListableConfigDialog.java

@@ -65,7 +65,7 @@ import uk.co.md87.evetool.ui.listable.ListableConfig.CompoundConfigElement;
 import uk.co.md87.evetool.ui.listable.ListableConfig.ConfigElement;
 import uk.co.md87.evetool.ui.listable.ListableConfig.LiteralConfigElement;
 import uk.co.md87.evetool.ui.listable.ListableParser;
-import uk.co.md87.evetool.ui.pages.SkillPage;
+import uk.co.md87.evetool.ui.pages.ListablePage;
 
 /**
  *
@@ -95,7 +95,7 @@ public class ListableConfigDialog extends JDialog implements ActionListener,
     private final JPanel configPanel, previewPanel;
     private final ListablePanel panel;
 
-    private final SkillPage page;
+    private final ListablePage page;
 
     private static ImageIcon editInactiveIcon, editActiveIcon;
 
@@ -111,7 +111,7 @@ public class ListableConfigDialog extends JDialog implements ActionListener,
         }
     }
 
-    public ListableConfigDialog(final Window window, final SkillPage page,
+    public ListableConfigDialog(final Window window, final ListablePage page,
             final ListableConfig config, final Listable sample) {
         super(window, "Display Configuration", ModalityType.APPLICATION_MODAL);
 

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

@@ -0,0 +1,44 @@
+/*
+ * 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.pages;
+
+import uk.co.md87.evetool.ui.ContentPanel.Page;
+import uk.co.md87.evetool.ui.listable.ListableConfig;
+
+/**
+ *
+ * TODO: Document ListablePage
+ * @author chris
+ */
+public class ListablePage extends Page {
+
+    /**
+     * 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;
+
+    public void setConfig(final ListableConfig config) {}
+
+}

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

@@ -0,0 +1,165 @@
+/*
+ * 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.pages;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.Collections;
+
+import java.util.List;
+import javax.swing.JSeparator;
+
+import net.miginfocom.swing.MigLayout;
+
+import uk.co.md87.evetool.AccountManager;
+import uk.co.md87.evetool.ApiFactory;
+import uk.co.md87.evetool.api.wrappers.data.BasicShipInfo;
+import uk.co.md87.evetool.api.wrappers.data.TrainedSkillInfo;
+import uk.co.md87.evetool.ui.ContextPanel;
+import uk.co.md87.evetool.ui.MainWindow;
+import uk.co.md87.evetool.ui.components.FilterButton;
+import uk.co.md87.evetool.ui.components.HeaderPanel;
+import uk.co.md87.evetool.ui.components.ListablePanel;
+import uk.co.md87.evetool.ui.data.BasicShipInfoSurrogate;
+import uk.co.md87.evetool.ui.data.TrainedSkillInfoSurrogate;
+import uk.co.md87.evetool.ui.dialogs.listableconfig.ListableConfigDialog;
+import uk.co.md87.evetool.ui.listable.ListableComparator;
+import uk.co.md87.evetool.ui.listable.ListableConfig;
+import uk.co.md87.evetool.ui.listable.ListableParser;
+
+/**
+ *
+ * TODO: Document ShipsPage
+ * @author chris
+ */
+public class ShipsPage extends ListablePage 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 MainWindow window;
+    private final ApiFactory factory;
+
+    private ListableConfig config;
+
+    public ShipsPage(final MainWindow window, final AccountManager manager,
+            final ApiFactory factory) {
+        this.window = window;
+        this.factory = factory;
+
+        setLayout(new MigLayout("fillx, wrap 1"));
+
+        config = new ListableConfig();
+        config.topLeft = new ListableConfig.BasicConfigElement("name");
+        config.topRight = new ListableConfig.CompoundConfigElement();
+        config.bottomLeft = new ListableConfig.BasicConfigElement("can fly");
+        config.bottomRight = new ListableConfig.CompoundConfigElement();
+        config.group = new ListableConfig.BasicConfigElement("group name");
+
+        config.sortOrder = new ListableConfig.ConfigElement[]{
+            new ListableConfig.BasicConfigElement("group name"),
+            new ListableConfig.BasicConfigElement("name"),
+        };
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean isReady() {
+        return character != null && character.getSheet() != null
+                && character.getSheet().wasSuccessful();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void activated(final ContextPanel context) {
+        final FilterButton button = new FilterButton();
+        button.addActionListener(this);
+        context.add(button, "growy, al right");
+        
+        updatePage();
+    }
+
+
+    protected void updatePage() {
+        removeAll();
+
+        final ListableParser parser = new ListableParser(BasicShipInfoSurrogate.class);
+        final List<BasicShipInfoSurrogate> list = new ArrayList<BasicShipInfoSurrogate>();
+
+        for (BasicShipInfo ship : factory.getApi().getShipList().getResult()
+                .getShips().values()) {
+            list.add(new BasicShipInfoSurrogate(ship, character.getSheet().getResult()));
+        }
+
+        if (config.sortOrder != null) {
+            Collections.sort(list, new ListableComparator(config.sortOrder, parser));
+        }
+
+        String lastGroup = null;
+        boolean first = true;
+        
+        for (BasicShipInfoSurrogate ship : list) {
+            if (config.group != null) {
+                final String thisGroup = config.group.getValue(ship, parser);
+
+                if (lastGroup == null || !thisGroup.equals(lastGroup)) {
+                    first = true;
+                    lastGroup = thisGroup;
+                    add(new HeaderPanel(lastGroup), "growx, pushx");
+                }
+            }
+
+            if (first) {
+                first = false;
+            } else {
+                add(new JSeparator(), "growx, pushx");
+            }
+
+            add(new ListablePanel(ship, parser, config),
+                    "growx, pushx");
+        }
+
+        revalidate();
+    }
+
+    public void setConfig(final ListableConfig config) {
+        this.config = config;
+        
+        updatePage();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void actionPerformed(final ActionEvent e) {
+        new ListableConfigDialog(window, this, config,
+                new BasicShipInfoSurrogate(factory.getApi().getShipList()
+                .getResult().getShips().values().iterator().next(),
+                character.getSheet().getResult())).setVisible(true);
+    }
+
+}

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

@@ -35,7 +35,6 @@ import net.miginfocom.swing.MigLayout;
 import uk.co.md87.evetool.AccountManager;
 import uk.co.md87.evetool.ApiFactory;
 import uk.co.md87.evetool.api.wrappers.data.TrainedSkillInfo;
-import uk.co.md87.evetool.ui.ContentPanel.Page;
 import uk.co.md87.evetool.ui.ContextPanel;
 import uk.co.md87.evetool.ui.MainWindow;
 import uk.co.md87.evetool.ui.components.FilterButton;
@@ -52,7 +51,7 @@ import uk.co.md87.evetool.ui.listable.ListableParser;
  * TODO: Document SkillPage
  * @author chris
  */
-public class SkillPage extends Page implements ActionListener {
+public class SkillPage extends ListablePage implements ActionListener {
 
     /**
      * A version number for this class. It should be changed whenever the class
@@ -114,7 +113,7 @@ public class SkillPage extends Page implements ActionListener {
         final ListableParser parser = new ListableParser(TrainedSkillInfoSurrogate.class);
         final List<TrainedSkillInfoSurrogate> list = new ArrayList<TrainedSkillInfoSurrogate>();
 
-        for (TrainedSkillInfo skill : character.getSheet().getResult().getSkills()) {
+        for (TrainedSkillInfo skill : character.getSheet().getResult().getSkills().values()) {
             list.add(new TrainedSkillInfoSurrogate(skill));
         }