IDEA-138409 Deadlock on startup: obsolete template removing dropped

This commit is contained in:
Dmitry Avdeev
2015-03-30 18:36:54 +03:00
parent d20d47c8f5
commit 1649fefd93
@@ -17,9 +17,6 @@
package com.intellij.uiDesigner.actions;
import com.intellij.ide.actions.TemplateKindCombo;
import com.intellij.ide.fileTemplates.FileTemplate;
import com.intellij.ide.fileTemplates.FileTemplateManager;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.project.Project;
@@ -51,19 +48,6 @@ public class CreateFormAction extends AbstractCreateFormAction {
public CreateFormAction() {
super(UIDesignerBundle.message("action.gui.form.text"),
UIDesignerBundle.message("action.gui.form.description"), PlatformIcons.UI_FORM_ICON);
// delete obsolete template
ApplicationManager.getApplication().executeOnPooledThread(new Runnable() {
public void run() {
// to prevent deadlocks, this code must run while not holding the ActionManager lock
FileTemplateManager manager = FileTemplateManager.getDefaultInstance();
final FileTemplate template = manager.getTemplate("GUI Form");
//noinspection HardCodedStringLiteral
if (template != null && template.getExtension().equals("form")) {
manager.removeTemplate(template);
}
}
});
}
@NotNull