hexedtech/codemp
3
0
Fork 0
mirror of https://github.com/hexedtech/codemp.git synced 2024-10-22 17:59:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(java): borked glue methods

Browse source
This commit is contained in:
zaaarf 2024-09-09 16:06:05 +02:00
parent 5218042ca0
commit f6ee2f0806
No known key found for this signature in database
GPG key ID: C91CFF9E2262BBA1
4 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dist/java/build.gradle vendored
View file

@ -52,3 +52,4 @@ tasks.register('cargoBuild', Exec) {
}
build.dependsOn cargoBuild
build.finalizedBy shadowJar

10
dist/java/src/mp/code/Client.java vendored
View file

@ -50,9 +50,9 @@ public class Client {
return leave_workspace(this.ptr, id);
}
private static native Workspace get_workspace(long self);
public Optional<Workspace> getWorkspace() {
return Optional.ofNullable(get_workspace(this.ptr));
private static native Workspace get_workspace(long self, String workspace);
public Optional<Workspace> getWorkspace(String workspace) {
return Optional.ofNullable(get_workspace(this.ptr, workspace));
}
private static native void refresh_native(long self) throws ConnectionRemoteException;
@ -70,8 +70,8 @@ public class Client {
static {
try {
if(System.getProperty("os.name").startsWith("Windows"))
NativeUtils.loadLibraryFromJar("/natives/codemp_intellij.dll");
else NativeUtils.loadLibraryFromJar("/natives/libcodemp_intellij.so");
NativeUtils.loadLibraryFromJar("/natives/codemp.dll");
else NativeUtils.loadLibraryFromJar("/natives/libcodemp.so");
setup_tracing(System.getenv().get("CODEMP_TRACING_LOG"));
} catch(IOException e) {
throw new RuntimeException(e);

2
dist/java/src/mp/code/exceptions/ConnectionRemoteException.java vendored
View file

@ -3,7 +3,7 @@ package mp.code.exceptions;
/**
* An exception returned by the server as a response.
*/
public abstract class ConnectionRemoteException extends Exception {
public abstract class ConnectionRemoteException extends ConnectionException {
protected ConnectionRemoteException(String msg) {
super(msg);
}

5
src/ffi/java/client.rs
View file

@ -204,8 +204,9 @@ pub extern "system" fn Java_mp_code_Client_setup_1tracing<'local>(
super::setup_logger(
true,
Some(path)
.filter(|p| p.is_null())
.map(|p| env.get_string(&p).map(|s| s.into()).jexcept(&mut env))
.filter(|p| !p.is_null())
.map(|p| env.get_string(&p).map(|s| s.into())
.jexcept(&mut env))
);
}