|
@@ -28,6 +28,7 @@ import java.util.List;
|
28
|
28
|
import java.util.Map;
|
29
|
29
|
|
30
|
30
|
import uk.co.md87.evetool.api.parser.ApiElement;
|
|
31
|
+import uk.co.md87.evetool.api.wrappers.data.Attribute;
|
31
|
32
|
import uk.co.md87.evetool.api.wrappers.data.SkillGroup;
|
32
|
33
|
import uk.co.md87.evetool.api.wrappers.data.SkillInfo;
|
33
|
34
|
import uk.co.md87.evetool.api.wrappers.data.SkillRequirement;
|
|
@@ -79,10 +80,10 @@ public class SkillList extends ArrayList<SkillGroup> {
|
79
|
80
|
final String desc = row.getChildContent("description");
|
80
|
81
|
final int rank = row.getNumericChildContent("rank");
|
81
|
82
|
final List<SkillRequirement> reqs = getReqs(row.getRowset("requiredSkills"));
|
82
|
|
- final String primaryAttribute = row.getChild("requiredAttributes")
|
83
|
|
- .getChildContent("primaryAttribute");
|
84
|
|
- final String secondaryAttribute = row.getChild("requiredAttributes")
|
85
|
|
- .getChildContent("secondaryAttribute");
|
|
83
|
+ final Attribute primaryAttribute = Attribute.valueOf(row.getChild("requiredAttributes")
|
|
84
|
+ .getChildContent("primaryAttribute").toUpperCase());
|
|
85
|
+ final Attribute secondaryAttribute = Attribute.valueOf(row.getChild("requiredAttributes")
|
|
86
|
+ .getChildContent("secondaryAttribute").toUpperCase());
|
86
|
87
|
final Map<String, String> bonuses = getBonuses(row.getRowset("skillBonusCollection"));
|
87
|
88
|
|
88
|
89
|
return new SkillInfo(group, skillName, typeId, desc, rank, reqs, primaryAttribute,
|