diff --git a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/GenerateToStringActionHandlerImpl.java b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/GenerateToStringActionHandlerImpl.java index ad43f7bc2bc9..0e7f6a84c086 100644 --- a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/GenerateToStringActionHandlerImpl.java +++ b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/GenerateToStringActionHandlerImpl.java @@ -192,7 +192,7 @@ public class GenerateToStringActionHandlerImpl extends EditorWriteActionHandler comboBox = new ComboBox(all); settingsButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - final TemplatesPanel ui = new TemplatesPanel(); + final TemplatesPanel ui = new TemplatesPanel(clazz.getProject()); Disposable disposable = Disposer.newDisposable(); Configurable composite = new TabbedConfigurable(disposable) { protected List createConfigurables() { diff --git a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/view/TemplatesPanel.java b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/view/TemplatesPanel.java index 53d59f412222..2327611b540d 100644 --- a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/view/TemplatesPanel.java +++ b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/view/TemplatesPanel.java @@ -21,6 +21,7 @@ package org.jetbrains.generate.tostring.view; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.UnnamedConfigurable; +import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.NamedItemsListEditor; import com.intellij.openapi.ui.Namer; import com.intellij.openapi.util.Cloner; @@ -75,13 +76,15 @@ public class TemplatesPanel extends NamedItemsListEditor { return Comparing.equal(o1.getTemplate(), o2.getTemplate()) && Comparing.equal(o1.getFileName(), o2.getFileName()); } }; + private final Project myProject; - public TemplatesPanel() { + public TemplatesPanel(Project project) { super(NAMER, FACTORY, CLONER, COMPARER, new ArrayList(TemplatesManager.getInstance().getAllTemplates())); //ServiceManager.getService(project, MasterDetailsStateService.class).register("ToStringTemplates.UI", this); - } + myProject = project; + } @Nls public String getDisplayName() { @@ -110,7 +113,7 @@ public class TemplatesPanel extends NamedItemsListEditor { } protected UnnamedConfigurable createConfigurable(TemplateResource item) { - return new ToStringTemplateConfigurable(item); + return new ToStringTemplateConfigurable(item, myProject); } @Override diff --git a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/view/ToStringTemplateConfigurable.java b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/view/ToStringTemplateConfigurable.java index 6fd82ed64010..0de3284ba560 100644 --- a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/view/ToStringTemplateConfigurable.java +++ b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/view/ToStringTemplateConfigurable.java @@ -24,8 +24,13 @@ import com.intellij.openapi.command.WriteCommandAction; import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.EditorFactory; +import com.intellij.openapi.fileTypes.FileType; +import com.intellij.openapi.fileTypes.FileTypeManager; +import com.intellij.openapi.fileTypes.FileTypes; +import com.intellij.openapi.fileTypes.StdFileTypes; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.UnnamedConfigurable; +import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Comparing; import org.jetbrains.generate.tostring.template.TemplateResource; @@ -35,11 +40,12 @@ public class ToStringTemplateConfigurable implements UnnamedConfigurable{ private final TemplateResource template; private final Editor myEditor; - public ToStringTemplateConfigurable(TemplateResource template) { + public ToStringTemplateConfigurable(TemplateResource template, Project project) { this.template = template; final EditorFactory factory = EditorFactory.getInstance(); final Document doc = factory.createDocument(template.getTemplate()); - myEditor = template.isDefault() ? factory.createViewer(doc) : factory.createEditor(doc); + final FileType ftl = FileTypeManager.getInstance().findFileTypeByName("VTL"); + myEditor = factory.createEditor(doc, project, ftl != null ? ftl : FileTypes.PLAIN_TEXT, template.isDefault()); } public JComponent createComponent() {