Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Michel-Lemieux2004-05-05 14:46:06 -0400
committerJean Michel-Lemieux2004-05-05 14:46:06 -0400
commite1a6d57ad8a2d17a40b321cb87f092d584fa6d81 (patch)
tree053ee421f52fd29718654262f6b5f753c279262e
parentf5ab5ab19f3a212828858ec567fa73ad835c8fab (diff)
downloadeclipse.platform.team-e1a6d57ad8a2d17a40b321cb87f092d584fa6d81.tar.gz
eclipse.platform.team-e1a6d57ad8a2d17a40b321cb87f092d584fa6d81.tar.xz
eclipse.platform.team-e1a6d57ad8a2d17a40b321cb87f092d584fa6d81.zip
Added reference to new progress properties
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/JobRunnableContext.java7
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshSubscriberJob.java30
2 files changed, 13 insertions, 24 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/JobRunnableContext.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/JobRunnableContext.java
index 75fdffe13..5da78972b 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/JobRunnableContext.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/JobRunnableContext.java
@@ -22,6 +22,7 @@ import org.eclipse.swt.widgets.Shell;
import org.eclipse.team.core.TeamException;
import org.eclipse.team.internal.ui.Utils;
import org.eclipse.ui.IWorkbenchSite;
+import org.eclipse.ui.progress.IProgressConstants;
/**
* This runnable context executes it's operation in the context of a background job.
@@ -76,11 +77,11 @@ public final class JobRunnableContext implements ITeamRunnableContext {
private void configureJob(Job job) {
if(keep)
- job.setProperty(new QualifiedName("org.eclipse.ui.workbench.progress", "keep"), Boolean.TRUE); //$NON-NLS-1$ //$NON-NLS-2$
+ job.setProperty(IProgressConstants.KEEP_PROPERTY, Boolean.TRUE);
if(gotoAction != null)
- job.setProperty(new QualifiedName("org.eclipse.ui.workbench.progress", "goto"), gotoAction); //$NON-NLS-1$ //$NON-NLS-2$
+ job.setProperty(IProgressConstants.ACTION_PROPERTY, gotoAction);
if(icon != null)
- job.setProperty(new QualifiedName("org.eclipse.ui.workbench.progress", "icon"), icon); //$NON-NLS-1$ //$NON-NLS-2$
+ job.setProperty(IProgressConstants.ICON_PROPERTY, icon);
}
/* (non-Javadoc)
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 2fa5fb4d9..049627979 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
@@ -13,28 +13,15 @@ package org.eclipse.team.internal.ui.synchronize;
import java.util.ArrayList;
import java.util.List;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.resources.WorkspaceJob;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.ISafeRunnable;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.ProgressMonitorWrapper;
-import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.IJobChangeEvent;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.core.runtime.jobs.JobChangeAdapter;
+import org.eclipse.core.resources.*;
+import org.eclipse.core.runtime.*;
+import org.eclipse.core.runtime.jobs.*;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.util.IPropertyChangeListener;
import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.team.core.TeamException;
import org.eclipse.team.core.subscribers.Subscriber;
-import org.eclipse.team.core.synchronize.SyncInfo;
-import org.eclipse.team.core.synchronize.SyncInfoSet;
-import org.eclipse.team.core.synchronize.SyncInfoTree;
+import org.eclipse.team.core.synchronize.*;
import org.eclipse.team.internal.core.Assert;
import org.eclipse.team.internal.core.subscribers.SubscriberSyncInfoCollector;
import org.eclipse.team.internal.ui.Policy;
@@ -44,6 +31,7 @@ import org.eclipse.team.ui.synchronize.SubscriberParticipant;
import org.eclipse.ui.actions.ActionFactory;
import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction;
import org.eclipse.ui.internal.progress.ProgressManager;
+import org.eclipse.ui.progress.IProgressConstants;
import org.eclipse.ui.progress.UIJob;
/**
@@ -266,8 +254,8 @@ public final class RefreshSubscriberJob extends WorkspaceJob {
NonblockingProgressMonitor wrappedMonitor = new NonblockingProgressMonitor(monitor, this);
subscriber.refresh(roots, IResource.DEPTH_INFINITE, wrappedMonitor);
// Prepare the results
- setProperty(new QualifiedName("org.eclipse.ui.workbench.progress", "keep"), Boolean.valueOf(! isJobModal()));
- setProperty(new QualifiedName("org.eclipse.ui.workbench.progress", "keepone"), Boolean.valueOf(! isJobModal()));
+ setProperty(IProgressConstants.KEEP_PROPERTY, Boolean.valueOf(! isJobModal()));
+ setProperty(IProgressConstants.KEEPONE_PROPERTY, Boolean.valueOf(! isJobModal()));
event.setStatus(calculateStatus(event));
} catch(OperationCanceledException e2) {
if (monitor.isCanceled()) {
@@ -381,8 +369,8 @@ public final class RefreshSubscriberJob extends WorkspaceJob {
group.beginTask(taskName, 100);
setProgressGroup(group, 80);
getCollector().setProgressGroup(group, 20);
- setProperty(new QualifiedName("org.eclipse.ui.workbench.progress", "icon"), participant.getImageDescriptor());
- setProperty(new QualifiedName("org.eclipse.ui.workbench.progress", "goto"), actionWrapper);
+ setProperty(IProgressConstants.ICON_PROPERTY, participant.getImageDescriptor());
+ setProperty(IProgressConstants.ACTION_PROPERTY, actionWrapper);
// Listener delagate
IRefreshSubscriberListener autoListener = new IRefreshSubscriberListener() {
public void refreshStarted(IRefreshEvent event) {

Back to the top