From 1228f786b7ba64d924ffc0d7fb31d2c85d8ec3af Mon Sep 17 00:00:00 2001 From: zaaarf Date: Thu, 16 Nov 2023 13:13:43 +0100 Subject: [PATCH] feat: added empty buffer creation and submenu section --- .../intellij/actions/ConnectAction.java | 6 ++-- .../codemp/intellij/actions/JoinAction.java | 3 +- .../actions/buffer/BufferCreateAction.java | 28 +++++++++++++++++++ src/main/resources/META-INF/plugin.xml | 21 ++++++++++---- 4 files changed, 47 insertions(+), 11 deletions(-) create mode 100644 src/main/java/com/codemp/intellij/actions/buffer/BufferCreateAction.java diff --git a/src/main/java/com/codemp/intellij/actions/ConnectAction.java b/src/main/java/com/codemp/intellij/actions/ConnectAction.java index 990df4c..6b74508 100644 --- a/src/main/java/com/codemp/intellij/actions/ConnectAction.java +++ b/src/main/java/com/codemp/intellij/actions/ConnectAction.java @@ -10,14 +10,14 @@ import org.jetbrains.annotations.NotNull; import java.io.IOException; public class ConnectAction extends AnAction { - static { /*try { NativeUtils.loadLibraryFromJar("/resources/libHelloJNI.so"); } catch(IOException e) { throw new RuntimeException(e); }*/ - System.load("O:/dev/IRL/Rust/codemp/client/intellij/target/debug/codemp_intellij.dll"); + System.load("/home/zaaarf/dev/irl/rust/codemp/client/intellij/target/debug/libcodemp_intellij.so"); + //System.load("O:/dev/IRL/Rust/codemp/client/intellij/target/debug/codemp_intellij.dll"); } @Override @@ -29,7 +29,7 @@ public class ConnectAction extends AnAction { try { CodeMPHandler.connect(url); //Messages.showInfoMessage(String.format("Connected to %s!", url), "CodeMP"); - System.out.printf("Connected to %s!%n", url); + System.out.printf("Connected to %s!\n", url); } catch(Exception ex) { Messages.showErrorDialog(String.format("Failed to connect to %s: %s!", url, ex.getMessage()), "CodeMP"); } diff --git a/src/main/java/com/codemp/intellij/actions/JoinAction.java b/src/main/java/com/codemp/intellij/actions/JoinAction.java index 8ebab61..d7d3172 100644 --- a/src/main/java/com/codemp/intellij/actions/JoinAction.java +++ b/src/main/java/com/codemp/intellij/actions/JoinAction.java @@ -24,7 +24,6 @@ import com.intellij.ui.JBColor; import org.jetbrains.annotations.NotNull; import java.awt.*; -import java.util.Arrays; import java.util.HashMap; import java.util.Map; import java.util.Objects; @@ -70,7 +69,7 @@ public class JoinAction extends AnAction { h.dispose(); System.out.printf( - "Cursor moved by user %s! Start pos: x%d y%d; end pos: x%d y%d with buffer %s%n\n", + "Cursor moved by user %s! Start pos: x%d y%d; end pos: x%d y%d with buffer %s!\n", event.getUser(), event.getStartCol(), event.getStartCol(), event.getEndRow(), event.getEndCol(), diff --git a/src/main/java/com/codemp/intellij/actions/buffer/BufferCreateAction.java b/src/main/java/com/codemp/intellij/actions/buffer/BufferCreateAction.java new file mode 100644 index 0000000..c2590ef --- /dev/null +++ b/src/main/java/com/codemp/intellij/actions/buffer/BufferCreateAction.java @@ -0,0 +1,28 @@ +package com.codemp.intellij.actions.buffer; + +import com.codemp.intellij.jni.CodeMPHandler; +import com.intellij.openapi.actionSystem.AnAction; +import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.ui.Messages; +import org.jetbrains.annotations.NotNull; + +public class BufferCreateAction extends AnAction { + + @Override + public void actionPerformed(@NotNull AnActionEvent e) { + String buffer = Messages.showInputDialog( + "Buffer name:", + "Create CodeMP Buffer", + Messages.getQuestionIcon()); + + try { + CodeMPHandler.create(buffer); + //Messages.showInfoMessage(String.format("Created buffer %s!", url), "Create CodeMP Buffer" ); + System.out.printf("Created buffer %s!\n", buffer); + } catch(Exception ex) { + Messages.showErrorDialog(String.format( + "Failed to create buffer with name %s: %s!", + buffer, ex.getMessage()), "Create CodeMP Buffer"); + } + } +} diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 6d9d430..d3896b0 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -23,12 +23,21 @@ com.intellij.modules.platform - - - - - - + + + + + + + + + + + + + +