Discovers favoring trait types automatically.

Author: UrsKR

Character_Main/src/main/java/net/sf/anathema/hero/template/magic/AbilityFavoringType.java

@@ -13,9 +13,10 @@ public AbilityType[] getTraitTypesForGenericCharms() {
   public TraitType getSpellFavoringType() {
     return AbilityType.Occult;
   }
+
   @Override
   public String getId() {
-    return "AbilityType";
+    return "Abilities";
   }
 
   @Override

Character_Main/src/main/java/net/sf/anathema/hero/template/magic/AttributeFavoringType.java

@@ -16,7 +16,7 @@ public TraitType getSpellFavoringType() {
 
   @Override
   public String getId() {
-    return "AttributeType";
+    return "Attributes";
   }
 
   @Override

Character_Main/src/main/java/net/sf/anathema/hero/type/CharacterTypeGson.java

@@ -3,6 +3,7 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import net.sf.anathema.character.framework.type.CharacterType;
+import net.sf.anathema.framework.environment.ObjectFactory;
 import net.sf.anathema.hero.template.magic.FavoringTraitType;
 import org.apache.commons.io.IOUtils;
 
@@ -12,9 +13,9 @@
 public class CharacterTypeGson {
   private Gson gson;
 
-  public CharacterTypeGson() {
+  public CharacterTypeGson(ObjectFactory objectFactory) {
     GsonBuilder gsonBuilder = new GsonBuilder();
-    gsonBuilder.registerTypeAdapter(FavoringTraitType.class, new FavoringTraitTypeAdapter());
+    gsonBuilder.registerTypeAdapter(FavoringTraitType.class, new FavoringTraitTypeAdapter(objectFactory));
     gsonBuilder.setPrettyPrinting();
     gson = gsonBuilder.create();
   }

Character_Main/src/main/java/net/sf/anathema/hero/type/FavoringTraitTypeAdapter.java

@@ -3,13 +3,19 @@
 import com.google.gson.TypeAdapter;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import net.sf.anathema.hero.template.magic.AbilityFavoringType;
-import net.sf.anathema.hero.template.magic.AttributeFavoringType;
+import net.sf.anathema.framework.environment.ObjectFactory;
 import net.sf.anathema.hero.template.magic.FavoringTraitType;
 
 import java.io.IOException;
+import java.util.Collection;
 
 public class FavoringTraitTypeAdapter extends TypeAdapter<FavoringTraitType> {
+  private final ObjectFactory objectFactory;
+
+  public FavoringTraitTypeAdapter(ObjectFactory objectFactory) {
+    this.objectFactory = objectFactory;
+  }
+
   @Override
   public void write(JsonWriter out, FavoringTraitType value) throws IOException {
     //nothing to do
@@ -18,11 +24,11 @@ public void write(JsonWriter out, FavoringTraitType value) throws IOException {
   @Override
   public FavoringTraitType read(JsonReader in) throws IOException {
     String string = in.nextString();
-    if (string.equals("Ability")) {
-      return new AbilityFavoringType();
-    }
-    if (string.equals("Attribute")) {
-      return new AttributeFavoringType();
+    Collection<FavoringTraitType> types = objectFactory.instantiateAllImplementers(FavoringTraitType.class);
+    for (FavoringTraitType type : types) {
+      if (type.getId().equals(string)) {
+        return type;
+      }
     }
     throw new IllegalArgumentException("Unknown trait type: " + string);
   }

Character_Main/src/main/java/net/sf/anathema/hero/type/HeroTypeCompiler.java

@@ -15,11 +15,11 @@ public class HeroTypeCompiler implements IExtensibleDataSetCompiler {
 
   private static final String TEMPLATE_FILE_RECOGNITION_PATTERN = "(.+?)\\.charactertype";
   private final ExtensibleCharacterTypes types = new ExtensibleCharacterTypes();
-  private final CharacterTypeGson gson = new CharacterTypeGson();
+  private final CharacterTypeGson gson;
 
   @SuppressWarnings("UnusedParameters")
   public HeroTypeCompiler(ObjectFactory objectFactory, IExtensibleDataSetProvider provider) {
-    //nothing to do
+    this.gson = new CharacterTypeGson(objectFactory);
   }
 
   @Override

Character_MartialArts/src/main/resources/data/Dragon-Blooded.charactertype

@@ -2,5 +2,5 @@
     id: "Dragon-Blooded";
     essenceUser: true;
     exalt: true;
-    favors: "Ability"
+    favors: "Abilities"
 }

HeroType_Mortal/src/main/resources/data/Mortal.charactertype

@@ -2,5 +2,5 @@
     id: "Mortal";
     essenceUser: false;
     exalt: false;
-    favors: "Ability"
+    favors: "Abilities"
 }

HeroType_Solar/src/main/resources/data/Solar.charactertype

@@ -2,5 +2,5 @@
     id: "Solar";
     essenceUser: true;
     exalt: true;
-    favors: "Ability"
+    favors: "Abilities"
 }