From 09e0d369d3721bb844e0f60355efccc52381d5be Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Wed, 8 Jun 2016 22:10:35 +0200 Subject: Avoid opening dialogs from push/fetch background jobs Doing so quite frequently led to UI deadlocks when modal dialogs were active when the job's result dialog popped up. Instead use the progress framework's mechanisms to give the user a possibility to open a job's result dialog at his leisure. Thus there is no danger of conflicting with any modal shells. Push and fetch UI tests adapted to the new behavior. Bug: 495512 Change-Id: I10f8df000fdfc4c91f3d5a9b75354caf2a37d876 Signed-off-by: Thomas Wolf --- .../src/org/eclipse/egit/ui/internal/uitext.properties | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties') diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties index 21fe5bb066..235953faa6 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties @@ -750,6 +750,10 @@ PushCommitHandler_pushCommitTitle=Push Commit PushOperationUI_MultiRepositoriesDestinationString={0} repositories PushOperationUI_PushJobName=Push to {0} +RepositoryJob_NullStatus=Internal error: job ''{0}'' returned a null status. +RepositoryJobResultAction_RepositoryGone=Cannot find git repository ''{0}'' anymore: result cannot be shown. +ShowPushResultAction_name=Show Push Result... + PushWizard_cantConnectToAny=Can''t connect to any repository: {0} PushWizard_cantPrepareUpdatesMessage=Can't resolve ref specifications locally (local refs changed?) or create tracking ref update. PushWizard_cantPrepareUpdatesTitle=Preparing Ref Updates Error @@ -929,6 +933,7 @@ PushToGerritWizard_Title=Push the current HEAD to Gerrit FetchAction_wrongURITitle=Corrupted Configuration FetchAction_wrongURIMessage=Remote repositories URIs configuration is corrupted. FetchOperationUI_FetchJobName=Fetch from {0} +FetchOperationUI_ShowFetchResult=Show Fetch Result... FetchDestinationPage_PageTitle=Please select a fetch destination FetchDestinationPage_CouldNotGetBranchesMessage=Could not obtain tracking branches -- cgit v1.2.3