Update a number of things

5 files changed, 16 insertions, 12 deletions

diff --git a/src/main/java/bjc/funcdata/ExtendedMap.java b/src/main/java/bjc/funcdata/ExtendedMap.java
index 4bee343..800cfaa 100644
--- a/src/main/java/bjc/funcdata/ExtendedMap.java
+++ b/src/main/java/bjc/funcdata/ExtendedMap.java
@@ -66,7 +66,8 @@ class ExtendedMap<KeyType, ValueType> implements MapEx<KeyType, ValueType> {
 	@Override
 	public boolean containsKey(final KeyType key) {
 		if (store.containsKey(key)) return true;
-		else                        return delegate.containsKey(key);
+		
+		return delegate.containsKey(key);
 	}
 
 	@Override
@@ -79,7 +80,8 @@ class ExtendedMap<KeyType, ValueType> implements MapEx<KeyType, ValueType> {
 	@Override
 	public Optional<ValueType> get(final KeyType key) {
 		if (store.containsKey(key)) return store.get(key);
-		else                        return delegate.get(key);
+		
+		return delegate.get(key);
 	}
 
 	@Override
@@ -111,7 +113,8 @@ class ExtendedMap<KeyType, ValueType> implements MapEx<KeyType, ValueType> {
 			throw new ObjectFrozen("Can't remove key " + key + " from frozen map");
 		
 		if (!store.containsKey(key)) return delegate.remove(key);
-		else                         return store.remove(key);
+		
+		return store.remove(key);
 	}
 
 	@Override
@@ -159,9 +162,9 @@ class ExtendedMap<KeyType, ValueType> implements MapEx<KeyType, ValueType> {
 		if (thawEnabled) {
 			isFrozen = false;
 			return true;
-		} else {
-			return false;
 		}
+		
+		return false;
 	}
 
 	@Override
diff --git a/src/main/java/bjc/funcdata/Freezable.java b/src/main/java/bjc/funcdata/Freezable.java
index c337509..c4bd27d 100644
--- a/src/main/java/bjc/funcdata/Freezable.java
+++ b/src/main/java/bjc/funcdata/Freezable.java
@@ -28,6 +28,7 @@ package bjc.funcdata;
  * you attempt to modify a frozen object, but they may also choose not to.
  * 
  * @author Ben Culkin
+ * @param <F> The type of the implementing object
  */
 public interface Freezable<F extends Freezable<?>> {
 	/**
diff --git a/src/main/java/bjc/funcdata/FunctionalMap.java b/src/main/java/bjc/funcdata/FunctionalMap.java
index 33a97e6..aec4d28 100644
--- a/src/main/java/bjc/funcdata/FunctionalMap.java
+++ b/src/main/java/bjc/funcdata/FunctionalMap.java
@@ -95,9 +95,9 @@ public class FunctionalMap<KeyType, ValueType> implements MapEx<KeyType, ValueTy
 
 		if (wrappedMap.containsKey(key)) {
 			return Optional.of(wrappedMap.get(key));
-		} else {
-			return Optional.empty();
 		}
+		
+		return Optional.empty();
 	}
 
 	@Override
@@ -172,9 +172,9 @@ public class FunctionalMap<KeyType, ValueType> implements MapEx<KeyType, ValueTy
 		if (thawEnabled) {
 			isFrozen = false;
 			return true;			
-		} else {
-			return false;
 		}
+		
+		return false;
 	}
 
 	@Override
diff --git a/src/main/java/bjc/funcdata/MapEx.java b/src/main/java/bjc/funcdata/MapEx.java
index 1dad1dc..b25960a 100644
--- a/src/main/java/bjc/funcdata/MapEx.java
+++ b/src/main/java/bjc/funcdata/MapEx.java
@@ -31,7 +31,7 @@ import java.util.function.*;
  * @param <ValueType>
  *                    The type of this map's values.
  */
-public interface MapEx<KeyType, ValueType> extends Freezable {
+public interface MapEx<KeyType, ValueType> extends Freezable<MapEx<KeyType, ValueType>> {
 	/**
 	 * Execute an action for each entry in the map.
 	 *
diff --git a/src/main/java/bjc/funcdata/TransformedValueMap.java b/src/main/java/bjc/funcdata/TransformedValueMap.java
index 57fe155..cd75f4a 100644
--- a/src/main/java/bjc/funcdata/TransformedValueMap.java
+++ b/src/main/java/bjc/funcdata/TransformedValueMap.java
@@ -123,9 +123,9 @@ final class TransformedValueMap<OldKey, OldValue, NewValue>
 		if (thawEnabled) {
 			isFrozen = false;
 			return true;
-		} else {
-			return false;
 		}
+		
+		return false;
 	}
 
 	@Override