Parameters json editor

graph-database-support-plugin/src/main/resources/META-INF/plugin.xml

@@ -128,6 +128,7 @@
         <projectService serviceInterface="com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.console.params.ParametersService"
                         serviceImplementation="com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.console.params.ParametersService"/>
         <scratch.rootType implementation="com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.interactions.GraphDbEditorsConsoleRootType"/>
+        <scratch.rootType implementation="com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.console.params.ParameterRootType"/>
         <applicationConfigurable groupId="tools"
                                  instance="com.neueda.jetbrains.plugin.graphdb.jetbrains.configuration.GraphDatabaseSupportConfiguration"/>
 

ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/console/params/ParameterRootType.java

@@ -0,0 +1,16 @@
+package com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.console.params;
+
+import com.intellij.execution.console.ConsoleRootType;
+import org.jetbrains.annotations.NotNull;
+
+public class ParameterRootType extends ConsoleRootType {
+
+    @NotNull
+    public static ParameterRootType getInstance() {
+        return findByClass(ParameterRootType.class);
+    }
+
+    ParameterRootType() {
+        super("graphdb-parameters", "Graph Database parameters");
+    }
+}

ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/console/params/ParametersPanel.java

@@ -1,39 +1,48 @@
 package com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.console.params;
 
+import com.google.common.base.Throwables;
 import com.intellij.codeInsight.hint.HintManager;
 import com.intellij.json.JsonFileType;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.editor.Document;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.editor.EditorFactory;
 import com.intellij.openapi.fileEditor.FileDocumentManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.ui.EditorTextField;
 import com.intellij.util.messages.MessageBus;
 import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.console.GraphConsoleView;
 import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.console.event.QueryParametersRetrievalErrorEvent;
 import com.neueda.jetbrains.plugin.graphdb.jetbrains.util.FileUtil;
 
+import javax.swing.*;
 import java.awt.*;
-import java.io.IOException;
 
 import static com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.console.event.QueryParametersRetrievalErrorEvent.*;
 
 public class ParametersPanel implements ParametersProvider {
 
     private static final FileDocumentManager FILE_DOCUMENT_MANAGER = FileDocumentManager.getInstance();
 
-    private EditorTextField editor;
+    private Editor editor;
+    private GraphConsoleView graphConsoleView;
+    private MessageBus messageBus;
+    private ParametersService service;
 
     public void initialize(GraphConsoleView graphConsoleView, Project project) {
-        MessageBus messageBus = project.getMessageBus();
-
-        editor = getJsonEditorFromScratchFile(project);
-        setInitialContent(editor.getDocument());
+        this.graphConsoleView = graphConsoleView;
+        this.messageBus = project.getMessageBus();
+        this.service = ServiceManager.getService(project, ParametersService.class);
+        setupEditor(project);
+    }
 
-        graphConsoleView.getParametersTab().add(editor, BorderLayout.CENTER);
+    public String getParametersJson() {
+        return editor.getDocument().getText();
+    }
 
-        ParametersService service = ServiceManager.getService(project, ParametersService.class);
+    private void initializeUi() {
+        graphConsoleView.getParametersTab().add(editor.getComponent(), BorderLayout.CENTER);
         service.registerParametersProvider(this);
 
         messageBus.connect().subscribe(QueryParametersRetrievalErrorEvent.QUERY_PARAMETERS_RETRIEVAL_ERROR_EVENT_TOPIC,
@@ -48,28 +57,31 @@ public void initialize(GraphConsoleView graphConsoleView, Project project) {
                 });
     }
 
-    private static EditorTextField getJsonEditorFromScratchFile(Project project) {
-        VirtualFile file;
-        try {
-            file = FileUtil.getScratchFile(project, "Neo4jGraphDbConsoleParametersPanel");
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        Document document = FILE_DOCUMENT_MANAGER.getDocument(file);
-
-        return new EditorTextField(document, project, new JsonFileType(), false, false);
+    private void setupEditor(Project project) {
+        ApplicationManager.getApplication().runWriteAction(() -> {
+            try {
+                VirtualFile file = FileUtil.getScratchFile(project, "Neo4jGraphDbConsoleParametersPanel.json");
+                Document document = FILE_DOCUMENT_MANAGER.getDocument(file);
+                editor = createEditor(project, document);
+                editor.setHeaderComponent(new JLabel("Provide query parameters in JSON format here:"));
+                setInitialContent(document);
+                initializeUi();
+            } catch (Throwable e) {
+                throw Throwables.propagate(e);
+            }
+        });
     }
 
     private void setInitialContent(Document document) {
         if (document.getText().isEmpty()) {
-            final Runnable setTextRunner = () -> document.setText("// Provide query parameters in JSON format here:");
+            final Runnable setTextRunner = () -> document.setText("{}");
             ApplicationManager.getApplication()
                     .invokeLater(() -> ApplicationManager.getApplication().runWriteAction(setTextRunner));
         }
     }
 
-    public String getParametersJson() {
-        return editor.getText();
+    private static Editor createEditor(Project project, Document document) {
+        return EditorFactory.getInstance().createEditor(document, project, new JsonFileType(), false);
     }
 
 }

ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/util/FileUtil.java

@@ -6,6 +6,7 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.neueda.jetbrains.plugin.graphdb.jetbrains.component.datasource.state.DataSourceApi;
+import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.console.params.ParameterRootType;
 import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.interactions.GraphDbEditorsConsoleRootType;
 
 import java.io.IOException;
@@ -22,8 +23,8 @@ public static VirtualFile getDataSourceFile(Project project, DataSourceApi dataS
 
     public static VirtualFile getScratchFile(Project project, String fileName) throws IOException {
         return ScratchFileService.getInstance().findFile(
-                GraphDbEditorsConsoleRootType.getInstance(),
-                fileName + project.getName(),
+                ParameterRootType.getInstance(),
+                 project.getName() + fileName,
                 ScratchFileService.Option.create_if_missing
         );
     }