From 1649fefd93fe09e22b67591a5d32a8cc439e09d1 Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Mon, 30 Mar 2015 18:28:17 +0300 Subject: [PATCH] IDEA-138409 Deadlock on startup: obsolete template removing dropped --- .../uiDesigner/actions/CreateFormAction.java | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/CreateFormAction.java b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/CreateFormAction.java index cb59b932ab8b..195c8b4667ac 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/CreateFormAction.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/CreateFormAction.java @@ -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