From 4d904a55a1b5fe6506f81c2c292c07dfe839029f Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Sun, 27 Mar 2016 17:01:00 -0400 Subject: Adapted component repository implementation to use files, not streams This change was made because a component reader might care about where it's reading a component from. --- .../bjc/utils/components/FileComponentRepository.java | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'BJC-Utils2/src/main') diff --git a/BJC-Utils2/src/main/java/bjc/utils/components/FileComponentRepository.java b/BJC-Utils2/src/main/java/bjc/utils/components/FileComponentRepository.java index 0d25e68..1e67a72 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/components/FileComponentRepository.java +++ b/BJC-Utils2/src/main/java/bjc/utils/components/FileComponentRepository.java @@ -1,9 +1,6 @@ package bjc.utils.components; import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.InputStream; import java.util.HashMap; import java.util.Map; import java.util.function.Function; @@ -41,8 +38,7 @@ public class FileComponentRepository * @param reader * The function to use to convert files to components */ - public FileComponentRepository(File dir, - Function reader) { + public FileComponentRepository(File dir, Function reader) { comps = new HashMap<>(); sourcePath = dir.getAbsolutePath(); @@ -51,17 +47,9 @@ public class FileComponentRepository // Do nothing with directories. They probably contain // support files for components } else { - try { - E comp = reader.apply(new FileInputStream(fle)); + E comp = reader.apply(fle); - comps.put(comp.getName(), comp); - } catch (FileNotFoundException fnfx) { - System.err.println("Couldn't read component file: " - + fle.getAbsolutePath() + "\nReason: " - + fnfx.getMessage()); - - fnfx.printStackTrace(System.err); - } + comps.put(comp.getName(), comp); } } } -- cgit v1.2.3