chore(java): aligned signatures to rust side

Author: zaaarf

dist/java/src/mp/code/CursorController.java

@@ -1,7 +1,8 @@
 package mp.code;
 
-import mp.code.proto.Cursor;
-import mp.code.proto.Selection;
+import mp.code.proto.CursorUpdate;
+import mp.code.proto.CursorEvent;
+import mp.code.proto.CursorPosition;
 import mp.code.proto.WorkspaceIdentifier;
 import mp.code.exceptions.ControllerException;
 
@@ -31,43 +32,43 @@ public WorkspaceIdentifier workspaceId() {
 		return workspace_id(this.ptr);
 	}
 
-	private static native Cursor try_recv(long self) throws ControllerException;
+	private static native CursorEvent try_recv(long self) throws ControllerException;
 
 	/**
-	 * Tries to get a {@link Cursor} update from the queue if any were present, null otherwise.
-	 * @return the first cursor update in queue, if any are present
+	 * Tries to get a {@link CursorEvent} from the queue if any were present, null otherwise.
+	 * @return the first cursor event in queue, if any are present
 	 * @throws ControllerException if the controller was stopped
 	 */
-	public Cursor tryRecv() throws ControllerException {
+	public CursorEvent tryRecv() throws ControllerException {
 		return try_recv(this.ptr);
 	}
 
-	private static native Cursor recv(long self) throws ControllerException;
+	private static native CursorUpdate recv(long self) throws ControllerException;
 
 	/**
-	 * Blocks until a {@link Cursor} update is available and returns it.
-	 * @return the cursor update that occurred
+	 * Blocks until a {@link CursorEvent} is available and returns it.
+	 * @return the cursor event that occurred
 	 * @throws ControllerException if the controller was stopped
 	 */
-	public Cursor recv() throws ControllerException {
+	public CursorUpdate recv() throws ControllerException {
 		return recv(this.ptr);
 	}
 
-	private static native void send(long self, Selection selection) throws ControllerException;
+	private static native void send(long self, CursorUpdate selection) throws ControllerException;
 
 	/**
-	 * Tries to send a {@link Selection} update.
-	 * @param selection the update to send
+	 * Tries to send a {@link CursorPosition} update.
+	 * @param update the update to send
 	 * @throws ControllerException if the controller was stopped
 	 */
-	public void send(Selection selection) throws ControllerException {
-		send(this.ptr, selection);
+	public void send(CursorUpdate update) throws ControllerException {
+		send(this.ptr, update);
 	}
 
 	private static native void callback(long self, Consumer<CursorController> cb);
 
 	/**
-	 * Registers a callback to be invoked whenever a {@link Cursor} update occurs.
+	 * Registers a callback to be invoked whenever a {@link CursorUpdate} update occurs.
 	 * This will not work unless a Java thread has been dedicated to the event loop.
 	 * @param cb a {@link Consumer} that receives the controller when the change occurs;
 	 *           you should probably spawn a new thread in here, to avoid deadlocking
@@ -90,7 +91,7 @@ public void clearCallback() {
 	private static native void poll(long self) throws ControllerException;
 
 	/**
-	 * Blocks until a {@link Cursor} update is available.
+	 * Blocks until a {@link CursorUpdate} update is available.
 	 * @throws ControllerException if the controller was stopped
 	 */
 	public void poll() throws ControllerException {

dist/java/src/mp/code/Workspace.java

@@ -1,13 +1,13 @@
 package mp.code;
 
-import java.util.Optional;
 import java.util.function.Consumer;
 
 import mp.code.proto.UserInfo;
 import mp.code.exceptions.ConnectionException;
 import mp.code.exceptions.ConnectionRemoteException;
 import mp.code.exceptions.ControllerException;
 import mp.code.proto.WorkspaceEvent;
+import mp.code.proto.WorkspaceIdentifier;
 
 /**
  * Represents a CodeMP workspace, which broadly speaking is a collection
@@ -25,13 +25,13 @@ public final class Workspace {
 		Extensions.CLEANER.register(this, () -> free(ptr));
 	}
 
-	private static native String id(long self);
+	private static native WorkspaceIdentifier id(long self);
 
 	/**
 	 * Gets the unique identifier of the current workspace.
-	 * @return the identifier
+	 * @return the {@link WorkspaceIdentifier} for this workspace
 	 */
-	public String id() {
+	public WorkspaceIdentifier id() {
 		return id(this.ptr);
 	}
 
@@ -51,10 +51,10 @@ public CursorController cursor() {
 	 * Looks for a {@link BufferController} with the given path within the
 	 * current workspace and returns it if it exists.
 	 * @param path the current path
-	 * @return the {@link BufferController} with the given path, if it exists
+	 * @return the {@link BufferController} with the given path, if it exists, null otherwise
 	 */
-	public Optional<BufferController> getBuffer(String path) {
-		return Optional.ofNullable(get_buffer(this.ptr, path));
+	public BufferController getBuffer(String path) {
+		return get_buffer(this.ptr, path);
 	}
 
 	private static native String[] search_buffers(long self, String filter);

dist/java/src/mp/code/proto/Config.java

@@ -1,6 +1,5 @@
 package mp.code.proto;
 
-import lombok.AccessLevel;
 import lombok.EqualsAndHashCode;
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
@@ -10,7 +9,7 @@
  */
 @ToString
 @EqualsAndHashCode
-@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
+@RequiredArgsConstructor
 public class Config {
 	/** The username to connect with. */
 	public final String username;

dist/java/src/mp/code/proto/CursorEvent.java

@@ -19,5 +19,5 @@ public class CursorEvent {
 	/**
 	 * The cursor position data.
 	 */
-	public final Cursor cursor;
+	public final CursorUpdate position;
 }

dist/java/src/mp/code/proto/CursorPosition.java

@@ -0,0 +1,23 @@
+package mp.code.proto;
+
+import lombok.EqualsAndHashCode;
+import lombok.RequiredArgsConstructor;
+import lombok.ToString;
+
+/**
+ * A data class holding information about a cursor selection.
+ */
+@ToString
+@EqualsAndHashCode
+@RequiredArgsConstructor
+public class CursorPosition {
+	/**
+	 * The start of the cursor's position.
+	 */
+	public final RowCol start;
+
+	/**
+	 * The end of the cursor's position.
+	 */
+	public final RowCol end;
+}

dist/java/src/mp/code/proto/Cursor.java …java/src/mp/code/proto/CursorUpdate.javadist/java/src/mp/code/proto/Cursor.java renamed to dist/java/src/mp/code/proto/CursorUpdate.java dist/java/src/mp/code/proto/Cursor.java renamed to dist/java/src/mp/code/proto/CursorUpdate.java

@@ -10,7 +10,7 @@
 @ToString
 @EqualsAndHashCode
 @RequiredArgsConstructor
-public class Cursor {
+public class CursorUpdate {
 	/**
 	 * The buffer the cursor is on.
 	 */
@@ -19,5 +19,5 @@ public class Cursor {
 	/**
 	 * The associated selection updates.
 	 */
-	public final Selection[] selection;
+	public final CursorPosition[] cursors;
 }

dist/java/src/mp/code/proto/RowCol.java

@@ -0,0 +1,23 @@
+package mp.code.proto;
+
+import lombok.EqualsAndHashCode;
+import lombok.RequiredArgsConstructor;
+import lombok.ToString;
+
+/**
+ * A data class representing a position in a buffer.
+ */
+@ToString
+@EqualsAndHashCode
+@RequiredArgsConstructor
+public class RowCol {
+	/**
+	 * The row. If negative, it is clamped to 0.
+	 */
+	public final int row;
+
+	/**
+	 * The column. If negative, it is clamped to 0.
+	 */
+	public final int col;
+}