Add new Format - to use our format schema

Author: mintUI9976

.idea/misc.xml

@@ -5,7 +5,7 @@ plugins {
 }
 
 group 'de.mint.consoleline'
-version '1.0.7-1'
+version '1.0.8'
 
 java {
     toolchain {

build.gradle

@@ -12,7 +12,18 @@
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.concurrent.ScheduledExecutorService;
-public record InputRunnable(LineReader lineReader, LogWriter logWriter, CommandHandler commandHandler, ScheduledExecutorService scheduledExecutorService, String prompt, String commandNotAvailable, String commandArgumentNotAvailable) implements Runnable {
+
+public record InputRunnable(
+    LineReader lineReader,
+    LogWriter logWriter,
+    CommandHandler commandHandler,
+    ScheduledExecutorService scheduledExecutorService,
+    String prompt,
+    String commandNotAvailable,
+    String commandArgumentNotAvailable,
+    String[] commandNotAvailableFormat,
+    String[] commandArgumentNotAvailableFormat)
+    implements Runnable {
 
   @Override
   public void run() {
@@ -25,35 +36,49 @@ public void run() {
         final String[] strings = message.split(" ");
         final String command = strings[0];
         if (!command.isEmpty()) {
-          if (this.commandHandler.getCommands().containsKey(command)){
+          if (this.commandHandler.getCommands().containsKey(command)) {
             final String[] stringsToArray = Arrays.copyOfRange(strings, 1, strings.length);
             if (stringsToArray.length > 0) {
               try {
                 final Class<?> obj = this.commandHandler.getCommands().get(command).getClass();
                 final Method method = obj.getMethod("onCommand", String[].class);
                 method.invoke(obj.newInstance(), (Object) stringsToArray);
               } catch (final InvocationTargetException
-                             | InstantiationException
-                             | NoSuchMethodException
-                             | IllegalAccessException exception) {
+                  | InstantiationException
+                  | NoSuchMethodException
+                  | IllegalAccessException exception) {
                 throw new ConsoleLineException(
-                        "instance creation error - parameter or object error", exception);
+                    "instance creation error - parameter or object error", exception);
               }
             } else {
-              if (this.commandArgumentNotAvailable() != null) {
-                System.out.println(this.commandArgumentNotAvailable());
+
+              if (this.commandArgumentNotAvailableFormat() != null) {
+                String[] formatData = this.commandArgumentNotAvailableFormat();
+                Object[] args = Arrays.copyOfRange(formatData, 1, formatData.length);
+                System.out.println(String.format(formatData[0], args));
+              } else {
+                if (this.commandArgumentNotAvailable() != null) {
+                  System.out.println(this.commandArgumentNotAvailable());
+                }
               }
             }
           } else {
-            if (this.commandNotAvailable() != null){
-              System.out.println(this.commandNotAvailable());
+
+            if (this.commandNotAvailableFormat() != null) {
+              String[] formatData = this.commandNotAvailableFormat();
+              Object[] args = Arrays.copyOfRange(formatData, 1, formatData.length);
+              System.out.println(String.format(formatData[0], args));
+            } else {
+              if (this.commandNotAvailable() != null) {
+                System.out.println(this.commandNotAvailable());
+              }
             }
           }
-          }
         }
-      } catch (final UserInterruptException ignored) {
+      }
+    } catch (final UserInterruptException ignored) {
       Runtime.getRuntime().exit(0);
     } catch (final EndOfFileException ignored) {
     }
-    }
   }
+}

src/main/java/de/mint/consoleline/event/input/InputRunnable.java

@@ -49,6 +49,9 @@ public class JlineExecutor {
 
   private String prompt;
 
+  private String[] commandArgumentNotAvailableFormat;
+  private String[] commandNotAvailableFormat;
+
   private String prefix = null;
 
   private boolean withCommandSystem = true;
@@ -186,7 +189,23 @@ public boolean isJna() {
     return this.jna;
   }
 
-  /**
+    public String[] getCommandArgumentNotAvailableFormat() {
+        return this.commandArgumentNotAvailableFormat;
+    }
+
+    void setCommandArgumentNotAvailableFormat(String[] commandArgumentNotAvailableFormat) {
+        this.commandArgumentNotAvailableFormat = commandArgumentNotAvailableFormat;
+    }
+
+    public String[] getCommandNotAvailableFormat() {
+        return commandNotAvailableFormat;
+    }
+
+    public void setCommandNotAvailableFormat(String[] commandNotAvailableFormat) {
+        this.commandNotAvailableFormat = commandNotAvailableFormat;
+    }
+
+    /**
    * This function sets the value of the jna variable to the value of the jna parameter.
    *
    * @param jna If true, the JNA library will be used to access the native library. If false, the
@@ -453,7 +472,7 @@ private void createInputStream() {
               this.scheduledExecutorService,
               this.prompt,
               this.commandNotAvailable,
-              this.commandArgumentNotAvailable);
+              this.commandArgumentNotAvailable, this.commandNotAvailableFormat, this.commandArgumentNotAvailableFormat);
       this.createInputRunnable();
     }
   }