General update

1 files changed, 10 insertions, 9 deletions

diff --git a/BJC-Utils2/src/main/java/bjc/utils/components/IComponentRepository.java b/BJC-Utils2/src/main/java/bjc/utils/components/IComponentRepository.java
index 6780f2e..2644276 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/components/IComponentRepository.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/components/IComponentRepository.java
@@ -1,17 +1,18 @@
 package bjc.utils.components;
 
-import bjc.utils.funcdata.IFunctionalList;
-import bjc.utils.funcdata.IFunctionalMap;
+import bjc.utils.funcdata.IList;
+import bjc.utils.funcdata.IMap;
 
 /**
- * A collection of implementations of {@link IDescribedComponent}
+ * A collection of implementations of a particular type of
+ * {@link IDescribedComponent}
  * 
  * @author ben
  *
- * @param <E>
+ * @param <ComponentType>
  *            The type of components contained in this repository
  */
-public interface IComponentRepository<E extends IDescribedComponent> {
+public interface IComponentRepository<ComponentType extends IDescribedComponent> {
 	/**
 	 * Get a component with a specific name
 	 * 
@@ -20,15 +21,15 @@ public interface IComponentRepository<E extends IDescribedComponent> {
 	 * @return The named component, or null if no component with that name
 	 *         exists
 	 */
-	public E getComponentByName(String name);
+	public ComponentType getByName(String name);
 
 	/**
 	 * Get a list of all the registered componets
 	 * 
 	 * @return A list of all the registered components
 	 */
-	public default IFunctionalList<E> getComponentList() {
-		return getComponents().valueList();
+	public default IList<ComponentType> getList() {
+		return getAll().valueList();
 	}
 
 	/**
@@ -37,7 +38,7 @@ public interface IComponentRepository<E extends IDescribedComponent> {
 	 * @return A map from component name to component, containing all of
 	 *         the components in the repositories
 	 */
-	public IFunctionalMap<String, E> getComponents();
+	public IMap<String, ComponentType> getAll();
 
 	/**
 	 * Get the source from which these components came