Work on ship list

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

@@ -58,7 +58,7 @@ public class Main {
         initTables();
 
         final AccountManager manager = new AccountManager(ApiFactory.getConnection());
-        
+
         new MainWindow(manager, new ApiFactory()).setVisible(true);
     }
 

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

@@ -38,6 +38,7 @@ import uk.co.md87.evetool.api.wrappers.CertificateTree;
 import uk.co.md87.evetool.api.wrappers.CharacterList;
 import uk.co.md87.evetool.api.wrappers.CharacterSheet;
 import uk.co.md87.evetool.api.wrappers.MarketOrders;
+import uk.co.md87.evetool.api.wrappers.ShipList;
 import uk.co.md87.evetool.api.wrappers.SkillInTraining;
 import uk.co.md87.evetool.api.wrappers.SkillList;
 
@@ -179,6 +180,17 @@ public class EveApi implements Cloneable {
         return getResponse("/eve/CertificateTree.xml.aspx", CertificateTree.class, false, false);
     }
 
+    /**
+     * Retrieves a list of ships in EVE.
+     * Does not require an API key.
+     *
+     * @return A list of ships in EVE
+     */
+    public ApiResponse<ShipList> getShipList() {
+        return getResponse("http://evetool.md87.co.uk/api/types.php?category=6"
+                + "&published&attributes=requiredSkill%&groups", ShipList.class, false, false);
+    }
+
     /**
      * Utility method to send a request to the API and manufacture the
      * appropaite response objects.

src/uk/co/md87/evetool/api/db/pagecache.sql

@@ -1,6 +1,6 @@
 CREATE TABLE PageCache (
     pc_id INT PRIMARY KEY GENERATED ALWAYS AS IDENTITY,
-    pc_method VARCHAR(50),
+    pc_method VARCHAR(512),
     pc_args VARCHAR(512),
     pc_cachedat TIMESTAMP,
     pc_cacheduntil TIMESTAMP,

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

@@ -22,16 +22,79 @@
 
 package uk.co.md87.evetool.api.wrappers;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import uk.co.md87.evetool.api.parser.ApiElement;
+import uk.co.md87.evetool.api.wrappers.data.BasicShipInfo;
+import uk.co.md87.evetool.api.wrappers.data.SkillRequirement;
+import uk.co.md87.evetool.api.wrappers.data.TypeGroup;
 
 /**
  *
+ * TODO: Document ShipList
  * @author chris
  */
 public class ShipList {
 
+    private final Map<Integer, TypeGroup> groups = new HashMap<Integer, TypeGroup>();
+    private final Map<Integer, BasicShipInfo> ships = new HashMap<Integer, BasicShipInfo>();
+
     public ShipList(final ApiElement resultElement) {
+        for (ApiElement grouprow : resultElement.getRowset("groups")) {
+            final int groupID = grouprow.getNumericAttribute("groupID");
+            final String groupName = grouprow.getStringAttribute("groupName");
+
+            final TypeGroup group = new TypeGroup(groupID, groupName);
+            groups.put(groupID, group);
+
+            for (ApiElement ship : grouprow.getRowset("types")) {
+                final int typeID = ship.getNumericAttribute("typeID");
+                final String typeName = ship.getStringAttribute("typeName");
+                final int graphicID = ship.getNumericAttribute("graphicID");
+                final List<SkillRequirement> reqs = new ArrayList<SkillRequirement>();
+                
+                final int[][] values = new int[ship.getRowset("attributes").size()][2];
+                for (ApiElement req : ship.getRowset("attributes")) {
+                    String atName = req.getStringAttribute("attributeName").substring(13);
+
+                    int index = 0;
+
+                    if (atName.endsWith("Level")) {
+                        index = 1;
+                        
+                        atName = atName.substring(0, atName.length() - 5);
+                    }
+
+                    int number = Integer.parseInt(atName);
+                    values[number][index] = req.getNumericAttribute("value");
+                }
+
+                for (int[] value : values) {
+                    reqs.add(new SkillRequirement(value[0], value[1]));
+                }
+
+                final BasicShipInfo info = new BasicShipInfo(typeID, typeName,
+                        group, graphicID, reqs);
+                group.add(info);
+                ships.put(typeID, info);
+            }
+        }
+    }
+
+    public Map<Integer, TypeGroup> getGroups() {
+        return groups;
+    }
+
+    public Map<Integer, BasicShipInfo> getShips() {
+        return ships;
+    }
 
+    @Override
+    public String toString() {
+        return groups.toString();
     }
 
 }

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

@@ -34,9 +34,9 @@ public class BasicShipInfo extends BasicType {
     private final int graphicID;
     private final List<SkillRequirement> requirements;
 
-    public BasicShipInfo(final int id, final String name, final int graphicID,
-            final List<SkillRequirement> requirements) {
-        super(id, name);
+    public BasicShipInfo(final int id, final String name, final TypeGroup group,
+            final int graphicID, final List<SkillRequirement> requirements) {
+        super(id, name, group);
 
         this.graphicID = graphicID;
         this.requirements = requirements;

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

@@ -35,9 +35,17 @@ public class BasicType {
 
     private final String name;
 
-    public BasicType(final int id, final String name) {
+    private final TypeGroup group;
+
+    public BasicType(final int id, final String name, final TypeGroup group) {
         this.id = id;
         this.name = name;
+        this.group = group;
+    }
+
+    @Retrievable(deferred=true,name="group")
+    public TypeGroup getGroup() {
+        return group;
     }
 
     @Retrievable

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

@@ -0,0 +1,60 @@
+/*
+ * 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.api.wrappers.data;
+
+import java.util.ArrayList;
+import uk.co.md87.evetool.ui.listable.Retrievable;
+
+/**
+ *
+ * TODO: Document TypeGroup
+ * @author chris
+ */
+public class TypeGroup extends ArrayList<BasicType> {
+
+    /**
+     * 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 int id;
+    private final String name;
+
+    public TypeGroup(final int id, final String name) {
+        this.id = id;
+        this.name = name;
+    }
+
+    @Retrievable
+    public int getId() {
+        return id;
+    }
+
+    @Retrievable
+    public String getName() {
+        return name;
+    }
+
+}