From b577ec9c213de63f6b7d77efbb64b6ef7201deca Mon Sep 17 00:00:00 2001 From: zaaarf Date: Thu, 17 Oct 2024 03:11:02 +0200 Subject: [PATCH] chore: rename to mp.code.ij --- .../java/mp/code/{intellij => ij}/CodeMP.java | 4 +- .../actions/ConnectAction.java | 4 +- .../actions/DisconnectAction.java | 6 +-- .../actions/buffer/BufferAttachAction.java | 10 ++--- .../actions/buffer/BufferCreateAction.java | 4 +- .../actions/buffer/BufferDeleteAction.java | 4 +- .../actions/buffer/BufferDetachAction.java | 4 +- .../actions/buffer/BufferSyncAction.java | 6 +-- .../workspace/WorkspaceAttachAction.java | 6 +-- .../workspace/WorkspaceCreateAction.java | 6 +-- .../workspace/WorkspaceDeleteAction.java | 6 +-- .../workspace/WorkspaceInviteAction.java | 6 +-- .../workspace/WorkspaceLeaveAction.java | 6 +-- .../exceptions/CodeMPIJException.java | 2 +- .../exceptions/ide/NotConnectedException.java | 4 +- .../listeners/BufferEventListener.java | 4 +- .../listeners/CursorEventListener.java | 6 +-- .../settings/CodeMPSettings.java | 2 +- .../settings/CodeMPSettingsConfigurable.java | 2 +- .../{intellij => ij}/ui/CodeMPToolPanel.java | 10 ++--- .../ui/CodeMPWindowFactory.java | 4 +- .../ui/SimpleMouseListener.java | 2 +- .../code/{intellij => ij}/util/ColorUtil.java | 2 +- .../code/{intellij => ij}/util/FileUtil.java | 6 +-- .../util/InteractionUtil.java | 16 ++++---- .../{intellij => ij}/util/MemoryManager.java | 2 +- .../util/cb/BufferCallback.java | 6 +-- .../util/cb/CursorCallback.java | 10 ++--- .../util/cb/WorkspaceCallback.java | 6 +-- .../{intellij => ij}/vfs/CodeMPDirectory.java | 4 +- .../code/{intellij => ij}/vfs/CodeMPFile.java | 7 +--- .../vfs/CodeMPFileIndexContributor.java | 2 +- .../vfs/CodeMPFileSystem.java | 11 +++--- .../code/{intellij => ij}/vfs/CodeMPPath.java | 2 +- src/main/resources/META-INF/plugin.xml | 39 ++++++++++--------- 35 files changed, 109 insertions(+), 112 deletions(-) rename src/main/java/mp/code/{intellij => ij}/CodeMP.java (95%) rename src/main/java/mp/code/{intellij => ij}/actions/ConnectAction.java (79%) rename src/main/java/mp/code/{intellij => ij}/actions/DisconnectAction.java (84%) rename src/main/java/mp/code/{intellij => ij}/actions/buffer/BufferAttachAction.java (93%) rename src/main/java/mp/code/{intellij => ij}/actions/buffer/BufferCreateAction.java (93%) rename src/main/java/mp/code/{intellij => ij}/actions/buffer/BufferDeleteAction.java (93%) rename src/main/java/mp/code/{intellij => ij}/actions/buffer/BufferDetachAction.java (95%) rename src/main/java/mp/code/{intellij => ij}/actions/buffer/BufferSyncAction.java (95%) rename src/main/java/mp/code/{intellij => ij}/actions/workspace/WorkspaceAttachAction.java (90%) rename src/main/java/mp/code/{intellij => ij}/actions/workspace/WorkspaceCreateAction.java (88%) rename src/main/java/mp/code/{intellij => ij}/actions/workspace/WorkspaceDeleteAction.java (90%) rename src/main/java/mp/code/{intellij => ij}/actions/workspace/WorkspaceInviteAction.java (92%) rename src/main/java/mp/code/{intellij => ij}/actions/workspace/WorkspaceLeaveAction.java (85%) rename src/main/java/mp/code/{intellij => ij}/exceptions/CodeMPIJException.java (75%) rename src/main/java/mp/code/{intellij => ij}/exceptions/ide/NotConnectedException.java (76%) rename src/main/java/mp/code/{intellij => ij}/listeners/BufferEventListener.java (96%) rename src/main/java/mp/code/{intellij => ij}/listeners/CursorEventListener.java (95%) rename src/main/java/mp/code/{intellij => ij}/settings/CodeMPSettings.java (97%) rename src/main/java/mp/code/{intellij => ij}/settings/CodeMPSettingsConfigurable.java (98%) rename src/main/java/mp/code/{intellij => ij}/ui/CodeMPToolPanel.java (96%) rename src/main/java/mp/code/{intellij => ij}/ui/CodeMPWindowFactory.java (94%) rename src/main/java/mp/code/{intellij => ij}/ui/SimpleMouseListener.java (94%) rename src/main/java/mp/code/{intellij => ij}/util/ColorUtil.java (90%) rename src/main/java/mp/code/{intellij => ij}/util/FileUtil.java (97%) rename src/main/java/mp/code/{intellij => ij}/util/InteractionUtil.java (96%) rename src/main/java/mp/code/{intellij => ij}/util/MemoryManager.java (98%) rename src/main/java/mp/code/{intellij => ij}/util/cb/BufferCallback.java (96%) rename src/main/java/mp/code/{intellij => ij}/util/cb/CursorCallback.java (94%) rename src/main/java/mp/code/{intellij => ij}/util/cb/WorkspaceCallback.java (92%) rename src/main/java/mp/code/{intellij => ij}/vfs/CodeMPDirectory.java (96%) rename src/main/java/mp/code/{intellij => ij}/vfs/CodeMPFile.java (92%) rename src/main/java/mp/code/{intellij => ij}/vfs/CodeMPFileIndexContributor.java (97%) rename src/main/java/mp/code/{intellij => ij}/vfs/CodeMPFileSystem.java (96%) rename src/main/java/mp/code/{intellij => ij}/vfs/CodeMPPath.java (99%) diff --git a/src/main/java/mp/code/intellij/CodeMP.java b/src/main/java/mp/code/ij/CodeMP.java similarity index 95% rename from src/main/java/mp/code/intellij/CodeMP.java rename to src/main/java/mp/code/ij/CodeMP.java index f178bbb..ed00ae4 100644 --- a/src/main/java/mp/code/intellij/CodeMP.java +++ b/src/main/java/mp/code/ij/CodeMP.java @@ -1,4 +1,4 @@ -package mp.code.intellij; +package mp.code.ij; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; @@ -9,7 +9,7 @@ import mp.code.Extensions; import mp.code.Workspace; import mp.code.data.Config; import mp.code.exceptions.ConnectionException; -import mp.code.intellij.exceptions.ide.NotConnectedException; +import mp.code.ij.exceptions.ide.NotConnectedException; import mp.code.Client; import java.nio.file.Path; diff --git a/src/main/java/mp/code/intellij/actions/ConnectAction.java b/src/main/java/mp/code/ij/actions/ConnectAction.java similarity index 79% rename from src/main/java/mp/code/intellij/actions/ConnectAction.java rename to src/main/java/mp/code/ij/actions/ConnectAction.java index fee9289..e18b6ac 100644 --- a/src/main/java/mp/code/intellij/actions/ConnectAction.java +++ b/src/main/java/mp/code/ij/actions/ConnectAction.java @@ -1,8 +1,8 @@ -package mp.code.intellij.actions; +package mp.code.ij.actions; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import mp.code.intellij.util.InteractionUtil; +import mp.code.ij.util.InteractionUtil; import org.jetbrains.annotations.NotNull; public class ConnectAction extends AnAction { diff --git a/src/main/java/mp/code/intellij/actions/DisconnectAction.java b/src/main/java/mp/code/ij/actions/DisconnectAction.java similarity index 84% rename from src/main/java/mp/code/intellij/actions/DisconnectAction.java rename to src/main/java/mp/code/ij/actions/DisconnectAction.java index b8f1342..6dcb865 100644 --- a/src/main/java/mp/code/intellij/actions/DisconnectAction.java +++ b/src/main/java/mp/code/ij/actions/DisconnectAction.java @@ -1,10 +1,10 @@ -package mp.code.intellij.actions; +package mp.code.ij.actions; import com.intellij.openapi.actionSystem.ActionUpdateThread; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import mp.code.intellij.CodeMP; -import mp.code.intellij.util.InteractionUtil; +import mp.code.ij.CodeMP; +import mp.code.ij.util.InteractionUtil; import org.jetbrains.annotations.NotNull; public class DisconnectAction extends AnAction { diff --git a/src/main/java/mp/code/intellij/actions/buffer/BufferAttachAction.java b/src/main/java/mp/code/ij/actions/buffer/BufferAttachAction.java similarity index 93% rename from src/main/java/mp/code/intellij/actions/buffer/BufferAttachAction.java rename to src/main/java/mp/code/ij/actions/buffer/BufferAttachAction.java index 56bb0b3..b3e5a06 100644 --- a/src/main/java/mp/code/intellij/actions/buffer/BufferAttachAction.java +++ b/src/main/java/mp/code/ij/actions/buffer/BufferAttachAction.java @@ -1,4 +1,4 @@ -package mp.code.intellij.actions.buffer; +package mp.code.ij.actions.buffer; import com.intellij.openapi.actionSystem.ActionUpdateThread; import com.intellij.openapi.actionSystem.AnAction; @@ -13,10 +13,10 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Messages; import mp.code.BufferController; import mp.code.exceptions.ControllerException; -import mp.code.intellij.CodeMP; -import mp.code.intellij.util.FileUtil; -import mp.code.intellij.util.InteractionUtil; -import mp.code.intellij.util.cb.BufferCallback; +import mp.code.ij.CodeMP; +import mp.code.ij.util.FileUtil; +import mp.code.ij.util.InteractionUtil; +import mp.code.ij.util.cb.BufferCallback; import org.jetbrains.annotations.NotNull; import java.util.Optional; diff --git a/src/main/java/mp/code/intellij/actions/buffer/BufferCreateAction.java b/src/main/java/mp/code/ij/actions/buffer/BufferCreateAction.java similarity index 93% rename from src/main/java/mp/code/intellij/actions/buffer/BufferCreateAction.java rename to src/main/java/mp/code/ij/actions/buffer/BufferCreateAction.java index db7c6d8..46cb84d 100644 --- a/src/main/java/mp/code/intellij/actions/buffer/BufferCreateAction.java +++ b/src/main/java/mp/code/ij/actions/buffer/BufferCreateAction.java @@ -1,11 +1,11 @@ -package mp.code.intellij.actions.buffer; +package mp.code.ij.actions.buffer; import com.intellij.openapi.actionSystem.ActionUpdateThread; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.ui.Messages; import mp.code.exceptions.ConnectionRemoteException; -import mp.code.intellij.CodeMP; +import mp.code.ij.CodeMP; import org.jetbrains.annotations.NotNull; public class BufferCreateAction extends AnAction { diff --git a/src/main/java/mp/code/intellij/actions/buffer/BufferDeleteAction.java b/src/main/java/mp/code/ij/actions/buffer/BufferDeleteAction.java similarity index 93% rename from src/main/java/mp/code/intellij/actions/buffer/BufferDeleteAction.java rename to src/main/java/mp/code/ij/actions/buffer/BufferDeleteAction.java index bacc510..e085e75 100644 --- a/src/main/java/mp/code/intellij/actions/buffer/BufferDeleteAction.java +++ b/src/main/java/mp/code/ij/actions/buffer/BufferDeleteAction.java @@ -1,11 +1,11 @@ -package mp.code.intellij.actions.buffer; +package mp.code.ij.actions.buffer; import com.intellij.openapi.actionSystem.ActionUpdateThread; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.ui.Messages; import mp.code.exceptions.ConnectionRemoteException; -import mp.code.intellij.CodeMP; +import mp.code.ij.CodeMP; import org.jetbrains.annotations.NotNull; public class BufferDeleteAction extends AnAction { diff --git a/src/main/java/mp/code/intellij/actions/buffer/BufferDetachAction.java b/src/main/java/mp/code/ij/actions/buffer/BufferDetachAction.java similarity index 95% rename from src/main/java/mp/code/intellij/actions/buffer/BufferDetachAction.java rename to src/main/java/mp/code/ij/actions/buffer/BufferDetachAction.java index 6ce5f33..e27e82d 100644 --- a/src/main/java/mp/code/intellij/actions/buffer/BufferDetachAction.java +++ b/src/main/java/mp/code/ij/actions/buffer/BufferDetachAction.java @@ -1,11 +1,11 @@ -package mp.code.intellij.actions.buffer; +package mp.code.ij.actions.buffer; import com.intellij.openapi.actionSystem.ActionUpdateThread; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.ui.Messages; import mp.code.BufferController; -import mp.code.intellij.CodeMP; +import mp.code.ij.CodeMP; import org.jetbrains.annotations.NotNull; import java.nio.file.Path; diff --git a/src/main/java/mp/code/intellij/actions/buffer/BufferSyncAction.java b/src/main/java/mp/code/ij/actions/buffer/BufferSyncAction.java similarity index 95% rename from src/main/java/mp/code/intellij/actions/buffer/BufferSyncAction.java rename to src/main/java/mp/code/ij/actions/buffer/BufferSyncAction.java index 61f3508..0568f61 100644 --- a/src/main/java/mp/code/intellij/actions/buffer/BufferSyncAction.java +++ b/src/main/java/mp/code/ij/actions/buffer/BufferSyncAction.java @@ -1,4 +1,4 @@ -package mp.code.intellij.actions.buffer; +package mp.code.ij.actions.buffer; import com.intellij.openapi.actionSystem.ActionUpdateThread; import com.intellij.openapi.actionSystem.AnAction; @@ -9,8 +9,8 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.ui.Messages; import mp.code.BufferController; import mp.code.exceptions.ControllerException; -import mp.code.intellij.CodeMP; -import mp.code.intellij.util.FileUtil; +import mp.code.ij.CodeMP; +import mp.code.ij.util.FileUtil; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/mp/code/intellij/actions/workspace/WorkspaceAttachAction.java b/src/main/java/mp/code/ij/actions/workspace/WorkspaceAttachAction.java similarity index 90% rename from src/main/java/mp/code/intellij/actions/workspace/WorkspaceAttachAction.java rename to src/main/java/mp/code/ij/actions/workspace/WorkspaceAttachAction.java index 9407d9a..bd6b44f 100644 --- a/src/main/java/mp/code/intellij/actions/workspace/WorkspaceAttachAction.java +++ b/src/main/java/mp/code/ij/actions/workspace/WorkspaceAttachAction.java @@ -1,8 +1,8 @@ -package mp.code.intellij.actions.workspace; +package mp.code.ij.actions.workspace; import com.intellij.openapi.actionSystem.ActionUpdateThread; -import mp.code.intellij.CodeMP; -import mp.code.intellij.util.InteractionUtil; +import mp.code.ij.CodeMP; +import mp.code.ij.util.InteractionUtil; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.ui.Messages; diff --git a/src/main/java/mp/code/intellij/actions/workspace/WorkspaceCreateAction.java b/src/main/java/mp/code/ij/actions/workspace/WorkspaceCreateAction.java similarity index 88% rename from src/main/java/mp/code/intellij/actions/workspace/WorkspaceCreateAction.java rename to src/main/java/mp/code/ij/actions/workspace/WorkspaceCreateAction.java index c7c51ff..7a86f78 100644 --- a/src/main/java/mp/code/intellij/actions/workspace/WorkspaceCreateAction.java +++ b/src/main/java/mp/code/ij/actions/workspace/WorkspaceCreateAction.java @@ -1,12 +1,12 @@ -package mp.code.intellij.actions.workspace; +package mp.code.ij.actions.workspace; import com.intellij.openapi.actionSystem.ActionUpdateThread; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.ui.Messages; -import mp.code.intellij.CodeMP; -import mp.code.intellij.util.InteractionUtil; +import mp.code.ij.CodeMP; +import mp.code.ij.util.InteractionUtil; import org.jetbrains.annotations.NotNull; public class WorkspaceCreateAction extends AnAction { diff --git a/src/main/java/mp/code/intellij/actions/workspace/WorkspaceDeleteAction.java b/src/main/java/mp/code/ij/actions/workspace/WorkspaceDeleteAction.java similarity index 90% rename from src/main/java/mp/code/intellij/actions/workspace/WorkspaceDeleteAction.java rename to src/main/java/mp/code/ij/actions/workspace/WorkspaceDeleteAction.java index 9c0e202..5a45adf 100644 --- a/src/main/java/mp/code/intellij/actions/workspace/WorkspaceDeleteAction.java +++ b/src/main/java/mp/code/ij/actions/workspace/WorkspaceDeleteAction.java @@ -1,12 +1,12 @@ -package mp.code.intellij.actions.workspace; +package mp.code.ij.actions.workspace; import com.intellij.openapi.actionSystem.ActionUpdateThread; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.ui.Messages; -import mp.code.intellij.CodeMP; -import mp.code.intellij.util.InteractionUtil; +import mp.code.ij.CodeMP; +import mp.code.ij.util.InteractionUtil; import org.jetbrains.annotations.NotNull; public class WorkspaceDeleteAction extends AnAction { diff --git a/src/main/java/mp/code/intellij/actions/workspace/WorkspaceInviteAction.java b/src/main/java/mp/code/ij/actions/workspace/WorkspaceInviteAction.java similarity index 92% rename from src/main/java/mp/code/intellij/actions/workspace/WorkspaceInviteAction.java rename to src/main/java/mp/code/ij/actions/workspace/WorkspaceInviteAction.java index f4f9c3c..aef5c8a 100644 --- a/src/main/java/mp/code/intellij/actions/workspace/WorkspaceInviteAction.java +++ b/src/main/java/mp/code/ij/actions/workspace/WorkspaceInviteAction.java @@ -1,11 +1,11 @@ -package mp.code.intellij.actions.workspace; +package mp.code.ij.actions.workspace; import com.intellij.openapi.actionSystem.ActionUpdateThread; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.ui.Messages; -import mp.code.intellij.CodeMP; -import mp.code.intellij.util.InteractionUtil; +import mp.code.ij.CodeMP; +import mp.code.ij.util.InteractionUtil; import org.jetbrains.annotations.NotNull; public class WorkspaceInviteAction extends AnAction { diff --git a/src/main/java/mp/code/intellij/actions/workspace/WorkspaceLeaveAction.java b/src/main/java/mp/code/ij/actions/workspace/WorkspaceLeaveAction.java similarity index 85% rename from src/main/java/mp/code/intellij/actions/workspace/WorkspaceLeaveAction.java rename to src/main/java/mp/code/ij/actions/workspace/WorkspaceLeaveAction.java index 14aa693..2305e3f 100644 --- a/src/main/java/mp/code/intellij/actions/workspace/WorkspaceLeaveAction.java +++ b/src/main/java/mp/code/ij/actions/workspace/WorkspaceLeaveAction.java @@ -1,10 +1,10 @@ -package mp.code.intellij.actions.workspace; +package mp.code.ij.actions.workspace; import com.intellij.openapi.actionSystem.ActionUpdateThread; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import mp.code.intellij.CodeMP; -import mp.code.intellij.util.InteractionUtil; +import mp.code.ij.CodeMP; +import mp.code.ij.util.InteractionUtil; import org.jetbrains.annotations.NotNull; import java.util.Objects; diff --git a/src/main/java/mp/code/intellij/exceptions/CodeMPIJException.java b/src/main/java/mp/code/ij/exceptions/CodeMPIJException.java similarity index 75% rename from src/main/java/mp/code/intellij/exceptions/CodeMPIJException.java rename to src/main/java/mp/code/ij/exceptions/CodeMPIJException.java index 627b090..1b5e813 100644 --- a/src/main/java/mp/code/intellij/exceptions/CodeMPIJException.java +++ b/src/main/java/mp/code/ij/exceptions/CodeMPIJException.java @@ -1,4 +1,4 @@ -package mp.code.intellij.exceptions; +package mp.code.ij.exceptions; public class CodeMPIJException extends RuntimeException { public CodeMPIJException(String s) { diff --git a/src/main/java/mp/code/intellij/exceptions/ide/NotConnectedException.java b/src/main/java/mp/code/ij/exceptions/ide/NotConnectedException.java similarity index 76% rename from src/main/java/mp/code/intellij/exceptions/ide/NotConnectedException.java rename to src/main/java/mp/code/ij/exceptions/ide/NotConnectedException.java index 0620c12..6e5e4b7 100644 --- a/src/main/java/mp/code/intellij/exceptions/ide/NotConnectedException.java +++ b/src/main/java/mp/code/ij/exceptions/ide/NotConnectedException.java @@ -1,6 +1,6 @@ -package mp.code.intellij.exceptions.ide; +package mp.code.ij.exceptions.ide; -import mp.code.intellij.exceptions.CodeMPIJException; +import mp.code.ij.exceptions.CodeMPIJException; /** * Fired when trying to access the CodeMP client without first connecting diff --git a/src/main/java/mp/code/intellij/listeners/BufferEventListener.java b/src/main/java/mp/code/ij/listeners/BufferEventListener.java similarity index 96% rename from src/main/java/mp/code/intellij/listeners/BufferEventListener.java rename to src/main/java/mp/code/ij/listeners/BufferEventListener.java index 35b8e10..78f3aa0 100644 --- a/src/main/java/mp/code/intellij/listeners/BufferEventListener.java +++ b/src/main/java/mp/code/ij/listeners/BufferEventListener.java @@ -1,11 +1,11 @@ -package mp.code.intellij.listeners; +package mp.code.ij.listeners; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.EditorFactory; import com.intellij.openapi.vfs.VirtualFile; import lombok.SneakyThrows; import mp.code.exceptions.ControllerException; -import mp.code.intellij.CodeMP; +import mp.code.ij.CodeMP; import com.intellij.openapi.command.CommandProcessor; import com.intellij.openapi.editor.event.DocumentEvent; import com.intellij.openapi.editor.event.DocumentListener; diff --git a/src/main/java/mp/code/intellij/listeners/CursorEventListener.java b/src/main/java/mp/code/ij/listeners/CursorEventListener.java similarity index 95% rename from src/main/java/mp/code/intellij/listeners/CursorEventListener.java rename to src/main/java/mp/code/ij/listeners/CursorEventListener.java index 3c9f0e2..7a085a0 100644 --- a/src/main/java/mp/code/intellij/listeners/CursorEventListener.java +++ b/src/main/java/mp/code/ij/listeners/CursorEventListener.java @@ -1,12 +1,12 @@ -package mp.code.intellij.listeners; +package mp.code.ij.listeners; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.editor.LogicalPosition; import com.intellij.openapi.vfs.VirtualFile; import mp.code.data.Selection; import mp.code.exceptions.ControllerException; -import mp.code.intellij.CodeMP; -import mp.code.intellij.util.FileUtil; +import mp.code.ij.CodeMP; +import mp.code.ij.util.FileUtil; import com.intellij.openapi.editor.Caret; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.event.CaretEvent; diff --git a/src/main/java/mp/code/intellij/settings/CodeMPSettings.java b/src/main/java/mp/code/ij/settings/CodeMPSettings.java similarity index 97% rename from src/main/java/mp/code/intellij/settings/CodeMPSettings.java rename to src/main/java/mp/code/ij/settings/CodeMPSettings.java index 5b2817c..9ba030f 100644 --- a/src/main/java/mp/code/intellij/settings/CodeMPSettings.java +++ b/src/main/java/mp/code/ij/settings/CodeMPSettings.java @@ -1,4 +1,4 @@ -package mp.code.intellij.settings; +package mp.code.ij.settings; import com.intellij.credentialStore.CredentialAttributes; import com.intellij.credentialStore.CredentialAttributesKt; diff --git a/src/main/java/mp/code/intellij/settings/CodeMPSettingsConfigurable.java b/src/main/java/mp/code/ij/settings/CodeMPSettingsConfigurable.java similarity index 98% rename from src/main/java/mp/code/intellij/settings/CodeMPSettingsConfigurable.java rename to src/main/java/mp/code/ij/settings/CodeMPSettingsConfigurable.java index da5def4..9039b3e 100644 --- a/src/main/java/mp/code/intellij/settings/CodeMPSettingsConfigurable.java +++ b/src/main/java/mp/code/ij/settings/CodeMPSettingsConfigurable.java @@ -1,4 +1,4 @@ -package mp.code.intellij.settings; +package mp.code.ij.settings; import com.intellij.credentialStore.Credentials; import com.intellij.credentialStore.OneTimeString; diff --git a/src/main/java/mp/code/intellij/ui/CodeMPToolPanel.java b/src/main/java/mp/code/ij/ui/CodeMPToolPanel.java similarity index 96% rename from src/main/java/mp/code/intellij/ui/CodeMPToolPanel.java rename to src/main/java/mp/code/ij/ui/CodeMPToolPanel.java index d2c04cb..ee8aca5 100644 --- a/src/main/java/mp/code/intellij/ui/CodeMPToolPanel.java +++ b/src/main/java/mp/code/ij/ui/CodeMPToolPanel.java @@ -1,4 +1,4 @@ -package mp.code.intellij.ui; +package mp.code.ij.ui; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.editor.Editor; @@ -13,10 +13,10 @@ import mp.code.BufferController; import mp.code.Workspace; import mp.code.data.TextChange; import mp.code.exceptions.ControllerException; -import mp.code.intellij.CodeMP; -import mp.code.intellij.util.FileUtil; -import mp.code.intellij.util.InteractionUtil; -import mp.code.intellij.util.cb.BufferCallback; +import mp.code.ij.CodeMP; +import mp.code.ij.util.FileUtil; +import mp.code.ij.util.InteractionUtil; +import mp.code.ij.util.cb.BufferCallback; import javax.swing.*; import javax.swing.tree.DefaultMutableTreeNode; diff --git a/src/main/java/mp/code/intellij/ui/CodeMPWindowFactory.java b/src/main/java/mp/code/ij/ui/CodeMPWindowFactory.java similarity index 94% rename from src/main/java/mp/code/intellij/ui/CodeMPWindowFactory.java rename to src/main/java/mp/code/ij/ui/CodeMPWindowFactory.java index 5f746d2..6869724 100644 --- a/src/main/java/mp/code/intellij/ui/CodeMPWindowFactory.java +++ b/src/main/java/mp/code/ij/ui/CodeMPWindowFactory.java @@ -1,4 +1,4 @@ -package mp.code.intellij.ui; +package mp.code.ij.ui; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; @@ -6,7 +6,7 @@ import com.intellij.openapi.wm.ToolWindow; import com.intellij.openapi.wm.ToolWindowFactory; import com.intellij.ui.content.Content; import com.intellij.ui.content.ContentFactory; -import mp.code.intellij.CodeMP; +import mp.code.ij.CodeMP; import org.jetbrains.annotations.NotNull; public class CodeMPWindowFactory implements ToolWindowFactory, DumbAware { diff --git a/src/main/java/mp/code/intellij/ui/SimpleMouseListener.java b/src/main/java/mp/code/ij/ui/SimpleMouseListener.java similarity index 94% rename from src/main/java/mp/code/intellij/ui/SimpleMouseListener.java rename to src/main/java/mp/code/ij/ui/SimpleMouseListener.java index a34fa14..940af06 100644 --- a/src/main/java/mp/code/intellij/ui/SimpleMouseListener.java +++ b/src/main/java/mp/code/ij/ui/SimpleMouseListener.java @@ -1,4 +1,4 @@ -package mp.code.intellij.ui; +package mp.code.ij.ui; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; diff --git a/src/main/java/mp/code/intellij/util/ColorUtil.java b/src/main/java/mp/code/ij/util/ColorUtil.java similarity index 90% rename from src/main/java/mp/code/intellij/util/ColorUtil.java rename to src/main/java/mp/code/ij/util/ColorUtil.java index b5a9d66..47f8d5d 100644 --- a/src/main/java/mp/code/intellij/util/ColorUtil.java +++ b/src/main/java/mp/code/ij/util/ColorUtil.java @@ -1,4 +1,4 @@ -package mp.code.intellij.util; +package mp.code.ij.util; import com.intellij.ui.JBColor; diff --git a/src/main/java/mp/code/intellij/util/FileUtil.java b/src/main/java/mp/code/ij/util/FileUtil.java similarity index 97% rename from src/main/java/mp/code/intellij/util/FileUtil.java rename to src/main/java/mp/code/ij/util/FileUtil.java index 7b391ad..e4b61f0 100644 --- a/src/main/java/mp/code/intellij/util/FileUtil.java +++ b/src/main/java/mp/code/ij/util/FileUtil.java @@ -1,4 +1,4 @@ -package mp.code.intellij.util; +package mp.code.ij.util; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.fileEditor.FileEditor; @@ -12,8 +12,8 @@ import com.intellij.openapi.vfs.VirtualFile; import mp.code.BufferController; import mp.code.exceptions.ConnectionException; import mp.code.exceptions.ControllerException; -import mp.code.intellij.CodeMP; -import mp.code.intellij.vfs.CodeMPPath; +import mp.code.ij.CodeMP; +import mp.code.ij.vfs.CodeMPPath; import java.io.IOException; import java.util.Arrays; diff --git a/src/main/java/mp/code/intellij/util/InteractionUtil.java b/src/main/java/mp/code/ij/util/InteractionUtil.java similarity index 96% rename from src/main/java/mp/code/intellij/util/InteractionUtil.java rename to src/main/java/mp/code/ij/util/InteractionUtil.java index 883f69e..2dc4b8a 100644 --- a/src/main/java/mp/code/intellij/util/InteractionUtil.java +++ b/src/main/java/mp/code/ij/util/InteractionUtil.java @@ -1,4 +1,4 @@ -package mp.code.intellij.util; +package mp.code.ij.util; import com.intellij.credentialStore.Credentials; import com.intellij.notification.Notification; @@ -19,13 +19,13 @@ import mp.code.Client; import mp.code.Workspace; import mp.code.exceptions.ConnectionException; import mp.code.exceptions.ConnectionRemoteException; -import mp.code.intellij.CodeMP; -import mp.code.intellij.listeners.BufferEventListener; -import mp.code.intellij.listeners.CursorEventListener; -import mp.code.intellij.settings.CodeMPSettings; -import mp.code.intellij.ui.CodeMPToolPanel; -import mp.code.intellij.util.cb.CursorCallback; -import mp.code.intellij.util.cb.WorkspaceCallback; +import mp.code.ij.CodeMP; +import mp.code.ij.listeners.BufferEventListener; +import mp.code.ij.listeners.CursorEventListener; +import mp.code.ij.settings.CodeMPSettings; +import mp.code.ij.ui.CodeMPToolPanel; +import mp.code.ij.util.cb.CursorCallback; +import mp.code.ij.util.cb.WorkspaceCallback; import org.apache.commons.lang3.ArrayUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/mp/code/intellij/util/MemoryManager.java b/src/main/java/mp/code/ij/util/MemoryManager.java similarity index 98% rename from src/main/java/mp/code/intellij/util/MemoryManager.java rename to src/main/java/mp/code/ij/util/MemoryManager.java index 6a262d4..bbe775f 100644 --- a/src/main/java/mp/code/intellij/util/MemoryManager.java +++ b/src/main/java/mp/code/ij/util/MemoryManager.java @@ -1,4 +1,4 @@ -package mp.code.intellij.util; +package mp.code.ij.util; import com.intellij.openapi.Disposable; import com.intellij.openapi.util.Disposer; diff --git a/src/main/java/mp/code/intellij/util/cb/BufferCallback.java b/src/main/java/mp/code/ij/util/cb/BufferCallback.java similarity index 96% rename from src/main/java/mp/code/intellij/util/cb/BufferCallback.java rename to src/main/java/mp/code/ij/util/cb/BufferCallback.java index 6efcc92..7cedb97 100644 --- a/src/main/java/mp/code/intellij/util/cb/BufferCallback.java +++ b/src/main/java/mp/code/ij/util/cb/BufferCallback.java @@ -1,4 +1,4 @@ -package mp.code.intellij.util.cb; +package mp.code.ij.util.cb; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.command.CommandProcessor; @@ -9,8 +9,8 @@ import mp.code.BufferController; import mp.code.Extensions; import mp.code.data.BufferUpdate; import mp.code.exceptions.ControllerException; -import mp.code.intellij.CodeMP; -import mp.code.intellij.util.FileUtil; +import mp.code.ij.CodeMP; +import mp.code.ij.util.FileUtil; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/mp/code/intellij/util/cb/CursorCallback.java b/src/main/java/mp/code/ij/util/cb/CursorCallback.java similarity index 94% rename from src/main/java/mp/code/intellij/util/cb/CursorCallback.java rename to src/main/java/mp/code/ij/util/cb/CursorCallback.java index 14ca54a..9e29732 100644 --- a/src/main/java/mp/code/intellij/util/cb/CursorCallback.java +++ b/src/main/java/mp/code/ij/util/cb/CursorCallback.java @@ -1,4 +1,4 @@ -package mp.code.intellij.util.cb; +package mp.code.ij.util.cb; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.editor.Editor; @@ -11,10 +11,10 @@ import lombok.RequiredArgsConstructor; import mp.code.CursorController; import mp.code.data.Cursor; import mp.code.exceptions.ControllerException; -import mp.code.intellij.CodeMP; -import mp.code.intellij.util.ColorUtil; -import mp.code.intellij.util.FileUtil; -import mp.code.intellij.util.InteractionUtil; +import mp.code.ij.CodeMP; +import mp.code.ij.util.ColorUtil; +import mp.code.ij.util.FileUtil; +import mp.code.ij.util.InteractionUtil; import java.awt.*; import java.util.Optional; diff --git a/src/main/java/mp/code/intellij/util/cb/WorkspaceCallback.java b/src/main/java/mp/code/ij/util/cb/WorkspaceCallback.java similarity index 92% rename from src/main/java/mp/code/intellij/util/cb/WorkspaceCallback.java rename to src/main/java/mp/code/ij/util/cb/WorkspaceCallback.java index 966e2ca..2dabaf3 100644 --- a/src/main/java/mp/code/intellij/util/cb/WorkspaceCallback.java +++ b/src/main/java/mp/code/ij/util/cb/WorkspaceCallback.java @@ -1,12 +1,12 @@ -package mp.code.intellij.util.cb; +package mp.code.ij.util.cb; import com.intellij.openapi.editor.markup.RangeHighlighter; import com.intellij.openapi.project.Project; import lombok.RequiredArgsConstructor; import mp.code.Workspace; import mp.code.exceptions.ControllerException; -import mp.code.intellij.CodeMP; -import mp.code.intellij.util.InteractionUtil; +import mp.code.ij.CodeMP; +import mp.code.ij.util.InteractionUtil; import java.util.Optional; import java.util.concurrent.Executor; diff --git a/src/main/java/mp/code/intellij/vfs/CodeMPDirectory.java b/src/main/java/mp/code/ij/vfs/CodeMPDirectory.java similarity index 96% rename from src/main/java/mp/code/intellij/vfs/CodeMPDirectory.java rename to src/main/java/mp/code/ij/vfs/CodeMPDirectory.java index fbe0a61..2628f93 100644 --- a/src/main/java/mp/code/intellij/vfs/CodeMPDirectory.java +++ b/src/main/java/mp/code/ij/vfs/CodeMPDirectory.java @@ -1,7 +1,7 @@ -package mp.code.intellij.vfs; +package mp.code.ij.vfs; import lombok.Getter; -import mp.code.intellij.CodeMP; +import mp.code.ij.CodeMP; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/mp/code/intellij/vfs/CodeMPFile.java b/src/main/java/mp/code/ij/vfs/CodeMPFile.java similarity index 92% rename from src/main/java/mp/code/intellij/vfs/CodeMPFile.java rename to src/main/java/mp/code/ij/vfs/CodeMPFile.java index 74befcd..15a5615 100644 --- a/src/main/java/mp/code/intellij/vfs/CodeMPFile.java +++ b/src/main/java/mp/code/ij/vfs/CodeMPFile.java @@ -1,13 +1,10 @@ -package mp.code.intellij.vfs; +package mp.code.ij.vfs; -import com.intellij.ide.projectView.impl.ProjectTreeStructure; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.openapi.vfs.VirtualFileWithId; import lombok.Getter; import lombok.RequiredArgsConstructor; import mp.code.exceptions.ControllerException; -import mp.code.intellij.CodeMP; -import mp.code.intellij.util.FileUtil; +import mp.code.ij.util.FileUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/mp/code/intellij/vfs/CodeMPFileIndexContributor.java b/src/main/java/mp/code/ij/vfs/CodeMPFileIndexContributor.java similarity index 97% rename from src/main/java/mp/code/intellij/vfs/CodeMPFileIndexContributor.java rename to src/main/java/mp/code/ij/vfs/CodeMPFileIndexContributor.java index 388e1af..b631ae1 100644 --- a/src/main/java/mp/code/intellij/vfs/CodeMPFileIndexContributor.java +++ b/src/main/java/mp/code/ij/vfs/CodeMPFileIndexContributor.java @@ -1,4 +1,4 @@ -package mp.code.intellij.vfs; +package mp.code.ij.vfs; import com.intellij.platform.workspace.jps.entities.ModuleEntity; import com.intellij.platform.workspace.storage.EntityStorage; diff --git a/src/main/java/mp/code/intellij/vfs/CodeMPFileSystem.java b/src/main/java/mp/code/ij/vfs/CodeMPFileSystem.java similarity index 96% rename from src/main/java/mp/code/intellij/vfs/CodeMPFileSystem.java rename to src/main/java/mp/code/ij/vfs/CodeMPFileSystem.java index 1ce184e..8d36327 100644 --- a/src/main/java/mp/code/intellij/vfs/CodeMPFileSystem.java +++ b/src/main/java/mp/code/ij/vfs/CodeMPFileSystem.java @@ -1,4 +1,4 @@ -package mp.code.intellij.vfs; +package mp.code.ij.vfs; import com.google.common.collect.Sets; import com.intellij.credentialStore.Credentials; @@ -10,10 +10,10 @@ import mp.code.data.TextChange; import mp.code.exceptions.ConnectionException; import mp.code.exceptions.ConnectionRemoteException; import mp.code.exceptions.ControllerException; -import mp.code.intellij.CodeMP; -import mp.code.intellij.exceptions.ide.NotConnectedException; -import mp.code.intellij.settings.CodeMPSettings; -import mp.code.intellij.util.FileUtil; +import mp.code.ij.CodeMP; +import mp.code.ij.exceptions.ide.NotConnectedException; +import mp.code.ij.settings.CodeMPSettings; +import mp.code.ij.util.FileUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -22,7 +22,6 @@ import java.io.IOException; import java.nio.file.Path; import java.util.Objects; import java.util.Optional; -import java.util.OptionalLong; import java.util.Set; import java.util.function.BiConsumer; diff --git a/src/main/java/mp/code/intellij/vfs/CodeMPPath.java b/src/main/java/mp/code/ij/vfs/CodeMPPath.java similarity index 99% rename from src/main/java/mp/code/intellij/vfs/CodeMPPath.java rename to src/main/java/mp/code/ij/vfs/CodeMPPath.java index c42e70c..8fe15ff 100644 --- a/src/main/java/mp/code/intellij/vfs/CodeMPPath.java +++ b/src/main/java/mp/code/ij/vfs/CodeMPPath.java @@ -1,4 +1,4 @@ -package mp.code.intellij.vfs; +package mp.code.ij.vfs; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index f4042f2..e254df0 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -1,6 +1,7 @@ - mp.code.intellij + mp.code.ij CodeMP + 0.0.1 CodeMP A plugin for MultiPlayer code editing across different IDEs. @@ -10,30 +11,30 @@ - - + + - - - - - - - - - - @@ -45,19 +46,19 @@ id="codemp_vfs" key="codemp" physical="false" - implementationClass="mp.code.intellij.vfs.CodeMPFileSystem"/> - + implementationClass="mp.code.ij.vfs.CodeMPFileSystem"/> + --> - +