diff --git a/model/src/main/java/jetbrains/jetpad/model/composite/Composites.java b/model/src/main/java/jetbrains/jetpad/model/composite/Composites.java index 2af50001..79be097b 100644 --- a/model/src/main/java/jetbrains/jetpad/model/composite/Composites.java +++ b/model/src/main/java/jetbrains/jetpad/model/composite/Composites.java @@ -44,14 +44,16 @@ public boolean test(HasVisibility value) { } }; - @SuppressWarnings("unchecked") public static & HasFocusability> Predicate isFocusable() { - return (Predicate) IS_FOCUSABLE; + @SuppressWarnings("unchecked") + Predicate predicate = (Predicate) IS_FOCUSABLE; + return predicate; } - @SuppressWarnings("unchecked") public static & HasVisibility> Predicate isInvisible() { - return (Predicate) IS_INVISIBLE; + @SuppressWarnings("unchecked") + Predicate predicate = (Predicate) IS_INVISIBLE; + return predicate; } public static > diff --git a/model/src/test/java/jetbrains/jetpad/model/collections/SelectTest.java b/model/src/test/java/jetbrains/jetpad/model/collections/SelectTest.java index bda48f01..18bfd6f3 100644 --- a/model/src/test/java/jetbrains/jetpad/model/collections/SelectTest.java +++ b/model/src/test/java/jetbrains/jetpad/model/collections/SelectTest.java @@ -199,9 +199,9 @@ private void testNonListened(Property src, assertEquals(0, res.size()); } - @SuppressWarnings("unchecked") private void testListened(Property src, ObservableCollection selected, ObservableCollection res) { + @SuppressWarnings("unchecked") CollectionListener mock = mock(CollectionListener.class); res.addListener(mock); @@ -223,12 +223,12 @@ private void testListened(Property src, assertEquals(0, res.size()); } - @SuppressWarnings("unchecked") private void testRegistrations(Property src, ObservableCollection res, AtomicInteger propertyListeners, AtomicInteger collectionListeners) { assertEquals(0, propertyListeners.get()); assertEquals(0, collectionListeners.get()); + @SuppressWarnings("unchecked") CollectionListener mock = mock(CollectionListener.class); Registration mockReg = res.addListener(mock); assertEquals(1, propertyListeners.get()); diff --git a/util/base/src/main/java/jetbrains/jetpad/base/Functions.java b/util/base/src/main/java/jetbrains/jetpad/base/Functions.java index 3313c991..e321e491 100644 --- a/util/base/src/main/java/jetbrains/jetpad/base/Functions.java +++ b/util/base/src/main/java/jetbrains/jetpad/base/Functions.java @@ -66,14 +66,16 @@ public static Supplier memorize(Supplier supplier) { return new Memo<>(supplier); } - @SuppressWarnings("unchecked") public static Predicate alwaysTrue() { - return (Predicate) TRUE_PREDICATE; + @SuppressWarnings("unchecked") + Predicate predicate = (Predicate) TRUE_PREDICATE; + return predicate; } - @SuppressWarnings("unchecked") public static Predicate alwaysFalse() { - return (Predicate) FALSE_PREDICATE; + @SuppressWarnings("unchecked") + Predicate predicate = (Predicate) FALSE_PREDICATE; + return predicate; } public static Function constant(final ResultT result) { @@ -85,19 +87,22 @@ public ResultT apply(ArgT a) { }; } - @SuppressWarnings("unchecked") public static Predicate isNull() { - return (Predicate) NULL_PREDICATE; + @SuppressWarnings("unchecked") + Predicate predicate = (Predicate) NULL_PREDICATE; + return predicate; } - @SuppressWarnings("unchecked") public static Predicate isNotNull() { - return (Predicate) NOT_NULL_PREDICATE; + @SuppressWarnings("unchecked") + Predicate predicate = (Predicate) NOT_NULL_PREDICATE; + return predicate; } - @SuppressWarnings("unchecked") public static Function identity() { - return (Function) IDENTITY_FUNCTION; + @SuppressWarnings("unchecked") + Function function = (Function) IDENTITY_FUNCTION; + return function; } public static Predicate same(final Object value) { diff --git a/util/java8adapter/src/main/java/jetbrains/jetpad/java8adapter/Functions.java b/util/java8adapter/src/main/java/jetbrains/jetpad/java8adapter/Functions.java index 2c45c83c..128f4d87 100644 --- a/util/java8adapter/src/main/java/jetbrains/jetpad/java8adapter/Functions.java +++ b/util/java8adapter/src/main/java/jetbrains/jetpad/java8adapter/Functions.java @@ -24,13 +24,15 @@ public final class Functions { private Functions() { } - @SuppressWarnings("unchecked") public static Predicate alwaysTrue() { - return (Predicate) TRUE_PREDICATE; + @SuppressWarnings("unchecked") + Predicate predicate = (Predicate) TRUE_PREDICATE; + return predicate; } - @SuppressWarnings("unchecked") public static Predicate alwaysFalse() { - return (Predicate) FALSE_PREDICATE; + @SuppressWarnings("unchecked") + Predicate predicate = (Predicate) FALSE_PREDICATE; + return predicate; } } \ No newline at end of file