Merge pull request #17 from neueda/query-exec-error-hint

FylmTM · web-flow · commit 877e7aa59a02 · 2017-01-10T11:34:46.000+02:00
show error hint in editor if query execution fails
diff --git a/ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/actions/execute/ChooseDataSourceAction.java b/ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/actions/execute/ChooseDataSourceAction.java
@@ -2,6 +2,8 @@
 
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.actionSystem.CommonDataKeys;
+import com.intellij.openapi.editor.Editor;
 import com.intellij.util.messages.MessageBus;
 import com.neueda.jetbrains.plugin.graphdb.jetbrains.component.datasource.DataSourcesComponent;
 import com.neueda.jetbrains.plugin.graphdb.jetbrains.component.datasource.state.DataSourceApi;
@@ -23,6 +25,7 @@ public ChooseDataSourceAction(DataSourceApi dataSource, DataSourcesComponent com
     @Override
     public void actionPerformed(AnActionEvent e) {
         ExecuteQueryEvent executeQueryEvent = messageBus.syncPublisher(ExecuteQueryEvent.EXECUTE_QUERY_TOPIC);
+        Editor editor = e.getData(CommonDataKeys.EDITOR_EVEN_IF_INACTIVE);
         executeQueryEvent.executeQuery(dataSource, executeQueryPayload);
     }
 }
diff --git a/ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/actions/execute/ExecuteQueryAction.java b/ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/actions/execute/ExecuteQueryAction.java
@@ -80,7 +80,7 @@ public void actionPerformed(AnActionEvent e) {
             return;
         }
 
-        ExecuteQueryPayload executeQueryPayload = new ExecuteQueryPayload(content);
+        ExecuteQueryPayload executeQueryPayload = new ExecuteQueryPayload(content, editor);
         ConsoleToolWindow.ensureOpen(project);
 
         if (virtualFile != null) {
diff --git a/ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/actions/execute/ExecuteQueryPayload.java b/ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/actions/execute/ExecuteQueryPayload.java
@@ -1,17 +1,27 @@
 package com.neueda.jetbrains.plugin.graphdb.jetbrains.actions.execute;
 
+import com.intellij.openapi.editor.Editor;
 import org.jetbrains.annotations.NotNull;
 
 public class ExecuteQueryPayload {
 
     private final String content;
 
-    public ExecuteQueryPayload(String content) {
+    private final Editor editor;
+
+    public ExecuteQueryPayload(String content, Editor editor) {
         this.content = content;
+        this.editor = editor;
     }
 
     @NotNull
     public String getContent() {
         return content;
     }
+
+    @NotNull
+    public Editor getEditor() {
+        return editor;
+    }
+
 }
diff --git a/ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/database/QueryExecutionService.java b/ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/database/QueryExecutionService.java
@@ -58,14 +58,14 @@ private synchronized void executeInBackground(DataSourceApi dataSource, ExecuteQ
                 GraphQueryResult result = database.execute(payload.getContent());
 
                 ApplicationManager.getApplication().invokeLater(() -> {
-                    event.resultReceived(result);
-                    event.postResultReceived();
-                    event.executionCompleted();
+                    event.resultReceived(payload, result);
+                    event.postResultReceived(payload);
+                    event.executionCompleted(payload);
                 });
             } catch (Exception e) {
                 ApplicationManager.getApplication().invokeLater(() -> {
-                    event.handleError(e);
-                    event.executionCompleted();
+                    event.handleError(payload, e);
+                    event.executionCompleted(payload);
                 });
             }
         });
diff --git a/ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/console/event/QueryExecutionProcessEvent.java b/ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/console/event/QueryExecutionProcessEvent.java
@@ -11,11 +11,11 @@ public interface QueryExecutionProcessEvent {
 
     void executionStarted(ExecuteQueryPayload payload);
 
-    void resultReceived(GraphQueryResult result);
+    void resultReceived(ExecuteQueryPayload payload, GraphQueryResult result);
 
-    void postResultReceived();
+    void postResultReceived(ExecuteQueryPayload payload);
 
-    void handleError(Exception exception);
+    void handleError(ExecuteQueryPayload payload, Exception exception);
 
-    void executionCompleted();
+    void executionCompleted(ExecuteQueryPayload payload);
 }
diff --git a/ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/console/graph/GraphPanel.java b/ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/console/graph/GraphPanel.java
@@ -25,14 +25,11 @@
 
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreePath;
-import java.awt.Color;
-import java.awt.Container;
-import java.awt.Point;
+import java.awt.*;
 import java.awt.event.MouseEvent;
 import java.util.Enumeration;
 
-import static com.neueda.jetbrains.plugin.graphdb.visualization.util.DisplayUtil.getTooltipText;
-import static com.neueda.jetbrains.plugin.graphdb.visualization.util.DisplayUtil.getTooltipTitle;
+import static com.neueda.jetbrains.plugin.graphdb.visualization.util.DisplayUtil.*;
 
 public class GraphPanel {
 
@@ -73,19 +70,19 @@ public void executionStarted(ExecuteQueryPayload payload) {
             }
 
             @Override
-            public void resultReceived(GraphQueryResult result) {
+            public void resultReceived(ExecuteQueryPayload payload, GraphQueryResult result) {
             }
 
             @Override
-            public void postResultReceived() {
+            public void postResultReceived(ExecuteQueryPayload payload) {
             }
 
             @Override
-            public void handleError(Exception exception) {
+            public void handleError(ExecuteQueryPayload payload, Exception exception) {
             }
 
             @Override
-            public void executionCompleted() {
+            public void executionCompleted(ExecuteQueryPayload payload) {
             }
         });
 
diff --git a/ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/console/graph/GraphPanelInteractions.java b/ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/console/graph/GraphPanelInteractions.java
@@ -1,5 +1,6 @@
 package com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.console.graph;
 
+import com.intellij.codeInsight.hint.HintManager;
 import com.intellij.util.messages.MessageBus;
 import com.neueda.jetbrains.plugin.graphdb.database.api.query.GraphQueryResult;
 import com.neueda.jetbrains.plugin.graphdb.jetbrains.actions.execute.ExecuteQueryEvent;
@@ -47,24 +48,27 @@ public void executionStarted(ExecuteQueryPayload payload) {
                     }
 
                     @Override
-                    public void resultReceived(GraphQueryResult result) {
+                    public void resultReceived(ExecuteQueryPayload payload, GraphQueryResult result) {
                         result.getNodes().forEach(visualization::addNode);
                         result.getRelationships().forEach(visualization::addRelation);
                     }
 
                     @Override
-                    public void postResultReceived() {
+                    public void postResultReceived(ExecuteQueryPayload payload) {
                         visualization.paint();
                     }
 
                     @Override
-                    public void handleError(Exception exception) {
+                    public void handleError(ExecuteQueryPayload payload, Exception exception) {
+                        String errorMessage = exception.getMessage() == null ? "Error occurred" : "Error occurred: " + exception.getMessage();
+                        HintManager.getInstance().showErrorHint(payload.getEditor(), errorMessage);
+
                         visualization.stop();
                         visualization.clear();
                     }
 
                     @Override
-                    public void executionCompleted() {
+                    public void executionCompleted(ExecuteQueryPayload payload) {
                     }
                 });
     }
diff --git a/ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/console/log/LogPanel.java b/ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/console/log/LogPanel.java
@@ -14,7 +14,7 @@
 import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.console.event.QueryExecutionProcessEvent;
 import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.metadata.MetadataRetrieveEvent;
 
-import java.awt.BorderLayout;
+import java.awt.*;
 
 public class LogPanel implements Disposable {
 
@@ -38,23 +38,23 @@ public void executionStarted(ExecuteQueryPayload payload) {
             }
 
             @Override
-            public void resultReceived(GraphQueryResult result) {
+            public void resultReceived(ExecuteQueryPayload payload, GraphQueryResult result) {
                 info(String.format("Query executed in %sms. %s", result.getExecutionTimeMs(), result.getResultSummary()));
                 newLine();
             }
 
             @Override
-            public void postResultReceived() {
+            public void postResultReceived(ExecuteQueryPayload payload) {
             }
 
             @Override
-            public void handleError(Exception exception) {
+            public void handleError(ExecuteQueryPayload payload, Exception exception) {
                 error("Error occurred: ");
                 printException(exception);
             }
 
             @Override
-            public void executionCompleted() {
+            public void executionCompleted(ExecuteQueryPayload payload) {
                 newLine();
             }
         });
diff --git a/ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/console/status/ExecutionStatusBarWidget.java b/ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/console/status/ExecutionStatusBarWidget.java
@@ -10,9 +10,8 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import javax.swing.JComponent;
-import javax.swing.JPanel;
-import java.awt.BorderLayout;
+import javax.swing.*;
+import java.awt.*;
 
 public class ExecutionStatusBarWidget extends JPanel implements CustomStatusBarWidget {
 
@@ -34,21 +33,21 @@ public void executionStarted(ExecuteQueryPayload payload) {
             }
 
             @Override
-            public void resultReceived(GraphQueryResult result) {
+            public void resultReceived(ExecuteQueryPayload payload, GraphQueryResult result) {
                 setVisible(false);
             }
 
             @Override
-            public void postResultReceived() {
+            public void postResultReceived(ExecuteQueryPayload payload) {
             }
 
             @Override
-            public void handleError(Exception exception) {
+            public void handleError(ExecuteQueryPayload payload, Exception exception) {
                 setVisible(false);
             }
 
             @Override
-            public void executionCompleted() {
+            public void executionCompleted(ExecuteQueryPayload payload) {
             }
         });
     }
diff --git a/ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/console/table/TablePanel.java b/ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/console/table/TablePanel.java
@@ -11,10 +11,10 @@
 import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.console.table.editor.CompositeTableCellEditor;
 import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.console.table.renderer.CompositeTableCellRenderer;
 
-import javax.swing.JTable;
+import javax.swing.*;
 import javax.swing.table.TableCellRenderer;
 import javax.swing.table.TableColumn;
-import java.awt.Component;
+import java.awt.*;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -47,7 +47,7 @@ public void executionStarted(ExecuteQueryPayload payload) {
             }
 
             @Override
-            public void resultReceived(GraphQueryResult result) {
+            public void resultReceived(ExecuteQueryPayload payload, GraphQueryResult result) {
                 List<GraphQueryResultColumn> columns = result.getColumns();
                 columns.forEach((column) -> tableModel.addColumn(column.getName()));
 
@@ -63,17 +63,17 @@ public void resultReceived(GraphQueryResult result) {
             }
 
             @Override
-            public void postResultReceived() {
+            public void postResultReceived(ExecuteQueryPayload payload) {
                 updateColumnWidths();
                 updateRowHeights();
             }
 
             @Override
-            public void handleError(Exception exception) {
+            public void handleError(ExecuteQueryPayload payload, Exception exception) {
             }
 
             @Override
-            public void executionCompleted() {
+            public void executionCompleted(ExecuteQueryPayload payload) {
             }
         });
     }

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public void actionPerformed(AnActionEvent e) {`
`80`	`80`	`return;`
`81`	`81`	`}`
`82`	`82`
`83`		`- ExecuteQueryPayload executeQueryPayload = new ExecuteQueryPayload(content);`
	`83`	`+ ExecuteQueryPayload executeQueryPayload = new ExecuteQueryPayload(content, editor);`
`84`	`84`	`ConsoleToolWindow.ensureOpen(project);`
`85`	`85`
`86`	`86`	`if (virtualFile != null) {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.console.graph;`
`2`	`2`
	`3`	`+import com.intellij.codeInsight.hint.HintManager;`
`3`	`4`	`import com.intellij.util.messages.MessageBus;`
`4`	`5`	`import com.neueda.jetbrains.plugin.graphdb.database.api.query.GraphQueryResult;`
`5`	`6`	`import com.neueda.jetbrains.plugin.graphdb.jetbrains.actions.execute.ExecuteQueryEvent;`
`@@ -47,24 +48,27 @@ public void executionStarted(ExecuteQueryPayload payload) {`
`47`	`48`	`}`
`48`	`49`
`49`	`50`	`@Override`
`50`		`- public void resultReceived(GraphQueryResult result) {`
	`51`	`+ public void resultReceived(ExecuteQueryPayload payload, GraphQueryResult result) {`
`51`	`52`	`result.getNodes().forEach(visualization::addNode);`
`52`	`53`	`result.getRelationships().forEach(visualization::addRelation);`
`53`	`54`	`}`
`54`	`55`
`55`	`56`	`@Override`
`56`		`- public void postResultReceived() {`
	`57`	`+ public void postResultReceived(ExecuteQueryPayload payload) {`
`57`	`58`	`visualization.paint();`
`58`	`59`	`}`
`59`	`60`
`60`	`61`	`@Override`
`61`		`- public void handleError(Exception exception) {`
	`62`	`+ public void handleError(ExecuteQueryPayload payload, Exception exception) {`
	`63`	`+ String errorMessage = exception.getMessage() == null ? "Error occurred" : "Error occurred: " + exception.getMessage();`
	`64`	`+ HintManager.getInstance().showErrorHint(payload.getEditor(), errorMessage);`
	`65`	`+`
`62`	`66`	`visualization.stop();`
`63`	`67`	`visualization.clear();`
`64`	`68`	`}`
`65`	`69`
`66`	`70`	`@Override`
`67`		`- public void executionCompleted() {`
	`71`	`+ public void executionCompleted(ExecuteQueryPayload payload) {`
`68`	`72`	`}`
`69`	`73`	`});`
`70`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.console.event.QueryExecutionProcessEvent;`
`15`	`15`	`import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.metadata.MetadataRetrieveEvent;`
`16`	`16`
`17`		`-import java.awt.BorderLayout;`
	`17`	`+import java.awt.*;`
`18`	`18`
`19`	`19`	`public class LogPanel implements Disposable {`
`20`	`20`
`@@ -38,23 +38,23 @@ public void executionStarted(ExecuteQueryPayload payload) {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`@Override`
`41`		`- public void resultReceived(GraphQueryResult result) {`
	`41`	`+ public void resultReceived(ExecuteQueryPayload payload, GraphQueryResult result) {`
`42`	`42`	`info(String.format("Query executed in %sms. %s", result.getExecutionTimeMs(), result.getResultSummary()));`
`43`	`43`	`newLine();`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`@Override`
`47`		`- public void postResultReceived() {`
	`47`	`+ public void postResultReceived(ExecuteQueryPayload payload) {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`@Override`
`51`		`- public void handleError(Exception exception) {`
	`51`	`+ public void handleError(ExecuteQueryPayload payload, Exception exception) {`
`52`	`52`	`error("Error occurred: ");`
`53`	`53`	`printException(exception);`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`@Override`
`57`		`- public void executionCompleted() {`
	`57`	`+ public void executionCompleted(ExecuteQueryPayload payload) {`
`58`	`58`	`newLine();`
`59`	`59`	`}`
`60`	`60`	`});`
Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,8 @@`
`10`	`10`	`import org.jetbrains.annotations.NotNull;`
`11`	`11`	`import org.jetbrains.annotations.Nullable;`
`12`	`12`
`13`		`-import javax.swing.JComponent;`
`14`		`-import javax.swing.JPanel;`
`15`		`-import java.awt.BorderLayout;`
	`13`	`+import javax.swing.*;`
	`14`	`+import java.awt.*;`
`16`	`15`
`17`	`16`	`public class ExecutionStatusBarWidget extends JPanel implements CustomStatusBarWidget {`
`18`	`17`
`@@ -34,21 +33,21 @@ public void executionStarted(ExecuteQueryPayload payload) {`
`34`	`33`	`}`
`35`	`34`
`36`	`35`	`@Override`
`37`		`- public void resultReceived(GraphQueryResult result) {`
	`36`	`+ public void resultReceived(ExecuteQueryPayload payload, GraphQueryResult result) {`
`38`	`37`	`setVisible(false);`
`39`	`38`	`}`
`40`	`39`
`41`	`40`	`@Override`
`42`		`- public void postResultReceived() {`
	`41`	`+ public void postResultReceived(ExecuteQueryPayload payload) {`
`43`	`42`	`}`
`44`	`43`
`45`	`44`	`@Override`
`46`		`- public void handleError(Exception exception) {`
	`45`	`+ public void handleError(ExecuteQueryPayload payload, Exception exception) {`
`47`	`46`	`setVisible(false);`
`48`	`47`	`}`
`49`	`48`
`50`	`49`	`@Override`
`51`		`- public void executionCompleted() {`
	`50`	`+ public void executionCompleted(ExecuteQueryPayload payload) {`
`52`	`51`	`}`
`53`	`52`	`});`
`54`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,10 +11,10 @@`
`11`	`11`	`import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.console.table.editor.CompositeTableCellEditor;`
`12`	`12`	`import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.console.table.renderer.CompositeTableCellRenderer;`
`13`	`13`
`14`		`-import javax.swing.JTable;`
	`14`	`+import javax.swing.*;`
`15`	`15`	`import javax.swing.table.TableCellRenderer;`
`16`	`16`	`import javax.swing.table.TableColumn;`
`17`		`-import java.awt.Component;`
	`17`	`+import java.awt.*;`
`18`	`18`	`import java.util.ArrayList;`
`19`	`19`	`import java.util.List;`
`20`	`20`
`@@ -47,7 +47,7 @@ public void executionStarted(ExecuteQueryPayload payload) {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`@Override`
`50`		`- public void resultReceived(GraphQueryResult result) {`
	`50`	`+ public void resultReceived(ExecuteQueryPayload payload, GraphQueryResult result) {`
`51`	`51`	`List<GraphQueryResultColumn> columns = result.getColumns();`
`52`	`52`	`columns.forEach((column) -> tableModel.addColumn(column.getName()));`
`53`	`53`
`@@ -63,17 +63,17 @@ public void resultReceived(GraphQueryResult result) {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`@Override`
`66`		`- public void postResultReceived() {`
	`66`	`+ public void postResultReceived(ExecuteQueryPayload payload) {`
`67`	`67`	`updateColumnWidths();`
`68`	`68`	`updateRowHeights();`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`@Override`
`72`		`- public void handleError(Exception exception) {`
	`72`	`+ public void handleError(ExecuteQueryPayload payload, Exception exception) {`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`@Override`
`76`		`- public void executionCompleted() {`
	`76`	`+ public void executionCompleted(ExecuteQueryPayload payload) {`
`77`	`77`	`}`
`78`	`78`	`});`
`79`	`79`	`}`