From 229e3deecb7a87aa180e20d17c25779b3b87a673 Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Thu, 7 Feb 2013 12:00:31 +0400 Subject: [PATCH] SaveProjectAsTemplateAction: read action & default template name --- .../templates/SaveProjectAsTemplateAction.java | 16 ++++++++++------ .../templates/SaveProjectAsTemplateDialog.java | 2 ++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/java/idea-ui/src/com/intellij/platform/templates/SaveProjectAsTemplateAction.java b/java/idea-ui/src/com/intellij/platform/templates/SaveProjectAsTemplateAction.java index 95986f529c31..e320cbdf6308 100644 --- a/java/idea-ui/src/com/intellij/platform/templates/SaveProjectAsTemplateAction.java +++ b/java/idea-ui/src/com/intellij/platform/templates/SaveProjectAsTemplateAction.java @@ -120,13 +120,17 @@ public class SaveProjectAsTemplateAction extends AnAction { final Map parameters = new HashMap(); if (replaceParameters) { - ProjectTemplateParameterFactory[] extensions = Extensions.getExtensions(ProjectTemplateParameterFactory.EP_NAME); - for (ProjectTemplateParameterFactory extension : extensions) { - String value = extension.detectParameterValue(project); - if (value != null) { - parameters.put(value, extension.getParameterId()); + ApplicationManager.getApplication().runReadAction(new Runnable() { + public void run() { + ProjectTemplateParameterFactory[] extensions = Extensions.getExtensions(ProjectTemplateParameterFactory.EP_NAME); + for (ProjectTemplateParameterFactory extension : extensions) { + String value = extension.detectParameterValue(project); + if (value != null) { + parameters.put(value, extension.getParameterId()); + } + } } - } + }); } indicator.setText("Saving project..."); UIUtil.invokeAndWaitIfNeeded(new Runnable() { diff --git a/java/idea-ui/src/com/intellij/platform/templates/SaveProjectAsTemplateDialog.java b/java/idea-ui/src/com/intellij/platform/templates/SaveProjectAsTemplateDialog.java index 7763175f363e..d3d832befab6 100644 --- a/java/idea-ui/src/com/intellij/platform/templates/SaveProjectAsTemplateDialog.java +++ b/java/idea-ui/src/com/intellij/platform/templates/SaveProjectAsTemplateDialog.java @@ -59,6 +59,8 @@ public class SaveProjectAsTemplateDialog extends DialogWrapper { myProject = project; setTitle("Save Project As Template"); + myName.setText(project.getName()); + Module[] modules = ModuleManager.getInstance(project).getModules(); if (modules.length < 2) { myModuleLabel.setVisible(false);