From e0c68747514fcc62512251be8bb8944bbc1d4dd8 Mon Sep 17 00:00:00 2001 From: Alex Dev Sm Date: Tue, 18 Jun 2019 03:33:17 +0300 Subject: [PATCH] =?UTF-8?q?[FIX]=20=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20clear=20=D0=B8=D0=B7=20=D0=BA=D0=BE=D0=BD=D1=81?= =?UTF-8?q?=D0=BE=D0=BB=D0=B8=20=D0=BB=D0=B0=D1=83=D0=BD=D1=87=D0=B5=D1=80?= =?UTF-8?q?=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Launcher/runtime/dialog/dialog.js | 3 +++ .../pro/gravit/utils/command/CommandHandler.java | 2 +- .../gravit/utils/command/StdCommandHandler.java | 15 +++++++++++++-- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/Launcher/runtime/dialog/dialog.js b/Launcher/runtime/dialog/dialog.js index bd9796f2..e7934c4c 100644 --- a/Launcher/runtime/dialog/dialog.js +++ b/Launcher/runtime/dialog/dialog.js @@ -130,6 +130,9 @@ function initConsoleScene() { var appendFunction = function(line) javafx.application.Platform.runLater(function() output.appendText(line)); consoleMenu.lookup("#send").setOnAction(function(){ execCommand(text.getText()); + if (text.getText()=="clear") { + output.setText(""); + } text.setText(""); }); FunctionalBridge.addPlainOutput(function(string) { diff --git a/LauncherCore/src/main/java/pro/gravit/utils/command/CommandHandler.java b/LauncherCore/src/main/java/pro/gravit/utils/command/CommandHandler.java index d52168e2..46bef058 100644 --- a/LauncherCore/src/main/java/pro/gravit/utils/command/CommandHandler.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/command/CommandHandler.java @@ -153,5 +153,5 @@ public List getCategories() { public abstract void bell() throws IOException; - public abstract void clear() throws IOException; + public abstract void clear() throws IOException, InterruptedException; } diff --git a/LauncherCore/src/main/java/pro/gravit/utils/command/StdCommandHandler.java b/LauncherCore/src/main/java/pro/gravit/utils/command/StdCommandHandler.java index c744be50..b32a8890 100644 --- a/LauncherCore/src/main/java/pro/gravit/utils/command/StdCommandHandler.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/command/StdCommandHandler.java @@ -18,8 +18,19 @@ public void bell() { } @Override - public void clear() { - throw new UnsupportedOperationException("clear terminal"); + public void clear() throws IOException, InterruptedException { + //throw new UnsupportedOperationException("clear terminal"); + String os = System.getProperty("os.name"); + + if (os.contains("Windows")) + { + + new ProcessBuilder("cmd", "/c", "cls").inheritIO().start().waitFor(); + } + else + { + Runtime.getRuntime().exec("clear"); + } } @Override