diff options
| author | Thomas Wolf | 2021-06-02 13:43:18 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2021-06-02 14:39:05 +0000 |
| commit | 654dc3cb6c38294c9c3a1ca960e0e0dc26c456a0 (patch) | |
| tree | d5e44a312f6ebfe24bd59b3e3923c762cc37b5c0 | |
| parent | 981ba1bf0200fb18eddb02aaf0b6a853a650629b (diff) | |
| download | egit-654dc3cb6c38294c9c3a1ca960e0e0dc26c456a0.tar.gz egit-654dc3cb6c38294c9c3a1ca960e0e0dc26c456a0.tar.xz egit-654dc3cb6c38294c9c3a1ca960e0e0dc26c456a0.zip | |
Use a job name for the HiddenResources clean-up at start-up
The method without job name was removed in Eclipse 4.20.
Bug: 573922
Change-Id: Idf15ee3b9c3050c1822695b4717f9f3b72eb0b9e
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
3 files changed, 6 insertions, 1 deletions
diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/CoreText.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/CoreText.java index 81824ab263..69e85cf632 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/CoreText.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/CoreText.java @@ -202,6 +202,9 @@ public class CoreText extends NLS { public static String GpgSetup_signerUnknown; /** */ + public static String HiddenResources_InitJobName; + + /** */ public static String BlobStorage_blobNotFound; /** */ diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/coretext.properties b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/coretext.properties index 1351958f8e..b6e89699ab 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/coretext.properties +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/coretext.properties @@ -58,6 +58,7 @@ ExternalGpgSigner_ttyInput=GPG requested user input from a terminal; this does n GitSettings_gpgInvalidExecutable=The EGit preference for the GPG executable is invalid: {0} GitSettings_gpgNotExecutable=The file for the GPG executable in the EGit preferences is not executable: {0} GpgSetup_signerUnknown=Unknown GPG signer ''{0}'' configured; valid values are "bc" or "gpg". Using Bouncy Castle. +HiddenResources_InitJobName=EGit Hidden Resources Clean-up Activator_autoIgnoreDerivedResources=Auto-ignore derived resources Activator_AutoShareJobName=Auto share git projects diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/start/WorkspaceConnector.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/start/WorkspaceConnector.java index 41c80e79a8..a9e2547d92 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/start/WorkspaceConnector.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/start/WorkspaceConnector.java @@ -115,7 +115,8 @@ public class WorkspaceConnector { registerBuiltinLFS(); hiddenResourcesInitializer = Job - .createSystem(HiddenResources.INSTANCE::initialize); + .createSystem(CoreText.HiddenResources_InitJobName, + HiddenResources.INSTANCE::initialize); hiddenResourcesInitializer.setUser(false); hiddenResourcesInitializer.schedule(); } |