backup

nietoperz809 · Oct 22, 2023 · 679c150 · 679c150
1 parent 02c9730
commit 679c150
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 38 deletions.
diff --git a/src/guishell/JfTerminalPanel.java b/src/guishell/JfTerminalPanel.java
@@ -11,6 +11,7 @@
 import javax.swing.text.Element;
 import java.awt.*;
 import java.awt.image.BufferedImage;
+import java.util.Objects;
 
 /**
  * @author Administrator
@@ -80,7 +81,7 @@ public BufferedImage getScreenShot() {
     @Override
     public void paste() {
         super.paste();
-        String clip = Utilities.getClipBoardString().trim();
+        String clip = Objects.requireNonNull(Utilities.getClipBoardString()).trim();
         clip = clip.replaceAll("[\\p{C}]", " ");
         lineListener.fakeIn(clip);
     }
@@ -141,7 +142,7 @@ private void runForthLoop() {
         Utilities.executeThread(() -> {
             //noinspection InfiniteLoopStatement
             while (true) {
-                lineListener.getBufferedLine(); / WAIT
+                lineListener.getBufferedLine(); /* WAIT */
 
                 ///
                 String lineData = currentLine(this);
@@ -150,10 +151,10 @@ private void runForthLoop() {
                 boolean ok = _jf.interpretLine(lineData);
                 String txt = _ss.getAndClear();
                 if (ok)
-                    txt = AnsiDefaultOutput + txt;
+                    txt = AnsiDefaultOutput + txt + " OK\n";
                 else
-                    txt = AnsiError + "Error";
-                txt = txt+ "\nJFORTH> ";
+                    txt = AnsiError + " Error\n";
+                txt = txt+ "JFORTH> ";
                 appendANSI(txt);
             }
         });

diff --git a/src/guishell/LineListener.java b/src/guishell/LineListener.java
@@ -1,22 +1,15 @@
 package guishell;
 
-import java.awt.*;
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.stream.Collectors;
 
 public class LineListener implements KeyListener {
-    Robot robot;
+    //Robot robot;
 
     public LineListener() {
         super();
-        try {
-            robot = new Robot();
-        } catch (AWTException e) {
-            robot = null;
-            e.printStackTrace();
-        }
     }
 
     private final ArrayBlockingQueue<String> lineBuffer = new ArrayBlockingQueue<>(128, true);
@@ -50,30 +43,9 @@ public void keyTyped(KeyEvent e) {
             charBuffer.offer(c);  // insert at tail
     }
 
-//    public void writeKeyboard(Robot bot, String st) throws Exception {
-//        String upperCase = st.toUpperCase();
-//
-//        for(int i = 0; i < upperCase.length(); i++) {
-//            String letter = Character.toString(upperCase.charAt(i));
-//            String code = "VK_" + letter;
-//
-//            Field f = KeyEvent.class.getField(code);
-//            int keyEvent = f.getInt(null);
-//
-//            bot.keyPress(keyEvent);
-//            bot.keyRelease(keyEvent);
-//        }
-//    }
 
     @Override
     public void keyPressed(KeyEvent e) {
-//        if (e.getKeyCode() == 35) {
-//            try {
-//                writeKeyboard(robot, lastStr);
-//            } catch (Exception ex) {
-//                ex.printStackTrace();
-//            }
-//        }
     }
 
     @Override

diff --git a/src/tools/BuildInfo.java b/src/tools/BuildInfo.java
@@ -1,8 +1,8 @@
 package tools;
 
 public class BuildInfo {
-    private static final String BUILD_NUMBER = "3717";
-    private static final String BUILD_DATE = "10/21/2023 05:42:18 PM";
+    private static final String BUILD_NUMBER = "3725";
+    private static final String BUILD_DATE = "10/22/2023 03:35:50 AM";
 
     public static final String buildInfo = "JForth, Build: " + BUILD_NUMBER + ", " + BUILD_DATE
             + " -- " + System.getProperty("java.version");

diff --git a/src/tools/build.number b/src/tools/build.number
@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Sat Oct 21 17:42:18 CEST 2023
-build.number=3718
+#Sun Oct 22 03:35:51 CEST 2023
+build.number=3726