Skip to content

fix: initialize images in a UI job if workbench is running #1011

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
trancexpress wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: initialize images in a UI job if workbench is running #1011

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 28 additions & 1 deletion org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/TMUIPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.util.logging.LogRecord;
import java.util.logging.Logger;

import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
Expand All @@ -33,6 +34,7 @@
import org.eclipse.tm4e.ui.internal.samples.SampleManager;
import org.eclipse.tm4e.ui.internal.themes.ThemeManager;
import org.eclipse.tm4e.ui.internal.utils.CodeTemplateContextTypeUtils;
import org.eclipse.tm4e.ui.internal.utils.UI;
import org.eclipse.tm4e.ui.model.ITMModelManager;
import org.eclipse.tm4e.ui.samples.ISampleManager;
import org.eclipse.tm4e.ui.templates.CommentTemplateContextType;
Expand All @@ -41,9 +43,11 @@
import org.eclipse.tm4e.ui.templates.TMLanguageTemplateContextType;
import org.eclipse.tm4e.ui.themes.ColorManager;
import org.eclipse.tm4e.ui.themes.IThemeManager;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.editors.text.templates.ContributionContextTypeRegistry;
import org.eclipse.ui.editors.text.templates.ContributionTemplateStore;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.eclipse.ui.progress.UIJob;
import org.osgi.framework.BundleContext;

/**
Expand Down Expand Up @@ -171,7 +175,7 @@ public void close() throws SecurityException {
});
}

TMImages.initalize(getImageRegistry());
initializeImages();
}

@Override
Expand Down Expand Up @@ -266,4 +270,27 @@ public TemplateStore getTemplateStore() {
return newTemplateStore;
}

private void initializeImages() {
// if we are already in the UI thread, don't schedule an extra job
if (UI.isUIThread()) {
TMImages.initalize(getImageRegistry());
return;
}
if (PlatformUI.isWorkbenchRunning()) {
UIJob initJob = new UIJob("Initialize images") {

@Override
public IStatus runInUIThread(IProgressMonitor monitor) {
if (monitor.isCanceled()) {
return Status.CANCEL_STATUS;
}
TMImages.initalize(getImageRegistry());
return Status.OK_STATUS;
}

};
initJob.setSystem(true);
initJob.schedule();
}
}
}
Loading