diff --git a/src/main/java/inf112/fiasko/roborally/utility/BoardLoaderUtil.java b/src/main/java/inf112/fiasko/roborally/utility/BoardLoaderUtil.java index a84a479..9ee6c68 100644 --- a/src/main/java/inf112/fiasko/roborally/utility/BoardLoaderUtil.java +++ b/src/main/java/inf112/fiasko/roborally/utility/BoardLoaderUtil.java @@ -27,12 +27,7 @@ public final class BoardLoaderUtil { * @throws IOException If the board file cannot be loaded */ public static Board loadBoard(String boardFile, List robotList) throws IOException { - ClassLoader classloader = Thread.currentThread().getContextClassLoader(); - InputStream fileStream = classloader.getResourceAsStream(boardFile); - if (fileStream == null) { - throw new IllegalArgumentException("Board file could not be loaded."); - } - + InputStream fileStream = ResourceUtil.getResourceAsInputStream(boardFile); BufferedReader reader = new BufferedReader(new InputStreamReader(fileStream)); String infoLine = reader.readLine(); String[] infoData = infoLine.split(" "); diff --git a/src/main/java/inf112/fiasko/roborally/utility/ResourceUtil.java b/src/main/java/inf112/fiasko/roborally/utility/ResourceUtil.java new file mode 100644 index 0000000..4ae246a --- /dev/null +++ b/src/main/java/inf112/fiasko/roborally/utility/ResourceUtil.java @@ -0,0 +1,21 @@ +package inf112.fiasko.roborally.utility; + +import java.io.InputStream; + +public class ResourceUtil { + private ResourceUtil() {} + + /** + * Gets an input stream for a given resource + * @param resourcePath The relative path from the resources folder to the resource + * @return An input stream + */ + public static InputStream getResourceAsInputStream(String resourcePath) { + ClassLoader classloader = Thread.currentThread().getContextClassLoader(); + InputStream resourceStream = classloader.getResourceAsStream(resourcePath); + if (resourceStream == null) { + throw new IllegalArgumentException("Unable to load resource."); + } + return resourceStream; + } +}