Merge branch 'master' of https://github.com/bculkin2442/bjc-utils2

1 files changed, 9 insertions, 9 deletions

diff --git a/base/src/main/java/bjc/utils/components/FileComponentRepository.java b/base/src/main/java/bjc/utils/components/FileComponentRepository.java
index 6e6e604..e0e929f 100644
--- a/base/src/main/java/bjc/utils/components/FileComponentRepository.java
+++ b/base/src/main/java/bjc/utils/components/FileComponentRepository.java
@@ -9,11 +9,11 @@ import java.util.function.Function;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import bjc.data.IHolder;
+import bjc.data.Holder;
 import bjc.data.Identity;
 import bjc.funcdata.FunctionalMap;
-import bjc.funcdata.IList;
-import bjc.funcdata.IMap;
+import bjc.funcdata.ListEx;
+import bjc.funcdata.MapEx;
 import bjc.utils.funcutils.FileUtils;
 
 /**
@@ -24,14 +24,14 @@ import bjc.utils.funcutils.FileUtils;
  * @param <ComponentType>
  *                        The type of component being read in.
  */
-public class FileComponentRepository<ComponentType extends IDescribedComponent>
-		implements IComponentRepository<ComponentType> {
+public class FileComponentRepository<ComponentType extends DescribedComponent>
+		implements ComponentRepository<ComponentType> {
 	/* The logger to use for storing data about this class. */
 	private static final Logger CLASS_LOGGER
 			= Logger.getLogger("FileComponentRepository");
 
 	/* The internal storage of components. */
-	private IMap<String, ComponentType> components;
+	private MapEx<String, ComponentType> components;
 
 	/* The path that all the components came from. */
 	private Path sourceDirectory;
@@ -69,7 +69,7 @@ public class FileComponentRepository<ComponentType extends IDescribedComponent>
 		sourceDirectory = directory.toPath().toAbsolutePath();
 
 		/* Marker for making sure we don't skip the parent. */
-		final IHolder<Boolean> isFirstDir = new Identity<>(true);
+		final Holder<Boolean> isFirstDir = new Identity<>(true);
 
 		/*
 		 * Predicate to use to traverse all the files in a directory, but not recurse
@@ -110,7 +110,7 @@ public class FileComponentRepository<ComponentType extends IDescribedComponent>
 	}
 
 	@Override
-	public IMap<String, ComponentType> getAll() {
+	public MapEx<String, ComponentType> getAll() {
 		return components;
 	}
 
@@ -120,7 +120,7 @@ public class FileComponentRepository<ComponentType extends IDescribedComponent>
 	}
 
 	@Override
-	public IList<ComponentType> getList() {
+	public ListEx<ComponentType> getList() {
 		return components.valueList();
 	}