diff options
| author | Michael Valenta | 2005-04-11 14:59:05 +0000 |
|---|---|---|
| committer | Michael Valenta | 2005-04-11 14:59:05 +0000 |
| commit | 720e670f6f681dda0b5027a761ea6c4738dcef1b (patch) | |
| tree | 04c43bce44d94b7cc60407d44efa424669db2ae2 /bundles/org.eclipse.team.ui | |
| parent | 54610439c09ceebfdc040437e31c005463d672f4 (diff) | |
| download | eclipse.platform.team-720e670f6f681dda0b5027a761ea6c4738dcef1b.tar.gz eclipse.platform.team-720e670f6f681dda0b5027a761ea6c4738dcef1b.tar.xz eclipse.platform.team-720e670f6f681dda0b5027a761ea6c4738dcef1b.zip | |
Bug 90835 Comparing from the synchronize view uses a generic progress message
Diffstat (limited to 'bundles/org.eclipse.team.ui')
3 files changed, 10 insertions, 4 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIMessages.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIMessages.java index a437d7615..4eca1d33d 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIMessages.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIMessages.java @@ -46,7 +46,8 @@ public class TeamUIMessages extends NLS { public static String SyncInfoCompareInput_0; public static String SyncInfoCompareInput_1; public static String SyncInfoCompareInput_2; - public static String SyncInfoCompareInput_tooltip; + public static String SyncInfoCompareInput_3; + public static String SyncInfoCompareInput_tooltip; public static String TeamAction_internal; public static String TextPreferencePage_add; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties index d403628aa..2dbf8d272 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties @@ -50,6 +50,7 @@ SyncInfoCompareInput_title={0} SyncInfoCompareInput_0=File Changed SyncInfoCompareInput_1=File has changed outside of this compare editor. What do you want to do? SyncInfoCompareInput_2=Save +SyncInfoCompareInput_3=Opening Compare Editor SyncInfoCompareInput_tooltip={0}: {1} TeamAction_internal=Internal error occurred. diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SyncInfoCompareInput.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SyncInfoCompareInput.java index 458bd853b..e6eec258f 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SyncInfoCompareInput.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SyncInfoCompareInput.java @@ -208,16 +208,20 @@ public final class SyncInfoCompareInput extends CompareEditorInput implements IR // update the title now that the remote revision number as been fetched // from the server setTitle(getTitle()); + monitor.beginTask(TeamUIMessages.SyncInfoCompareInput_3, 100); + monitor.setTaskName(TeamUIMessages.SyncInfoCompareInput_3); try { if (participant != null) { - participant.prepareCompareInput(node, getCompareConfiguration(), monitor); + participant.prepareCompareInput(node, getCompareConfiguration(), Policy.subMonitorFor(monitor, 100)); } else { Utils.updateLabels(node.getSyncInfo(), getCompareConfiguration()); - node.cacheContents(monitor); + node.cacheContents(Policy.subMonitorFor(monitor, 100)); } } catch (TeamException e) { throw new InvocationTargetException(e); - } + } finally { + monitor.done(); + } return node; } |