X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FdbObjects%2FObjectCache.java;h=0d9fc14ba51b4f2d0e4005a3977367bdd3c66ff5;hp=2a5d297b96652d3c2b07cbd9fa402bb87297c361;hb=b47144d6f3bf6b6eb1ec477de9d2af38256f074f;hpb=6fe8f289fa30293ca22eea16bfdd34046297eb02

diff --git a/src/org/cacert/gigi/dbObjects/ObjectCache.java b/src/org/cacert/gigi/dbObjects/ObjectCache.java
index 2a5d297b..0d9fc14b 100644
--- a/src/org/cacert/gigi/dbObjects/ObjectCache.java
+++ b/src/org/cacert/gigi/dbObjects/ObjectCache.java
@@ -6,16 +6,17 @@ import java.util.HashSet;
 
 public class ObjectCache<T extends IdCachable> {
 
-    HashMap<Integer, WeakReference<T>> hashmap = new HashMap<>();
+    private final HashMap<Integer, WeakReference<T>> hashmap = new HashMap<>();
 
-    private static HashSet<ObjectCache<?>> caches = new HashSet<>();
+    private static final HashSet<ObjectCache<? extends IdCachable>> caches = new HashSet<>();
 
     protected ObjectCache() {
         caches.add(this);
     }
 
-    public void put(T c) {
+    public T put(T c) {
         hashmap.put(c.getId(), new WeakReference<T>(c));
+        return c;
     }
 
     public T get(int id) {
@@ -27,8 +28,12 @@ public class ObjectCache<T extends IdCachable> {
     }
 
     public static void clearAllCaches() {
-        for (ObjectCache<?> objectCache : caches) {
+        for (ObjectCache<? extends IdCachable> objectCache : caches) {
             objectCache.hashmap.clear();
         }
     }
+
+    public void remove(T toRm) {
+        hashmap.remove(toRm);
+    }
 }