Code drop from //branches/cupcake/...@124589

1 files changed, 55 insertions, 22 deletions

diff --git a/core/java/android/widget/ExpandableListPosition.java b/core/java/android/widget/ExpandableListPosition.java
index 71e970c..e8d6113 100644
--- a/core/java/android/widget/ExpandableListPosition.java
+++ b/core/java/android/widget/ExpandableListPosition.java
@@ -16,6 +16,8 @@
 
 package android.widget;
 
+import java.util.ArrayList;
+
 /**
  * ExpandableListPosition can refer to either a group's position or a child's
  * position. Referring to a child's position requires both a group position (the
@@ -24,6 +26,11 @@ package android.widget;
  * {@link #obtainGroupPosition(int)}.
  */
 class ExpandableListPosition {
+    
+    private static final int MAX_POOL_SIZE = 5;
+    private static ArrayList<ExpandableListPosition> sPool =
+        new ArrayList<ExpandableListPosition>(MAX_POOL_SIZE);
+    
     /**
      * This data type represents a child position
      */
@@ -56,21 +63,14 @@ class ExpandableListPosition {
      */
     public int type;
     
-    ExpandableListPosition(int type, int groupPos, int childPos, int flatListPos) {
-        this.type = type;
-        this.flatListPos = flatListPos;
-        this.groupPos = groupPos;
-        this.childPos = childPos;
+    private void resetState() {
+        groupPos = 0;
+        childPos = 0;
+        flatListPos = 0;
+        type = 0;
     }
-
-    /**
-     * Used internally by the {@link #obtainChildPosition} and
-     * {@link #obtainGroupPosition} methods to construct a new object.
-     */
-    private ExpandableListPosition(int type, int groupPos, int childPos) {
-        this.type = type;
-        this.groupPos = groupPos;
-        this.childPos = childPos;
+    
+    private ExpandableListPosition() {
     }
     
     long getPackedPosition() {
@@ -79,11 +79,11 @@ class ExpandableListPosition {
     }
 
     static ExpandableListPosition obtainGroupPosition(int groupPosition) {
-        return new ExpandableListPosition(GROUP, groupPosition, 0);
+        return obtain(GROUP, groupPosition, 0, 0);
     }
     
     static ExpandableListPosition obtainChildPosition(int groupPosition, int childPosition) {
-        return new ExpandableListPosition(CHILD, groupPosition, childPosition);
+        return obtain(CHILD, groupPosition, childPosition, 0);
     }
 
     static ExpandableListPosition obtainPosition(long packedPosition) {
@@ -91,12 +91,45 @@ class ExpandableListPosition {
             return null;
         }
         
-        final int type = ExpandableListView.getPackedPositionType(packedPosition) ==
-            ExpandableListView.PACKED_POSITION_TYPE_CHILD ? CHILD : GROUP;
-        
-        return new ExpandableListPosition(type, ExpandableListView
-                .getPackedPositionGroup(packedPosition), ExpandableListView
-                .getPackedPositionChild(packedPosition));
+        ExpandableListPosition elp = getRecycledOrCreate(); 
+        elp.groupPos = ExpandableListView.getPackedPositionGroup(packedPosition);
+        if (ExpandableListView.getPackedPositionType(packedPosition) ==
+                ExpandableListView.PACKED_POSITION_TYPE_CHILD) {
+            elp.type = CHILD;
+            elp.childPos = ExpandableListView.getPackedPositionChild(packedPosition);
+        } else {
+            elp.type = GROUP;
+        }
+        return elp;
+    }
+    
+    static ExpandableListPosition obtain(int type, int groupPos, int childPos, int flatListPos) {
+        ExpandableListPosition elp = getRecycledOrCreate(); 
+        elp.type = type;
+        elp.groupPos = groupPos;
+        elp.childPos = childPos;
+        elp.flatListPos = flatListPos;
+        return elp;
+    }
+    
+    private static ExpandableListPosition getRecycledOrCreate() {
+        ExpandableListPosition elp;
+        synchronized (sPool) {
+            if (sPool.size() > 0) {
+                elp = sPool.remove(0);
+            } else {
+                return new ExpandableListPosition();
+            }
+        }
+        elp.resetState();
+        return elp;
     }
     
+    public void recycle() {
+        synchronized (sPool) {
+            if (sPool.size() < MAX_POOL_SIZE) {
+                sPool.add(this);
+            }
+        }
+    }
 }