Document Attribute and make SkillInfo use attributes

src/uk/co/md87/evetool/api/wrappers/SkillList.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.Attribute;
 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,10 +80,10 @@ public class SkillList extends ArrayList<SkillGroup> {
         final String desc = row.getChildContent("description");
         final int rank = row.getNumericChildContent("rank");
         final List<SkillRequirement> reqs = getReqs(row.getRowset("requiredSkills"));
-        final String primaryAttribute = row.getChild("requiredAttributes")
-                .getChildContent("primaryAttribute");
-        final String secondaryAttribute = row.getChild("requiredAttributes")
-                .getChildContent("secondaryAttribute");
+        final Attribute primaryAttribute = Attribute.valueOf(row.getChild("requiredAttributes")
+                .getChildContent("primaryAttribute").toUpperCase());
+        final Attribute secondaryAttribute = Attribute.valueOf(row.getChild("requiredAttributes")
+                .getChildContent("secondaryAttribute").toUpperCase());
         final Map<String, String> bonuses = getBonuses(row.getRowset("skillBonusCollection"));
 
         return new SkillInfo(group, skillName, typeId, desc, rank, reqs, primaryAttribute,

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

@@ -23,17 +23,25 @@
 package uk.co.md87.evetool.api.wrappers.data;
 
 /**
+ * An enumeration of the five attributes of a character.
  *
- * TODO: Document Attribute
- * TODO: Switch skill to use Attribute
  * @author chris
  */
 public enum Attribute {
 
+    /** The intelligence attribute. */
     INTELLIGENCE,
+
+    /** The memory attribute. */
     MEMORY,
+
+    /** The charisma attribute. */
     CHARISMA,
+
+    /** The perception attribute. */
     PERCEPTION,
+
+    /** The willpower attribute. */
     WILLPOWER;
 
 }

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

@@ -38,14 +38,14 @@ public class SkillInfo {
     protected final String description;
     protected final int rank;
     protected final List<SkillRequirement> requirements;
-    protected final String primaryAttribute;
-    protected final String secondaryAttribute;
+    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 String primaryAttribute, final String secondaryAttribute,
+            final Attribute primaryAttribute, final Attribute secondaryAttribute,
             final Map<String, String> bonuses) {
         this.group = group;
         this.name = name;