Buildscript + Spotless (#318)

* Convert AES.java to readable class

* Buildscript

* Spotless

12 files changed, 1001 insertions, 1065 deletions

diff --git a/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java b/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java
index e04f1af03a..f0687fae4f 100644
--- a/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java
+++ b/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java
@@ -5,341 +5,336 @@ import java.util.*;
 
 public class AutoMap<V> implements Iterable<V>, Cloneable, Serializable, Collection<V>, Queue<V>, List<V> {
 
-	/**
-	 * The Internal Map
-	 */
-	protected final Map<Integer, V> mInternalMap;
-	protected final Map<String, Integer> mInternalNameMap;
-	
-	/**
-	 * The Internal ID
-	 */
-	private int mInternalID = 0;
-	private static final long serialVersionUID = 3771412318075131790L;
-
-	
-	public AutoMap() {
-		this(new LinkedHashMap<Integer, V>());
-	}
-	
-	public Map<Integer, V> getMap(){
-		return mInternalMap;
-	}
-	
-	public AutoMap(Map<Integer, V> defaultMapType) {
-		mInternalMap = defaultMapType;
-		mInternalNameMap = new LinkedHashMap<String, Integer>();
-	}
-	
-	/**
-	 * Generates an AutoMap from the List.
-	 * @param aList - Data to be inserted into the AutoMap.
-	 */
-	public AutoMap(List<V> aList) {
-		mInternalMap = new LinkedHashMap<Integer, V>();
-		mInternalNameMap = new LinkedHashMap<String, Integer>();	
-		if (aList != null && aList.size() > 0) {
-			for (V obj : aList) {
-				add(obj);
-			}
-		}		
-	}
-	/**
-	 * Generates an AutoMap from a Set.
-	 * @param aList - Data to be inserted into the AutoMap.
-	 */
-	public AutoMap(Set<V> aList) {
-		mInternalMap = new LinkedHashMap<Integer, V>();
-		mInternalNameMap = new LinkedHashMap<String, Integer>();	
-		if (aList != null && aList.size() > 0) {
-			for (V obj : aList) {
-				add(obj);
-			}
-		}		
-	}
-	/**
-	 * Generates an AutoMap from a Collection.
-	 * @param aList - Data to be inserted into the AutoMap.
-	 */
-	public AutoMap(Collection<V> aList) {
-		mInternalMap = new LinkedHashMap<Integer, V>();
-		mInternalNameMap = new LinkedHashMap<String, Integer>();	
-		if (aList != null && aList.size() > 0) {
-			for (V obj : aList) {
-				add(obj);
-			}
-		}		
-	}
-	
-	/**
-	 * Generates an AutoMap from a Array.
-	 * @param aArray - Data to be inserted into the AutoMap.
-	 */
-	public AutoMap(V[] aArray) {
-		mInternalMap = new LinkedHashMap<Integer, V>();
-		mInternalNameMap = new LinkedHashMap<String, Integer>();	
-		if (aArray != null && aArray.length > 0) {
-			for (V obj : aArray) {
-				add(obj);
-			}
-		}		
-	}
-
-	@Override
-	public Iterator<V> iterator() {		
-		return values().iterator();
-	}
-
-	public synchronized boolean setValue(V object){
-		int mOriginalID = this.mInternalID;
-		put(object);		
-		if (this.mInternalMap.get(mOriginalID).equals(object) || mOriginalID > this.mInternalID){
-			return true;
-		}
-		else {
-			return false;
-		}
-	}
-	
-	public synchronized V put(V object){
-		return set(object);
-	}
-	
-	public synchronized boolean add(V object){
-		return set(object) != null;
-	}
-	
-	public synchronized V set(V object){
-		if (object == null) {
-			return null;
-		}
-		mInternalNameMap.put(""+object.hashCode(), (mInternalID+1));
-		return mInternalMap.put(mInternalID++, object);
-	}
-	
-	public synchronized V get(int id){
-		return mInternalMap.get(id);
-	}
-	
-	public synchronized Collection<V> values(){
-		return mInternalMap.values();
-	}
-	
-	public synchronized int size(){
-		return mInternalMap.size();
-	}
-	
-	public synchronized int hashCode(){
-		return mInternalMap.hashCode();
-	}
-	
-	public synchronized boolean containsKey(int key){
-		return mInternalMap.containsKey(key);
-	}
-	
-	public synchronized boolean containsValue(V value){
-		return mInternalMap.containsValue(value);
-	}
-	
-	public synchronized boolean isEmpty(){
-		return mInternalMap.isEmpty();
-	}
-	
-	public synchronized void clear(){
-		this.mInternalID = 0;
-		this.mInternalMap.clear();
-		this.mInternalNameMap.clear();
-		return;
-	}
-	
-	@SuppressWarnings("unchecked")
-	public V[] toArray() {
-		V[] toR = (V[]) java.lang.reflect.Array.newInstance(mInternalMap.get(0).getClass(), mInternalMap.size());
-		for (int i = 0; i < mInternalMap.size(); i++) {
-			toR[i] = mInternalMap.get(i);
-		}
-		return toR;
-	}
-
-	public synchronized final int getInternalID() {
-		return mInternalID;
-	}	
-	
-	public synchronized final boolean remove(Object value) {
-		value.getClass();
-		if (this.mInternalMap.containsValue(value)) {
-			return this.mInternalMap.remove(mInternalNameMap.get(""+value.hashCode()), value);
-		}
-		return false;
-	}	
-
-	@Override
-	public boolean contains(Object o) {
-		for (V g : this.mInternalMap.values()) {
-			if (g.equals(o)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	@SuppressWarnings("unchecked")
-	@Override
-	public <V> V[] toArray(V[] a) {
-		return (V[]) toArray();
-	}
-
-	@Override
-	public boolean containsAll(Collection<?> c) {
-		boolean aTrue = true;
-		for (Object g : c) {
-			if (!this.contains(g)) {
-				aTrue = false;
-			}
-		}		
-		return aTrue;
-	}
-
-	@Override
-	public boolean addAll(Collection<? extends V> c) {
-		boolean aTrue = true;
-		for (V g : c) {
-			if (!this.add(g)) {
-				aTrue = false;
-			}
-		}		
-		return aTrue;
-	}
-
-	@Override
-	public boolean removeAll(Collection<?> c) {
-		boolean aTrue = true;
-		for (Object g : c) {
-			if (!this.remove(g)) {
-				aTrue = false;
-			}
-		}		
-		return aTrue;
-	}
-
-	@Override
-	public boolean retainAll(Collection<?> c) {
-		AutoMap<?> aTempAllocation = new AutoMap<Object>();
-		boolean aTrue = false;
-		aTempAllocation = this;
-		aTempAllocation.removeAll(c);	
-		aTempAllocation.clear();
-		aTrue = aTempAllocation.isEmpty();
-		aTempAllocation.clear();
-		return aTrue;
-	}
-
-	@Override
-	public boolean offer(V e) {
-		return add(e);
-	}
-
-	@Override
-	public V remove() {
-		V y = this.get(0);
-		if (remove(y))
-			return y;
-		else
-			return null;
-	}
-
-	@Override
-	public V poll() {
-		if (this.mInternalMap.isEmpty()) {
-			return null;
-		}
-		return remove();
-	}
-
-	@Override
-	public V element() {
-		if (this.mInternalMap.isEmpty()) {
-			return null;
-		}
-		return this.get(0);
-	}
-
-	@Override
-	public V peek() {
-		return element();
-	}
-
-	@Override
-	public boolean addAll(int index, Collection<? extends V> c) {
-		for (V y : c) {
-			add(y);
-		}
-		return true;
-	}
-
-	@Override
-	public V set(int index, V element) {
-		return mInternalMap.put(index, element);
-	}
-
-	@Override
-	public void add(int index, V element) {
-		add(element);		
-	}
-
-	@Override
-	public V remove(int index) {
-		V h = mInternalMap.get(index);		
-		set(index, null);
-		return h;
-	}
-
-	@Override
-	public int indexOf(Object o) {
-		int aCount = 0;
-		for (V of : mInternalMap.values()) {
-			if (of != o) {
-				aCount++;
-				continue;
-			}
-			else {
-				return aCount;
-			}
-		}
-		return -1;
-	}
-
-	@Override
-	public int lastIndexOf(Object o) {
-		//TODO
-		return indexOf(o);
-	}
-
-	@Override
-	public ListIterator<V> listIterator() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public ListIterator<V> listIterator(int index) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public List<V> subList(int fromIndex, int toIndex) {
-		AutoMap<V> aNewSubList = new AutoMap<V>();		
-		for (int slot=fromIndex; slot<=toIndex; slot++) {
-			V obj = mInternalMap.get(slot);
-			if (obj == null) {
-				continue;
-			}
-			else {
-				aNewSubList.put(obj);
-			}
-		}
-		return aNewSubList;
-	}
-  
+    /**
+     * The Internal Map
+     */
+    protected final Map<Integer, V> mInternalMap;
+
+    protected final Map<String, Integer> mInternalNameMap;
+
+    /**
+     * The Internal ID
+     */
+    private int mInternalID = 0;
+
+    private static final long serialVersionUID = 3771412318075131790L;
+
+    public AutoMap() {
+        this(new LinkedHashMap<Integer, V>());
+    }
+
+    public Map<Integer, V> getMap() {
+        return mInternalMap;
+    }
+
+    public AutoMap(Map<Integer, V> defaultMapType) {
+        mInternalMap = defaultMapType;
+        mInternalNameMap = new LinkedHashMap<String, Integer>();
+    }
+
+    /**
+     * Generates an AutoMap from the List.
+     * @param aList - Data to be inserted into the AutoMap.
+     */
+    public AutoMap(List<V> aList) {
+        mInternalMap = new LinkedHashMap<Integer, V>();
+        mInternalNameMap = new LinkedHashMap<String, Integer>();
+        if (aList != null && aList.size() > 0) {
+            for (V obj : aList) {
+                add(obj);
+            }
+        }
+    }
+    /**
+     * Generates an AutoMap from a Set.
+     * @param aList - Data to be inserted into the AutoMap.
+     */
+    public AutoMap(Set<V> aList) {
+        mInternalMap = new LinkedHashMap<Integer, V>();
+        mInternalNameMap = new LinkedHashMap<String, Integer>();
+        if (aList != null && aList.size() > 0) {
+            for (V obj : aList) {
+                add(obj);
+            }
+        }
+    }
+    /**
+     * Generates an AutoMap from a Collection.
+     * @param aList - Data to be inserted into the AutoMap.
+     */
+    public AutoMap(Collection<V> aList) {
+        mInternalMap = new LinkedHashMap<Integer, V>();
+        mInternalNameMap = new LinkedHashMap<String, Integer>();
+        if (aList != null && aList.size() > 0) {
+            for (V obj : aList) {
+                add(obj);
+            }
+        }
+    }
+
+    /**
+     * Generates an AutoMap from a Array.
+     * @param aArray - Data to be inserted into the AutoMap.
+     */
+    public AutoMap(V[] aArray) {
+        mInternalMap = new LinkedHashMap<Integer, V>();
+        mInternalNameMap = new LinkedHashMap<String, Integer>();
+        if (aArray != null && aArray.length > 0) {
+            for (V obj : aArray) {
+                add(obj);
+            }
+        }
+    }
+
+    @Override
+    public Iterator<V> iterator() {
+        return values().iterator();
+    }
+
+    public synchronized boolean setValue(V object) {
+        int mOriginalID = this.mInternalID;
+        put(object);
+        if (this.mInternalMap.get(mOriginalID).equals(object) || mOriginalID > this.mInternalID) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public synchronized V put(V object) {
+        return set(object);
+    }
+
+    public synchronized boolean add(V object) {
+        return set(object) != null;
+    }
+
+    public synchronized V set(V object) {
+        if (object == null) {
+            return null;
+        }
+        mInternalNameMap.put("" + object.hashCode(), (mInternalID + 1));
+        return mInternalMap.put(mInternalID++, object);
+    }
+
+    public synchronized V get(int id) {
+        return mInternalMap.get(id);
+    }
+
+    public synchronized Collection<V> values() {
+        return mInternalMap.values();
+    }
+
+    public synchronized int size() {
+        return mInternalMap.size();
+    }
+
+    public synchronized int hashCode() {
+        return mInternalMap.hashCode();
+    }
+
+    public synchronized boolean containsKey(int key) {
+        return mInternalMap.containsKey(key);
+    }
+
+    public synchronized boolean containsValue(V value) {
+        return mInternalMap.containsValue(value);
+    }
+
+    public synchronized boolean isEmpty() {
+        return mInternalMap.isEmpty();
+    }
+
+    public synchronized void clear() {
+        this.mInternalID = 0;
+        this.mInternalMap.clear();
+        this.mInternalNameMap.clear();
+        return;
+    }
+
+    @SuppressWarnings("unchecked")
+    public V[] toArray() {
+        V[] toR = (V[]) java.lang.reflect.Array.newInstance(mInternalMap.get(0).getClass(), mInternalMap.size());
+        for (int i = 0; i < mInternalMap.size(); i++) {
+            toR[i] = mInternalMap.get(i);
+        }
+        return toR;
+    }
+
+    public final synchronized int getInternalID() {
+        return mInternalID;
+    }
+
+    public final synchronized boolean remove(Object value) {
+        value.getClass();
+        if (this.mInternalMap.containsValue(value)) {
+            return this.mInternalMap.remove(mInternalNameMap.get("" + value.hashCode()), value);
+        }
+        return false;
+    }
+
+    @Override
+    public boolean contains(Object o) {
+        for (V g : this.mInternalMap.values()) {
+            if (g.equals(o)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <V> V[] toArray(V[] a) {
+        return (V[]) toArray();
+    }
+
+    @Override
+    public boolean containsAll(Collection<?> c) {
+        boolean aTrue = true;
+        for (Object g : c) {
+            if (!this.contains(g)) {
+                aTrue = false;
+            }
+        }
+        return aTrue;
+    }
+
+    @Override
+    public boolean addAll(Collection<? extends V> c) {
+        boolean aTrue = true;
+        for (V g : c) {
+            if (!this.add(g)) {
+                aTrue = false;
+            }
+        }
+        return aTrue;
+    }
+
+    @Override
+    public boolean removeAll(Collection<?> c) {
+        boolean aTrue = true;
+        for (Object g : c) {
+            if (!this.remove(g)) {
+                aTrue = false;
+            }
+        }
+        return aTrue;
+    }
+
+    @Override
+    public boolean retainAll(Collection<?> c) {
+        AutoMap<?> aTempAllocation = new AutoMap<Object>();
+        boolean aTrue = false;
+        aTempAllocation = this;
+        aTempAllocation.removeAll(c);
+        aTempAllocation.clear();
+        aTrue = aTempAllocation.isEmpty();
+        aTempAllocation.clear();
+        return aTrue;
+    }
+
+    @Override
+    public boolean offer(V e) {
+        return add(e);
+    }
+
+    @Override
+    public V remove() {
+        V y = this.get(0);
+        if (remove(y)) return y;
+        else return null;
+    }
+
+    @Override
+    public V poll() {
+        if (this.mInternalMap.isEmpty()) {
+            return null;
+        }
+        return remove();
+    }
+
+    @Override
+    public V element() {
+        if (this.mInternalMap.isEmpty()) {
+            return null;
+        }
+        return this.get(0);
+    }
+
+    @Override
+    public V peek() {
+        return element();
+    }
+
+    @Override
+    public boolean addAll(int index, Collection<? extends V> c) {
+        for (V y : c) {
+            add(y);
+        }
+        return true;
+    }
+
+    @Override
+    public V set(int index, V element) {
+        return mInternalMap.put(index, element);
+    }
+
+    @Override
+    public void add(int index, V element) {
+        add(element);
+    }
+
+    @Override
+    public V remove(int index) {
+        V h = mInternalMap.get(index);
+        set(index, null);
+        return h;
+    }
+
+    @Override
+    public int indexOf(Object o) {
+        int aCount = 0;
+        for (V of : mInternalMap.values()) {
+            if (of != o) {
+                aCount++;
+                continue;
+            } else {
+                return aCount;
+            }
+        }
+        return -1;
+    }
+
+    @Override
+    public int lastIndexOf(Object o) {
+        // TODO
+        return indexOf(o);
+    }
+
+    @Override
+    public ListIterator<V> listIterator() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public ListIterator<V> listIterator(int index) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public List<V> subList(int fromIndex, int toIndex) {
+        AutoMap<V> aNewSubList = new AutoMap<V>();
+        for (int slot = fromIndex; slot <= toIndex; slot++) {
+            V obj = mInternalMap.get(slot);
+            if (obj == null) {
+                continue;
+            } else {
+                aNewSubList.put(obj);
+            }
+        }
+        return aNewSubList;
+    }
 }
diff --git a/src/main/java/gtPlusPlus/api/objects/data/ConcurrentHashSet.java b/src/main/java/gtPlusPlus/api/objects/data/ConcurrentHashSet.java
index 991908e402..1d6cad3a38 100644
--- a/src/main/java/gtPlusPlus/api/objects/data/ConcurrentHashSet.java
+++ b/src/main/java/gtPlusPlus/api/objects/data/ConcurrentHashSet.java
@@ -5,14 +5,13 @@ import java.util.concurrent.ConcurrentMap;
 
 public class ConcurrentHashSet<V> extends ConcurrentSet<V> {
 
-	private static final long serialVersionUID = -1293478938482781728L;
-	
-	public ConcurrentHashSet() {
-		this(new ConcurrentHashMap<Integer, V>());
-	}
-	
-	public ConcurrentHashSet(ConcurrentMap<Integer, V> defaultMapType) {
-		super(defaultMapType);
-	}	
-	
+    private static final long serialVersionUID = -1293478938482781728L;
+
+    public ConcurrentHashSet() {
+        this(new ConcurrentHashMap<Integer, V>());
+    }
+
+    public ConcurrentHashSet(ConcurrentMap<Integer, V> defaultMapType) {
+        super(defaultMapType);
+    }
 }
diff --git a/src/main/java/gtPlusPlus/api/objects/data/ConcurrentSet.java b/src/main/java/gtPlusPlus/api/objects/data/ConcurrentSet.java
index 1d3ffc1c01..aaa759edfa 100644
--- a/src/main/java/gtPlusPlus/api/objects/data/ConcurrentSet.java
+++ b/src/main/java/gtPlusPlus/api/objects/data/ConcurrentSet.java
@@ -10,14 +10,14 @@ public abstract class ConcurrentSet<E> extends AbstractSet<E> implements Seriali
     private static final long serialVersionUID = -6761513279741915432L;
 
     private final ConcurrentMap<Integer, E> mInternalMap;
-    
-	private int mInternalID = 0;	
+
+    private int mInternalID = 0;
 
     /**
      * Creates a new instance which wraps the specified {@code map}.
-     */    
+     */
     public ConcurrentSet(ConcurrentMap<Integer, E> aMap) {
-    	mInternalMap = aMap;
+        mInternalMap = aMap;
     }
 
     @Override
@@ -42,7 +42,7 @@ public abstract class ConcurrentSet<E> extends AbstractSet<E> implements Seriali
 
     @Override
     public void clear() {
-		this.mInternalID = 0;
+        this.mInternalID = 0;
         mInternalMap.clear();
     }
 
diff --git a/src/main/java/gtPlusPlus/api/objects/data/FlexiblePair.java b/src/main/java/gtPlusPlus/api/objects/data/FlexiblePair.java
index 64f57b4e5a..698e56ae45 100644
--- a/src/main/java/gtPlusPlus/api/objects/data/FlexiblePair.java
+++ b/src/main/java/gtPlusPlus/api/objects/data/FlexiblePair.java
@@ -1,39 +1,38 @@
 package gtPlusPlus.api.objects.data;
 
+import com.google.common.base.Objects;
 import java.io.Serializable;
 
-import com.google.common.base.Objects;
+public class FlexiblePair<K, V> implements Serializable {
+
+    /**
+     * SVUID
+     */
+    private static final long serialVersionUID = 1250550491092812443L;
+
+    private final K key;
+    private V value;
+
+    public FlexiblePair(final K key, final V value) {
+        this.key = key;
+        this.value = value;
+    }
+
+    public final K getKey() {
+        return this.key;
+    }
+
+    public final V getValue() {
+        return this.value;
+    }
+
+    public final void setValue(V aObj) {
+        value = aObj;
+    }
 
-public class FlexiblePair<K,V> implements Serializable {
-
-	/**
-	 * SVUID
-	 */
-	private static final long serialVersionUID = 1250550491092812443L;
-	private final K key;
-	private V value;
-
-	public FlexiblePair(final K key, final V value){
-		this.key = key;
-		this.value = value;
-	}
-
-	final public K getKey(){
-		return this.key;
-	}
-
-	final public V getValue(){
-		return this.value;
-	}
-	
-	final public void setValue(V aObj) {
-		value = aObj;
-	}
-
-	@Override
-	public int hashCode() {
-		Integer aCode = Objects.hashCode(getKey(), getValue());		
-		return aCode != null ? aCode : super.hashCode();
-	}
-
-}
\ No newline at end of file
+    @Override
+    public int hashCode() {
+        Integer aCode = Objects.hashCode(getKey(), getValue());
+        return aCode != null ? aCode : super.hashCode();
+    }
+}
diff --git a/src/main/java/gtPlusPlus/api/objects/data/ObjMap.java b/src/main/java/gtPlusPlus/api/objects/data/ObjMap.java
index 49dd70d2b8..1f8a4baa2c 100644
--- a/src/main/java/gtPlusPlus/api/objects/data/ObjMap.java
+++ b/src/main/java/gtPlusPlus/api/objects/data/ObjMap.java
@@ -5,8 +5,7 @@ import java.util.Arrays;
 /**
  * Object-2-object map based on IntIntMap4a
  */
-public class ObjMap<K, V>
-{
+public class ObjMap<K, V> {
     private static final Object FREE_KEY = new Object();
     private static final Object REMOVED_KEY = new Object();
 
@@ -15,6 +14,7 @@ public class ObjMap<K, V>
 
     /** Value for the null key (if inserted into a map) */
     private Object m_nullValue;
+
     private boolean m_hasNull;
 
     /** Fill factor, must be between (0 and 1) */
@@ -28,159 +28,120 @@ public class ObjMap<K, V>
     /** Mask to wrap the actual array pointer */
     private int m_mask2;
 
-    public ObjMap( final int size, final float fillFactor )
-    {
-        if ( fillFactor <= 0 || fillFactor >= 1 )
-            throw new IllegalArgumentException( "FillFactor must be in (0, 1)" );
-        if ( size <= 0 )
-            throw new IllegalArgumentException( "Size must be positive!" );
+    public ObjMap(final int size, final float fillFactor) {
+        if (fillFactor <= 0 || fillFactor >= 1) throw new IllegalArgumentException("FillFactor must be in (0, 1)");
+        if (size <= 0) throw new IllegalArgumentException("Size must be positive!");
         final int capacity = arraySize(size, fillFactor);
         m_mask = capacity - 1;
         m_mask2 = capacity * 2 - 1;
         m_fillFactor = fillFactor;
 
         m_data = new Object[capacity * 2];
-        Arrays.fill( m_data, FREE_KEY );
+        Arrays.fill(m_data, FREE_KEY);
 
         m_threshold = (int) (capacity * fillFactor);
     }
 
     @SuppressWarnings("unchecked")
-	public V get( final K key )
-    {
-        if ( key == null )
-            return (V) m_nullValue; //we null it on remove, so safe not to check a flag here
+    public V get(final K key) {
+        if (key == null) return (V) m_nullValue; // we null it on remove, so safe not to check a flag here
 
         int ptr = (key.hashCode() & m_mask) << 1;
-        Object k = m_data[ ptr ];
+        Object k = m_data[ptr];
 
-        if ( k == FREE_KEY )
-            return null;  //end of chain already
-        if ( k.equals( key ) ) //we check FREE and REMOVED prior to this call
-            return (V) m_data[ ptr + 1 ];
-        while ( true )
-        {
-            ptr = (ptr + 2) & m_mask2; //that's next index
-            k = m_data[ ptr ];
-            if ( k == FREE_KEY )
-                return null;
-            if ( k.equals( key ) )
-                return (V) m_data[ ptr + 1 ];
+        if (k == FREE_KEY) return null; // end of chain already
+        if (k.equals(key)) // we check FREE and REMOVED prior to this call
+        return (V) m_data[ptr + 1];
+        while (true) {
+            ptr = (ptr + 2) & m_mask2; // that's next index
+            k = m_data[ptr];
+            if (k == FREE_KEY) return null;
+            if (k.equals(key)) return (V) m_data[ptr + 1];
         }
     }
 
     @SuppressWarnings("unchecked")
-	public V put( final K key, final V value )
-    {
-        if ( key == null )
-            return insertNullKey(value);
+    public V put(final K key, final V value) {
+        if (key == null) return insertNullKey(value);
 
         int ptr = getStartIndex(key) << 1;
         Object k = m_data[ptr];
 
-        if ( k == FREE_KEY ) //end of chain already
+        if (k == FREE_KEY) // end of chain already
         {
-            m_data[ ptr ] = key;
-            m_data[ ptr + 1 ] = value;
-            if ( m_size >= m_threshold )
-                rehash( m_data.length * 2 ); //size is set inside
-            else
-                ++m_size;
+            m_data[ptr] = key;
+            m_data[ptr + 1] = value;
+            if (m_size >= m_threshold) rehash(m_data.length * 2); // size is set inside
+            else ++m_size;
             return null;
-        }
-        else if ( k.equals( key ) ) //we check FREE and REMOVED prior to this call
+        } else if (k.equals(key)) // we check FREE and REMOVED prior to this call
         {
-            final Object ret = m_data[ ptr + 1 ];
-            m_data[ ptr + 1 ] = value;
+            final Object ret = m_data[ptr + 1];
+            m_data[ptr + 1] = value;
             return (V) ret;
         }
 
         int firstRemoved = -1;
-        if ( k == REMOVED_KEY )
-            firstRemoved = ptr; //we may find a key later
-
-        while ( true )
-        {
-            ptr = ( ptr + 2 ) & m_mask2; //that's next index calculation
-            k = m_data[ ptr ];
-            if ( k == FREE_KEY )
-            {
-                if ( firstRemoved != -1 )
-                    ptr = firstRemoved;
-                m_data[ ptr ] = key;
-                m_data[ ptr + 1 ] = value;
-                if ( m_size >= m_threshold )
-                    rehash( m_data.length * 2 ); //size is set inside
-                else
-                    ++m_size;
+        if (k == REMOVED_KEY) firstRemoved = ptr; // we may find a key later
+
+        while (true) {
+            ptr = (ptr + 2) & m_mask2; // that's next index calculation
+            k = m_data[ptr];
+            if (k == FREE_KEY) {
+                if (firstRemoved != -1) ptr = firstRemoved;
+                m_data[ptr] = key;
+                m_data[ptr + 1] = value;
+                if (m_size >= m_threshold) rehash(m_data.length * 2); // size is set inside
+                else ++m_size;
                 return null;
-            }
-            else if ( k.equals( key ) )
-            {
-                final Object ret = m_data[ ptr + 1 ];
-                m_data[ ptr + 1 ] = value;
+            } else if (k.equals(key)) {
+                final Object ret = m_data[ptr + 1];
+                m_data[ptr + 1] = value;
                 return (V) ret;
-            }
-            else if ( k == REMOVED_KEY )
-            {
-                if ( firstRemoved == -1 )
-                    firstRemoved = ptr;
+            } else if (k == REMOVED_KEY) {
+                if (firstRemoved == -1) firstRemoved = ptr;
             }
         }
     }
 
     @SuppressWarnings("unchecked")
-	public V remove( final K key )
-    {
-        if ( key == null )
-            return removeNullKey();
+    public V remove(final K key) {
+        if (key == null) return removeNullKey();
 
         int ptr = getStartIndex(key) << 1;
-        Object k = m_data[ ptr ];
-        if ( k == FREE_KEY )
-            return null;  //end of chain already
-        else if ( k.equals( key ) ) //we check FREE and REMOVED prior to this call
+        Object k = m_data[ptr];
+        if (k == FREE_KEY) return null; // end of chain already
+        else if (k.equals(key)) // we check FREE and REMOVED prior to this call
         {
             --m_size;
-            if ( m_data[ ( ptr + 2 ) & m_mask2 ] == FREE_KEY )
-                m_data[ ptr ] = FREE_KEY;
-            else
-                m_data[ ptr ] = REMOVED_KEY;
-            final V ret = (V) m_data[ ptr + 1 ];
-            m_data[ ptr + 1 ] = null;
+            if (m_data[(ptr + 2) & m_mask2] == FREE_KEY) m_data[ptr] = FREE_KEY;
+            else m_data[ptr] = REMOVED_KEY;
+            final V ret = (V) m_data[ptr + 1];
+            m_data[ptr + 1] = null;
             return ret;
         }
-        while ( true )
-        {
-            ptr = ( ptr + 2 ) & m_mask2; //that's next index calculation
-            k = m