Fixes

Author: BarsaTM

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

@@ -9,7 +9,11 @@
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.EditorFactory;
-import com.intellij.openapi.fileEditor.*;
+import com.intellij.openapi.fileEditor.FileDocumentManager;
+import com.intellij.openapi.fileEditor.FileEditor;
+import com.intellij.openapi.fileEditor.FileEditorManager;
+import com.intellij.openapi.fileEditor.FileEditorManagerEvent;
+import com.intellij.openapi.fileEditor.FileEditorManagerListener;
 import com.intellij.openapi.fileEditor.ex.FileEditorManagerEx;
 import com.intellij.openapi.fileEditor.impl.EditorTabPresentationUtil;
 import com.intellij.openapi.fileEditor.impl.EditorWindow;
@@ -33,7 +37,7 @@
 import java.awt.*;
 
 import static com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.console.event.QueryParametersRetrievalErrorEvent.PARAMS_ERROR_COMMON_MSG;
-import static com.neueda.jetbrains.plugin.graphdb.jetbrains.util.ExceptionWrapper.truncateString;
+import static com.neueda.jetbrains.plugin.graphdb.jetbrains.util.ExceptionWrapper.wrapExceptionInMeaningMessage;
 
 public class ParametersPanel implements ParametersProvider {
 
@@ -79,7 +83,7 @@ private void initializeUi() {
                     }
                     String errorMessage;
                     if (exception.getMessage() != null) {
-                        errorMessage = String.format("%s: %s", PARAMS_ERROR_COMMON_MSG, truncateString(exception.getMessage(), 120));
+                        errorMessage = String.format("%s: %s", PARAMS_ERROR_COMMON_MSG, wrapExceptionInMeaningMessage(exception));
                     } else {
                         errorMessage = PARAMS_ERROR_COMMON_MSG;
                     }

ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/datasource/actions/DataSourceAction.java

@@ -11,7 +11,7 @@
 import javax.swing.*;
 import java.io.IOException;
 
-import static com.neueda.jetbrains.plugin.graphdb.jetbrains.util.ExceptionWrapper.truncateString;
+import static com.neueda.jetbrains.plugin.graphdb.jetbrains.util.ExceptionWrapper.wrapExceptionInMeaningMessage;
 
 public class DataSourceAction extends AnAction {
 
@@ -29,7 +29,7 @@ public void actionPerformed(AnActionEvent e) {
         try {
             FileUtil.openFile(project, FileUtil.getDataSourceFile(project, dataSource));
         } catch (IOException exception) {
-            Notifier.error("Open editor error", truncateString(exception.getMessage(), 120));
+            Notifier.error("Open editor error", wrapExceptionInMeaningMessage(exception));
         }
     }
 }

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

@@ -16,15 +16,16 @@
 import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.tree.TreeNodeModelApi;
 import com.neueda.jetbrains.plugin.graphdb.jetbrains.util.FileUtil;
 import com.neueda.jetbrains.plugin.graphdb.jetbrains.util.Notifier;
+
+import javax.swing.tree.DefaultMutableTreeNode;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
-import javax.swing.tree.DefaultMutableTreeNode;
 
-import static com.neueda.jetbrains.plugin.graphdb.jetbrains.util.ExceptionWrapper.truncateString;
+import static com.neueda.jetbrains.plugin.graphdb.jetbrains.util.ExceptionWrapper.wrapExceptionInMeaningMessage;
 
 public class DataSourceInteractions {
 
@@ -130,7 +131,7 @@ public void mouseClicked(MouseEvent e) {
                     try {
                         FileUtil.openFile(project, FileUtil.getDataSourceFile(project, dataSource));
                     } catch (IOException exception) {
-                        Notifier.error("Open editor error", truncateString(exception.getMessage(), 120));
+                        Notifier.error("Open editor error", wrapExceptionInMeaningMessage(exception));
                     }
                 }
             }

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

@@ -1,9 +1,8 @@
 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;
 
     private static int textWidth(String str) {
         return str.length() - str.replaceAll(NON_THIN_CHARS, "").length() / 2;
@@ -37,10 +36,6 @@ public static String getCause(Exception exception) {
         return exceptionCauses.toString();
     }
 
-    public static String wrapText(String message) {
-        return WordUtils.wrap(message, 20);
-    }
-
     public static String wrapExceptionInMeaningMessage(Exception exception) {
         String exceptionMessage = exception.getMessage();
         if (exceptionMessage.contains("org.apache.tinkerpop.gremlin.driver.ser.SerializationException")) {
@@ -52,6 +47,9 @@ public static String wrapExceptionInMeaningMessage(Exception exception) {
         if (exceptionMessage.contains("org.apache.tinkerpop.gremlin.driver.exception.ConnectionException")) {
             return "Database connection failed with gremlin driver connection exception. Please check database configuration.";
         }
-        return truncateString(exception.getMessage(), 120);
+        if (exceptionMessage.length() > SHORT_STRING_LENGTH) {
+            return truncateString(exceptionMessage, SHORT_STRING_LENGTH);
+        }
+        return exceptionMessage;
     }
 }