Lines 599-605
Link Here
|
599 |
|
599 |
|
600 |
currentSelection = (IFileRevision)o; |
600 |
currentSelection = (IFileRevision)o; |
601 |
if(needsProgressDialog) { |
601 |
if(needsProgressDialog) { |
602 |
PlatformUI.getWorkbench().getProgressService().run(true, true, new IRunnableWithProgress() { |
602 |
PlatformUI.getWorkbench().getProgressService().run(false, true, new IRunnableWithProgress() { |
603 |
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { |
603 |
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { |
604 |
try { |
604 |
try { |
605 |
action.run(monitor); |
605 |
action.run(monitor); |
Lines 638-651
Link Here
|
638 |
String title = TeamUIMessages.LocalHistoryPage_OverwriteTitle; |
638 |
String title = TeamUIMessages.LocalHistoryPage_OverwriteTitle; |
639 |
String msg = TeamUIMessages.LocalHistoryPage_OverwriteMessage; |
639 |
String msg = TeamUIMessages.LocalHistoryPage_OverwriteMessage; |
640 |
IHistoryPageSite parentSite = getHistoryPageSite(); |
640 |
IHistoryPageSite parentSite = getHistoryPageSite(); |
641 |
final MessageDialog dialog = new MessageDialog(parentSite.getShell(), title, null, msg, MessageDialog.QUESTION, new String[] {IDialogConstants.YES_LABEL, IDialogConstants.CANCEL_LABEL}, 0); |
641 |
MessageDialog dialog = new MessageDialog(parentSite.getShell(), title, null, msg, MessageDialog.QUESTION, new String[] {IDialogConstants.YES_LABEL, IDialogConstants.CANCEL_LABEL}, 0); |
642 |
final int[] result = new int[1]; |
642 |
int result = dialog.open(); |
643 |
parentSite.getShell().getDisplay().syncExec(new Runnable() { |
643 |
if (result != 0) { |
644 |
public void run() { |
|
|
645 |
result[0] = dialog.open(); |
646 |
} |
647 |
}); |
648 |
if (result[0] != 0) { |
649 |
// cancel |
644 |
// cancel |
650 |
return false; |
645 |
return false; |
651 |
} |
646 |
} |