diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-07-16 18:07:37 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-07-16 18:09:03 -0700 |
| commit | 65f60eb9011bb2c549a6d83ae31257480368ddc5 (patch) | |
| tree | de0dca03bec460e8797332e5f460400f5cf6485f /plugins/svn4idea/src/org | |
| parent | 9ea67227e8fdcf8ed37e65bb96e32767291d0f4f (diff) | |
| download | idea-65f60eb9011bb2c549a6d83ae31257480368ddc5.tar.gz | |
Snapshot idea/138.1029 from git://git.jetbrains.org/idea/community.git
Update from idea/138.538 to idea/138.1029
Change-Id: I828f829a968439a99ec67640990c18ff7c9b58ce
Diffstat (limited to 'plugins/svn4idea/src/org')
| -rw-r--r-- | plugins/svn4idea/src/org/jetbrains/idea/svn/auth/SvnAuthenticationNotifier.java | 8 | ||||
| -rw-r--r-- | plugins/svn4idea/src/org/jetbrains/idea/svn/treeConflict/MergeFromTheirsResolver.java | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/auth/SvnAuthenticationNotifier.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/auth/SvnAuthenticationNotifier.java index 96c8d6e2e4de..57c835daef2f 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/auth/SvnAuthenticationNotifier.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/auth/SvnAuthenticationNotifier.java @@ -19,7 +19,6 @@ import com.intellij.notification.NotificationType; import com.intellij.openapi.application.Application; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ModalityState; -import com.intellij.openapi.application.ex.ApplicationEx; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.ProgressManager; @@ -128,11 +127,12 @@ public class SvnAuthenticationNotifier extends GenericNotifierImpl<SvnAuthentica } } }; - final ApplicationEx application = (ApplicationEx)ApplicationManager.getApplication(); + final Application application = ApplicationManager.getApplication(); // also do not show auth if thread does not have progress indicator - if (application.holdsReadLock() || application.isDispatchThread() || ! ProgressManager.getInstance().hasProgressIndicator()) { + if (application.isReadAccessAllowed() || !ProgressManager.getInstance().hasProgressIndicator()) { application.executeOnPooledThread(checker); - } else { + } + else { checker.run(); return resultRef.get(); } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/treeConflict/MergeFromTheirsResolver.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/treeConflict/MergeFromTheirsResolver.java index 9764c4666a61..762f4449b897 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/treeConflict/MergeFromTheirsResolver.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/treeConflict/MergeFromTheirsResolver.java @@ -50,6 +50,7 @@ import com.intellij.util.continuation.Continuation; import com.intellij.util.continuation.ContinuationContext; import com.intellij.util.continuation.TaskDescriptor; import com.intellij.util.continuation.Where; +import org.jetbrains.annotations.NotNull; import org.jetbrains.idea.svn.*; import org.jetbrains.idea.svn.history.SvnChangeList; import org.jetbrains.idea.svn.history.SvnRepositoryLocation; @@ -629,6 +630,7 @@ public class MergeFromTheirsResolver { return true; } + @NotNull @Override public String getDoNotShowMessage() { return CommonBundle.message("dialog.options.do.not.ask"); |