From 8f656d9dacdefa7cc50cbdf363894bf568204253 Mon Sep 17 00:00:00 2001 From: Myles Date: Mon, 5 Sep 2016 12:24:33 +0100 Subject: [PATCH] Fix ListWrapper, I'm not even sure why I did this... but hey! --- .../us/myles/ViaVersion/util/ListWrapper.java | 107 ++++++------------ 1 file changed, 32 insertions(+), 75 deletions(-) diff --git a/src/main/java/us/myles/ViaVersion/util/ListWrapper.java b/src/main/java/us/myles/ViaVersion/util/ListWrapper.java index 9e782e950..7b19c96cf 100644 --- a/src/main/java/us/myles/ViaVersion/util/ListWrapper.java +++ b/src/main/java/us/myles/ViaVersion/util/ListWrapper.java @@ -1,6 +1,9 @@ package us.myles.ViaVersion.util; -import java.util.*; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.ListIterator; public abstract class ListWrapper implements List { public final Object lock = new Object(); @@ -18,169 +21,123 @@ public abstract class ListWrapper implements List { @Override public synchronized int size() { - synchronized (lock) { - return this.list.size(); - } + return this.list.size(); } @Override public synchronized boolean isEmpty() { - synchronized (lock) { - return this.list.isEmpty(); - } + return this.list.isEmpty(); } @Override public synchronized boolean contains(Object o) { - synchronized (lock) { - return this.list.contains(o); - } + return this.list.contains(o); } @Override public synchronized Iterator iterator() { - synchronized (lock) { - return listIterator(); - } + return listIterator(); } @Override public synchronized Object[] toArray() { - synchronized (lock) { - return this.list.toArray(); - } + return this.list.toArray(); } @Override public synchronized boolean add(Object o) { - synchronized (lock) { - handleAdd(o); - return this.list.add(o); - } + handleAdd(o); + return this.list.add(o); } @Override public synchronized boolean remove(Object o) { - synchronized (lock) { - return this.list.remove(o); - } + return this.list.remove(o); } @Override public synchronized boolean addAll(Collection c) { - synchronized (lock) { - for (Object o : c) { - handleAdd(o); - } - return this.list.addAll(c); + for (Object o : c) { + handleAdd(o); } + return this.list.addAll(c); } @Override public synchronized boolean addAll(int index, Collection c) { - synchronized (lock) { - for (Object o : c) { - handleAdd(o); - } - return this.list.addAll(index, c); + for (Object o : c) { + handleAdd(o); } + return this.list.addAll(index, c); } @Override public synchronized void clear() { - synchronized (lock) { - this.list.clear(); - } + this.list.clear(); } @Override public synchronized Object get(int index) { - synchronized (lock) { - return this.list.get(index); - } + return this.list.get(index); } @Override public synchronized Object set(int index, Object element) { - synchronized (lock) { - return this.list.set(index, element); - } + return this.list.set(index, element); } @Override public synchronized void add(int index, Object element) { - synchronized (lock) { - this.list.add(index, element); - } + this.list.add(index, element); } @Override public synchronized Object remove(int index) { - synchronized (lock) { - return this.list.remove(index); - } + return this.list.remove(index); } @Override public synchronized int indexOf(Object o) { - synchronized (lock) { - return this.list.indexOf(o); - } + return this.list.indexOf(o); } @Override public synchronized int lastIndexOf(Object o) { - synchronized (lock) { - return this.list.lastIndexOf(o); - } + return this.list.lastIndexOf(o); } @Override public synchronized ListIterator listIterator() { - synchronized (lock) { - return this.list.listIterator(); - } + return this.list.listIterator(); } @Override public synchronized ListIterator listIterator(int index) { - synchronized (lock) { - return this.list.listIterator(index); - } + return this.list.listIterator(index); } @Override public synchronized List subList(int fromIndex, int toIndex) { - synchronized (lock) { - return this.list.subList(fromIndex, toIndex); - } + return this.list.subList(fromIndex, toIndex); } @Override public synchronized boolean retainAll(Collection c) { - synchronized (lock) { - return this.list.retainAll(c); - } + return this.list.retainAll(c); } @Override public synchronized boolean removeAll(Collection c) { - synchronized (lock) { - return this.list.removeAll(c); - } + return this.list.removeAll(c); } @Override public synchronized boolean containsAll(Collection c) { - synchronized (lock) { - return this.list.containsAll(c); - } + return this.list.containsAll(c); } @Override public synchronized Object[] toArray(Object[] a) { - synchronized (lock) { - return this.list.toArray(a); - } + return this.list.toArray(a); } }