From a2c7425458f645802a352abc4783e0afc73dba13 Mon Sep 17 00:00:00 2001
From: Ben Culkin <scorpress@gmail.com>
Date: Thu, 3 Dec 2020 19:22:35 -0500
Subject: Adapt to esodata changes

---
 .../java/bjc/utils/components/MemoryComponentRepository.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'base/src/main/java/bjc/utils/components/MemoryComponentRepository.java')

diff --git a/base/src/main/java/bjc/utils/components/MemoryComponentRepository.java b/base/src/main/java/bjc/utils/components/MemoryComponentRepository.java
index bba0867..2e11616 100644
--- a/base/src/main/java/bjc/utils/components/MemoryComponentRepository.java
+++ b/base/src/main/java/bjc/utils/components/MemoryComponentRepository.java
@@ -1,6 +1,6 @@
 package bjc.utils.components;
 
-import bjc.funcdata.IMap;
+import bjc.funcdata.MapEx;
 
 /**
  * A repository of components stored in memory.
@@ -12,7 +12,7 @@ import bjc.funcdata.IMap;
  */
 public class MemoryComponentRepository<ComponentType extends IDescribedComponent>
 		implements IComponentRepository<ComponentType> {
-	private final IMap<String, ComponentType> repo;
+	private final MapEx<String, ComponentType> repo;
 
 	private final String source;
 
@@ -22,7 +22,7 @@ public class MemoryComponentRepository<ComponentType extends IDescribedComponent
 	 * @param repo
 	 *             The set of components to use.
 	 */
-	public MemoryComponentRepository(IMap<String, ComponentType> repo) {
+	public MemoryComponentRepository(MapEx<String, ComponentType> repo) {
 		this(repo, "memory");
 	}
 
@@ -34,14 +34,14 @@ public class MemoryComponentRepository<ComponentType extends IDescribedComponent
 	 * @param source
 	 *               Where the components came from.
 	 */
-	public MemoryComponentRepository(IMap<String, ComponentType> repo, String source) {
+	public MemoryComponentRepository(MapEx<String, ComponentType> repo, String source) {
 		this.repo = repo;
 
 		this.source = source;
 	}
 
 	@Override
-	public IMap<String, ComponentType> getAll() {
+	public MapEx<String, ComponentType> getAll() {
 		return repo;
 	}
 
-- 
cgit v1.2.3


From f3814a84f8471684cd483347db4fb7b107c2e635 Mon Sep 17 00:00:00 2001
From: Ben Culkin <scorpress@gmail.com>
Date: Thu, 3 Dec 2020 19:28:15 -0500
Subject: Rename interfaces to match Java style

Rename several interfaces that were in the style IWhatever, which Java
doesn't use
---
 .../src/main/java/bjc/utils/components/MemoryComponentRepository.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'base/src/main/java/bjc/utils/components/MemoryComponentRepository.java')

diff --git a/base/src/main/java/bjc/utils/components/MemoryComponentRepository.java b/base/src/main/java/bjc/utils/components/MemoryComponentRepository.java
index 2e11616..f83c293 100644
--- a/base/src/main/java/bjc/utils/components/MemoryComponentRepository.java
+++ b/base/src/main/java/bjc/utils/components/MemoryComponentRepository.java
@@ -10,8 +10,8 @@ import bjc.funcdata.MapEx;
  * @param <ComponentType>
  *                        The type of component stored in the repository.
  */
-public class MemoryComponentRepository<ComponentType extends IDescribedComponent>
-		implements IComponentRepository<ComponentType> {
+public class MemoryComponentRepository<ComponentType extends DescribedComponent>
+		implements ComponentRepository<ComponentType> {
 	private final MapEx<String, ComponentType> repo;
 
 	private final String source;
-- 
cgit v1.2.3