simplification and code cleanup

This commit is contained in:
Yuri Orlov 2014-01-25 20:14:37 +03:00
parent 1a4d0786ec
commit b7692f2d85

View file

@ -10,58 +10,57 @@ package org.telegram.messenger;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class NotificationCenter {
final private HashMap<Integer, ArrayList<Object>> observers = new HashMap<Integer, ArrayList<Object>>();
final private HashMap<Integer, Object> memCache = new HashMap<Integer, Object>();
final private HashMap<String, Object> memCacheString = new HashMap<String, Object>();
public static NotificationCenter Instance = new NotificationCenter();
private final Map<Integer, List<Object>> observers = new HashMap<Integer, List<Object>>();
private Map<String, Object> memCache = new HashMap<String, Object>();
private Map<Integer, Object> removeAfterBroadcast = new HashMap<Integer, Object>();
private boolean broadcasting = false;
final private HashMap<Integer, Object> removeAfterBroadcast = new HashMap<Integer, Object>();
public interface NotificationCenterDelegate {
public abstract void didReceivedNotification(int id, Object... args);
}
public static NotificationCenter Instance = new NotificationCenter();
public void addToMemCache(int id, Object object) {
memCache.put(id, object);
addToMemCache(String.valueOf(id), object);
}
public void addToMemCache(String id, Object object) {
memCacheString.put(id, object);
memCache.put(id, object);
}
public Object getFromMemCache(int id) {
Object obj = memCache.get(id);
if (obj != null) {
memCache.remove(id);
}
return obj;
return getFromMemCache(String.valueOf(id), null);
}
public Object getFromMemCache(String id, Object defaultValue) {
Object obj = memCacheString.get(id);
Object obj = memCache.get(id);
if (obj != null) {
memCacheString.remove(id);
} else {
return defaultValue;
}
memCache.remove(id);
return obj;
}
return defaultValue;
}
public void postNotificationName(int id, Object... args) {
synchronized (observers) {
broadcasting = true;
ArrayList<Object> objects = observers.get(id);
List<Object> objects = observers.get(id);
if (objects != null) {
for (Object obj : objects) {
((NotificationCenterDelegate)obj).didReceivedNotification(id, args);
((NotificationCenterDelegate) obj).didReceivedNotification(id, args);
}
}
broadcasting = false;
if (!removeAfterBroadcast.isEmpty()) {
for (HashMap.Entry<Integer, Object> entry : removeAfterBroadcast.entrySet()) {
for (Map.Entry<Integer, Object> entry : removeAfterBroadcast.entrySet()) {
removeObserver(entry.getValue(), entry.getKey());
}
removeAfterBroadcast.clear();
@ -71,44 +70,26 @@ public class NotificationCenter {
public void addObserver(Object observer, int id) {
synchronized (observers) {
ArrayList<Object> objects = observers.get(id);
if (objects == null) {
objects = new ArrayList<Object>();
observers.put(id, objects);
if (!observers.containsKey(id)) {
observers.put(id, new ArrayList<Object>());
}
List<Object> objects = observers.get(id);
if (objects.contains(observer)) {
return;
}
objects.add(observer);
}
}
// public void removeObserver(Object observer) {
// synchronized (observers) {
// if (broadcasting) {
// removeAfterBroadcast.put(-1, observer);
// return;
// }
// Integer[] keyArr = (Integer[])observers.keySet().toArray();
// for (int a = 0; a < observers.size(); a++) {
// Integer id = keyArr[a];
// ArrayList<Object> objects = observers.get(id);
// objects.remove(observer);
// if (objects.size() == 0) {
// observers.remove(id);
// a--;
// }
// }
// }
// }
public void removeObserver(Object observer, int id) {
synchronized (observers) {
if (broadcasting) {
removeAfterBroadcast.put(id, observer);
return;
}
ArrayList<Object> objects = observers.get(id);
List<Object> objects = observers.get(id);
if (objects != null) {
objects.remove(observer);
if (objects.size() == 0) {