Remove ARRAY_CONTENTS from NonNullByDefault to avoid confusions with
behavior of annotations by JDT
diff --git a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/AbstractImList.java b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/AbstractImList.java
index 44ffa1d..d189b02 100644
--- a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/AbstractImList.java
+++ b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/AbstractImList.java
@@ -14,12 +14,6 @@
package org.eclipse.statet.internal.jcommons.collections;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.FIELD;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.PARAMETER;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.RETURN_TYPE;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.TYPE_ARGUMENT;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.TYPE_BOUND;
-
import java.util.Collection;
import java.util.ListIterator;
@@ -30,7 +24,7 @@
import org.eclipse.statet.jcommons.lang.Nullable;
-@NonNullByDefault({ PARAMETER, RETURN_TYPE, FIELD, TYPE_BOUND, TYPE_ARGUMENT })
+@NonNullByDefault
public abstract class AbstractImList<E> {
diff --git a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImArrayIdentityList.java b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImArrayIdentityList.java
index 16d0430..8818aec 100644
--- a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImArrayIdentityList.java
+++ b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImArrayIdentityList.java
@@ -14,12 +14,6 @@
package org.eclipse.statet.internal.jcommons.collections;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.FIELD;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.PARAMETER;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.RETURN_TYPE;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.TYPE_ARGUMENT;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.TYPE_BOUND;
-
import java.util.Arrays;
import java.util.Collection;
import java.util.Iterator;
@@ -44,7 +38,7 @@
*
* @since de.walware.ecommons.coremisc 1.5
*/
-@NonNullByDefault({ PARAMETER, RETURN_TYPE, FIELD, TYPE_BOUND, TYPE_ARGUMENT })
+@NonNullByDefault
public final class ImArrayIdentityList<E> extends AbstractImList<E> implements ImIdentityList<E>,
RandomAccess {
@@ -295,7 +289,7 @@
}
-@NonNullByDefault({ PARAMETER, RETURN_TYPE, FIELD, TYPE_BOUND, TYPE_ARGUMENT })
+@NonNullByDefault
final class ImArrayIdentitySubList<E> extends AbstractImList<E> implements ImIdentityList<E>,
RandomAccess {
diff --git a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImArrayIdentitySet.java b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImArrayIdentitySet.java
index 8f74b90..3842cff 100644
--- a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImArrayIdentitySet.java
+++ b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImArrayIdentitySet.java
@@ -14,12 +14,6 @@
package org.eclipse.statet.internal.jcommons.collections;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.FIELD;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.PARAMETER;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.RETURN_TYPE;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.TYPE_ARGUMENT;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.TYPE_BOUND;
-
import java.util.Arrays;
import java.util.Collection;
import java.util.Iterator;
@@ -43,7 +37,7 @@
*
* @since de.walware.ecommons.coremisc 1.5
*/
-@NonNullByDefault({ PARAMETER, RETURN_TYPE, FIELD, TYPE_BOUND, TYPE_ARGUMENT })
+@NonNullByDefault
public final class ImArrayIdentitySet<E> extends AbstractImList<E> implements ImIdentitySet<E>,
RandomAccess {
diff --git a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImArrayList.java b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImArrayList.java
index b0dcdb6..777cabf 100644
--- a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImArrayList.java
+++ b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImArrayList.java
@@ -14,12 +14,6 @@
package org.eclipse.statet.internal.jcommons.collections;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.FIELD;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.PARAMETER;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.RETURN_TYPE;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.TYPE_ARGUMENT;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.TYPE_BOUND;
-
import java.util.Arrays;
import java.util.Collection;
import java.util.Iterator;
@@ -44,7 +38,7 @@
*
* @since de.walware.ecommons.coremisc 1.2
*/
-@NonNullByDefault({ PARAMETER, RETURN_TYPE, FIELD, TYPE_BOUND, TYPE_ARGUMENT })
+@NonNullByDefault
public final class ImArrayList<E> extends AbstractImList<E> implements ImList<E>,
RandomAccess {
diff --git a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImArraySet.java b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImArraySet.java
index a8724d0..0986c8a 100644
--- a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImArraySet.java
+++ b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImArraySet.java
@@ -14,12 +14,6 @@
package org.eclipse.statet.internal.jcommons.collections;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.FIELD;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.PARAMETER;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.RETURN_TYPE;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.TYPE_ARGUMENT;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.TYPE_BOUND;
-
import java.util.Arrays;
import java.util.Collection;
import java.util.Iterator;
@@ -43,7 +37,7 @@
*
* @since de.walware.ecommons.coremisc 1.5
*/
-@NonNullByDefault({ PARAMETER, RETURN_TYPE, FIELD, TYPE_BOUND, TYPE_ARGUMENT })
+@NonNullByDefault
public final class ImArraySet<E> extends AbstractImList<E> implements ImSet<E>,
RandomAccess {
diff --git a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImArraySub0List.java b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImArraySub0List.java
index 6fe818e..2f06c21 100644
--- a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImArraySub0List.java
+++ b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImArraySub0List.java
@@ -14,12 +14,6 @@
package org.eclipse.statet.internal.jcommons.collections;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.FIELD;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.PARAMETER;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.RETURN_TYPE;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.TYPE_ARGUMENT;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.TYPE_BOUND;
-
import java.util.Arrays;
import java.util.Collection;
import java.util.Iterator;
@@ -37,7 +31,7 @@
import org.eclipse.statet.jcommons.lang.Nullable;
-@NonNullByDefault({ PARAMETER, RETURN_TYPE, FIELD, TYPE_BOUND, TYPE_ARGUMENT })
+@NonNullByDefault
public final class ImArraySub0List<E> extends AbstractImList<E> implements ImList<E>,
RandomAccess {
diff --git a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImArraySubList.java b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImArraySubList.java
index 35240fe..64e0514 100644
--- a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImArraySubList.java
+++ b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImArraySubList.java
@@ -14,12 +14,6 @@
package org.eclipse.statet.internal.jcommons.collections;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.FIELD;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.PARAMETER;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.RETURN_TYPE;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.TYPE_ARGUMENT;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.TYPE_BOUND;
-
import java.util.Arrays;
import java.util.Collection;
import java.util.Iterator;
@@ -37,7 +31,7 @@
import org.eclipse.statet.jcommons.lang.Nullable;
-@NonNullByDefault({ PARAMETER, RETURN_TYPE, FIELD, TYPE_BOUND, TYPE_ARGUMENT })
+@NonNullByDefault
public final class ImArraySubList<E> extends AbstractImList<E> implements ImList<E>,
RandomAccess {
diff --git a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImEmptyIdentityList.java b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImEmptyIdentityList.java
index 5ca1235..6a7c94a 100644
--- a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImEmptyIdentityList.java
+++ b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImEmptyIdentityList.java
@@ -14,12 +14,6 @@
package org.eclipse.statet.internal.jcommons.collections;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.FIELD;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.PARAMETER;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.RETURN_TYPE;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.TYPE_ARGUMENT;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.TYPE_BOUND;
-
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
@@ -43,7 +37,7 @@
*
* @since de.walware.ecommons.coremisc 1.5
*/
-@NonNullByDefault({ PARAMETER, RETURN_TYPE, FIELD, TYPE_BOUND, TYPE_ARGUMENT })
+@NonNullByDefault
public final class ImEmptyIdentityList<E> extends AbstractImList<E> implements ImIdentityList<E>,
RandomAccess {
diff --git a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImEmptyIdentitySet.java b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImEmptyIdentitySet.java
index 5ce418b..e0e1dde 100644
--- a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImEmptyIdentitySet.java
+++ b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImEmptyIdentitySet.java
@@ -14,12 +14,6 @@
package org.eclipse.statet.internal.jcommons.collections;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.FIELD;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.PARAMETER;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.RETURN_TYPE;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.TYPE_ARGUMENT;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.TYPE_BOUND;
-
import java.util.Collection;
import java.util.Iterator;
import java.util.ListIterator;
@@ -44,7 +38,7 @@
*
* @since de.walware.ecommons.coremisc 1.5
*/
-@NonNullByDefault({ PARAMETER, RETURN_TYPE, FIELD, TYPE_BOUND, TYPE_ARGUMENT })
+@NonNullByDefault
public final class ImEmptyIdentitySet<E> extends AbstractImList<E> implements ImIdentitySet<E>,
RandomAccess {
diff --git a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImEmptyList.java b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImEmptyList.java
index 1bc24cc..2a7a0f0 100644
--- a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImEmptyList.java
+++ b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImEmptyList.java
@@ -14,12 +14,6 @@
package org.eclipse.statet.internal.jcommons.collections;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.FIELD;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.PARAMETER;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.RETURN_TYPE;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.TYPE_ARGUMENT;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.TYPE_BOUND;
-
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
@@ -42,7 +36,7 @@
*
* @since de.walware.ecommons.coremisc 1.2
*/
-@NonNullByDefault({ PARAMETER, RETURN_TYPE, FIELD, TYPE_BOUND, TYPE_ARGUMENT })
+@NonNullByDefault
public final class ImEmptyList<E> extends AbstractImList<E> implements ImList<E>,
RandomAccess {
diff --git a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImEmptySet.java b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImEmptySet.java
index b12fada..82233e2 100644
--- a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImEmptySet.java
+++ b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImEmptySet.java
@@ -14,12 +14,6 @@
package org.eclipse.statet.internal.jcommons.collections;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.FIELD;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.PARAMETER;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.RETURN_TYPE;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.TYPE_ARGUMENT;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.TYPE_BOUND;
-
import java.util.Collection;
import java.util.Iterator;
import java.util.ListIterator;
@@ -43,7 +37,7 @@
*
* @since 1.5
*/
-@NonNullByDefault({ PARAMETER, RETURN_TYPE, FIELD, TYPE_BOUND, TYPE_ARGUMENT })
+@NonNullByDefault
public final class ImEmptySet<E> extends AbstractImList<E> implements ImSet<E>,
RandomAccess {
diff --git a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImSingletonIdentityList.java b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImSingletonIdentityList.java
index ac56dd6..8976b02 100644
--- a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImSingletonIdentityList.java
+++ b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImSingletonIdentityList.java
@@ -14,12 +14,6 @@
package org.eclipse.statet.internal.jcommons.collections;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.FIELD;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.PARAMETER;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.RETURN_TYPE;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.TYPE_ARGUMENT;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.TYPE_BOUND;
-
import java.lang.reflect.Array;
import java.util.Collection;
import java.util.Iterator;
@@ -44,7 +38,7 @@
*
* @since de.walware.ecommons.coremisc 1.5
*/
-@NonNullByDefault({ PARAMETER, RETURN_TYPE, FIELD, TYPE_BOUND, TYPE_ARGUMENT })
+@NonNullByDefault
public final class ImSingletonIdentityList<E> extends AbstractImList<E> implements ImIdentityList<E>,
RandomAccess {
diff --git a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImSingletonIdentitySet.java b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImSingletonIdentitySet.java
index 6bdbc12..2f7a264 100644
--- a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImSingletonIdentitySet.java
+++ b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImSingletonIdentitySet.java
@@ -14,12 +14,6 @@
package org.eclipse.statet.internal.jcommons.collections;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.FIELD;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.PARAMETER;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.RETURN_TYPE;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.TYPE_ARGUMENT;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.TYPE_BOUND;
-
import java.lang.reflect.Array;
import java.util.Collection;
import java.util.Iterator;
@@ -44,7 +38,7 @@
*
* @since de.walware.ecommons.coremisc 1.5
*/
-@NonNullByDefault({ PARAMETER, RETURN_TYPE, FIELD, TYPE_BOUND, TYPE_ARGUMENT })
+@NonNullByDefault
public final class ImSingletonIdentitySet<E> extends AbstractImList<E> implements ImIdentitySet<E>,
RandomAccess {
diff --git a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImSingletonList.java b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImSingletonList.java
index 594f4c0..e23ea60 100644
--- a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImSingletonList.java
+++ b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImSingletonList.java
@@ -14,12 +14,6 @@
package org.eclipse.statet.internal.jcommons.collections;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.FIELD;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.PARAMETER;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.RETURN_TYPE;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.TYPE_ARGUMENT;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.TYPE_BOUND;
-
import java.lang.reflect.Array;
import java.util.Collection;
import java.util.Iterator;
@@ -43,7 +37,7 @@
*
* @since de.walware.ecommons.coremisc 1.2
*/
-@NonNullByDefault({ PARAMETER, RETURN_TYPE, FIELD, TYPE_BOUND, TYPE_ARGUMENT })
+@NonNullByDefault
public final class ImSingletonList<E> extends AbstractImList<E> implements ImList<E>,
RandomAccess {
diff --git a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImSingletonSet.java b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImSingletonSet.java
index 451e3cf..852ae21 100644
--- a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImSingletonSet.java
+++ b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/internal/jcommons/collections/ImSingletonSet.java
@@ -14,12 +14,6 @@
package org.eclipse.statet.internal.jcommons.collections;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.FIELD;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.PARAMETER;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.RETURN_TYPE;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.TYPE_ARGUMENT;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.TYPE_BOUND;
-
import java.lang.reflect.Array;
import java.util.Collection;
import java.util.Iterator;
@@ -43,7 +37,7 @@
*
* @since de.walware.ecommons.coremisc 1.5
*/
-@NonNullByDefault({ PARAMETER, RETURN_TYPE, FIELD, TYPE_BOUND, TYPE_ARGUMENT })
+@NonNullByDefault
public final class ImSingletonSet<E> extends AbstractImList<E> implements ImSet<E>,
RandomAccess {
diff --git a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/jcommons/collections/CollectionUtils.java b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/jcommons/collections/CollectionUtils.java
index ecf2e60..7588d82 100644
--- a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/jcommons/collections/CollectionUtils.java
+++ b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/jcommons/collections/CollectionUtils.java
@@ -14,12 +14,6 @@
package org.eclipse.statet.jcommons.collections;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.FIELD;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.PARAMETER;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.RETURN_TYPE;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.TYPE_ARGUMENT;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.TYPE_BOUND;
-
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
@@ -83,7 +77,7 @@
}
- @NonNullByDefault({ PARAMETER, RETURN_TYPE, FIELD, TYPE_BOUND, TYPE_ARGUMENT })
+ @SuppressWarnings("null")
public static ImIdentityList<String> toIdentifierList(final String[] array) {
int count= 0;
for (int i= 0; i < array.length; i++) {
@@ -95,7 +89,7 @@
return ImCollections.newIdentityList(array, 0, count);
}
- @NonNullByDefault({ PARAMETER, RETURN_TYPE, FIELD, TYPE_BOUND, TYPE_ARGUMENT })
+ @SuppressWarnings("null")
public static ImIdentitySet<String> toIdentifierSet(final String[] array) {
int count= 0;
for (int i= 0; i < array.length; i++) {
diff --git a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/jcommons/collections/CopyOnWriteIdentityListSet.java b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/jcommons/collections/CopyOnWriteIdentityListSet.java
index c8556aa..9f521eb 100644
--- a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/jcommons/collections/CopyOnWriteIdentityListSet.java
+++ b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/jcommons/collections/CopyOnWriteIdentityListSet.java
@@ -14,12 +14,6 @@
package org.eclipse.statet.jcommons.collections;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.FIELD;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.PARAMETER;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.RETURN_TYPE;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.TYPE_ARGUMENT;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.TYPE_BOUND;
-
import java.util.AbstractSet;
import java.util.Collection;
import java.util.Iterator;
@@ -36,7 +30,7 @@
*
* @param <E>
*/
-@NonNullByDefault({ PARAMETER, RETURN_TYPE, FIELD, TYPE_BOUND, TYPE_ARGUMENT })
+@NonNullByDefault
public final class CopyOnWriteIdentityListSet<E> extends AbstractSet<E> implements IdentitySet<E> {
diff --git a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/jcommons/collections/CopyOnWriteList.java b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/jcommons/collections/CopyOnWriteList.java
index 748516d..38b535e 100644
--- a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/jcommons/collections/CopyOnWriteList.java
+++ b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/jcommons/collections/CopyOnWriteList.java
@@ -14,12 +14,6 @@
package org.eclipse.statet.jcommons.collections;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.FIELD;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.PARAMETER;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.RETURN_TYPE;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.TYPE_ARGUMENT;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.TYPE_BOUND;
-
import java.util.AbstractList;
import java.util.Collection;
import java.util.Iterator;
@@ -36,7 +30,7 @@
*
* @param <E>
*/
-@NonNullByDefault({ PARAMETER, RETURN_TYPE, FIELD, TYPE_BOUND, TYPE_ARGUMENT })
+@NonNullByDefault
public final class CopyOnWriteList<E> extends AbstractList<E> implements List<E> {
diff --git a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/jcommons/collections/CopyOnWriteListSet.java b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/jcommons/collections/CopyOnWriteListSet.java
index bc51f29..18dc5ba 100644
--- a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/jcommons/collections/CopyOnWriteListSet.java
+++ b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/jcommons/collections/CopyOnWriteListSet.java
@@ -14,12 +14,6 @@
package org.eclipse.statet.jcommons.collections;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.FIELD;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.PARAMETER;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.RETURN_TYPE;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.TYPE_ARGUMENT;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.TYPE_BOUND;
-
import java.util.AbstractSet;
import java.util.Collection;
import java.util.Iterator;
@@ -36,7 +30,7 @@
*
* @param <E>
*/
-@NonNullByDefault({ PARAMETER, RETURN_TYPE, FIELD, TYPE_BOUND, TYPE_ARGUMENT })
+@NonNullByDefault
public final class CopyOnWriteListSet<E> extends AbstractSet<E> implements Set<E> {
diff --git a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/jcommons/collections/NonNullList.java b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/jcommons/collections/NonNullList.java
index 17738e5..89369b9 100644
--- a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/jcommons/collections/NonNullList.java
+++ b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/jcommons/collections/NonNullList.java
@@ -50,6 +50,6 @@
@NonNull E remove(int index);
@Override
- @NonNull Object[] toArray();
+ @NonNull Object [] toArray();
}
diff --git a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/jcommons/collections/NonNullSet.java b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/jcommons/collections/NonNullSet.java
index 6893403..ce0f19c 100644
--- a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/jcommons/collections/NonNullSet.java
+++ b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/jcommons/collections/NonNullSet.java
@@ -36,7 +36,7 @@
@Override
- @NonNull Object[] toArray();
+ @NonNull Object [] toArray();
}
diff --git a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/jcommons/concurrent/CommonThreadFactory.java b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/jcommons/concurrent/CommonThreadFactory.java
index 83c84ac..f7297e5 100644
--- a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/jcommons/concurrent/CommonThreadFactory.java
+++ b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/jcommons/concurrent/CommonThreadFactory.java
@@ -43,6 +43,11 @@
private static final String NAME_SUFFIX= "]"; //$NON-NLS-1$
+ @SuppressWarnings("null")
+ private static ThreadGroup getCurrentThreadGroup() {
+ return Thread.currentThread().getThreadGroup();
+ }
+
private final ThreadGroup threadGroup;
@@ -60,7 +65,7 @@
}
public CommonThreadFactory(final String threadBaseName) {
- this(Thread.currentThread().getThreadGroup(),
+ this(getCurrentThreadGroup(),
buildNamePrefix(threadBaseName, null), NAME_SUFFIX );
}
diff --git a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/jcommons/lang/NonNullByDefault.java b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/jcommons/lang/NonNullByDefault.java
index 6a68f21..7f029ea 100644
--- a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/jcommons/lang/NonNullByDefault.java
+++ b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/jcommons/lang/NonNullByDefault.java
@@ -14,7 +14,6 @@
package org.eclipse.statet.jcommons.lang;
-import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.ARRAY_CONTENTS;
import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.FIELD;
import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.PARAMETER;
import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.RETURN_TYPE;
@@ -40,7 +39,6 @@
FIELD,
TYPE_BOUND,
TYPE_ARGUMENT,
- ARRAY_CONTENTS
};
}
diff --git a/jcommons/org.eclipse.statet.jcommons.util/srcERuntime/org/eclipse/statet/internal/jcommons/rmi/eplatform/EPlatformContributor.java b/jcommons/org.eclipse.statet.jcommons.util/srcERuntime/org/eclipse/statet/internal/jcommons/rmi/eplatform/EPlatformContributor.java
index 708a721..fae8f63 100644
--- a/jcommons/org.eclipse.statet.jcommons.util/srcERuntime/org/eclipse/statet/internal/jcommons/rmi/eplatform/EPlatformContributor.java
+++ b/jcommons/org.eclipse.statet.jcommons.util/srcERuntime/org/eclipse/statet/internal/jcommons/rmi/eplatform/EPlatformContributor.java
@@ -75,10 +75,10 @@
}
private List<String> collectPluginIds(final String extensionPointId, final String entryId) {
- final IConfigurationElement[] elements= RegistryFactory.getRegistry()
+ final var configurationElements= RegistryFactory.getRegistry()
.getConfigurationElementsFor(extensionPointId);
final List<String> pluginIds= new ArrayList<>();
- for (final IConfigurationElement element : elements) {
+ for (final IConfigurationElement element : configurationElements) {
if (element.getName().equals(entryId)) {
final String pluginId= element.getAttribute("pluginId"); //$NON-NLS-1$
if (pluginId != null && pluginId.length() > 0
diff --git a/jcommons/org.eclipse.statet.jcommons.util/srcERuntime/org/eclipse/statet/internal/jcommons/runtime/eplatform/EPlatformAppEnvironment.java b/jcommons/org.eclipse.statet.jcommons.util/srcERuntime/org/eclipse/statet/internal/jcommons/runtime/eplatform/EPlatformAppEnvironment.java
index 527bfbf..0c6494b 100644
--- a/jcommons/org.eclipse.statet.jcommons.util/srcERuntime/org/eclipse/statet/internal/jcommons/runtime/eplatform/EPlatformAppEnvironment.java
+++ b/jcommons/org.eclipse.statet.jcommons.util/srcERuntime/org/eclipse/statet/internal/jcommons/runtime/eplatform/EPlatformAppEnvironment.java
@@ -52,6 +52,7 @@
private Bundle bundle= nonNullLateInit();
+ @SuppressWarnings("null")
public EPlatformAppEnvironment() {
super(ENV_ID, null, new EPlatformBundleResolver());
}
diff --git a/jcommons/org.eclipse.statet.jcommons.util/srcERuntime/org/eclipse/statet/internal/jcommons/runtime/eplatform/EPlatformBundleResolver.java b/jcommons/org.eclipse.statet.jcommons.util/srcERuntime/org/eclipse/statet/internal/jcommons/runtime/eplatform/EPlatformBundleResolver.java
index 76a2fcd..06e8e10 100644
--- a/jcommons/org.eclipse.statet.jcommons.util/srcERuntime/org/eclipse/statet/internal/jcommons/runtime/eplatform/EPlatformBundleResolver.java
+++ b/jcommons/org.eclipse.statet.jcommons.util/srcERuntime/org/eclipse/statet/internal/jcommons/runtime/eplatform/EPlatformBundleResolver.java
@@ -31,6 +31,7 @@
import org.eclipse.statet.internal.jcommons.runtime.CommonsRuntimeInternals;
import org.eclipse.statet.jcommons.io.UriUtils;
+import org.eclipse.statet.jcommons.lang.NonNull;
import org.eclipse.statet.jcommons.lang.NonNullByDefault;
import org.eclipse.statet.jcommons.lang.Nullable;
import org.eclipse.statet.jcommons.lang.ObjectUtils.ToStringBuilder;
@@ -116,7 +117,7 @@
final Bundle pluginBundle= Platform.getBundle(bundleSpec.getId());
if (pluginBundle != null) {
final boolean ok= addEntries(pluginBundle, resolved, status);
- final Bundle[] fragments= Platform.getFragments(pluginBundle);
+ final @NonNull Bundle [] fragments= Platform.getFragments(pluginBundle);
if (fragments != null) {
for (final Bundle fragmentBundle : fragments) {
addEntries(fragmentBundle, resolved, status);
diff --git a/jcommons/org.eclipse.statet.jcommons.util/srcERuntime/org/eclipse/statet/jcommons/status/eplatform/EStatusUtils.java b/jcommons/org.eclipse.statet.jcommons.util/srcERuntime/org/eclipse/statet/jcommons/status/eplatform/EStatusUtils.java
index 016af96..7dea42f 100644
--- a/jcommons/org.eclipse.statet.jcommons.util/srcERuntime/org/eclipse/statet/jcommons/status/eplatform/EStatusUtils.java
+++ b/jcommons/org.eclipse.statet.jcommons.util/srcERuntime/org/eclipse/statet/jcommons/status/eplatform/EStatusUtils.java
@@ -14,13 +14,19 @@
package org.eclipse.statet.jcommons.status.eplatform;
+import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.ARRAY_CONTENTS;
+import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.FIELD;
+import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.PARAMETER;
+import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.RETURN_TYPE;
+import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.TYPE_ARGUMENT;
+import static org.eclipse.statet.jcommons.lang.NullDefaultLocation.TYPE_BOUND;
+
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IProgressMonitorWithBlocking;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.statet.jcommons.collections.ImCollections;
-import org.eclipse.statet.jcommons.collections.ImList;
import org.eclipse.statet.jcommons.lang.NonNull;
import org.eclipse.statet.jcommons.lang.NonNullByDefault;
import org.eclipse.statet.jcommons.lang.Nullable;
@@ -37,7 +43,7 @@
/**
* A utility class to work with IStatus.
*/
-@NonNullByDefault
+@NonNullByDefault({ PARAMETER, RETURN_TYPE, FIELD, TYPE_BOUND, TYPE_ARGUMENT, ARRAY_CONTENTS })
public class EStatusUtils {
@@ -111,7 +117,7 @@
private static class EMultiStatus extends EStatus {
- private final IStatus[] children;
+ private final IStatus [] children;
public EMultiStatus(final Status status, final IStatus[] children) {
@@ -126,7 +132,7 @@
}
@Override
- public IStatus[] getChildren() {
+ public IStatus [] getChildren() {
return this.children;
}
@@ -135,8 +141,8 @@
public static IStatus convert(final Status status) {
if (status.isMultiStatus()) {
- final ImList<Status> children= status.getChildren();
- final IStatus[] convertedChildren= new @NonNull IStatus[children.size()];
+ final var children= status.getChildren();
+ final var convertedChildren= new @NonNull IStatus[children.size()];
for (int i= 0; i < convertedChildren.length; i++) {
convertedChildren[i]= convert(children.get(i));
}
@@ -155,8 +161,8 @@
public static Status convert(final IStatus status) {
if (status.isMultiStatus()) {
- final IStatus[] children= status.getChildren();
- final Status[] convertedChildren= new @NonNull Status[children.length];
+ final var children= status.getChildren();
+ final var convertedChildren= new @NonNull Status[children.length];
for (int i= 0; i < convertedChildren.length; i++) {
convertedChildren[i]= convert(children[i]);
}
