Merge pull request #2161 from Windchild292/dev_Windchild_FileFactory

File Factory Standardization
MegaMek · Nov 4, 2020 · f4dfef7 · f4dfef7
2 parents 6b4b54b + d23fcd0
commit f4dfef7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 219 deletions.
diff --git a/MekHQ/src/mekhq/MHQStaticDirectoryManager.java b/MekHQ/src/mekhq/MHQStaticDirectoryManager.java
@@ -23,9 +23,9 @@
 import megamek.common.annotations.Nullable;
 import megamek.common.icons.AbstractIcon;
 import megamek.common.util.fileUtils.DirectoryItems;
+import megamek.common.util.fileUtils.ImageFileFactory;
 import mekhq.campaign.force.Force;
 import mekhq.gui.enums.LayeredForceIcon;
-import mekhq.gui.utilities.PortraitFileFactory;
 
 import java.awt.*;
 import java.awt.image.BufferedImage;
@@ -50,7 +50,6 @@ protected MHQStaticDirectoryManager() {
     }
     //endregion Constructors
 
-
     //region Initialization
     /**
      * This initialized all of the directories under this manager
@@ -73,7 +72,7 @@ private static void initializeForceIcons() {
             parseForceIconDirectory = false;
             try {
                 forceIconDirectory = new DirectoryItems(new File("data/images/force"),
-                        "", PortraitFileFactory.getInstance());
+                        "", new ImageFileFactory());
             } catch (Exception e) {
                 MegaMek.getLogger().error("Could not parse the force icon directory!", e);
             }
@@ -92,7 +91,7 @@ private static void initializeAwardIcons() {
             parseAwardIconDirectory = false;
             try {
                 awardIconDirectory = new DirectoryItems(new File("data/images/awards"),
-                        "", PortraitFileFactory.getInstance());
+                        "", new ImageFileFactory());
             } catch (Exception e) {
                 MegaMek.getLogger().error("Could not parse the award icon directory!", e);
             }

diff --git a/MekHQ/src/mekhq/gui/utilities/PortraitFileFactory.java b/MekHQ/src/mekhq/gui/utilities/PortraitFileFactory.java