Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Java cleanups (#1776)

Browse Source 
* Remove extra ';'s
* Remove unnecessary conversions to String
* Use StandardCharsets object
* Replace infinite while with check for interrupted thread
* Remove redundant local vars
* Remove redundant throws clause
* Remove redundant primitive wrapping
* Fix malformed Nested class test
* Remove unnecessary unboxing
* Remove unnecessary explicit type argument
* Replace lambdas with method references
* Replace statement lambdas with expression lambdas
* Replace null check with method call
* Replace number comparison with method call
* Fix broken javadoc comments
* Replace Arrays.asList with singletonLists
* Remove excessive lambda usage
* Remove redundant string operation
* Remove redundant type casts
* Remove unnecessary returns
* Remove redundant suppressions
* Fix unresolved file reference
* static analysis fixes
This commit is contained in:
Austin Shalit
2019-08-01 01:19:48 -04:00
committed by Peter Johnson
parent 39561751fc
commit df12fc2a86
43 changed files with 129 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wpiutil/src/main/java/edu/wpi/first/wpiutil/RuntimeDetector.java
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2017-2018 FIRST. All Rights Reserved. */
/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */
/* Open Source Software - may be modified and shared by FRC teams. The code */
/* must be accompanied by the FIRST BSD license file in the root directory of */
/* the project. */
@@ -96,8 +96,7 @@ public final class RuntimeDetector {
public static synchronized String getLibraryResource(String libName) {
computePlatform();
String toReturn = filePath + filePrefix + libName + fileExtension;
return toReturn;
return filePath + filePrefix + libName + fileExtension;
}
/**
@@ -106,8 +105,7 @@ public final class RuntimeDetector {
public static synchronized String getHashLibraryResource(String libName) {
computePlatform();
String toReturn = filePath + libName + ".hash";
return toReturn;
return filePath + libName + ".hash";
}
public static boolean isAthena() {

4
wpiutil/src/main/java/edu/wpi/first/wpiutil/RuntimeLoader.java
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2018 FIRST. All Rights Reserved. */
/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */
/* Open Source Software - may be modified and shared by FRC teams. The code */
/* must be accompanied by the FIRST BSD license file in the root directory of */
/* the project. */
@@ -69,7 +69,6 @@ public final class RuntimeLoader<T> {
try {
// First, try loading path
System.loadLibrary(m_libraryName);
return;
} catch (UnsatisfiedLinkError ule) {
// Then load the hash from the resources
String hashName = RuntimeDetector.getHashLibraryResource(m_libraryName);
@@ -115,7 +114,6 @@ public final class RuntimeLoader<T> {
try {
// First, try loading path
System.loadLibrary(m_libraryName);
return;
} catch (UnsatisfiedLinkError ule) {
// Then load the hash from the input file
String resname = RuntimeDetector.getLibraryResource(m_libraryName);