From 879e15eef656ef4a389df89c1b082759e46bb898 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Mon, 15 Aug 2011 13:22:37 +0400 Subject: [PATCH] optimization: removed costly atomics --- .../intellij/openapi/progress/impl/ProgressManagerImpl.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/progress/impl/ProgressManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/progress/impl/ProgressManagerImpl.java index 3583bfe99be4..a15b94fae472 100644 --- a/platform/platform-impl/src/com/intellij/openapi/progress/impl/ProgressManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/progress/impl/ProgressManagerImpl.java @@ -42,7 +42,6 @@ public class ProgressManagerImpl extends ProgressManager implements Disposable{ @NonNls private static final String PROCESS_CANCELED_EXCEPTION = "idea.ProcessCanceledException"; private static final ThreadLocal myThreadIndicator = new ThreadLocal(); - private final AtomicInteger myCurrentProgressCount = new AtomicInteger(0); private final AtomicInteger myCurrentUnsafeProgressCount = new AtomicInteger(0); private final AtomicInteger myCurrentModalProgressCount = new AtomicInteger(0); @@ -152,7 +151,7 @@ public class ProgressManagerImpl extends ProgressManager implements Disposable{ } public boolean hasProgressIndicator() { - return myCurrentProgressCount.get() > 0; + return getProgressIndicator() != null; } public boolean hasUnsafeProgressIndicator() { @@ -194,7 +193,6 @@ public class ProgressManagerImpl extends ProgressManager implements Disposable{ ProgressIndicator oldIndicator = myThreadIndicator.get(); if (progress != null) myThreadIndicator.set(progress); - myCurrentProgressCount.incrementAndGet(); final boolean modal = progress != null && progress.isModal(); if (modal) myCurrentModalProgressCount.incrementAndGet(); @@ -206,7 +204,6 @@ public class ProgressManagerImpl extends ProgressManager implements Disposable{ finally { myThreadIndicator.set(oldIndicator); - myCurrentProgressCount.decrementAndGet(); if (modal) myCurrentModalProgressCount.decrementAndGet(); if (progress == null || progress instanceof ProgressWindow) myCurrentUnsafeProgressCount.decrementAndGet();