1 files changed, 34 insertions, 34 deletions

diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcdata/ExtendedMap.java b/BJC-Utils2/src/main/java/bjc/utils/funcdata/ExtendedMap.java
index 7e4c7fd..9776961 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/funcdata/ExtendedMap.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/funcdata/ExtendedMap.java
@@ -19,49 +19,47 @@ class ExtendedMap<KeyType, ValueType>
 	}
 
 	@Override
-	public ValueType put(KeyType key, ValueType val) {
-		return store.put(key, val);
-	}
-
-	@Override
-	public ValueType get(KeyType key) {
+	public boolean containsKey(KeyType key) {
 		if (store.containsKey(key)) {
-			return store.get(key);
+			return true;
 		}
 
-		return delegate.get(key);
+		return delegate.containsKey(key);
 	}
 
 	@Override
-	public <MappedValue> IFunctionalMap<KeyType, MappedValue> mapValues(
-			Function<ValueType, MappedValue> transformer) {
-		return new TransformedValueMap<>(this, transformer);
+	public IFunctionalMap<KeyType, ValueType> extend() {
+		return new ExtendedMap<>(this, new FunctionalMap<>());
 	}
 
 	@Override
-	public boolean containsKey(KeyType key) {
-		if (store.containsKey(key)) {
-			return true;
-		}
+	public void forEach(BiConsumer<KeyType, ValueType> action) {
+		store.forEach(action);
 
-		return delegate.containsKey(key);
+		delegate.forEach(action);
 	}
 
 	@Override
-	public IFunctionalList<KeyType> keyList() {
-		return ListUtils.mergeLists(store.keyList(), delegate.keyList());
+	public void forEachKey(Consumer<KeyType> action) {
+		store.forEachKey(action);
+
+		delegate.forEachKey(action);
 	}
 
 	@Override
-	public void forEach(BiConsumer<KeyType, ValueType> action) {
-		store.forEach(action);
+	public void forEachValue(Consumer<ValueType> action) {
+		store.forEachValue(action);
 
-		delegate.forEach(action);
+		delegate.forEachValue(action);
 	}
 
 	@Override
-	public ValueType remove(KeyType key) {
-		return store.remove(key);
+	public ValueType get(KeyType key) {
+		if (store.containsKey(key)) {
+			return store.get(key);
+		}
+
+		return delegate.get(key);
 	}
 
 	@Override
@@ -70,17 +68,24 @@ class ExtendedMap<KeyType, ValueType>
 	}
 
 	@Override
-	public void forEachKey(Consumer<KeyType> action) {
-		store.forEachKey(action);
+	public IFunctionalList<KeyType> keyList() {
+		return ListUtils.mergeLists(store.keyList(), delegate.keyList());
+	}
 
-		delegate.forEachKey(action);
+	@Override
+	public <MappedValue> IFunctionalMap<KeyType, MappedValue> mapValues(
+			Function<ValueType, MappedValue> transformer) {
+		return new TransformedValueMap<>(this, transformer);
 	}
 
 	@Override
-	public void forEachValue(Consumer<ValueType> action) {
-		store.forEachValue(action);
+	public ValueType put(KeyType key, ValueType val) {
+		return store.put(key, val);
+	}
 
-		delegate.forEachValue(action);
+	@Override
+	public ValueType remove(KeyType key) {
+		return store.remove(key);
 	}
 
 	@Override
@@ -88,9 +93,4 @@ class ExtendedMap<KeyType, ValueType>
 		return ListUtils.mergeLists(store.valueList(),
 				delegate.valueList());
 	}
-
-	@Override
-	public IFunctionalMap<KeyType, ValueType> extend() {
-		return new ExtendedMap<>(this, new FunctionalMap<>());
-	}
 }