add logbook

Author: HaleyWang

build.gradle

@@ -44,7 +44,10 @@ dependencies {
     compile ":cookxml:"
 
     testCompile 'junit:junit:4.12'
-    compile 'log4j:log4j:1.2.14'
+
+    compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
+    compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'
+
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     compile "org.jetbrains:annotations:13.0"
     compile 'net.java.dev.jna:jna:4.5.0'
@@ -58,11 +61,13 @@ dependencies {
     compile 'com.google.guava:guava:25.1-jre'
 
     compile 'com.google.code.gson:gson:2.8.5'
-    compile 'org.slf4j:slf4j-log4j12:1.7.26'
     compile 'com.formdev:flatlaf:0.22'
 
     compile 'org.swinglabs:swingx:1.6.1'
 
+
+
+
 }
 
 mainClassName = "com.haleywang.putty.SpringRemoteApp"

build/libs/SpringRemote-0.1.jar

@@ -22,7 +22,8 @@ public static void main(String[] args) {
         } catch (Exception e) {
             LOGGER.error("setLookAndFeel error", e);
         }
-
+        LOGGER.info("start SpringRemoteView");
         EventQueue.invokeLater(SpringRemoteView::getInstance);
+
     }
 }

src/main/java/com/haleywang/putty/SpringRemoteApp.java

@@ -50,7 +50,7 @@ public class ActionsDialog extends JDialog {
     public static final String ACTIONS = "Actions";
     private static final List<Action> ACTIONS_DATA = new ArrayList<>();
     private final JXTable table;
-    private JTextField searchField;
+    private final JTextField searchField;
 
     public ActionsDialog(SpringRemoteView omegaRemote) {
         super(omegaRemote, ACTIONS, true);
@@ -128,7 +128,7 @@ private JTextField initSearchField() {
         mainTextField.setFocusTraversalKeysEnabled(false);
 
 // Our words to complete
-        ArrayList keywords = new ArrayList<String>(5);
+        List<String> keywords = new ArrayList<>(5);
 
         for (ActionCategoryEnum item : ActionCategoryEnum.values()) {
             keywords.add("@" + item.getName().toLowerCase());
@@ -189,22 +189,21 @@ private void doSearch() {
             final String category = categoryText.toLowerCase();
             ACTIONS_DATA.clear();
 
-            List<Action> allActionData = new ArrayList<>();
-
             List<Action> staticData = ActionsData.getActionsData();
             List<Action> userData = new ArrayList<>();
-            allActionData.addAll(staticData);
+            List<Action> allActionData = new ArrayList<>(staticData);
+
             DefaultMutableTreeNode commandsTreeNode = (DefaultMutableTreeNode) SideView.getInstance().getCommandsTreeView().getModel().getRoot();
             DefaultMutableTreeNode connectionsTreeNode = (DefaultMutableTreeNode) SideView.getInstance().getConnectionsInfoTreeView().getModel().getRoot();
 
-            parseTreeNodes(userData, commandsTreeNode, ActionCategoryEnum.COMMAND);
-            parseTreeNodes(userData, connectionsTreeNode, ActionCategoryEnum.SSH);
+            parseTreeNodes(userData, commandsTreeNode);
+            parseTreeNodes(userData, connectionsTreeNode);
             allActionData.addAll(userData);
 
-            allActionData.stream()
+            ACTIONS_DATA.addAll(allActionData.stream()
                     .filter(o -> StringUtils.isBlank(category) || o.getCategoryName().toLowerCase().contains(category))
-                    .filter(o -> StringUtils.isBlank(query) || o.searchText().toLowerCase().contains(query)).collect(Collectors.toList()).forEach(ACTIONS_DATA::add
-            );
+                    .filter(o -> StringUtils.isBlank(query) || o.searchText().toLowerCase().contains(query))
+                    .collect(Collectors.toList()));
 
             populate();
 
@@ -214,7 +213,7 @@ private void doSearch() {
     }
 
 
-    void parseTreeNodes(List<Action> actions, DefaultMutableTreeNode data, ActionCategoryEnum category) {
+    void parseTreeNodes(List<Action> actions, DefaultMutableTreeNode data) {
 
         for (int i = 0, n = data.getChildCount(); i < n; i++) {
             TreeNode child = data.getChildAt(i);
@@ -234,7 +233,7 @@ void parseTreeNodes(List<Action> actions, DefaultMutableTreeNode data, ActionCat
                 }
 
             } else {
-                parseTreeNodes(actions, treeChild, category);
+                parseTreeNodes(actions, treeChild);
             }
 
         }

src/main/java/com/haleywang/putty/view/ActionsDialog.java

@@ -0,0 +1,8 @@
+package com.haleywang.putty.view;
+
+import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
+
+public class CommandEditor extends RSyntaxTextArea {
+
+
+}

src/main/java/com/haleywang/putty/view/CommandEditor.java

@@ -10,7 +10,7 @@
 import com.jcraft.jsch.Session;
 import com.jediterm.terminal.Questioner;
 import com.jediterm.terminal.TtyConnector;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
 
 import java.awt.Dimension;
 import java.io.IOException;
@@ -25,7 +25,7 @@
  * @author haley
  */
 public abstract class AbstractJschTtyConnector<T extends Channel> implements TtyConnector {
-    public static final Logger LOG = Logger.getLogger(AbstractJschTtyConnector.class);
+    public static final Logger LOG = org.slf4j.LoggerFactory.getLogger(AbstractJschTtyConnector.class);
 
     public static final int DEFAULT_SSH_PORT = 22;
 

src/main/java/com/haleywang/putty/view/puttypanel/connector/ssh/AbstractJschTtyConnector.java

@@ -86,7 +86,7 @@ private static class SingletonHolder {
 
     private String aesKey;
 
-    private FileStorage fileStorage = FileStorage.INSTANCE;
+    private static final FileStorage FILE_STORAGE = FileStorage.INSTANCE;
 
     private SideView() {
         super(JSplitPane.VERTICAL_SPLIT);
@@ -103,30 +103,27 @@ public void changeTheme() {
 
     public void reloadData() {
 
-        String str = fileStorage.getCommandsData();
-        if (str != null) {
-            updateCommandsJsonTextArea.setText(str);
-        } else {
+        String commandsData = FILE_STORAGE.getCommandsData();
+        if (commandsData == null) {
             try {
-                str = IoTool.read(this.getClass(), "/myCommandsExample.json");
-                updateCommandsJsonTextArea.setText(str);
+                commandsData = IoTool.read(this.getClass(), "/myCommandsExample.json");
             } catch (Exception e) {
                 LOGGER.error("reload CommandsJson error", e);
             }
         }
 
-        String connectionsInfoData = fileStorage.getConnectionsInfoData();
-        if (connectionsInfoData != null) {
-            updateConnectionsJsonTextArea.setText(connectionsInfoData);
-        } else {
+        updateCommandsJsonTextArea.setText(commandsData);
+
+        String connectionsInfoData = FILE_STORAGE.getConnectionsInfoData();
+        if (connectionsInfoData == null) {
             try {
-                String str1 = IoTool.read(this.getClass(), "/myConnectionsInfoExample.json");
-                updateConnectionsJsonTextArea.setText(str1);
+                connectionsInfoData = IoTool.read(this.getClass(), "/myConnectionsInfoExample.json");
             } catch (Exception e) {
                 LOGGER.error("reload ConnectionsJson error", e);
-
             }
         }
+        updateConnectionsJsonTextArea.setText(connectionsInfoData);
+
 
         commandsTreePanel.getCommandsTreeView().updateUI();
         connectionsTreePanel.getConnectionsInfoTreeView().updateUI();
@@ -286,7 +283,7 @@ public void saveCommandsDataAndChangeCommandsTree() {
     }
 
     public void saveCommandsData() {
-        fileStorage.saveCommandsData(updateCommandsJsonTextArea.getText());
+        FILE_STORAGE.saveCommandsData(updateCommandsJsonTextArea.getText());
     }
 
 
@@ -301,7 +298,7 @@ public void saveCommand() {
             Gson gson = new GsonBuilder().setPrettyPrinting().create();
 
             String commandsJson = gson.toJson(userDataObject);
-            fileStorage.saveCommandsData(commandsJson);
+            FILE_STORAGE.saveCommandsData(commandsJson);
 
             reloadData();
         });
@@ -408,7 +405,7 @@ private void changeCommandsTree() {
     }
 
     private Map<String, Object> getConnectionsPasswordsMap() {
-        String text = fileStorage.getConnectionsPasswords();
+        String text = FILE_STORAGE.getConnectionsPasswords();
         if (text == null) {
             return new HashMap<>(6);
         }
@@ -421,7 +418,7 @@ private Map<String, Object> getConnectionsPasswordsMap() {
     }
 
     public AccountDto getConnectionAccountByNodeName(String nodeName) {
-        Map map = getConnectionsPasswordsMap();
+        Map<String, Object> map = getConnectionsPasswordsMap();
         String accountKey =  getAccountKey(nodeName);
         String pwdKey = getAccountPwdKey(nodeName);
 

src/main/java/com/haleywang/putty/view/side/SideView.java

@@ -2,23 +2,35 @@
 
 import com.haleywang.putty.dto.CommandDto;
 import com.haleywang.putty.util.StringUtils;
+import com.haleywang.putty.view.CommandEditor;
 import com.haleywang.putty.view.PlaceholderTextField;
 import com.haleywang.putty.view.SpringRemoteView;
 import com.haleywang.putty.view.side.SideView;
+import com.mindbright.util.StringUtil;
+import org.fife.ui.rsyntaxtextarea.FoldingAwareIconRowHeader;
+import org.fife.ui.rtextarea.Gutter;
+import org.fife.ui.rtextarea.GutterIconInfo;
+import org.fife.ui.rtextarea.RTextScrollPane;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JPanel;
-import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
 import javax.swing.SwingUtilities;
 import javax.swing.border.EmptyBorder;
 import javax.swing.border.LineBorder;
 import java.awt.BorderLayout;
 import java.awt.Color;
+import java.awt.Component;
+import java.awt.Cursor;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.net.URL;
+import java.util.Arrays;
 
 
 /**
@@ -31,6 +43,7 @@ public class CommandEditorPanel extends JPanel implements TextAreaMenu.RunAction
     private JTextArea updateCommandTextArea;
     private PlaceholderTextField commandNameTextField;
     private CommandDto currentEditCommand;
+    private Gutter gutter;
 
     public CommandEditorPanel() {
         createUpdateCommandPanel();
@@ -40,9 +53,58 @@ private void createUpdateCommandPanel() {
         JPanel updateCommandPanel = this;
         updateCommandPanel.setLayout(new BorderLayout());
 
-        updateCommandTextArea = new TextAreaMenu(this);
+        updateCommandTextArea = new CommandEditor();
+
+        RTextScrollPane sp = new RTextScrollPane(updateCommandTextArea);
+        sp.setIconRowHeaderEnabled(true);
+
+        gutter = sp.getGutter();
+
+        gutter.getIconArea().addMouseListener(new MouseAdapter() {
+
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                Component[] comps = gutter.getComponents();
+                FoldingAwareIconRowHeader iconComp = (FoldingAwareIconRowHeader) Arrays.stream(comps)
+                        .filter(o -> o instanceof FoldingAwareIconRowHeader)
+                        .findFirst().orElse(null);
+                if(iconComp == null) {
+                    return;
+                }
+                int offs = gutter.getTextArea().viewToModel(e.getPoint());
+                try {
+                    int currLine = gutter.getTextArea().getLineOfOffset(offs);
+                    GutterIconInfo[] trackingIcons = iconComp.getTrackingIcons(currLine);
+
+                    if(trackingIcons.length >= 1){
+                        //run command
+                        int lineStartOffset = gutter.getTextArea().getLineStartOffset(currLine);
+
+                        int lineEndOffset = gutter.getTextArea().getLineEndOffset(currLine);
+                        String commandText = gutter.getTextArea().getText(lineStartOffset, (lineEndOffset - lineStartOffset));
+                        commandText = StringUtils.trim(commandText);
+                        SideView.getInstance().runWithSelectedText(commandText);
+                        return;
+                    }
+                    gutter.removeAllTrackingIcons();
+
+                    URL url = ClassLoader.getSystemClassLoader().getResource("Play16.png");
+                    assert url != null;
+                    ImageIcon icon = new ImageIcon(url);
+
+                    gutter.addOffsetTrackingIcon(offs, icon, "Run");
+                } catch (Exception ex) {
+                    LOGGER.error("click run icon error", ex);
+                }
+
+            }
+
+
+
+        });
+
+        
 
-        JScrollPane sp = new JScrollPane(updateCommandTextArea);
         updateCommandTextArea.setLineWrap(true);
 
         updateCommandTextArea.setEditable(true);
@@ -95,6 +157,9 @@ public void keyReleased(KeyEvent e) {
         updateCommandOuterPanel.setLayout(new BorderLayout());
         updateCommandOuterPanel.add(updateCommandPanel);
         updateCommandOuterPanel.setBorder(new EmptyBorder(2, 2, 2, 2));
+
+        Arrays.stream(gutter.getComponents()).filter(o -> o instanceof FoldingAwareIconRowHeader)
+                .findFirst().ifPresent(o -> o.setCursor(new Cursor(Cursor.HAND_CURSOR)));
     }
 
     @Override

src/main/java/com/haleywang/putty/view/side/subview/CommandEditorPanel.java

@@ -17,7 +17,7 @@
 
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.ExceptionUtil;
-import org.apache.log4j.Level;
+import org.slf4j.event.Level;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;