aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Keppler2018-07-06 08:24:45 -0400
committerThomas Wolf2018-07-07 12:11:28 -0400
commit70d01ef871f64de26390f243613beb5ad6ac8978 (patch)
tree06e261103b2a1e48f08f469534158cb6613b73a4
parentb5764723c1bef281a3d7d00d6f64af1d016472ca (diff)
downloadegit-70d01ef871f64de26390f243613beb5ad6ac8978.tar.gz
egit-70d01ef871f64de26390f243613beb5ad6ac8978.tar.xz
egit-70d01ef871f64de26390f243613beb5ad6ac8978.zip
mark more jobs as system or user
When browsing some job creations, I noticed that some of the egit internal jobs are not marked as system or user. Change-Id: I8d557bcf5ccfc54e5d27e0f3c1f4455dc62a751a Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
-rw-r--r--org.eclipse.egit.core/src/org/eclipse/egit/core/project/GitProjectData.java8
-rwxr-xr-xorg.eclipse.egit.ui/src/org/eclipse/egit/ui/Activator.java2
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CreateTagDialog.java1
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/command/GarbageCollectCommand.java1
4 files changed, 8 insertions, 4 deletions
diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/project/GitProjectData.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/project/GitProjectData.java
index 8a1ac8b82..e66aeb81e 100644
--- a/org.eclipse.egit.core/src/org/eclipse/egit/core/project/GitProjectData.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/project/GitProjectData.java
@@ -73,9 +73,9 @@ import org.eclipse.team.core.TeamException;
*/
public class GitProjectData {
- private static final Map<IProject, GitProjectData> projectDataCache = new HashMap<IProject, GitProjectData>();
+ private static final Map<IProject, GitProjectData> projectDataCache = new HashMap<>();
- private static Set<RepositoryMappingChangeListener> repositoryChangeListeners = new HashSet<RepositoryMappingChangeListener>();
+ private static Set<RepositoryMappingChangeListener> repositoryChangeListeners = new HashSet<>();
@SuppressWarnings("synthetic-access")
private static final IResourceChangeListener rcl = new RCL();
@@ -189,7 +189,7 @@ public class GitProjectData {
return super.belongsTo(family);
}
};
-
+ job.setUser(false);
job.schedule();
}
@@ -426,7 +426,7 @@ public class GitProjectData {
private final Map<IPath, RepositoryMapping> mappings = new HashMap<>();
- private final Set<IResource> protectedResources = new HashSet<IResource>();
+ private final Set<IResource> protectedResources = new HashSet<>();
/**
* Construct a {@link GitProjectData} for the mapping
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/Activator.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/Activator.java
index 72dafd029..ce8570abc 100755
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/Activator.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/Activator.java
@@ -431,6 +431,8 @@ public class Activator extends AbstractUIPlugin implements DebugOptionsListener
return Status.OK_STATUS;
}
};
+ job.setSystem(true);
+ job.setUser(false);
job.schedule();
}
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CreateTagDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CreateTagDialog.java
index 42ed47322..0279a90d6 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CreateTagDialog.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CreateTagDialog.java
@@ -341,6 +341,7 @@ public class CreateTagDialog extends TitleAreaDialog {
}
};
job.setSystem(true);
+ job.setUser(false);
job.schedule();
}
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/command/GarbageCollectCommand.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/command/GarbageCollectCommand.java
index f74378d9f..c8e525fb0 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/command/GarbageCollectCommand.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/command/GarbageCollectCommand.java
@@ -82,6 +82,7 @@ public class GarbageCollectCommand extends
return Status.OK_STATUS;
}
};
+ job.setUser(true);
IServiceLocator serviceLocator = HandlerUtil.getActiveSite(event);
if (serviceLocator != null) {
IWorkbenchSiteProgressService service = CommonUtils.getService(