[yocto] [Upstream org.eclipse.tm] Add getReader method in IHostShell

[Ioana Grigoropol]

- added method in IHostShell to be implemented in TerminalHostShell
- this method is already implemented in LocalHostShell upstream

Signed-off-by: Ioana Grigoropol <ioanax.grigoropol at intel.com>
---
 .../services/dstore/shells/DStoreHostShell.java    |    7 +++++++
 .../services/shells/TerminalServiceHostShell.java  |   19 +++++++++++--------
 .../eclipse/rse/services/shells/IHostShell.java    |    3 +++
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shells/DStoreHostShell.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shells/DStoreHostShell.java
index 06763d3..5094cd1 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shells/DStoreHostShell.java
+++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shells/DStoreHostShell.java
@@ -18,6 +18,8 @@
 
 package org.eclipse.rse.internal.services.dstore.shells;
 
+import java.io.BufferedReader;
+
 import org.eclipse.dstore.core.model.DE;
 import org.eclipse.dstore.core.model.DataElement;
 import org.eclipse.dstore.core.model.DataStore;
@@ -92,5 +94,10 @@ public class DStoreHostShell extends AbstractHostShell implements IHostShell
 		
 	}
 
+	public BufferedReader getReader(boolean isErrorReader) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
 	
 }
diff --git a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/internal/services/shells/TerminalServiceHostShell.java b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/internal/services/shells/TerminalServiceHostShell.java
index 2a461ad..9a8e890 100644
--- a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/internal/services/shells/TerminalServiceHostShell.java
+++ b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/internal/services/shells/TerminalServiceHostShell.java
@@ -47,7 +47,7 @@ public class TerminalServiceHostShell extends AbstractHostShell {
 	public static final String SHELL_INVOCATION = ">"; //$NON-NLS-1$
 
 	ITerminalShell fTerminalShell;
-	
+	BufferedReader fBufReader;
 	private TerminalServiceShellOutputReader fStdoutHandler;
 	
 	private TerminalServiceShellOutputReader fStderrHandler;
@@ -60,21 +60,21 @@ public class TerminalServiceHostShell extends AbstractHostShell {
 		try {
 			fTerminalShell = terminalShell;
 			String encoding = fTerminalShell.getDefaultEncoding();
-			BufferedReader bufReader;
+
 			if (encoding != null) {
-				bufReader = new BufferedReader(new InputStreamReader(fTerminalShell
+				fBufReader = new BufferedReader(new InputStreamReader(fTerminalShell
 						.getInputStream(), encoding)); 
 			} else {
-				bufReader = new BufferedReader(new InputStreamReader(fTerminalShell
+				fBufReader = new BufferedReader(new InputStreamReader(fTerminalShell
 								.getInputStream()));
 			}
 			//bug 356132: wait for initial output before sending any command
 			//FIXME this should likely move into the TerminalServiceShellWriterThread, so wait can be canceled
-			bufReader.mark(1);
-			bufReader.read();
-			bufReader.reset();
+			fBufReader.mark(1);
+			fBufReader.read();
+			fBufReader.reset();
 			
-			fStdoutHandler = new TerminalServiceShellOutputReader(this, bufReader, false);
+			fStdoutHandler = new TerminalServiceShellOutputReader(this, fBufReader, false);
 			fStderrHandler = new TerminalServiceShellOutputReader(this, null, true);
 			OutputStream outputStream = fTerminalShell.getOutputStream();
 			if (encoding != null) {
@@ -170,4 +170,7 @@ public class TerminalServiceHostShell extends AbstractHostShell {
 		return "echo $PWD'>'"; //$NON-NLS-1$
 	}
 
+	public BufferedReader getReader(boolean isErrorReader) {
+		return fBufReader;
+	}
 }
diff --git a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/shells/IHostShell.java b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/shells/IHostShell.java
index 8139cfc..e7fd70b 100644
--- a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/shells/IHostShell.java
+++ b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/shells/IHostShell.java
@@ -16,6 +16,8 @@
 
 package org.eclipse.rse.services.shells;
 
+import java.io.BufferedReader;
+
 
 public interface IHostShell 
 {
@@ -29,4 +31,5 @@ public interface IHostShell
 	
 	public void exit();
 	
+	public BufferedReader getReader(boolean isErrorReader);
 }
\ No newline at end of file
-- 
1.7.9.5