API now parses race information for types and ships

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

@@ -28,6 +28,7 @@ import java.util.List;
 import java.util.Map;
 
 import uk.co.md87.evetool.api.parser.ApiElement;
+import uk.co.md87.evetool.api.wrappers.data.BasicRaceInfo;
 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;
@@ -54,6 +55,7 @@ public class ShipList {
                 final int typeID = ship.getNumericAttribute("typeID");
                 final String typeName = ship.getStringAttribute("typeName");
                 final int graphicID = ship.getNumericAttribute("graphicID");
+                final int raceID = ship.getNumericAttribute("raceID");
                 final List<SkillRequirement> reqs = new ArrayList<SkillRequirement>();
                 
                 final int[][] values = new int[ship.getRowset("attributes").size() / 2][2];
@@ -77,7 +79,7 @@ public class ShipList {
                 }
 
                 final BasicShipInfo info = new BasicShipInfo(typeID, typeName,
-                        group, graphicID, reqs);
+                        new BasicRaceInfo(raceID), group, graphicID, reqs);
                 group.add(info);
                 ships.put(typeID, info);
             }

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

@@ -0,0 +1,46 @@
+/*
+ * 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 uk.co.md87.evetool.ui.listable.Retrievable;
+
+/**
+ *
+ * TODO: Document BasicRaceInfo
+ * TODO: Add ability to resolve race
+ * @author chris
+ */
+public class BasicRaceInfo {
+
+    private final int id;
+
+    public BasicRaceInfo(final int id) {
+        this.id = id;
+    }
+
+    @Retrievable
+    public int getId() {
+        return id;
+    }
+
+}

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

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

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

@@ -35,11 +35,15 @@ public class BasicType {
 
     private final String name;
 
+    private final BasicRaceInfo race;
+
     private final TypeGroup group;
 
-    public BasicType(final int id, final String name, final TypeGroup group) {
+    public BasicType(final int id, final String name, final BasicRaceInfo race,
+            final TypeGroup group) {
         this.id = id;
         this.name = name;
+        this.race = race;
         this.group = group;
     }
 
@@ -58,4 +62,9 @@ public class BasicType {
         return name;
     }
 
+    @Retrievable(deferred=true,name="race")
+    public BasicRaceInfo getRace() {
+        return race;
+    }
+
 }