Skill tree

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

@@ -49,6 +49,7 @@ public class Main {
         api.setCharID("113499922");
         System.out.println(api.getCharacterList());
         System.out.println(api.getSkillInTraining());
+        System.out.println(api.getSkillTree());
     }
 
 }

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

@@ -40,6 +40,7 @@ import uk.co.md87.evetool.api.parser.ApiParser;
 import uk.co.md87.evetool.api.parser.ApiResult;
 import uk.co.md87.evetool.api.wrappers.CharacterList;
 import uk.co.md87.evetool.api.wrappers.SkillInTraining;
+import uk.co.md87.evetool.api.wrappers.SkillList;
 
 /**
  *
@@ -90,6 +91,10 @@ public class EveApi {
         return getResponse("/char/SkillInTraining.xml.aspx", SkillInTraining.class, true, true);
     }
 
+    public ApiResponse<SkillList> getSkillTree() {
+        return getResponse("/eve/SkillTree.xml.aspx ", SkillList.class, false, true);
+    }
+
     protected <T> ApiResponse<T> getResponse(final String method, final Class<T> type,
             final boolean needKey, final boolean needChar) {
         // TODO: Require userid + apikey

src/uk/co/md87/evetool/api/io/ApiDownloader.java

@@ -99,7 +99,9 @@ public class ApiDownloader {
             try {
                 final String page = Downloader.getPage(getUrl(method), ourArgs);
                 final ApiResult res = parser.parseResult(page);
+                
                 cache.setCache(method, ourArgs, page, res.getCachedUntil().getTime());
+                // TODO: Time should be converted from GMT
 
                 return res;
             } catch (IOException ex) {

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

@@ -73,4 +73,16 @@ public class ApiElement {
         return null;
     }
 
+    public ApiElement getRowset(final String name) {
+        for (ApiElement child : getChildren()) {
+            if (child instanceof NamedApiElement
+                    && "rowset".equals(((NamedApiElement) child).getName())
+                    && name.equals(child.getAttributes().get("name"))) {
+                return child;
+            }
+        }
+
+        return null;
+    }
+
 }

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

@@ -0,0 +1,90 @@
+/*
+ * 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;
+
+import uk.co.md87.evetool.api.wrappers.data.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import uk.co.md87.evetool.api.parser.ApiElement;
+
+/**
+ *
+ * TODO: Document
+ * @author chris
+ */
+public class SkillGroup extends ArrayList<Skill> {
+
+    private final int id;
+    private final String name;
+
+    public SkillGroup(final ApiElement rowElement) {
+        this.name = rowElement.getAttributes().get("groupName");
+        this.id = Integer.parseInt(rowElement.getAttributes().get("groupID"));
+
+        for (ApiElement row : rowElement.getChild("rowset").getChildren()) {
+            addSkill(row);
+        }
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    protected void addSkill(final ApiElement row) {
+        final String skillName = row.getAttributes().get("typeName");
+        final int typeId = Integer.parseInt(row.getAttributes().get("typeID"));
+        final String desc = row.getChild("description").getContent();
+        final int rank = Integer.parseInt(row.getChild("rank").getContent());
+        final List<SkillRequirement> reqs = getReqs(row.getRowset("requiredSkills"));
+        final String primaryAttribute = row.getChild("requiredAttributes")
+                .getChild("primaryAttribute").getContent();
+        final String secondaryAttribute = row.getChild("requiredAttributes")
+                .getChild("secondaryAttribute").getContent();
+        final Map<String, String> bonuses = getBonuses(row.getRowset("skillBonusCollection"));
+
+        add(new Skill(this, skillName, typeId, desc, rank, reqs, primaryAttribute,
+                secondaryAttribute, bonuses));
+    }
+
+    protected List<SkillRequirement> getReqs(final ApiElement rowset) {
+        final List<SkillRequirement> reqs = new ArrayList<SkillRequirement>();
+
+        for (ApiElement row : rowset.getChildren()) {
+            reqs.add(new SkillRequirement(
+                    Integer.parseInt(row.getAttributes().get("typeID")),
+                    Integer.parseInt(row.getAttributes().get("skillLevel"))));
+        }
+
+        return reqs;
+    }
+
+    protected Map<String, String> getBonuses(final ApiElement rowset) {
+        return null; // TODO: Implement
+    }
+
+}

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

@@ -0,0 +1,42 @@
+/*
+ * 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;
+
+import java.util.ArrayList;
+
+import uk.co.md87.evetool.api.parser.ApiElement;
+
+/**
+ *
+ * TODO: Document
+ * @author chris
+ */
+public class SkillList extends ArrayList<SkillGroup> {
+
+    public SkillList(final ApiElement resultElement) {
+        for (ApiElement row : resultElement.getRowset("skillGroups").getChildren()) {
+            add(new SkillGroup(row));
+        }
+    }
+
+}

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

@@ -0,0 +1,67 @@
+/*
+ * 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.List;
+import java.util.Map;
+import uk.co.md87.evetool.api.wrappers.SkillGroup;
+
+/**
+ *
+ * TODO: Document
+ * @author chris
+ */
+public class Skill {
+
+    protected final SkillGroup group;
+    protected final String name;
+    protected final int id;
+    protected final String description;
+    protected final int rank;
+    protected final List<SkillRequirement> requirements;
+    protected final String primaryAttribute;
+    protected final String secondaryAttribute;
+    protected final Map<String, String> bonuses;
+
+    public Skill(final SkillGroup group, final String name, final int id,
+            final String description, final int rank,
+            final List<SkillRequirement> requirements,
+            final String primaryAttribute, final String secondaryAttribute,
+            final Map<String, String> bonuses) {
+        this.group = group;
+        this.name = name;
+        this.id = id;
+        this.description = description;
+        this.rank = rank;
+        this.requirements = requirements;
+        this.primaryAttribute = primaryAttribute;
+        this.secondaryAttribute = secondaryAttribute;
+        this.bonuses = bonuses;
+    }
+
+    @Override
+    public String toString() {
+        return "[" + name + " (" + id + ")]";
+    }
+
+}

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

@@ -0,0 +1,40 @@
+/*
+ * 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;
+
+/**
+ *
+ * TODO: Document
+ * @author chris
+ */
+public class SkillRequirement {
+
+    private final int skillId;
+    private final int requiredLevel;
+
+    public SkillRequirement(int skillId, int requiredLevel) {
+        this.skillId = skillId;
+        this.requiredLevel = requiredLevel;
+    }
+
+}