rusefi
/
jSerialComm
mirror of https://github.com/rusefi/jSerialComm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify tmpFile directory parsing

This commit is contained in:
Will Hedgecock 2021-11-03 14:04:01 -05:00
parent fc17fd225a
commit 24e5e14a6d
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/com/fazecast/jSerialComm/SerialPort.java
View File

@ -50,26 +50,24 @@ import java.util.Date;
public final class SerialPort public final class SerialPort
{ {
// Static initializer loads correct native library for this machine // Static initializer loads correct native library for this machine
private static final String versionString = "2.8.0"; static private final String versionString = "2.8.0";
private static final String tmpdirAppIdProperty = "fazecast.jSerialComm.appid"; static private final String tmpdirAppIdProperty = "fazecast.jSerialComm.appid";
private static volatile boolean isAndroid = false; static private volatile boolean isAndroid = false;
private static volatile boolean isUnixBased = false; static private volatile boolean isUnixBased = false;
private static volatile boolean isWindows = false; static private volatile boolean isWindows = false;
static static
{ {
// Determine the temporary file directory for Java and remove any previous versions of this library // Determine the temporary file directory for Java and remove any previous versions of this library
String OS = System.getProperty("os.name").toLowerCase(); String OS = System.getProperty("os.name").toLowerCase();
String libraryPath = "", fileName = ""; String libraryPath = "", fileName = "";
String tempFileDirectory = System.getProperty("java.io.tmpdir"); String tempFileDirectory = System.getProperty("java.io.tmpdir");
if ((tempFileDirectory.charAt(tempFileDirectory.length()-1) != '\\') && (tempFileDirectory.charAt(tempFileDirectory.length()-1) != '/')) if (!tempFileDirectory.endsWith("\\") && !tempFileDirectory.endsWith("/"))
tempFileDirectory += "/"; tempFileDirectory += "/";
// Make sure to use appId to separate tmpdir directories if library is used by multiple modules so they don't erase each others' folders // Make sure to use appId to separate tmpdir directories if library is used by multiple modules so they don't erase each others' folders
String appId = System.getProperty(tmpdirAppIdProperty, ""); tempFileDirectory += "jSerialComm/" + System.getProperty(tmpdirAppIdProperty, "");
tempFileDirectory += "jSerialComm/"; if (!tempFileDirectory.endsWith("\\") && !tempFileDirectory.endsWith("/"))
if (!appId.isEmpty()) { tempFileDirectory += "/";
tempFileDirectory += appId + (!appId.endsWith("/") ? "/" : "");
}
deleteDirectory(new File(tempFileDirectory)); deleteDirectory(new File(tempFileDirectory));
// Determine Operating System and architecture // Determine Operating System and architecture
@ -264,14 +262,14 @@ public final class SerialPort
} }
// Static symbolic link testing function // Static symbolic link testing function
private static boolean isSymbolicLink(File file) throws IOException static private final boolean isSymbolicLink(File file) throws IOException
{ {
File canonicalFile = (file.getParent() == null) ? file : new File(file.getParentFile().getCanonicalFile(), file.getName()); File canonicalFile = (file.getParent() == null) ? file : new File(file.getParentFile().getCanonicalFile(), file.getName());
return !canonicalFile.getCanonicalFile().equals(canonicalFile.getAbsoluteFile()); return !canonicalFile.getCanonicalFile().equals(canonicalFile.getAbsoluteFile());
} }
// Static recursive directory deletion function // Static recursive directory deletion function
private static void deleteDirectory(File path) static private final void deleteDirectory(File path)
{ {
if (path.isDirectory()) if (path.isDirectory())
for (File file : path.listFiles()) for (File file : path.listFiles())
@ -285,14 +283,14 @@ public final class SerialPort
* @return The port description as reported by the device itself. * @return The port description as reported by the device itself.
*/ */
@Override @Override
public String toString() { return getPortDescription(); } public final String toString() { return getPortDescription(); }
/** /**
* Returns the current version of the jSerialComm library. * Returns the current version of the jSerialComm library.
* *
* @return The current library version. * @return The current library version.
*/ */
static public String getVersion() { return versionString; } static public final String getVersion() { return versionString; }
/** /**
* Returns a list of all available serial ports on this machine. * Returns a list of all available serial ports on this machine.
@ -310,7 +308,7 @@ public final class SerialPort
* *
* @return An array of {@link SerialPort} objects. * @return An array of {@link SerialPort} objects.
*/ */
static public native SerialPort[] getCommPorts(); static public final native SerialPort[] getCommPorts();
/** /**
* Allocates a {@link SerialPort} object corresponding to the user-specified port descriptor. * Allocates a {@link SerialPort} object corresponding to the user-specified port descriptor.
@ -322,7 +320,7 @@ public final class SerialPort
* @return A {@link SerialPort} object. * @return A {@link SerialPort} object.
* @throws SerialPortInvalidPortException If a {@link SerialPort} object cannot be created due to a logical or formatting error in the portDescriptor parameter. * @throws SerialPortInvalidPortException If a {@link SerialPort} object cannot be created due to a logical or formatting error in the portDescriptor parameter.
*/ */
static public SerialPort getCommPort(String portDescriptor) throws SerialPortInvalidPortException static public final SerialPort getCommPort(String portDescriptor) throws SerialPortInvalidPortException
{ {
// Correct port descriptor, if needed // Correct port descriptor, if needed
try try