commit 04285010a9ebcf288de7e1052fe3ea5950da1527
author Benjamin Wulfe <benwu@google.com> Wed Jan 28 11:53:54 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 28 11:53:54 2015 +0000
tree ca67d837791f472acdf1d284829c582971f19359
parent 4a1737a08f3af99b5bcde50f9adbc292c40756b5
parent 6b597de1b9b215b3609a8b35d84ede963c7e7151

Remove the error dialog when oauth scopes change. Feedback is that its more user friendly not to present the user with this and just let him log back in when required.
automerge: 6b597de

* commit '6b597de1b9b215b3609a8b35d84ede963c7e7151':
  Remove the error dialog when oauth scopes change. Feedback is that its more user friendly not to present the user with this and just let him log back in when required.

src/com/google/gct/login/GoogleLogin.java

diff --git a/src/com/google/gct/login/GoogleLogin.java b/src/com/google/gct/login/GoogleLogin.java
index 282e542..1a1bcd3 100644
--- a/src/com/google/gct/login/GoogleLogin.java
+++ b/src/com/google/gct/login/GoogleLogin.java
@@ -33,6 +33,7 @@
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.progress.Task;
+import com.intellij.openapi.progress.util.AbstractProgressIndicatorExBase;
 import com.intellij.openapi.progress.util.ProgressIndicatorBase;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
@@ -328,7 +329,7 @@
           return;
         }
 
-        ((ProgressIndicatorEx)indicator).addStateDelegate(new ProgressIndicatorBase() {
+        ((ProgressIndicatorEx)indicator).addStateDelegate(new AbstractProgressIndicatorExBase() {
           @Override
           public void cancel() {
             assert uiFacade != null;