Revert "Trying to adhere to java 14 rules"

This reverts commit 008af61.

Author: guFalcon

src/info/unterrainer/java/tools/scripting/bulkmakemkv/filevisitors/package-info.java

@@ -1,5 +1,6 @@
 /**
- * This package contains FileVisitors.
+ * This package contains {@link FileVisitor}s.
  */
 @javax.annotation.ParametersAreNonnullByDefault
 package info.unterrainer.java.tools.scripting.bulkmakemkv.filevisitors;
+

src/info/unterrainer/java/tools/scripting/bulkmakemkv/syscommandexecutor/SysCommandExecutor.java

@@ -19,6 +19,8 @@
  ***************************************************************************/
 package info.unterrainer.java.tools.scripting.bulkmakemkv.syscommandexecutor;
 
+import info.unterrainer.java.tools.utils.NullUtils;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -28,13 +30,13 @@
 
 import javax.annotation.Nullable;
 
-import org.apache.commons.lang.StringUtils;
-
-import info.unterrainer.java.tools.utils.NullUtils;
 import lombok.experimental.ExtensionMethod;
 
+import org.apache.commons.lang.StringUtils;
+
 /**
- * Usage of following class can go as ... <br>
+ * Usage of following class can go as ...
+ * <P>
  *
  * <PRE>
  * <CODE>
@@ -45,7 +47,9 @@
  * </CODE>
  * </PRE>
  *
- * OR <br>
+ * </P>
+ * OR
+ * <P>
  *
  * <PRE>
  * <CODE>
@@ -56,6 +60,8 @@
  *	String cmdOutput = cmdExecutor.getCommandOutput();
  * </CODE>
  * </PRE>
+ *
+ * </P>
  */
 
 @ExtensionMethod({ NullUtils.class })
@@ -78,44 +84,47 @@ public class SysCommandExecutor {
 @Nullable
 private AsyncStreamReader fCmdErrorThread;
 
-public SysCommandExecutor(@Nullable final LogDevice fOuputLogDevice, @Nullable final LogDevice fErrorLogDevice) {
+public SysCommandExecutor(@Nullable LogDevice fOuputLogDevice, @Nullable LogDevice fErrorLogDevice) {
 super();
 this.fOuputLogDevice = fOuputLogDevice;
 this.fErrorLogDevice = fErrorLogDevice;
 }
 
-public void setOutputLogDevice(final LogDevice logDevice) {
+public void setOutputLogDevice(LogDevice logDevice) {
 fOuputLogDevice = logDevice;
 }
 
-public void setErrorLogDevice(final LogDevice logDevice) {
+public void setErrorLogDevice(LogDevice logDevice) {
 fErrorLogDevice = logDevice;
 }
 
-public void setWorkingDirectory(final String workingDirectory) {
+public void setWorkingDirectory(String workingDirectory) {
 fWorkingDirectory = workingDirectory;
 }
 
-public void setEnvironmentVar(final String name, final String value) {
-if (fEnvironmentVarList == null)
-fEnvironmentVarList = new ArrayList<>();
+public void setEnvironmentVar(String name, String value) {
+if (fEnvironmentVarList == null) {
+fEnvironmentVarList = new ArrayList<EnvironmentVar>();
+}
 
 fEnvironmentVarList.noNull().add(new EnvironmentVar(name, value));
 }
 
 public String getCommandOutput() {
-if (fCmdOutput == null)
+if (fCmdOutput == null) {
 return StringUtils.EMPTY;
+}
 return fCmdOutput.noNull().toString();
 }
 
 public String getCommandError() {
-if (fCmdError == null)
+if (fCmdError == null) {
 return StringUtils.EMPTY;
+}
 return fCmdError.noNull().toString();
 }
 
-public int runCommand(final String commandLine) throws Exception {
+public int runCommand(String commandLine) throws Exception {
 /* run command */
 Process process = runCommandHelper(commandLine);
 
@@ -138,17 +147,18 @@ public int runCommand(final String commandLine) throws Exception {
 return exitStatus;
 }
 
-private Process runCommandHelper(final String commandLine) throws IOException {
+private Process runCommandHelper(String commandLine) throws IOException {
 Process process = null;
-if (fWorkingDirectory == null)
+if (fWorkingDirectory == null) {
 process = Runtime.getRuntime().exec(commandLine, getEnvTokens());
-else
+} else {
 process = Runtime.getRuntime().exec(commandLine, getEnvTokens(), new File(fWorkingDirectory));
+}
 
 return process;
 }
 
-private void startOutputAndErrorReadThreads(final InputStream processOut, final InputStream processErr) {
+private void startOutputAndErrorReadThreads(InputStream processOut, InputStream processErr) {
 fCmdOutput = new StringBuffer();
 fCmdOutputThread = new AsyncStreamReader(processOut, fCmdOutput.noNull(), fOuputLogDevice, "OUTPUT");
 fCmdOutputThread.start();
@@ -165,8 +175,9 @@ private void notifyOutputAndErrorReadThreadsToStopReading() {
 
 @Nullable
 private String[] getEnvTokens() {
-if (fEnvironmentVarList == null)
+if (fEnvironmentVarList == null) {
 return new String[0];
+}
 
 String[] envTokenArray = new String[fEnvironmentVarList.noNull().size()];
 Iterator<EnvironmentVar> envVarIter = fEnvironmentVarList.noNull().iterator();