Merge pull request #554 from jrenner/master

chmod -x Bits.java, tweak ArrayMap javadoc

diff --git a/gdx/src/com/badlogic/gdx/utils/ArrayMap.java b/gdx/src/com/badlogic/gdx/utils/ArrayMap.java
index 9f327e0..721ee33 100644 (file)
--- a/gdx/src/com/badlogic/gdx/utils/ArrayMap.java
+++ b/gdx/src/com/badlogic/gdx/utils/ArrayMap.java
@@ -24,9 +24,10 @@ import com.badlogic.gdx.utils.ObjectMap.Entry;
 import com.badlogic.gdx.utils.reflect.ArrayReflection;\r
 \r
 /** An ordered or unordered map of objects. This implementation uses arrays to store the keys and values, which means\r
- * {@link #getKey(Object, boolean) gets} do a comparison for each key in the map. This may be acceptable for small maps and has the\r
- * benefits that keys and values can be accessed by index, which makes iteration fast. Like {@link Array}, if ordered is false,\r
- * this class avoids a memory copy when removing elements (the last element is moved to the removed element's position).\r
+ * {@link #getKey(Object, boolean) gets} do a comparison for each key in the map. This is slower than a typical hash map\r
+ * implementation, but may be acceptable for small maps and has the benefits that keys and values can be accessed by\r
+ * index, which makes iteration fast. Like {@link Array}, if ordered is false, * this class avoids a memory copy when\r
+ * removing elements (the last element is moved to the removed element's position).\r
  * @author Nathan Sweet */\r
 public class ArrayMap<K, V> {\r
        public K[] keys;\r

diff --git a/gdx/src/com/badlogic/gdx/utils/Bits.java b/gdx/src/com/badlogic/gdx/utils/Bits.java
old mode 100755 (executable)
new mode 100644 (file)