Restored Award Unmarshalling Method Call

Restored functionality to process awards from XML in personnel logs. Removed ancient, <0.47.15, compatibility handler from `generateNewFromXML` method.
MegaMek · Sep 26, 2024 · 02b5e79 · 02b5e79
1 parent 6e2a350
commit 02b5e79
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 18 deletions.
diff --git a/MekHQ/src/mekhq/campaign/personnel/AwardsFactory.java b/MekHQ/src/mekhq/campaign/personnel/AwardsFactory.java
@@ -18,19 +18,6 @@
  */
 package mekhq.campaign.personnel;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
 import jakarta.xml.bind.JAXBContext;
 import jakarta.xml.bind.JAXBException;
 import jakarta.xml.bind.Unmarshaller;
@@ -41,6 +28,18 @@
 import mekhq.MHQConstants;
 import mekhq.campaign.AwardSet;
 import mekhq.utilities.MHQXMLUtility;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * This class is responsible to control the awards. It loads one instance of
@@ -117,7 +116,7 @@ public List<Award> getAllAwardsForSet(String setName) {
      *                            to be migrated
      * @return an award
      */
-    public @Nullable Award generateNewFromXML(final Node node, final boolean defaultSetMigration) {
+    public @Nullable Award generateNewFromXML(final Node node) {
         String name = null;
         String set = null;
         List<LocalDate> dates = new ArrayList<>();
@@ -140,10 +139,6 @@ public List<Award> getAllAwardsForSet(String setName) {
             logger.error("", ex);
         }
 
-        if (defaultSetMigration && "Default Set".equalsIgnoreCase(set)) {
-            name = (name == null) ? "" : name;
-        }
-
         final Award award = generateNew(set, name);
         if (award != null) {
             award.setDates(dates);

diff --git a/MekHQ/src/mekhq/campaign/personnel/Person.java b/MekHQ/src/mekhq/campaign/personnel/Person.java
@@ -2494,6 +2494,9 @@ public static Person generateInstanceFromXML(Node wn, Campaign c, Version versio
                             logger.error("Unknown node type not loaded in personnel log nodes: {}", wn3.getNodeName());
                             continue;
                         }
+
+                        retVal.getAwardController().addAwardFromXml(AwardsFactory.getInstance()
+                            .generateNewFromXML(wn3));
                     }
                 } else if (wn2.getNodeName().equalsIgnoreCase("injuries")) {
                     NodeList nl2 = wn2.getChildNodes();