diff options
author | Jean Michel-Lemieux | 2004-05-10 20:55:52 +0000 |
---|---|---|
committer | Jean Michel-Lemieux | 2004-05-10 20:55:52 +0000 |
commit | 2d5865dd25d77bfaa636b156e25589de83f92e1e (patch) | |
tree | 09929f55032abf360c4dbfa5b6f02375e9ed0dd4 | |
parent | 3b4d41ca88ceed2f2b6645f4ad7429b88976520b (diff) | |
download | eclipse.platform.team-2d5865dd25d77bfaa636b156e25589de83f92e1e.tar.gz eclipse.platform.team-2d5865dd25d77bfaa636b156e25589de83f92e1e.tar.xz eclipse.platform.team-2d5865dd25d77bfaa636b156e25589de83f92e1e.zip |
NLS
2 files changed, 4 insertions, 16 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshSubscriberJob.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshSubscriberJob.java index e0592679e..c6d67d45c 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshSubscriberJob.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshSubscriberJob.java @@ -95,7 +95,7 @@ public final class RefreshSubscriberJob extends WorkspaceJob { /* * Constant used for postponement */ - private static final IStatus POSTPONED = new Status(IStatus.CANCEL, TeamUIPlugin.ID, 0, "Scheduled refresh postponed due to conflicting operation", null); + private static final IStatus POSTPONED = new Status(IStatus.CANCEL, TeamUIPlugin.ID, 0, "Scheduled refresh postponed due to conflicting operation", null); //$NON-NLS-1$ /** * Notification for safely notifying listeners of refresh lifecycle. @@ -257,7 +257,6 @@ public final class RefreshSubscriberJob extends WorkspaceJob { subscriber.refresh(roots, IResource.DEPTH_INFINITE, wrappedMonitor); // Prepare the results setProperty(IProgressConstants.KEEP_PROPERTY, Boolean.valueOf(! isJobModal())); - setProperty(IProgressConstants.KEEPONE_PROPERTY, Boolean.valueOf(! isJobModal())); event.setStatus(calculateStatus(event)); } catch(OperationCanceledException e2) { if (monitor.isCanceled()) { @@ -356,7 +355,7 @@ public final class RefreshSubscriberJob extends WorkspaceJob { if(gotoAction[0] != null) { return gotoAction[0].isEnabled(); } - return false; + return true; } public void dispose() { @@ -389,7 +388,7 @@ public final class RefreshSubscriberJob extends WorkspaceJob { if(isModal) { if(runnable != null) { final IAction[] r = new IAction[] {runnable}; - Job update = new UIJob("") { + Job update = new UIJob("") { //$NON-NLS-1$ public IStatus runInUIThread(IProgressMonitor monitor) { r[0].run(); return Status.OK_STATUS; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/GlobalRefreshAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/GlobalRefreshAction.java index 843791e7c..9c55f5b86 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/GlobalRefreshAction.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/GlobalRefreshAction.java @@ -58,15 +58,6 @@ public class GlobalRefreshAction extends Action implements IMenuCreator, IWorkbe } } - /* - * (non-Javadoc) - * @see org.eclipse.ui.texteditor.IUpdate#update() - */ - public void update() { - ISynchronizeParticipantReference[] pages = TeamUI.getSynchronizeManager().getSynchronizeParticipants(); - setEnabled(pages.length >= 1); - } - public GlobalRefreshAction() { synchronizeAction = new Action(Policy.bind("GlobalRefreshAction.4")) { //$NON-NLS-1$ public void run() { @@ -159,8 +150,7 @@ public class GlobalRefreshAction extends Action implements IMenuCreator, IWorkbe p.run(null /* no workbench part */); updateTooltipMessage(); } catch (TeamException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + Utils.handle(e); } } @@ -174,6 +164,5 @@ public class GlobalRefreshAction extends Action implements IMenuCreator, IWorkbe protected void updateTooltipMessage() { setToolTipText(Policy.bind("GlobalRefreshAction.4")); //$NON-NLS-1$ - setToolTipText("THIS IS COOL"); //$NON-NLS-1$ } }
\ No newline at end of file |