1 files changed, 14 insertions, 17 deletions

diff --git a/src/main/java/bjc/esodata/UnifiedDirectory.java b/src/main/java/bjc/esodata/UnifiedDirectory.java
index 2221615..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() {
@@ -30,7 +30,7 @@ public class UnifiedDirectory<K, V> implements Directory<K, V> {
 
 	@Override
 	public Directory<K, V> getSubdirectory(final K key) {
-		return children.get(key);
+		return children.get(key).orElse(null);
 	}
 
 	@Override
@@ -56,7 +56,7 @@ public class UnifiedDirectory<K, V> implements Directory<K, V> {
 
 	@Override
 	public V getKey(final K key) {
-		return data.get(key);
+		return data.get(key).orElse(null);
 	}
 
 	@Override
@@ -82,26 +82,23 @@ public class UnifiedDirectory<K, V> implements Directory<K, V> {
 
 	@Override
 	public boolean equals(final Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (!(obj instanceof UnifiedDirectory<?, ?>))
-			return false;
+		if (this == obj)                              return true;
+		if (obj == null)                              return false;
+		if (!(obj instanceof UnifiedDirectory<?, ?>)) return false;
 
 		final UnifiedDirectory<?, ?> other = (UnifiedDirectory<?, ?>) obj;
 
 		if (children == null) {
-			if (other.children != null)
-				return false;
-		} else if (!children.equals(other.children))
+			if (other.children != null) return false;
+		} else if (!children.equals(other.children)) {
 			return false;
+		}
 
 		if (data == null) {
-			if (other.data != null)
-				return false;
-		} else if (!data.equals(other.data))
+			if (other.data != null) return false;
+		} else if (!data.equals(other.data)) {
 			return false;
+		}
 
 		return true;
 	}