Improved the way getRowset works to make it more useful

src/uk/co/md87/evetool/api/parser/ApiElement.java

@@ -73,16 +73,23 @@ public class ApiElement {
         return null;
     }
 
-    public ApiElement getRowset(final String name) {
+    public List<ApiElement> getRowset(final String name) {
+        final List<ApiElement> rows = new ArrayList<ApiElement>();
+        
         for (ApiElement child : getChildren()) {
             if (child instanceof NamedApiElement
                     && "rowset".equals(((NamedApiElement) child).getName())
                     && name.equals(child.getStringAttribute("name"))) {
-                return child;
+                for (ApiElement row : child.getChildren()) {
+                    if (row instanceof NamedApiElement
+                            && "row".equals(((NamedApiElement) row).getName())) {
+                        rows.add(row);
+                    }
+                }
             }
         }
 
-        return null;
+        return rows;
     }
 
     public String getChildContent(final String name) {

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

@@ -50,7 +50,7 @@ public class CertificateTree extends ArrayList<CertCategory> {
     protected final Map<Integer, CertInfo> certs = new HashMap<Integer, CertInfo>();
 
     public CertificateTree(final ApiElement resultElement) {
-        for (ApiElement row : resultElement.getRowset("categories").getChildren()) {
+        for (ApiElement row : resultElement.getRowset("categories")) {
             add(getCategory(row));
         }
     }
@@ -60,7 +60,7 @@ public class CertificateTree extends ArrayList<CertCategory> {
         final String name = row.getStringAttribute("categoryName");
         final List<CertClass> classes = new ArrayList<CertClass>();
 
-        for (ApiElement crow : row.getRowset("classes").getChildren()) {
+        for (ApiElement crow : row.getRowset("classes")) {
             classes.add(getClass(crow));
         }
 
@@ -72,7 +72,7 @@ public class CertificateTree extends ArrayList<CertCategory> {
         final String name = row.getStringAttribute("className");
         final List<CertInfo> certificates = new ArrayList<CertInfo>();
 
-        for (ApiElement crow : row.getRowset("certificates").getChildren()) {
+        for (ApiElement crow : row.getRowset("certificates")) {
             certificates.add(getCert(crow));
         }
 
@@ -87,11 +87,11 @@ public class CertificateTree extends ArrayList<CertCategory> {
         final List<SkillRequirement> skillReqs = new ArrayList<SkillRequirement>();
         final List<Integer> certReqs = new ArrayList<Integer>();
 
-        for (ApiElement srow : row.getRowset("requiredSkills").getChildren()) {
+        for (ApiElement srow : row.getRowset("requiredSkills")) {
             skillReqs.add(getSkillReq(srow));
         }
 
-        for (ApiElement crow : row.getRowset("requiredCertificates").getChildren()) {
+        for (ApiElement crow : row.getRowset("requiredCertificates")) {
             certReqs.add(getCertReq(crow));
         }
 

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

@@ -134,9 +134,8 @@ public class CharacterSheet {
         }
     }
 
-    protected void parseSkills(final ApiElement rowset) {
-        // TODO: Nice way to quickly parse rowsets?
-        for (ApiElement row : rowset.getChildren()) {
+    protected void parseSkills(final List<ApiElement> rowset) {
+        for (ApiElement row : rowset) {
             final int id = row.getNumericAttribute("typeID");
             final int level = row.getNumericAttribute("level");
             final int sp = row.getNumericAttribute("skillpoints");
@@ -144,8 +143,8 @@ public class CharacterSheet {
         }
     }
 
-    protected void parseCertificates(final ApiElement rowset) {
-        for (ApiElement row : rowset.getChildren()) {
+    protected void parseCertificates(final List<ApiElement> rowset) {
+        for (ApiElement row : rowset) {
             final int id = row.getNumericAttribute("certificateID");
             certificates.add(id);
         }

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

@@ -45,7 +45,7 @@ public class MarketOrders extends ArrayList<Order> {
 
         double total = 0;
 
-        for (ApiElement row : resultElement.getRowset("orders").getChildren()) {
+        for (ApiElement row : resultElement.getRowset("orders")) {
             if (row.getNumericAttribute("bid") == 0) {
                 // Sell order
                 final double value = row.getNumericAttribute("volRemaining")

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

@@ -50,7 +50,7 @@ public class SkillList extends ArrayList<SkillGroup> {
     protected final Map<Integer, SkillInfo> skills = new HashMap<Integer, SkillInfo>();
 
     public SkillList(final ApiElement resultElement) {
-        for (ApiElement row : resultElement.getRowset("skillGroups").getChildren()) {
+        for (ApiElement row : resultElement.getRowset("skillGroups")) {
             add(getSkillGroup(row));
         }
     }
@@ -65,7 +65,7 @@ public class SkillList extends ArrayList<SkillGroup> {
 
         final SkillGroup group = new SkillGroup(name, id);
 
-        for (ApiElement skillrow : row.getRowset("skills").getChildren()) {
+        for (ApiElement skillrow : row.getRowset("skills")) {
             final SkillInfo skill = getSkill(group, skillrow);
             group.add(skill);
             skills.put(skill.getId(), skill);
@@ -90,10 +90,10 @@ public class SkillList extends ArrayList<SkillGroup> {
                 secondaryAttribute, bonuses);
     }
 
-    protected List<SkillRequirement> getReqs(final ApiElement rowset) {
+    protected List<SkillRequirement> getReqs(final List<ApiElement> rowset) {
         final List<SkillRequirement> reqs = new ArrayList<SkillRequirement>();
 
-        for (ApiElement row : rowset.getChildren()) {
+        for (ApiElement row : rowset) {
             reqs.add(new SkillRequirement(row.getNumericAttribute("typeID"),
                     row.getNumericAttribute("skillLevel")));
         }
@@ -101,10 +101,10 @@ public class SkillList extends ArrayList<SkillGroup> {
         return reqs;
     }
 
-    protected Map<String, String> getBonuses(final ApiElement rowset) {
+    protected Map<String, String> getBonuses(final List<ApiElement> rowset) {
         final Map<String, String> bonuses = new HashMap<String, String>();
 
-        for (ApiElement child : rowset.getChildren()) {
+        for (ApiElement child : rowset) {
             bonuses.put(child.getStringAttribute("bonusType"),
                     child.getStringAttribute("bonusValue"));
         }