Refactoring

Author: BarsaTM

database/opencypher/src/main/java/com/neueda/jetbrains/plugin/graphdb/database/opencypher/gremlin/OpenCypherGremlinDatabase.java

@@ -13,7 +13,6 @@
 import org.apache.tinkerpop.gremlin.driver.Client;
 import org.apache.tinkerpop.gremlin.driver.Cluster;
 import org.apache.tinkerpop.gremlin.driver.Result;
-import org.neo4j.driver.v1.exceptions.ClientException;
 import org.opencypher.gremlin.client.CypherGremlinClient;
 
 import java.net.URI;
@@ -24,8 +23,10 @@
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
 
-import static java.util.Collections.*;
-import static java.util.stream.Collectors.*;
+import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
+import static java.util.Collections.singletonMap;
+import static java.util.stream.Collectors.toList;
 
 /**
  * Communicates with TinkerPop database by translating Cypher to Gremlin

ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/console/log/LogPanel.java

@@ -3,8 +3,10 @@
 import com.intellij.execution.filters.TextConsoleBuilderFactory;
 import com.intellij.execution.ui.ConsoleView;
 import com.intellij.execution.ui.ConsoleViewContentType;
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.ui.popup.JBPopupFactory;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.util.messages.MessageBus;
 import com.neueda.jetbrains.plugin.graphdb.database.api.query.GraphQueryResult;
@@ -17,15 +19,18 @@
 import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.metadata.MetadataRetrieveEvent;
 import org.jetbrains.annotations.Nullable;
 
+import javax.swing.*;
 import java.awt.*;
 import java.util.HashMap;
 import java.util.Map;
 
 import static com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.console.event.QueryParametersRetrievalErrorEvent.PARAMS_ERROR_COMMON_MSG;
-import static com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.console.log.ShowExceptionDetailsFilter.SHOW_DETAILS;
+import static com.neueda.jetbrains.plugin.graphdb.jetbrains.util.ExceptionWrapper.getCause;
 import static com.neueda.jetbrains.plugin.graphdb.jetbrains.util.ExceptionWrapper.wrapExceptionInMeaningMessage;
 
 public class LogPanel implements Disposable {
+    private static final String SHOW_DETAILS = "Show details";
+
     private ConsoleView log;
     private Map<String, String> exceptions = new HashMap<>();
     private Map<String, String> causes = new HashMap<>();
@@ -37,7 +42,6 @@ public void initialize(GraphConsoleView graphConsoleView, Project project) {
                 .createBuilder(project)
                 .getConsole();
         log.addMessageFilter(new GoToTabFilter(log));
-        log.addMessageFilter(new ShowExceptionDetailsFilter(log, exceptions));
 
         Disposer.register(graphConsoleView, log);
         graphConsoleView.getLogTab().add(log.getComponent(), BorderLayout.CENTER);
@@ -152,11 +156,13 @@ public void error(@Nullable String message) {
     private String printException(Exception exception) {
         String errorMessage;
         if (exception.getMessage() != null) {
-            errorMessage = wrapExceptionInMeaningMessage(exception) + " " + SHOW_DETAILS;
+            errorMessage = wrapExceptionInMeaningMessage(exception);
         } else {
-            errorMessage = exception.toString() + " " + SHOW_DETAILS;
+            errorMessage = exception.toString();
         }
         error(errorMessage);
+        String details = exception.getMessage() + '\n' + getCause(exception);
+        log.printHyperlink(SHOW_DETAILS, p -> showPopup("Error", details));
         newLine();
         return errorMessage;
     }
@@ -165,6 +171,18 @@ private void newLine() {
         log.print("\n", ConsoleViewContentType.NORMAL_OUTPUT);
     }
 
+    private void showPopup(String title, String text) {
+        JBPopupFactory.getInstance()
+                .createComponentPopupBuilder(
+                        new JLabel(text,
+                                AllIcons.General.Error,
+                                JLabel.LEFT),
+                        log.getComponent())
+                .setTitle(title)
+                .createPopup()
+                .showInFocusCenter();
+    }
+
     @Override
     public void dispose() {
         log.dispose();

ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/console/log/ShowExceptionDetailsFilter.java

@@ -1,5 +1,7 @@
 package com.neueda.jetbrains.plugin.graphdb.jetbrains.util;
 
+import org.apache.commons.lang.WordUtils;
+
 public class ExceptionWrapper {
     private final static String NON_THIN_CHARS = "[^iIl1\\.,']";
     private final static int SHORT_STRING_LENGTH = 140;
@@ -26,6 +28,10 @@ public static String truncateString(String text, int targetLength) {
         return text.substring(0, end) + "...";
     }
 
+    public static String wrapLongLine(String longLine) {
+        return WordUtils.wrap(longLine, 100);
+    }
+
     public static String getCause(Exception exception) {
         StringBuilder exceptionCauses = new StringBuilder();
         Throwable cause = exception.getCause();