Fix ListWrapper, I'm not even sure why I did this... but hey!

This commit is contained in:
Myles 2016-09-05 12:24:33 +01:00
parent 536e2e33e0
commit 8f656d9dac

View File

@ -1,6 +1,9 @@
package us.myles.ViaVersion.util; 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 abstract class ListWrapper implements List {
public final Object lock = new Object(); public final Object lock = new Object();
@ -18,169 +21,123 @@ public abstract class ListWrapper implements List {
@Override @Override
public synchronized int size() { public synchronized int size() {
synchronized (lock) { return this.list.size();
return this.list.size();
}
} }
@Override @Override
public synchronized boolean isEmpty() { public synchronized boolean isEmpty() {
synchronized (lock) { return this.list.isEmpty();
return this.list.isEmpty();
}
} }
@Override @Override
public synchronized boolean contains(Object o) { public synchronized boolean contains(Object o) {
synchronized (lock) { return this.list.contains(o);
return this.list.contains(o);
}
} }
@Override @Override
public synchronized Iterator iterator() { public synchronized Iterator iterator() {
synchronized (lock) { return listIterator();
return listIterator();
}
} }
@Override @Override
public synchronized Object[] toArray() { public synchronized Object[] toArray() {
synchronized (lock) { return this.list.toArray();
return this.list.toArray();
}
} }
@Override @Override
public synchronized boolean add(Object o) { public synchronized boolean add(Object o) {
synchronized (lock) { handleAdd(o);
handleAdd(o); return this.list.add(o);
return this.list.add(o);
}
} }
@Override @Override
public synchronized boolean remove(Object o) { public synchronized boolean remove(Object o) {
synchronized (lock) { return this.list.remove(o);
return this.list.remove(o);
}
} }
@Override @Override
public synchronized boolean addAll(Collection c) { public synchronized boolean addAll(Collection c) {
synchronized (lock) { for (Object o : c) {
for (Object o : c) { handleAdd(o);
handleAdd(o);
}
return this.list.addAll(c);
} }
return this.list.addAll(c);
} }
@Override @Override
public synchronized boolean addAll(int index, Collection c) { public synchronized boolean addAll(int index, Collection c) {
synchronized (lock) { for (Object o : c) {
for (Object o : c) { handleAdd(o);
handleAdd(o);
}
return this.list.addAll(index, c);
} }
return this.list.addAll(index, c);
} }
@Override @Override
public synchronized void clear() { public synchronized void clear() {
synchronized (lock) { this.list.clear();
this.list.clear();
}
} }
@Override @Override
public synchronized Object get(int index) { public synchronized Object get(int index) {
synchronized (lock) { return this.list.get(index);
return this.list.get(index);
}
} }
@Override @Override
public synchronized Object set(int index, Object element) { public synchronized Object set(int index, Object element) {
synchronized (lock) { return this.list.set(index, element);
return this.list.set(index, element);
}
} }
@Override @Override
public synchronized void add(int index, Object element) { public synchronized void add(int index, Object element) {
synchronized (lock) { this.list.add(index, element);
this.list.add(index, element);
}
} }
@Override @Override
public synchronized Object remove(int index) { public synchronized Object remove(int index) {
synchronized (lock) { return this.list.remove(index);
return this.list.remove(index);
}
} }
@Override @Override
public synchronized int indexOf(Object o) { public synchronized int indexOf(Object o) {
synchronized (lock) { return this.list.indexOf(o);
return this.list.indexOf(o);
}
} }
@Override @Override
public synchronized int lastIndexOf(Object o) { public synchronized int lastIndexOf(Object o) {
synchronized (lock) { return this.list.lastIndexOf(o);
return this.list.lastIndexOf(o);
}
} }
@Override @Override
public synchronized ListIterator listIterator() { public synchronized ListIterator listIterator() {
synchronized (lock) { return this.list.listIterator();
return this.list.listIterator();
}
} }
@Override @Override
public synchronized ListIterator listIterator(int index) { public synchronized ListIterator listIterator(int index) {
synchronized (lock) { return this.list.listIterator(index);
return this.list.listIterator(index);
}
} }
@Override @Override
public synchronized List subList(int fromIndex, int toIndex) { public synchronized List subList(int fromIndex, int toIndex) {
synchronized (lock) { return this.list.subList(fromIndex, toIndex);
return this.list.subList(fromIndex, toIndex);
}
} }
@Override @Override
public synchronized boolean retainAll(Collection c) { public synchronized boolean retainAll(Collection c) {
synchronized (lock) { return this.list.retainAll(c);
return this.list.retainAll(c);
}
} }
@Override @Override
public synchronized boolean removeAll(Collection c) { public synchronized boolean removeAll(Collection c) {
synchronized (lock) { return this.list.removeAll(c);
return this.list.removeAll(c);
}
} }
@Override @Override
public synchronized boolean containsAll(Collection c) { public synchronized boolean containsAll(Collection c) {
synchronized (lock) { return this.list.containsAll(c);
return this.list.containsAll(c);
}
} }
@Override @Override
public synchronized Object[] toArray(Object[] a) { public synchronized Object[] toArray(Object[] a) {
synchronized (lock) { return this.list.toArray(a);
return this.list.toArray(a);
}
} }
} }