From aaa621137c68ba89b6c310a2061c4fad8de3ad26 Mon Sep 17 00:00:00 2001 From: Francesco Macagno Date: Wed, 26 Aug 2015 19:09:37 -0700 Subject: [PATCH] Renamed ModReqChecker to XmlPreprocesser --- .../{ModRequirementChecker.java => XmlPreprocessor.java} | 2 +- .../java/cr0s/warpdrive/config/filler/FillerManager.java | 6 +++--- .../cr0s/warpdrive/config/structures/StructureManager.java | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) rename src/main/java/cr0s/warpdrive/config/{ModRequirementChecker.java => XmlPreprocessor.java} (97%) diff --git a/src/main/java/cr0s/warpdrive/config/ModRequirementChecker.java b/src/main/java/cr0s/warpdrive/config/XmlPreprocessor.java similarity index 97% rename from src/main/java/cr0s/warpdrive/config/ModRequirementChecker.java rename to src/main/java/cr0s/warpdrive/config/XmlPreprocessor.java index cc3b4767..619f42d2 100644 --- a/src/main/java/cr0s/warpdrive/config/ModRequirementChecker.java +++ b/src/main/java/cr0s/warpdrive/config/XmlPreprocessor.java @@ -8,7 +8,7 @@ import cpw.mods.fml.common.Loader; import cr0s.warpdrive.WarpDrive; -public class ModRequirementChecker { +public class XmlPreprocessor { /** * Will check the given element for a mod attribute and return a string of all the ones that are not loaded, separated by commas diff --git a/src/main/java/cr0s/warpdrive/config/filler/FillerManager.java b/src/main/java/cr0s/warpdrive/config/filler/FillerManager.java index 9b4f0364..e643d52e 100644 --- a/src/main/java/cr0s/warpdrive/config/filler/FillerManager.java +++ b/src/main/java/cr0s/warpdrive/config/filler/FillerManager.java @@ -15,7 +15,7 @@ import org.xml.sax.SAXException; import scala.actors.threadpool.Arrays; import cr0s.warpdrive.WarpDrive; import cr0s.warpdrive.config.InvalidXmlException; -import cr0s.warpdrive.config.ModRequirementChecker; +import cr0s.warpdrive.config.XmlPreprocessor; import cr0s.warpdrive.config.WarpDriveConfig; public class FillerManager { @@ -69,7 +69,7 @@ public class FillerManager { Document base = WarpDriveConfig.getXmlDocumentBuilder().parse(file); - String res = ModRequirementChecker.checkModRequirements(base.getDocumentElement()); + String res = XmlPreprocessor.checkModRequirements(base.getDocumentElement()); if (!res.isEmpty()) { WarpDrive.logger.info("Skippping filler data file " + file.getPath() + " because the mods " + res + " are not loaded"); @@ -77,7 +77,7 @@ public class FillerManager { } // Remove elements based on mod reqs sanitation - ModRequirementChecker.doModReqSanitation(base); + XmlPreprocessor.doModReqSanitation(base); // Initially add FillerSets NodeList nodesFillerSet = base.getElementsByTagName("FillerSet"); diff --git a/src/main/java/cr0s/warpdrive/config/structures/StructureManager.java b/src/main/java/cr0s/warpdrive/config/structures/StructureManager.java index 851232ac..672e73b8 100644 --- a/src/main/java/cr0s/warpdrive/config/structures/StructureManager.java +++ b/src/main/java/cr0s/warpdrive/config/structures/StructureManager.java @@ -13,7 +13,7 @@ import org.xml.sax.SAXException; import cr0s.warpdrive.WarpDrive; import cr0s.warpdrive.config.InvalidXmlException; -import cr0s.warpdrive.config.ModRequirementChecker; +import cr0s.warpdrive.config.XmlPreprocessor; import cr0s.warpdrive.config.WarpDriveConfig; @@ -61,14 +61,14 @@ public class StructureManager { private static void loadXmlStructureFile(File f) throws SAXException, IOException, InvalidXmlException { Document base = WarpDriveConfig.getXmlDocumentBuilder().parse(f); - String res = ModRequirementChecker.checkModRequirements(base.getDocumentElement()); + String res = XmlPreprocessor.checkModRequirements(base.getDocumentElement()); if (!res.isEmpty()) { WarpDrive.logger.info("Skippping structure data file " + f.getPath() + " because the mods " + res + " are not loaded"); return; } - ModRequirementChecker.doModReqSanitation(base); + XmlPreprocessor.doModReqSanitation(base); NodeList structures = base.getElementsByTagName("structure"); for (int i = 0; i < structures.getLength(); i++) {