From b99021d0f7110ac35705b49a0268d8af3bff8aeb Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Thu, 13 Sep 2018 20:02:54 +0200 Subject: [PATCH] extract duplicate code that checks if the list is sorted --- .../java/org/lucares/collections/IntList.java | 23 ++++++++----------- .../org/lucares/collections/LongList.java | 23 ++++++++----------- 2 files changed, 20 insertions(+), 26 deletions(-) diff --git a/primitiveCollections/src/main/java/org/lucares/collections/IntList.java b/primitiveCollections/src/main/java/org/lucares/collections/IntList.java index 238e91f..39597aa 100644 --- a/primitiveCollections/src/main/java/org/lucares/collections/IntList.java +++ b/primitiveCollections/src/main/java/org/lucares/collections/IntList.java @@ -356,10 +356,7 @@ public final class IntList implements Serializable, Cloneable { size = size - (toIndex - fromIndex); if (!sorted) { - sorted = true; - for (int i = 1; i < size && sorted; i++) { - sorted = data[i - 1] <= data[i]; - } + checkIfSorted(); } } @@ -407,10 +404,7 @@ public final class IntList implements Serializable, Cloneable { size = insertPosition; if (!sorted) { - sorted = true; - for (int i = 1; i < size && sorted; i++) { - sorted = data[i - 1] <= data[i]; - } + checkIfSorted(); } } @@ -561,11 +555,7 @@ public final class IntList implements Serializable, Cloneable { data[i] = tmp; } - // update sorted - sorted = true; - for (int i = 1; i < size && sorted; i++) { - sorted = data[i - 1] <= data[i]; - } + checkIfSorted(); } private void ensureCapacity(final int newElements) { @@ -1062,4 +1052,11 @@ public final class IntList implements Serializable, Cloneable { return unionSorted(aSorted, bSorted); } + + private void checkIfSorted() { + sorted = true; + for (int i = 1; i < size && sorted; i++) { + sorted = data[i - 1] <= data[i]; + } + } } diff --git a/primitiveCollections/src/main/java/org/lucares/collections/LongList.java b/primitiveCollections/src/main/java/org/lucares/collections/LongList.java index b433016..b5b4dc8 100644 --- a/primitiveCollections/src/main/java/org/lucares/collections/LongList.java +++ b/primitiveCollections/src/main/java/org/lucares/collections/LongList.java @@ -346,10 +346,7 @@ public final class LongList implements Serializable, Cloneable { size = size - (toIndex - fromIndex); if (!sorted) { - sorted = true; - for (int i = 1; i < size && sorted; i++) { - sorted = data[i - 1] <= data[i]; - } + checkIfSorted(); } } @@ -397,10 +394,7 @@ public final class LongList implements Serializable, Cloneable { size = insertPosition; if (!sorted) { - sorted = true; - for (int i = 1; i < size && sorted; i++) { - sorted = data[i - 1] <= data[i]; - } + checkIfSorted(); } } @@ -551,11 +545,7 @@ public final class LongList implements Serializable, Cloneable { data[i] = tmp; } - // update sorted - sorted = true; - for (int i = 1; i < size && sorted; i++) { - sorted = data[i - 1] <= data[i]; - } + checkIfSorted(); } private void ensureCapacity(final int newElements) { @@ -1046,4 +1036,11 @@ public final class LongList implements Serializable, Cloneable { return unionSorted(aSorted, bSorted); } + + private void checkIfSorted() { + sorted = true; + for (int i = 1; i < size && sorted; i++) { + sorted = data[i - 1] <= data[i]; + } + } }