Add requirements list and implement method to expand

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

@@ -31,6 +31,7 @@ import uk.co.md87.evetool.api.parser.ApiElement;
 import uk.co.md87.evetool.api.wrappers.data.CertCategory;
 import uk.co.md87.evetool.api.wrappers.data.CertClass;
 import uk.co.md87.evetool.api.wrappers.data.CertInfo;
+import uk.co.md87.evetool.api.wrappers.data.RequirementsList;
 import uk.co.md87.evetool.api.wrappers.data.SkillRequirement;
 
 /**
@@ -84,7 +85,7 @@ public class CertificateTree extends ArrayList<CertCategory> {
         final int grade = row.getNumericAttribute("grade");
         final int corp = row.getNumericAttribute("corporationID");
         final String desc = row.getStringAttribute("description");
-        final List<SkillRequirement> skillReqs = new ArrayList<SkillRequirement>();
+        final RequirementsList skillReqs = new RequirementsList();
         final List<Integer> certReqs = new ArrayList<Integer>();
 
         for (ApiElement srow : row.getRowset("requiredSkills")) {

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.RequirementsList;
 import uk.co.md87.evetool.api.wrappers.data.SkillRequirement;
 import uk.co.md87.evetool.api.wrappers.data.TrainedSkillInfo;
 
@@ -244,10 +245,14 @@ public class CharacterSheet {
         return skills;
     }
 
-    public boolean hasSkills(final List<SkillRequirement> reqs) {
+    public boolean hasSkill(final SkillRequirement req) {
+        return skills.containsKey(req.getSkillId()) ||
+                skills.get(req.getSkillId()).getLevel() < req.getRequiredLevel();
+    }
+
+    public boolean hasSkills(final RequirementsList reqs) {
         for (SkillRequirement req : reqs) {
-            if (!skills.containsKey(req.getSkillId()) ||
-                    skills.get(req.getSkillId()).getLevel() < req.getRequiredLevel()) {
+            if (!hasSkill(req)) {
                 return false;
             }
         }

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

@@ -22,14 +22,13 @@
 
 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.BasicRaceInfo;
 import uk.co.md87.evetool.api.wrappers.data.BasicShipInfo;
+import uk.co.md87.evetool.api.wrappers.data.RequirementsList;
 import uk.co.md87.evetool.api.wrappers.data.SkillRequirement;
 import uk.co.md87.evetool.api.wrappers.data.TypeGroup;
 
@@ -56,7 +55,7 @@ public class ShipList {
                 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 RequirementsList reqs = new RequirementsList();
                 
                 final int[][] values = new int[ship.getRowset("attributes").size() / 2][2];
                 for (ApiElement req : ship.getRowset("attributes")) {

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

@@ -29,6 +29,7 @@ import java.util.Map;
 
 import uk.co.md87.evetool.api.parser.ApiElement;
 import uk.co.md87.evetool.api.wrappers.data.Attribute;
+import uk.co.md87.evetool.api.wrappers.data.RequirementsList;
 import uk.co.md87.evetool.api.wrappers.data.SkillGroup;
 import uk.co.md87.evetool.api.wrappers.data.SkillInfo;
 import uk.co.md87.evetool.api.wrappers.data.SkillRequirement;
@@ -79,7 +80,7 @@ public class SkillList extends ArrayList<SkillGroup> {
         final int typeId = row.getNumericAttribute("typeID");
         final String desc = row.getChildContent("description");
         final int rank = row.getNumericChildContent("rank");
-        final List<SkillRequirement> reqs = getReqs(row.getRowset("requiredSkills"));
+        final RequirementsList reqs = getReqs(row.getRowset("requiredSkills"));
         final Attribute primaryAttribute = Attribute.valueOf(row.getChild("requiredAttributes")
                 .getChildContent("primaryAttribute").toUpperCase());
         final Attribute secondaryAttribute = Attribute.valueOf(row.getChild("requiredAttributes")
@@ -90,8 +91,8 @@ public class SkillList extends ArrayList<SkillGroup> {
                 secondaryAttribute, bonuses);
     }
 
-    protected List<SkillRequirement> getReqs(final List<ApiElement> rowset) {
-        final List<SkillRequirement> reqs = new ArrayList<SkillRequirement>();
+    protected RequirementsList getReqs(final List<ApiElement> rowset) {
+        final RequirementsList reqs = new RequirementsList();
 
         for (ApiElement row : rowset) {
             reqs.add(new SkillRequirement(row.getNumericAttribute("typeID"),

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

@@ -22,8 +22,6 @@
 
 package uk.co.md87.evetool.api.wrappers.data;
 
-import java.util.List;
-
 /**
  *
  * TODO: Document BasicShipInfo
@@ -32,11 +30,11 @@ import java.util.List;
 public class BasicShipInfo extends BasicType {
 
     private final int graphicID;
-    private final List<SkillRequirement> requirements;
+    private final RequirementsList requirements;
 
     public BasicShipInfo(final int id, final String name, final BasicRaceInfo race,
             final TypeGroup group, final int graphicID,
-            final List<SkillRequirement> requirements) {
+            final RequirementsList requirements) {
         super(id, name, race, group);
 
         this.graphicID = graphicID;
@@ -48,7 +46,7 @@ public class BasicShipInfo extends BasicType {
     }
 
 
-    public List<SkillRequirement> getRequirements() {
+    public RequirementsList getRequirements() {
         return requirements;
     }
 

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

@@ -23,6 +23,7 @@
 package uk.co.md87.evetool.api.wrappers.data;
 
 import java.util.List;
+
 import uk.co.md87.evetool.ui.listable.Retrievable;
 
 /**
@@ -36,11 +37,11 @@ public class CertInfo {
     private final int grade;
     private final int corp;
     private final String desc;
-    private final List<SkillRequirement> skillReqs;
+    private final RequirementsList skillReqs;
     private final List<Integer> certReqs;
 
     public CertInfo(final int id, final int grade, final int corp,
-            final String desc, final List<SkillRequirement> skillReqs,
+            final String desc, final RequirementsList skillReqs,
             final List<Integer> certReqs) {
         this.id = id;
         this.grade = grade;
@@ -74,7 +75,7 @@ public class CertInfo {
         return id;
     }
 
-    public List<SkillRequirement> getSkillReqs() {
+    public RequirementsList getSkillReqs() {
         return skillReqs;
     }
 

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

@@ -0,0 +1,74 @@
+/*
+ * 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 java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import uk.co.md87.evetool.api.wrappers.SkillList;
+import uk.co.md87.evetool.ui.listable.Retrievable;
+
+/**
+ *
+ * TODO: Document RequirementsList
+ * @author chris
+ */
+public class RequirementsList extends ArrayList<SkillRequirement> {
+
+    /**
+     * 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 expandRequirements(final SkillList skillList) {
+        final List<SkillRequirement> unprocessed = new ArrayList<SkillRequirement>();
+        final Map<Integer, Integer> needed = new HashMap<Integer, Integer>();
+        unprocessed.addAll(this);
+
+        while (!unprocessed.isEmpty()) {
+            final SkillRequirement target = unprocessed.remove(0);
+
+            unprocessed.addAll(skillList.getSkillById(target.getSkillId()).getRequirements());
+
+            final int level =  Math.max(needed.containsKey(target.getSkillId())
+                    ? needed.get(target.getSkillId()) : 0, target.getRequiredLevel());
+            needed.put(target.getSkillId(), level);
+        }
+
+        clear();
+
+        for (Map.Entry<Integer, Integer> entry : needed.entrySet()) {
+            add(new SkillRequirement(entry.getKey(), entry.getValue()));
+        }
+    }
+
+    @Retrievable(name="total number")
+    public int getNumSkills() {
+        return size();
+    }
+
+}

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

@@ -22,8 +22,8 @@
 
 package uk.co.md87.evetool.api.wrappers.data;
 
-import java.util.List;
 import java.util.Map;
+
 import uk.co.md87.evetool.ui.listable.Retrievable;
 import uk.co.md87.evetool.ui.listable.formatters.NumberFormatter;
 
@@ -39,14 +39,14 @@ public class SkillInfo {
     protected final int id;
     protected final String description;
     protected final int rank;
-    protected final List<SkillRequirement> requirements;
+    protected final RequirementsList requirements;
     protected final Attribute primaryAttribute;
     protected final Attribute secondaryAttribute;
     protected final Map<String, String> bonuses;
 
     public SkillInfo(final SkillGroup group, final String name, final int id,
             final String description, final int rank,
-            final List<SkillRequirement> requirements,
+            final RequirementsList requirements,
             final Attribute primaryAttribute, final Attribute secondaryAttribute,
             final Map<String, String> bonuses) {
         this.group = group;
@@ -97,6 +97,11 @@ public class SkillInfo {
         return group;
     }
 
+    @Retrievable(deferred=true,name="Requirements:")
+    public RequirementsList getRequirements() {
+        return requirements;
+    }
+
     @Override
     public String toString() {
         return "[" + name + " (" + id + ") | " + bonuses + "]";