update DoubleKeyValueMap

Author: wyouflf

library/src/com/lidroid/xutils/http/HttpHandler.java

@@ -305,7 +305,7 @@ public boolean updateProgress(long total, long current, boolean forceUpdateUI) {
     }
 
     public enum State {
-        WAITING(0), STARTED(1), LOADING(2), STOPPED(3), SUCCESS(4), FAILURE(-1);
+        WAITING(0), STARTED(1), LOADING(2), FAILURE(3), STOPPED(4), SUCCESS(5);
         private int value = 0;
 
         State(int value) {
@@ -321,13 +321,13 @@ public static State valueOf(int value) {
                 case 2:
                     return LOADING;
                 case 3:
-                    return STOPPED;
+                    return FAILURE;
                 case 4:
+                    return STOPPED;
+                case 5:
                     return SUCCESS;
-                case -1:
-                    return FAILURE;
                 default:
-                    return null;
+                    return FAILURE;
             }
         }
 

library/src/com/lidroid/xutils/util/core/DoubleKeyValueMap.java

@@ -15,6 +15,8 @@
 
 package com.lidroid.xutils.util.core;
 
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -56,6 +58,26 @@ public V get(K1 key1, K2 key2) {
         return k2_v == null ? null : k2_v.get(key2);
     }
 
+    public Collection<V> getAllValues(K1 key1) {
+        ConcurrentHashMap<K2, V> k2_v = k1_k2V_map.get(key1);
+        return k2_v == null ? null : k2_v.values();
+    }
+
+    public Collection<V> getAllValues() {
+        Collection<V> result = null;
+        Set<K1> k1Set = k1_k2V_map.keySet();
+        if (k1Set != null) {
+            result = new ArrayList<V>();
+            for (K1 k1 : k1Set) {
+                Collection<V> values = k1_k2V_map.get(k1).values();
+                if (values != null) {
+                    result.addAll(values);
+                }
+            }
+        }
+        return result;
+    }
+
     public boolean containsKey(K1 key1, K2 key2) {
         if (k1_k2V_map.containsKey(key1)) {
             return k1_k2V_map.get(key1).containsKey(key2);
@@ -77,6 +99,17 @@ public int size() {
         return result;
     }
 
+    public void remove(K1 key1) {
+        k1_k2V_map.remove(key1);
+    }
+
+    public void remove(K1 key1, K2 key2) {
+        ConcurrentHashMap<K2, V> k2_v = k1_k2V_map.get(key1);
+        if (k2_v != null) {
+            k2_v.remove(key2);
+        }
+    }
+
     public void clear() {
         if (k1_k2V_map.size() > 0) {
             for (ConcurrentHashMap<K2, V> k2V_map : k1_k2V_map.values()) {