From 825fb49ddfe6b27d2fa858351f45931dd886f21f Mon Sep 17 00:00:00 2001 From: David McKnight Date: Mon, 9 Jul 2007 14:49:25 +0000 Subject: [PATCH] minor shell output performance improvement merged from IBM rse to open rse. --- .../miners/command/CommandMinerThread.java | 14 ++++++++++---- .../universal/miners/command/OutputHandler.java | 2 ++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/command/CommandMinerThread.java b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/command/CommandMinerThread.java index 114f13db3ca..7b72a87de16 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/command/CommandMinerThread.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/command/CommandMinerThread.java @@ -456,6 +456,7 @@ public class CommandMinerThread extends MinerThread public void sendBreak() { + if (!_isWindows) { if (_processTracker != null) @@ -463,6 +464,8 @@ public class CommandMinerThread extends MinerThread _processTracker.killLastest(); } } + + } public void sendInput(String input) @@ -870,6 +873,7 @@ public class CommandMinerThread extends MinerThread public void cleanupThread() { + refreshStatus(); /* if (_isShell) { @@ -994,10 +998,13 @@ public class CommandMinerThread extends MinerThread } } - _dataStore.refresh(_status); - _dataStore.disconnectObjects(_status); } + public void refreshStatus() + { + _dataStore.refresh(_status); + } + public void createPrompt(String line, String fileName) { // prevent duplicate prompts @@ -1222,8 +1229,7 @@ public class CommandMinerThread extends MinerThread } obj.setAttribute(DE.A_SOURCE, obj.getSource() + ':' + line.toString()); } - _dataStore.refresh(_status); - _dataStore.disconnectObjects(_status); + return obj; } else diff --git a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/command/OutputHandler.java b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/command/OutputHandler.java index 864d5ad0418..bd4b9c5eab7 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/command/OutputHandler.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/command/OutputHandler.java @@ -107,6 +107,8 @@ public class OutputHandler extends Handler } if (!_isTerminal) doPrompt(); + + _commandThread.refreshStatus(); } else {