Persistent Command Buffer

src/data/defaults.txt

@@ -26,6 +26,8 @@ global	combatHotkey6
 global	combatHotkey7
 global	combatHotkey8
 global	combatHotkey9
+global	commandBufferGCLI
+global	commandBufferTabbedChat
 global	commandLineNamespace
 global	compactChessboard	false
 global	copyAsHTML	false

src/net/sourceforge/kolmafia/swingui/CommandDisplayFrame.java

@@ -24,7 +24,7 @@
   public CommandDisplayFrame() {
     super("Graphical CLI");
 
-    this.setCenterComponent(new CommandDisplayPanel());
+    this.setCenterComponent(new CommandDisplayPanel("commandBufferGCLI"));
   }
 
   @Override
@@ -42,12 +42,12 @@
     return true;
   }
 
-  public static final boolean hasQueuedCommands() {
+  public static boolean hasQueuedCommands() {
     return !CommandDisplayFrame.commandQueue.isEmpty() || handler.command != null;
   }
 
-  public static final void executeCommand(final String command) {
-    if (command.length() == 0) {
+  public static void executeCommand(final String command) {
+    if (command.isEmpty()) {
       return;
     }
 

src/net/sourceforge/kolmafia/swingui/TabbedChatFrame.java

@@ -17,7 +17,7 @@
     this.setTitle("Loathing Chat");
 
     if (Preferences.getBoolean("addChatCommandLine")) {
-      this.tabs.addTab("[gcli]", new CommandDisplayPanel());
+      this.tabs.addTab("[gcli]", new CommandDisplayPanel("commandBufferTabbedChat"));
     }
 
     this.tabs.addChangeListener(new TabFocusingListener());

src/net/sourceforge/kolmafia/swingui/panel/CommandDisplayPanel.java

@@ -1,9 +1,13 @@
 package net.sourceforge.kolmafia.swingui.panel;
 
+import static net.sourceforge.kolmafia.preferences.Preferences.getString;
+import static net.sourceforge.kolmafia.preferences.Preferences.setString;
+
 import java.awt.BorderLayout;
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
 import java.awt.event.KeyEvent;
+import java.util.Collections;
 import javax.swing.JButton;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
@@ -24,9 +28,14 @@
   private final AutoHighlightTextField entryField;
   private final JButton entryButton;
 
+  private final String preference;
+  private final String DELIMITER = "#";
+
   private int commandIndex = 0;
 
-  public CommandDisplayPanel() {
+  public CommandDisplayPanel(String preference) {
+    this.preference = preference;
+    loadHistoryFromPreference();
     RequestPane outputDisplay = new RequestPane();
     outputDisplay.addHyperlinkListener(new HyperlinkAdapter());
 
@@ -56,6 +65,20 @@
     this.addFocusListener(this);
   }
 
+  private void loadHistoryFromPreference() {
+    String pref = getString(preference);
+    String[] commands = pref.split(DELIMITER);
+    if (!commands[0].trim().isEmpty()) {
+      Collections.addAll(commandHistory, commands);
+      this.commandIndex = commandHistory.size();
+    }
+  }
+
+  private void updatePreference() {
+    String newPref = String.join(DELIMITER, commandHistory);
+    setString(preference, newPref);
+  }
+
   @Override
   public void focusGained(FocusEvent e) {
     this.entryField.requestFocus();
@@ -139,6 +162,7 @@
           && (CommandDisplayPanel.this.commandHistory.isEmpty()
               || !CommandDisplayPanel.this.commandHistory.getLast().equals(command))) {
         CommandDisplayPanel.this.commandHistory.add(command);
+        updatePreference();
       }
 
       CommandDisplayPanel.this.commandIndex = CommandDisplayPanel.this.commandHistory.size();