From fc8f7b7162a88ae183093095ab597636fdbe12cb Mon Sep 17 00:00:00 2001
From: Mark Winter <mwinter@drexel.edu>
Date: Mon, 4 Oct 2021 11:30:43 +0200
Subject: [PATCH] Fixed warnings and MATLAB launch issue
---
.../plugin-ij/src/main/java/net/leverjs/LeverscIJ.java | 7 ++++---
.../plugin-ij/src/main/java/net/leverjs/PlatformInfo.java | 1 -
.../plugin-ij/src/main/java/net/leverjs/PluginHelper.java | 4 ++--
src/MATLAB/@leversc/show.m | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/ImageJ/plugin-ij/src/main/java/net/leverjs/LeverscIJ.java b/src/ImageJ/plugin-ij/src/main/java/net/leverjs/LeverscIJ.java
index bae27ec..d7499f7 100644
--- a/src/ImageJ/plugin-ij/src/main/java/net/leverjs/LeverscIJ.java
+++ b/src/ImageJ/plugin-ij/src/main/java/net/leverjs/LeverscIJ.java
@@ -68,7 +68,7 @@ public class LeverscIJ implements PlugInFilter
public int setup(String arg, ImagePlus imp)
{
- // TODO - Try default install folders (e.g. LOCALAPPDADAT/leversc)
+ // TODO - Try default install folders (e.g. LOCALAPPDATA/leversc)
leverscExec = null;
image = imp;
@@ -132,8 +132,9 @@ public class LeverscIJ implements PlugInFilter
dos.write(_crlf);
dos.close();
- int resp = conn.getResponseCode();
- // IJ.log(String.format("Got leversc resp: %d", resp));
+ // TODO: We don't curently do anything with this response code, but it's important to retrieve it for proper data transmission
+ int status = conn.getResponseCode();
+ // IJ.log(String.format("LEVERSC response: %d", status));
conn.disconnect();
}
diff --git a/src/ImageJ/plugin-ij/src/main/java/net/leverjs/PlatformInfo.java b/src/ImageJ/plugin-ij/src/main/java/net/leverjs/PlatformInfo.java
index e5a4b7b..766525d 100644
--- a/src/ImageJ/plugin-ij/src/main/java/net/leverjs/PlatformInfo.java
+++ b/src/ImageJ/plugin-ij/src/main/java/net/leverjs/PlatformInfo.java
@@ -1,6 +1,5 @@
package net.leverjs;
-import java.nio.file.Path;
import java.nio.file.Paths;
public class PlatformInfo
diff --git a/src/ImageJ/plugin-ij/src/main/java/net/leverjs/PluginHelper.java b/src/ImageJ/plugin-ij/src/main/java/net/leverjs/PluginHelper.java
index 7dadc7f..8e6bc8d 100644
--- a/src/ImageJ/plugin-ij/src/main/java/net/leverjs/PluginHelper.java
+++ b/src/ImageJ/plugin-ij/src/main/java/net/leverjs/PluginHelper.java
@@ -14,13 +14,13 @@ import ij.IJ;
public class PluginHelper
{
- public static Path getJarPath(Class inClass) throws URISyntaxException
+ public static Path getJarPath(Class<?> inClass) throws URISyntaxException
{
URL jarUrl = inClass.getProtectionDomain().getCodeSource().getLocation();
return Paths.get(jarUrl.toURI());
}
- public static String getResourceProperty(Class inClass, String resourcePath, String propertyName)
+ public static String getResourceProperty(Class<?> inClass, String resourcePath, String propertyName)
{
try
{
diff --git a/src/MATLAB/@leversc/show.m b/src/MATLAB/@leversc/show.m
index bbd507d..e6a01af 100644
--- a/src/MATLAB/@leversc/show.m
+++ b/src/MATLAB/@leversc/show.m
@@ -125,7 +125,7 @@ end
function launch_electron_windows(port,fignum,workdir, leverpath, strDB)
elec_cmd = 'leverjs.exe';
if ( ~isempty(leverpath) )
- elec_path = fullfile(leverpath,'node_modules','electron','dist','electron.exe');
+ elec_path = fullfile(leverpath,'node_modules','.bin','electron.cmd');
elec_cmd = [elec_path ' ' fullfile(leverpath,'elever','main.js')];
else
[status,~] = system(['where ' elec_cmd]);
--
GitLab