1 files changed, 7 insertions, 82 deletions

diff --git a/main/src/cgeo/geocaching/utils/LeastRecentlyUsedSet.java b/main/src/cgeo/geocaching/utils/LeastRecentlyUsedSet.java
index a69f427..c139136 100644
--- a/main/src/cgeo/geocaching/utils/LeastRecentlyUsedSet.java
+++ b/main/src/cgeo/geocaching/utils/LeastRecentlyUsedSet.java
@@ -20,21 +20,18 @@ import java.util.List;
  * access has to be guarded externally or the synchronized getAsList method can be used
  * to get a clone for iteration.
  */
-public class LeastRecentlyUsedSet<E> extends AbstractSet<E>
-        implements Cloneable, java.io.Serializable {
+public class LeastRecentlyUsedSet<E> extends AbstractSet<E> {
 
-    private static final long serialVersionUID = -1942301031191419547L;
-
-    private transient LeastRecentlyUsedMap<E, Object> map;
+    private final LeastRecentlyUsedMap<E, Object> map;
     private static final Object PRESENT = new Object();
 
-    public LeastRecentlyUsedSet(int maxEntries, int initialCapacity, float loadFactor) {
+    public LeastRecentlyUsedSet(final int maxEntries, final int initialCapacity, final float loadFactor) {
         // because we don't use any Map.get() methods from the Set, BOUNDED and LRU_CACHE have the exact same Behaviour
         // So we use LRU_CACHE mode because it should perform a bit better (as it doesn't re-add explicitly)
         map = new LeastRecentlyUsedMap.LruCache<>(maxEntries, initialCapacity, loadFactor);
     }
 
-    public LeastRecentlyUsedSet(int maxEntries) {
+    public LeastRecentlyUsedSet(final int maxEntries) {
         map = new LeastRecentlyUsedMap.LruCache<>(maxEntries);
     }
 
@@ -79,7 +76,7 @@ public class LeastRecentlyUsedSet<E> extends AbstractSet<E>
      * @see HashSet
      */
     @Override
-    public synchronized boolean contains(Object o) {
+    public synchronized boolean contains(final Object o) {
         return map.containsKey(o);
     }
 
@@ -90,7 +87,7 @@ public class LeastRecentlyUsedSet<E> extends AbstractSet<E>
      * @see HashSet
      */
     @Override
-    public synchronized boolean add(E e) {
+    public synchronized boolean add(final E e) {
         if (e == null) {
             throw new IllegalArgumentException("LeastRecentlyUsedSet cannot take null element");
         }
@@ -104,7 +101,7 @@ public class LeastRecentlyUsedSet<E> extends AbstractSet<E>
      * @see HashSet
      */
     @Override
-    public synchronized boolean remove(Object o) {
+    public synchronized boolean remove(final Object o) {
         return map.remove(o) == PRESENT;
     }
 
@@ -132,26 +129,6 @@ public class LeastRecentlyUsedSet<E> extends AbstractSet<E>
     }
 
     /**
-     * (synchronized) Clone of the set
-     * Copy of the HashSet code if clone()
-     *
-     * @see HashSet
-     */
-    @Override
-    @SuppressWarnings("unchecked")
-    public Object clone() throws CloneNotSupportedException {
-        try {
-            synchronized (this) {
-                final LeastRecentlyUsedSet<E> newSet = (LeastRecentlyUsedSet<E>) super.clone();
-                newSet.map = (LeastRecentlyUsedMap<E, Object>) map.clone();
-                return newSet;
-            }
-        } catch (CloneNotSupportedException e) {
-            throw new InternalError();
-        }
-    }
-
-    /**
      * Creates a clone as a list in a synchronized fashion.
      *
      * @return List based clone of the set
@@ -160,56 +137,4 @@ public class LeastRecentlyUsedSet<E> extends AbstractSet<E>
         return new ArrayList<>(this);
     }
 
-    /**
-     * Serialization version of HashSet with the additional parameters for the custom Map
-     *
-     * @see HashSet
-     */
-    private void writeObject(java.io.ObjectOutputStream s)
-            throws java.io.IOException {
-        // Write out any hidden serialization magic
-        s.defaultWriteObject();
-
-        // Write out HashMap capacity and load factor
-        s.writeInt(map.initialCapacity);
-        s.writeFloat(map.loadFactor);
-        s.writeInt(map.getMaxEntries());
-
-        // Write out size
-        s.writeInt(map.size());
-
-        // Write out all elements in the proper order.
-        for (final E e : map.keySet()) {
-            s.writeObject(e);
-        }
-    }
-
-    /**
-     * Serialization version of HashSet with the additional parameters for the custom Map
-     *
-     * @see HashSet
-     */
-    @SuppressWarnings("unchecked")
-    private void readObject(java.io.ObjectInputStream s)
-            throws java.io.IOException, ClassNotFoundException {
-        // Read in any hidden serialization magic
-        s.defaultReadObject();
-
-        // Read in HashMap capacity and load factor and create backing HashMap
-        final int capacity = s.readInt();
-        final float loadFactor = s.readFloat();
-        final int maxEntries = s.readInt();
-
-        map = new LeastRecentlyUsedMap.LruCache<>(maxEntries, capacity, loadFactor);
-
-        // Read in size
-        final int size = s.readInt();
-
-        // Read in all elements in the proper order.
-        for (int i = 0; i < size; i++) {
-            E e = (E) s.readObject();
-            map.put(e, PRESENT);
-        }
-    }
-
 }