Rebase

Author: BarsaTM

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

@@ -28,6 +28,7 @@
 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.datasource.interactions.DataSourceDialog.HEIGHT;
 import static com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.interactions.DataSourceDialog.THICKNESS;
+import static com.neueda.jetbrains.plugin.graphdb.jetbrains.util.ExceptionWrapper.SHORT_STRING_LENGTH;
 import static com.neueda.jetbrains.plugin.graphdb.jetbrains.util.ExceptionWrapper.getCause;
 import static com.neueda.jetbrains.plugin.graphdb.jetbrains.util.ExceptionWrapper.truncateString;
 import static com.neueda.jetbrains.plugin.graphdb.jetbrains.util.ExceptionWrapper.wrapExceptionInMeaningMessage;
@@ -164,7 +165,7 @@ private String printException(Exception exception) {
         }
         error(errorMessage);
         String details = exception.getMessage() + '\n' + getCause(exception);
-        log.printHyperlink(SHOW_DETAILS, p -> showPopup("Error details", details));
+        log.printHyperlink(" " + SHOW_DETAILS, p -> showPopup("Error details", details));
         newLine();
         return errorMessage;
     }
@@ -180,7 +181,7 @@ private void showPopup(String title, String details) {
         JTextArea exceptionDetails = new JTextArea();
         exceptionDetails.setLineWrap(true);
         exceptionDetails.append(details);
-        JLabel jLabel = new JLabel(truncateString(details, 120), AllIcons.Process.State.RedExcl, JLabel.LEFT);
+        JLabel jLabel = new JLabel(truncateString(details, SHORT_STRING_LENGTH), AllIcons.Process.State.RedExcl, JLabel.LEFT);
 
         JBScrollPane scrollPane = new JBScrollPane(exceptionDetails);
         scrollPane.setPreferredSize(new Dimension(-1, HEIGHT));

ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/datasource/interactions/DataSourceDialog.java

@@ -21,6 +21,8 @@
 import javax.swing.*;
 import java.awt.*;
 
+import static com.neueda.jetbrains.plugin.graphdb.jetbrains.util.ExceptionWrapper.SHORT_STRING_LENGTH;
+import static com.neueda.jetbrains.plugin.graphdb.jetbrains.util.ExceptionWrapper.getCause;
 import static com.neueda.jetbrains.plugin.graphdb.jetbrains.util.ExceptionWrapper.truncateString;
 
 public abstract class DataSourceDialog extends DialogWrapper {
@@ -36,6 +38,7 @@ protected DataSourceDialog(@Nullable Project project, DataSourcesView dataSource
     public abstract DataSourceApi constructDataSource();
 
     protected abstract void showLoading();
+
     protected abstract void hideLoading();
 
     public boolean go() {
@@ -44,7 +47,6 @@ public boolean go() {
     }
 
 
-
     public void validationPopup() {
         JPanel popupPanel = new JPanel(new BorderLayout());
         popupPanel.setBorder(JBUI.Borders.empty(THICKNESS));
@@ -113,16 +115,11 @@ private void connectionFailed(
             JComponent contentPanel) {
         hideLoading();
 
-        JLabel connectionFailed = new JLabel("Connection failed: " + truncateString(exception.getMessage()), AllIcons.Process.State.RedExcl, JLabel.LEFT);
+        JLabel connectionFailed = new JLabel("Connection failed: " + truncateString(exception.getMessage(), SHORT_STRING_LENGTH), AllIcons.Process.State.RedExcl, JLabel.LEFT);
 
         JTextArea exceptionCauses = new JTextArea();
         exceptionCauses.setLineWrap(true);
-
-        Throwable cause = exception.getCause();
-        while (cause != null) {
-            exceptionCauses.append(cause.getMessage() + "\n");
-            cause = cause.getCause();
-        }
+        exceptionCauses.append(getCause(exception));
 
         JBScrollPane scrollPane = new JBScrollPane(exceptionCauses);
         scrollPane.setPreferredSize(new Dimension(-1, HEIGHT));

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

@@ -4,7 +4,7 @@
 
 public class ExceptionWrapper {
     private final static String NON_THIN_CHARS = "[^iIl1\\.,']";
-    private final static int SHORT_STRING_LENGTH = 140;
+    public final static int SHORT_STRING_LENGTH = 140;
 
     private static int textWidth(String str) {
         return str.length() - str.replaceAll(NON_THIN_CHARS, "").length() / 2;