From 0a8f34c27c6ef93c5c94d17728af62c7607e225f Mon Sep 17 00:00:00 2001
From: Ben Culkin <scorpress@gmail.com>
Date: Thu, 3 Dec 2020 19:21:38 -0500
Subject: Rename types to match Java style

This renames several interfaces that had names like IWhatever, since
that isn't a style that Java uses
---
 src/main/java/bjc/esodata/PushdownMap.java      | 8 ++++----
 src/main/java/bjc/esodata/SimpleDirectory.java  | 6 +++---
 src/main/java/bjc/esodata/UnifiedDirectory.java | 6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/main/java/bjc/esodata')

diff --git a/src/main/java/bjc/esodata/PushdownMap.java b/src/main/java/bjc/esodata/PushdownMap.java
index 410eb53..76dd2db 100644
--- a/src/main/java/bjc/esodata/PushdownMap.java
+++ b/src/main/java/bjc/esodata/PushdownMap.java
@@ -20,9 +20,9 @@ import bjc.funcdata.*;
  * @param <ValueType>
  *                    The values in the map.
  */
-public class PushdownMap<KeyType, ValueType> implements IMap<KeyType, ValueType> {
+public class PushdownMap<KeyType, ValueType> implements MapEx<KeyType, ValueType> {
 	/* Our backing storage. */
-	private final IMap<KeyType, Stack<ValueType>> backing;
+	private final MapEx<KeyType, Stack<ValueType>> backing;
 
 	private boolean isFrozen    = false;
 	private boolean thawEnabled = true;
@@ -60,7 +60,7 @@ public class PushdownMap<KeyType, ValueType> implements IMap<KeyType, ValueType>
 	}
 
 	@Override
-	public IList<KeyType> keyList() {
+	public ListEx<KeyType> keyList() {
 		return backing.keyList();
 	}
 
@@ -89,7 +89,7 @@ public class PushdownMap<KeyType, ValueType> implements IMap<KeyType, ValueType>
 	public ValueType remove(final KeyType key) {
 		if (isFrozen) throw new ObjectFrozen("Can't remove key " + key + " from frozen map");
 
-		IHolder<ValueType> result = IHolder.of(null);
+		Holder<ValueType> result = Holder.of(null);
 		
 		backing.get(key).ifPresent((stk) -> {
 			if (stk.size() > 1) {
diff --git a/src/main/java/bjc/esodata/SimpleDirectory.java b/src/main/java/bjc/esodata/SimpleDirectory.java
index ddc65b4..13a9f3e 100644
--- a/src/main/java/bjc/esodata/SimpleDirectory.java
+++ b/src/main/java/bjc/esodata/SimpleDirectory.java
@@ -1,7 +1,7 @@
 package bjc.esodata;
 
 import bjc.funcdata.FunctionalMap;
-import bjc.funcdata.IMap;
+import bjc.funcdata.MapEx;
 
 /**
  * Simple implementation of {@link Directory}.
@@ -18,9 +18,9 @@ import bjc.funcdata.IMap;
  */
 public class SimpleDirectory<K, V> implements Directory<K, V> {
 	/* Our sub-directories. */
-	private final IMap<K, Directory<K, V>> children;
+	private final MapEx<K, Directory<K, V>> children;
 	/* Our data. */
-	private final IMap<K, V> data;
+	private final MapEx<K, V> data;
 
 	/** Create a new directory. */
 	public SimpleDirectory() {
diff --git a/src/main/java/bjc/esodata/UnifiedDirectory.java b/src/main/java/bjc/esodata/UnifiedDirectory.java
index abf9a4c..1b630eb 100644
--- a/src/main/java/bjc/esodata/UnifiedDirectory.java
+++ b/src/main/java/bjc/esodata/UnifiedDirectory.java
@@ -1,7 +1,7 @@
 package bjc.esodata;
 
 import bjc.funcdata.FunctionalMap;
-import bjc.funcdata.IMap;
+import bjc.funcdata.MapEx;
 
 /**
  * Simple implementation of {@link Directory}.
@@ -18,9 +18,9 @@ import bjc.funcdata.IMap;
  */
 public class UnifiedDirectory<K, V> implements Directory<K, V> {
 	/* Our directory children. */
-	private final IMap<K, Directory<K, V>> children;
+	private final MapEx<K, Directory<K, V>> children;
 	/* Our data children. */
-	private final IMap<K, V> data;
+	private final MapEx<K, V> data;
 
 	/** Create a new directory. */
 	public UnifiedDirectory() {
-- 
cgit v1.2.3