From 46b73abe54324bf247c8c0e6d72f67a8f41b25d2 Mon Sep 17 00:00:00 2001 From: peter Date: Sat, 31 Jul 2010 10:13:49 +0100 Subject: [PATCH] VolatileNNLazyValue, AtomicNNLazyValue <: NNLazyValue --- .../com/intellij/openapi/util/AtomicNotNullLazyValue.java | 5 +---- .../util/src/com/intellij/openapi/util/NotNullLazyValue.java | 2 +- .../com/intellij/openapi/util/VolatileNotNullLazyValue.java | 5 +---- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/platform/util/src/com/intellij/openapi/util/AtomicNotNullLazyValue.java b/platform/util/src/com/intellij/openapi/util/AtomicNotNullLazyValue.java index 82c969fc08fc..71046e2be9f6 100644 --- a/platform/util/src/com/intellij/openapi/util/AtomicNotNullLazyValue.java +++ b/platform/util/src/com/intellij/openapi/util/AtomicNotNullLazyValue.java @@ -21,13 +21,10 @@ import org.jetbrains.annotations.NotNull; /** * @author peter */ -public abstract class AtomicNotNullLazyValue { +public abstract class AtomicNotNullLazyValue extends NotNullLazyValue { private volatile T myValue; - @NotNull - protected abstract T compute(); - @NotNull public final T getValue() { if (myValue != null) { diff --git a/platform/util/src/com/intellij/openapi/util/NotNullLazyValue.java b/platform/util/src/com/intellij/openapi/util/NotNullLazyValue.java index 8b10babd5afe..1225fed05b89 100644 --- a/platform/util/src/com/intellij/openapi/util/NotNullLazyValue.java +++ b/platform/util/src/com/intellij/openapi/util/NotNullLazyValue.java @@ -29,7 +29,7 @@ public abstract class NotNullLazyValue { protected abstract T compute(); @NotNull - public final T getValue() { + public T getValue() { if (!myComputed) { myValue = compute(); myComputed = true; diff --git a/platform/util/src/com/intellij/openapi/util/VolatileNotNullLazyValue.java b/platform/util/src/com/intellij/openapi/util/VolatileNotNullLazyValue.java index f2171358e902..344592047984 100644 --- a/platform/util/src/com/intellij/openapi/util/VolatileNotNullLazyValue.java +++ b/platform/util/src/com/intellij/openapi/util/VolatileNotNullLazyValue.java @@ -21,13 +21,10 @@ import org.jetbrains.annotations.NotNull; /** * @author peter */ -public abstract class VolatileNotNullLazyValue { +public abstract class VolatileNotNullLazyValue extends NotNullLazyValue { private volatile T myValue; - @NotNull - protected abstract T compute(); - @NotNull public final T getValue() { T value = myValue;