Merge remote-tracking branch 'origin/master'

[idea/community.git] / plugins / gradle / src / org / jetbrains / plugins / gradle / service / project / wizard / GradleModuleBuilder.java

diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/wizard/GradleModuleBuilder.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/wizard/GradleModuleBuilder.java
index c03281223c8a0f93cc947072799228033c15e278..acdf2f1b6912f37487d53f5e615eaaf32c015774 100644 (file)
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/wizard/GradleModuleBuilder.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/wizard/GradleModuleBuilder.java
@@ -236,7 +236,7 @@ public class GradleModuleBuilder extends AbstractExternalModuleBuilder<GradlePro
 
   private static void saveFile(@NotNull VirtualFile file, @NotNull String templateName, @Nullable Map templateAttributes)
     throws ConfigurationException {
-    FileTemplateManager manager = FileTemplateManager.getInstance();
+    FileTemplateManager manager = FileTemplateManager.getDefaultInstance();
     FileTemplate template = manager.getInternalTemplate(templateName);
     try {
       VfsUtil.saveText(file, templateAttributes != null ? template.getText(templateAttributes) : template.getText());
@@ -251,7 +251,7 @@ public class GradleModuleBuilder extends AbstractExternalModuleBuilder<GradlePro
 
   private static void appendToFile(@NotNull VirtualFile file, @NotNull String templateName, @Nullable Map templateAttributes)
     throws ConfigurationException {
-    FileTemplateManager manager = FileTemplateManager.getInstance();
+    FileTemplateManager manager = FileTemplateManager.getDefaultInstance();
     FileTemplate template = manager.getInternalTemplate(templateName);
     try {
       VfsUtil.saveText(file, VfsUtilCore.loadText(file) +