Remove AreaDependentQueue.TaskQueue

Unused and there is no reason to finish or use it.

Author: Spottedleaf

src/main/java/ca/spottedleaf/concurrentutil/executor/queue/AreaDependentQueue.java

@@ -6,7 +6,6 @@
 import ca.spottedleaf.concurrentutil.util.IntPairUtil;
 import ca.spottedleaf.concurrentutil.util.Priority;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.PriorityQueue;
 import java.util.concurrent.atomic.AtomicLong;
@@ -194,16 +193,13 @@ void adjust(final PositionedTask positionedTask, final QueuedTask oldTask, final
 
     private static final class Position {
 
-        //private final TaskQueue queue = new TaskQueue();
         private final PriorityQueue<QueuedTask> queue = new PriorityQueue<>();
         private QueuedTask firstOrRunning;
 
         // assume that lock is held for all positions of task
         // it is the callers responsibility to schedule the task if the waiting pos == 0
         // returns true if the queued task is the first in queue
         boolean addTask(final QueuedTask task, final List<PrioritisedExecutor.PrioritisedTask> toCancel) {
-            /*final int addIdx = this.queue.add(task);
-            if (addIdx != 0) {*/
             this.queue.add(task);
             if (this.queue.peek() != task) {
                 // behind another task
@@ -1184,123 +1180,4 @@ public int compareTo(final QueuedTask other) {
             return Long.signum(this.positionedTask.taskId - other.positionedTask.taskId);
         }
     }
-
-    private static final class TaskQueue {
-
-        private QueuedTask[] queue = new QueuedTask[4];
-        private int size;
-
-        private static int siftUp(final QueuedTask[] queue, int index, final QueuedTask val) {
-            while (index > 0) {
-                final int p = (index - 1) >>> 1;
-                final QueuedTask parent = queue[p];
-                if (val.compareTo(parent) >= 0) {
-                    break;
-                }
-                queue[index] = parent;
-                index = p;
-            }
-            queue[index] = val;
-            return index;
-        }
-
-        private static int siftDown(final QueuedTask[] queue, int index, final QueuedTask val) {
-            // TODO
-            throw new UnsupportedOperationException();
-        }
-
-        private static int find(final QueuedTask[] queue, final int size, final QueuedTask probe) {
-            for (int idx = 0, len = Math.min(size, queue.length); idx < len; ++idx) {
-                final QueuedTask val = queue[idx];
-                if (val == probe) {
-                    return idx;
-                }
-                continue;
-            }
-
-            return -1;
-        }
-
-        // rets insertion index
-        public int add(final QueuedTask task) {
-            QueuedTask[] queue = this.queue;
-            final int insert = this.size++;
-            if (insert == queue.length) {
-                this.queue = queue = Arrays.copyOf(queue, insert * 2);
-            }
-
-            return siftUp(queue, insert, task);
-        }
-
-        public void remove(final QueuedTask task) {
-            final QueuedTask[] queue = this.queue;
-            final int idx = find(queue, this.size, task);
-
-            if (idx == -1) {
-                return;
-            }
-
-            final int move = --this.size;
-            final QueuedTask last = queue[move];
-            queue[move] = null;
-
-            if (move == idx) {
-                // no sifting needed
-                return;
-            }
-
-            final int insert = siftDown(queue, idx, last);
-            if (insert == idx) {
-                siftUp(queue, idx, last);
-            }
-        }
-
-        public int reinsert(final QueuedTask task) {
-            final QueuedTask[] queue = this.queue;
-            final int size = this.size;
-            final int idx = find(queue, size, task);
-
-            if (idx == -1 || size == 1) {
-                return idx;
-            }
-
-            final int insert = siftDown(queue, idx, task);
-            if (insert != idx) {
-                return insert;
-            }
-            return siftUp(queue, idx, task);
-        }
-
-        public QueuedTask peek() {
-            return this.queue[0];
-        }
-
-        public QueuedTask poll() {
-            final QueuedTask[] queue = this.queue;
-            final QueuedTask ret = queue[0];
-            if (ret == null) {
-                return ret;
-            }
-
-            final int move = --this.size;
-            final QueuedTask last = queue[move];
-            queue[move] = null;
-
-            if (move == 0) {
-                return ret;
-            }
-
-            siftDown(queue, 0, last);
-
-            return ret;
-        }
-
-        public int size() {
-            return this.size;
-        }
-
-        public boolean isEmpty() {
-            return this.size != 0;
-        }
-    }
 }

src/main/java/ca/spottedleaf/concurrentutil/map/ConcurrentLong2ReferenceChainedHashTable.java

@@ -41,7 +41,7 @@
  */
 public class ConcurrentLong2ReferenceChainedHashTable<V> implements Iterable<ConcurrentLong2ReferenceChainedHashTable.TableEntry<V>> {
 
-    private static final TableEntry<?> RESIZE_NODE = new TableEntry(0L, null);
+    private static final TableEntry<?> RESIZE_NODE = new TableEntry<>(0L, null);
 
     protected static final int DEFAULT_CAPACITY = 16;
     protected static final float DEFAULT_LOAD_FACTOR = 0.75f;