Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 95116 Details for
Bug 170910
[api][nls] Prepare RSE Service API For Terminal Integrations
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
[patch]
patch for existing rse plugins with fixed APIs
terminalViewIntegration.diff (text/plain), 29.39 KB, created by
Anna Dushistova
on 2008-04-07 16:39:22 EDT
(
hide
)
Description:
patch for existing rse plugins with fixed APIs
Filename:
MIME Type:
Creator:
Anna Dushistova
Created:
2008-04-07 16:39:22 EDT
Size:
29.39 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.rse.subsystems.processes.shell.linux >Index: src/org/eclipse/rse/internal/subsystems/processes/shell/linux/LinuxShellProcessService.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.shell.linux/src/org/eclipse/rse/internal/subsystems/processes/shell/linux/LinuxShellProcessService.java,v >retrieving revision 1.3 >diff -u -r1.3 LinuxShellProcessService.java >--- src/org/eclipse/rse/internal/subsystems/processes/shell/linux/LinuxShellProcessService.java 24 Jul 2007 16:11:22 -0000 1.3 >+++ src/org/eclipse/rse/internal/subsystems/processes/shell/linux/LinuxShellProcessService.java 7 Apr 2008 20:36:11 -0000 >@@ -10,6 +10,7 @@ > * Martin Oberhuber (Wind River) - [refactor] "shell" instead of "ssh" everywhere > * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API > * David McKnight (IBM) - [175308] Need to use a job to wait for shell to exit >+ * Anna Dushistova (MontaVista) - Add ptyType argument to launchShell and runCommand methods > *******************************************************************************/ > > package org.eclipse.rse.internal.subsystems.processes.shell.linux; >@@ -77,7 +78,7 @@ > signalString = "-" + signal; //$NON-NLS-1$ > IShellService shellService = Activator.getShellService(host); > IHostShell hostShell = shellService.launchShell( >- "", null, new NullProgressMonitor()); //$NON-NLS-1$ >+ "", null, null, new NullProgressMonitor()); //$NON-NLS-1$ > hostShell.writeToShell(getKillCommand(PID, signalString)); > Process p = null; > try { >@@ -119,7 +120,7 @@ > } > IShellService shellService = Activator.getShellService(host); > IHostShell hostShell = shellService.launchShell( >- "", null, new NullProgressMonitor()); //$NON-NLS-1$ >+ "", null, null, new NullProgressMonitor()); //$NON-NLS-1$ > hostShell.writeToShell(getProcessesCommand()); > Process p = null; > try { >@@ -214,7 +215,7 @@ > protected String[] internalGetSignalTypes() { > IShellService shellService = Activator.getShellService(host); > IHostShell hostShell = shellService.launchShell( >- "", null, new NullProgressMonitor()); //$NON-NLS-1$ >+ "", null, null, new NullProgressMonitor()); //$NON-NLS-1$ > hostShell.writeToShell(getSignalTypesCommand()); > Process p = null; > try { >Index: src/org/eclipse/rse/internal/subsystems/processes/shell/linux/LinuxProcessHelper.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.shell.linux/src/org/eclipse/rse/internal/subsystems/processes/shell/linux/LinuxProcessHelper.java,v >retrieving revision 1.5 >diff -u -r1.5 LinuxProcessHelper.java >--- src/org/eclipse/rse/internal/subsystems/processes/shell/linux/LinuxProcessHelper.java 24 Jul 2007 16:11:22 -0000 1.5 >+++ src/org/eclipse/rse/internal/subsystems/processes/shell/linux/LinuxProcessHelper.java 7 Apr 2008 20:36:11 -0000 >@@ -15,6 +15,7 @@ > * Martin Oberhuber (Wind River) - [refactor] "shell" instead of "ssh" everywhere > * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API > * David McKnight (IBM) - [175308] Need to use a job to wait for shell to exit >+ * Anna Dushistova (MontaVista) - Add ptyType argument to launchShell and runCommand methods > *******************************************************************************/ > > package org.eclipse.rse.internal.subsystems.processes.shell.linux; >@@ -93,7 +94,7 @@ > > IShellService shellService = Activator.getShellService(host); > IHostShell hostShell = shellService.launchShell( >- "", null, new NullProgressMonitor()); //$NON-NLS-1$ >+ "", null, null, new NullProgressMonitor()); //$NON-NLS-1$ > hostShell.writeToShell(getUserNameCommand()); > Process p = null; > try { >#P org.eclipse.rse.services.ssh >Index: src/org/eclipse/rse/internal/services/ssh/shell/SshShellService.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/shell/SshShellService.java,v >retrieving revision 1.3 >diff -u -r1.3 SshShellService.java >--- src/org/eclipse/rse/internal/services/ssh/shell/SshShellService.java 10 May 2007 14:11:31 -0000 1.3 >+++ src/org/eclipse/rse/internal/services/ssh/shell/SshShellService.java 7 Apr 2008 20:36:13 -0000 >@@ -14,6 +14,7 @@ > * Contributors: > * Martin Oberhuber (Wind River) - Adapted from LocalShellService. > * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API >+ * Anna Dushistova (MontaVista) - Add ptyType argument to launchShell methods > *******************************************************************************/ > > package org.eclipse.rse.internal.services.ssh.shell; >@@ -41,15 +42,16 @@ > > //TODO abstract base class should handle default encodings > public IHostShell launchShell(String initialWorkingDirectory, >- String[] environment, IProgressMonitor monitor) { >+ String[] environment, String ptyType, IProgressMonitor monitor) { > String defaultEncoding = System.getProperty("file.encoding"); //$NON-NLS-1$ >- return launchShell(initialWorkingDirectory, defaultEncoding, environment, monitor); >+ return launchShell(initialWorkingDirectory, defaultEncoding, environment, ptyType, monitor); > } > > public IHostShell launchShell(String initialWorkingDirectory, >- String encoding, String[] environment, >+ String encoding, String[] environment,String ptyType, > IProgressMonitor monitor) { >- SshHostShell hostShell = new SshHostShell(fSessionProvider, initialWorkingDirectory, SshHostShell.SHELL_INVOCATION, encoding, environment); >+ SshHostShell hostShell = new SshHostShell(fSessionProvider, initialWorkingDirectory, >+ SshHostShell.SHELL_INVOCATION, encoding, environment, ptyType); > return hostShell; > } > >@@ -60,10 +62,9 @@ > return runCommand(initialWorkingDirectory, command, defaultEncoding, environment, monitor); > } > >- public IHostShell runCommand(String initialWorkingDirectory, >- String command, String encoding, String[] environment, >+ public IHostShell runCommand(String initialWorkingDirectory, String command, String encoding, String[] environment, > IProgressMonitor monitor) { >- SshHostShell hostShell = new SshHostShell(fSessionProvider, initialWorkingDirectory, command, encoding, environment); >+ SshHostShell hostShell = new SshHostShell(fSessionProvider, initialWorkingDirectory, command, encoding, environment,null); > return hostShell; > } > >Index: src/org/eclipse/rse/internal/services/ssh/shell/SshHostShell.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/shell/SshHostShell.java,v >retrieving revision 1.7 >diff -u -r1.7 SshHostShell.java >--- src/org/eclipse/rse/internal/services/ssh/shell/SshHostShell.java 7 Nov 2007 15:42:00 -0000 1.7 >+++ src/org/eclipse/rse/internal/services/ssh/shell/SshHostShell.java 7 Apr 2008 20:36:12 -0000 >@@ -16,11 +16,14 @@ > * David McKnight (IBM) - [191599] Use the remote encoding specified in the host property page > * David McKnight (IBM) - [196301] Check that the remote encoding isn't null before using it > * Martin Oberhuber (Wind River) - [204744] Honor encoding in SSH command input field >+ * Anna Dushistova (MontaVista) - [170910] Integrate the TM Terminal View with RSE > *******************************************************************************/ > > package org.eclipse.rse.internal.services.ssh.shell; > > import java.io.BufferedReader; >+import java.io.IOException; >+import java.io.InputStream; > import java.io.InputStreamReader; > import java.io.OutputStream; > import java.io.OutputStreamWriter; >@@ -53,12 +56,16 @@ > private SshShellOutputReader fStdoutHandler; > private SshShellOutputReader fStderrHandler; > private SshShellWriterThread fShellWriter; >+ private int fWidth; >+ private int fHeight; > >- public SshHostShell(ISshSessionProvider sessionProvider, String initialWorkingDirectory, String commandToRun, String encoding, String[] environment) { >+ public SshHostShell(ISshSessionProvider sessionProvider, String initialWorkingDirectory, String commandToRun, String encoding, String[] environment, String ptyType) { > try { > fSessionProvider = sessionProvider; > fChannel = fSessionProvider.getSession().openChannel("shell"); //$NON-NLS-1$ >- >+ if(ptyType!=null && !ptyType.trim().equals("")){ >+ ((ChannelShell) fChannel).setPtyType(ptyType); >+ } > ////disable pty mode. This works in jsch-0.1.25 and later only. > ////By default, jsch always creates a vt100 connection sized > ////80x24 / 640x480 (dimensions can be changed). >@@ -198,5 +205,26 @@ > fChannel.disconnect(); > } > } >+ >+ public InputStream getInputStream() throws IOException { >+ return fChannel.getInputStream(); >+ } >+ >+ public OutputStream getOutputStream() throws IOException { >+ return fChannel.getOutputStream(); >+ } > >+ public void setTerminalSize(int newWidth, int newHeight) { >+ super.setTerminalSize(newWidth, newHeight); >+ if (fChannel != null && fChannel instanceof ChannelShell >+ && (newWidth != fWidth || newHeight != fHeight)) { >+ // avoid excessive communications due to change size requests by >+ // caching previous size >+ ChannelShell channelShell = (ChannelShell) fChannel; >+ channelShell.setPtySize(newWidth, newHeight, 8 * newWidth, >+ 8 * newHeight); >+ fWidth = newWidth; >+ fHeight = newHeight; >+ } >+ } > } >#P org.eclipse.rse.subsystems.shells.core >Index: src/org/eclipse/rse/subsystems/shells/core/subsystems/servicesubsystem/ShellServiceSubSystem.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/servicesubsystem/ShellServiceSubSystem.java,v >retrieving revision 1.21 >diff -u -r1.21 ShellServiceSubSystem.java >--- src/org/eclipse/rse/subsystems/shells/core/subsystems/servicesubsystem/ShellServiceSubSystem.java 27 Feb 2008 14:32:49 -0000 1.21 >+++ src/org/eclipse/rse/subsystems/shells/core/subsystems/servicesubsystem/ShellServiceSubSystem.java 7 Apr 2008 20:36:14 -0000 >@@ -18,6 +18,7 @@ > * David Dykstal (IBM) - [197036] refactored switch configuration > * David Dykstal (IBM) - [217556] remove service subsystem types > * David McKnight (IBM) - [220524] internalSwitchServiceSubSystemConfiguration -> internalSwitchSubSystemConfiguration >+ * Anna Dushistova (MontaVista) - Add ptyType argument to launchShell methods > ********************************************************************************/ > > package org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem; >@@ -146,7 +147,7 @@ > > IShellService service = getShellService(); > String encoding = getHost().getDefaultEncoding(true); >- IHostShell hostShell = service.launchShell(cwd, encoding, getUserAndHostEnvVarsAsStringArray(), monitor); >+ IHostShell hostShell = service.launchShell(cwd, encoding, getUserAndHostEnvVarsAsStringArray(), null, monitor); > IServiceCommandShell cmdShell = createRemoteCommandShell(this, hostShell); > if (cmdShell != null) > { >#P org.eclipse.rse.examples.tutorial >Index: src/samples/ui/actions/ShowJarContents.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/examples/org.eclipse.rse.examples.tutorial/src/samples/ui/actions/ShowJarContents.java,v >retrieving revision 1.10 >diff -u -r1.10 ShowJarContents.java >--- src/samples/ui/actions/ShowJarContents.java 27 Jun 2007 01:52:12 -0000 1.10 >+++ src/samples/ui/actions/ShowJarContents.java 7 Apr 2008 20:36:15 -0000 >@@ -13,6 +13,7 @@ > * Contributors: > * Martin Oberhuber (Wind River) - Adapted original tutorial code to Open RSE. > * David Dykstal (IBM) - formatting for tutorial >+ * Anna Dushistova (MontaVista) - Add ptyType argument to launchShell methods > ********************************************************************************/ > > package samples.ui.actions; >@@ -131,7 +132,7 @@ > environment[0] = "AAA=BBB"; //$NON-NLS-1$ > String initialWorkingDirectory = "."; //$NON-NLS-1$ > >- IHostShell hostShell = shellService.launchShell(initialWorkingDirectory, environment, new NullProgressMonitor()); >+ IHostShell hostShell = shellService.launchShell(initialWorkingDirectory, environment, null, new NullProgressMonitor()); > hostShell.addOutputListener(new StdOutOutputListener()); > //hostShell.writeToShell("pwd"); //$NON-NLS-1$ > //hostShell.writeToShell("echo ${AAA}"); //$NON-NLS-1$ >#P org.eclipse.rse.services >Index: src/org/eclipse/rse/services/shells/AbstractHostShell.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/shells/AbstractHostShell.java,v >retrieving revision 1.1 >diff -u -r1.1 AbstractHostShell.java >--- src/org/eclipse/rse/services/shells/AbstractHostShell.java 10 Apr 2006 20:39:10 -0000 1.1 >+++ src/org/eclipse/rse/services/shells/AbstractHostShell.java 7 Apr 2008 20:36:16 -0000 >@@ -12,10 +12,16 @@ > * > * Contributors: > * {Name} (company) - description of contribution. >+ * Anna Dushistova (MontaVista) - [170910] Integrate the TM Terminal View with RSE >+ * Eugeniy Melekhov (MontaVista) - [170910] Integrate the TM Terminal View with RSE > ********************************************************************************/ > > package org.eclipse.rse.services.shells; > >+import java.io.IOException; >+import java.io.InputStream; >+import java.io.OutputStream; >+ > > public abstract class AbstractHostShell implements IHostShell > { >@@ -34,4 +40,20 @@ > } > } > >+ public InputStream getInputStream() throws IOException { >+ return null; >+ } >+ >+ public OutputStream getOutputStream() throws IOException { >+ return null; >+ } >+ >+ public boolean isLocalEcho() { >+ return false; >+ } >+ >+ public void setTerminalSize(int newWidth, int newHeight) { >+ >+ } >+ > } >\ No newline at end of file >Index: src/org/eclipse/rse/services/shells/IHostShell.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/shells/IHostShell.java,v >retrieving revision 1.1 >diff -u -r1.1 IHostShell.java >--- src/org/eclipse/rse/services/shells/IHostShell.java 10 Apr 2006 20:39:10 -0000 1.1 >+++ src/org/eclipse/rse/services/shells/IHostShell.java 7 Apr 2008 20:36:16 -0000 >@@ -12,16 +12,38 @@ > * > * Contributors: > * {Name} (company) - description of contribution. >+ * Anna Dushistova (MontaVista) - [170910] Integrate the TM Terminal View with RSE >+ * Eugeniy Melekhov (MontaVista) - [170910] Integrate the TM Terminal View with RSE > ********************************************************************************/ > > package org.eclipse.rse.services.shells; > >+import java.io.IOException; >+import java.io.InputStream; >+import java.io.OutputStream; >+ > > public interface IHostShell > { > public boolean isActive(); > public void writeToShell(String command); > >+ /** >+ * @return remote-to-local stream for the current shell or >+ * <code>null</code> if streams are not supported. >+ * @throws IOException >+ * @since org.eclipse.rse.services 3.0 >+ */ >+ public InputStream getInputStream() throws IOException; >+ >+ /** >+ * @return local-to-remote stream for the current shell or >+ * <code>null</code> if streams are not supported. >+ * @throws IOException >+ * @since org.eclipse.rse.services 3.0 >+ */ >+ public OutputStream getOutputStream() throws IOException; >+ > public void addOutputListener(IHostShellOutputListener listener); > > public IHostShellOutputReader getStandardOutputReader(); >@@ -29,4 +51,17 @@ > > public void exit(); > >+ /** >+ * @return true if a local echo is needed. >+ * @since org.eclipse.rse.services 3.0 >+ */ >+ boolean isLocalEcho(); >+ >+ /** >+ * Notify the remote site that the size of the terminal has changed. >+ * @param newWidth >+ * @param newHeight >+ * @since org.eclipse.rse.services 3.0 >+ */ >+ void setTerminalSize(int newWidth, int newHeight); > } >\ No newline at end of file >Index: src/org/eclipse/rse/services/shells/IShellService.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/shells/IShellService.java,v >retrieving revision 1.3 >diff -u -r1.3 IShellService.java >--- src/org/eclipse/rse/services/shells/IShellService.java 10 May 2007 14:10:20 -0000 1.3 >+++ src/org/eclipse/rse/services/shells/IShellService.java 7 Apr 2008 20:36:16 -0000 >@@ -12,6 +12,7 @@ > * > * Contributors: > * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API >+ * Anna Dushistova (MontaVista) - add ptyType parameter to the API creating new IHostShell > ********************************************************************************/ > > package org.eclipse.rse.services.shells; >@@ -30,20 +31,22 @@ > * Launch a new shell in the specified directory > * @param initialWorkingDirectory > * @param environment Array of environment variable Strings of the form "var=text" >+ * @param ptyType pty type for returned shell > * @param monitor > * @return the shell object > */ >- public IHostShell launchShell(String initialWorkingDirectory, String[] environment, IProgressMonitor monitor); >+ public IHostShell launchShell(String initialWorkingDirectory, String[] environment,String ptyType, IProgressMonitor monitor); > > /** > * Launch a new shell in the specified directory > * @param initialWorkingDirectory > * @param encoding > * @param environment Array of environment variable Strings of the form "var=text" >+ * @param ptyType pty type for returned shell > * @param monitor > * @return the shell object > */ >- public IHostShell launchShell(String initialWorkingDirectory, String encoding, String[] environment, IProgressMonitor monitor); >+ public IHostShell launchShell(String initialWorkingDirectory, String encoding, String[] environment,String ptyType, IProgressMonitor monitor); > > /** > * Run a command in it's own shell >#P org.eclipse.rse.services.local >Index: src/org/eclipse/rse/internal/services/local/shells/LocalShellService.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/shells/LocalShellService.java,v >retrieving revision 1.2 >diff -u -r1.2 LocalShellService.java >--- src/org/eclipse/rse/internal/services/local/shells/LocalShellService.java 10 May 2007 14:11:20 -0000 1.2 >+++ src/org/eclipse/rse/internal/services/local/shells/LocalShellService.java 7 Apr 2008 20:36:18 -0000 >@@ -12,6 +12,7 @@ > * > * Contributors: > * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API >+ * Anna Dushistova (MontaVista) - Add ptyType argument to launchShell methods > ********************************************************************************/ > > package org.eclipse.rse.internal.services.local.shells; >@@ -48,13 +49,13 @@ > return LocalServiceResources.Local_Shell_Service_Description; > } > >- public IHostShell launchShell(String initialWorkingDirectory, String[] environment, IProgressMonitor monitor) >+ public IHostShell launchShell(String initialWorkingDirectory, String[] environment, String ptyType, IProgressMonitor monitor) > { > String defaultEncoding = System.getProperty("file.encoding"); //$NON-NLS-1$ >- return launchShell(initialWorkingDirectory, defaultEncoding, environment, monitor); >+ return launchShell(initialWorkingDirectory, defaultEncoding, environment,ptyType, monitor); > } > >- public IHostShell launchShell(String initialWorkingDirectory, String encoding, String[] environment, IProgressMonitor monitor) >+ public IHostShell launchShell(String initialWorkingDirectory, String encoding, String[] environment,String ptyType, IProgressMonitor monitor) > { > LocalHostShell hostShell = new LocalHostShell(initialWorkingDirectory,SHELL_INVOCATION, encoding, environment); > hostShell.run(monitor); >#P org.eclipse.rse.services.dstore >Index: src/org/eclipse/rse/internal/services/dstore/shells/DStoreShellService.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shells/DStoreShellService.java,v >retrieving revision 1.8 >diff -u -r1.8 DStoreShellService.java >--- src/org/eclipse/rse/internal/services/dstore/shells/DStoreShellService.java 7 Apr 2008 12:50:02 -0000 1.8 >+++ src/org/eclipse/rse/internal/services/dstore/shells/DStoreShellService.java 7 Apr 2008 20:36:19 -0000 >@@ -16,6 +16,7 @@ > * David McKnight (IBM) - [190803] Canceling a long-running dstore job prints "InterruptedException" to stdout > * David McKnight (IBM) - [196624] dstore miner IDs should be String constants rather than dynamic lookup > * David McKnight (IBM) - [216252] use SimpleSystemMessage instead of getMessage() >+ * Anna Dushistova (MontaVista) - Add ptyType argument to launchShell methods > *******************************************************************************/ > > package org.eclipse.rse.internal.services.dstore.shells; >@@ -59,16 +60,16 @@ > } > > >- public IHostShell launchShell(String initialWorkingDirectory, String[] environment, IProgressMonitor monitor) >+ public IHostShell launchShell(String initialWorkingDirectory, String[] environment, String ptyType, IProgressMonitor monitor) > { > if (!isInitialized()) > { > waitForInitialize(null); > } >- return launchShell(initialWorkingDirectory, null, environment, monitor); >+ return launchShell(initialWorkingDirectory, null, environment,ptyType, monitor); > } > >- public IHostShell launchShell(String initialWorkingDirectory, String encoding, String[] environment, IProgressMonitor monitor) >+ public IHostShell launchShell(String initialWorkingDirectory, String encoding, String[] environment,String ptyType, IProgressMonitor monitor) > { > if (!isInitialized()) > { >#P org.eclipse.rse.files.ui >Index: src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java,v >retrieving revision 1.74 >diff -u -r1.74 SystemViewRemoteFileAdapter.java >--- src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java 28 Mar 2008 17:26:22 -0000 1.74 >+++ src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java 7 Apr 2008 20:36:21 -0000 >@@ -50,6 +50,7 @@ > * Xuan Chen (IBM) - [223126] [api][breaking] Remove API related to User Actions in RSE Core/UI > * Rupen Mardirossian (IBM) - [210682] Copy collisions will use SystemCopyDialog now instead of renameDialog when there is a copy collision within the same connection > * David McKnight (IBM) - [224377] "open with" menu does not have "other" option >+ * Anna Dushistova (MontaVista) - [170910] Integrate the TM Terminal View with RSE > *******************************************************************************/ > > package org.eclipse.rse.internal.files.ui.view; >@@ -3634,6 +3635,31 @@ > return !test; > } > } >+ else if (inName.equals("isterminalsubsystemexists")) { //$NON-NLS-1$ >+ >+ boolean test = value.equals("true"); //$NON-NLS-1$ >+ >+ ISubSystem subsystem = getSubSystem(tgt); >+ >+ if (subsystem != null) { >+ IHost host = subsystem.getHost(); >+ ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); >+ >+ ISubSystem[] subsystems = registry.getSubSystems(host); >+ >+ for (int i = 0; i < subsystems.length; i++) { >+ ISubSystem temp = subsystems[i]; >+ if (temp.getConfigurationId().endsWith("terminals")){ >+ return test; >+ } >+ } >+ >+ return !test; >+ } >+ else { >+ return !test; >+ } >+ } > } > > return super.testAttribute(target, name, value); >#P org.eclipse.rse.services.telnet >Index: src/org/eclipse/rse/internal/services/telnet/shell/TelnetHostShell.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.telnet/src/org/eclipse/rse/internal/services/telnet/shell/TelnetHostShell.java,v >retrieving revision 1.6 >diff -u -r1.6 TelnetHostShell.java >--- src/org/eclipse/rse/internal/services/telnet/shell/TelnetHostShell.java 7 Nov 2007 15:43:55 -0000 1.6 >+++ src/org/eclipse/rse/internal/services/telnet/shell/TelnetHostShell.java 7 Apr 2008 20:36:22 -0000 >@@ -17,11 +17,14 @@ > * Sheldon D'souza (Celunite) - [187301] support multiple telnet shells > * David McKnight (IBM) - [191599] Use the remote encoding specified in the host property page > * Martin Oberhuber (Wind River) - [194466] Fix shell terminated state when stream is closed >+ * Anna Dushistova (MontaVista) - [170910] Integrate the TM Terminal View with RSE >+ * Eugeniy Melekhov (MontaVista) - [170910] Integrate the TM Terminal View with RSE > *******************************************************************************/ > package org.eclipse.rse.internal.services.telnet.shell; > > import java.io.BufferedReader; > import java.io.IOException; >+import java.io.InputStream; > import java.io.InputStreamReader; > import java.io.OutputStream; > import java.io.PrintWriter; >@@ -162,4 +165,18 @@ > > } > >+ public InputStream getInputStream() throws IOException { >+ if(fTelnetClient != null){ >+ return fTelnetClient.getInputStream(); >+ } >+ return null; >+ } >+ >+ public OutputStream getOutputStream() throws IOException { >+ if(fTelnetClient != null){ >+ return fTelnetClient.getOutputStream(); >+ } >+ return null; >+ } >+ > } >Index: src/org/eclipse/rse/internal/services/telnet/shell/TelnetShellService.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.telnet/src/org/eclipse/rse/internal/services/telnet/shell/TelnetShellService.java,v >retrieving revision 1.1 >diff -u -r1.1 TelnetShellService.java >--- src/org/eclipse/rse/internal/services/telnet/shell/TelnetShellService.java 11 May 2007 09:28:26 -0000 1.1 >+++ src/org/eclipse/rse/internal/services/telnet/shell/TelnetShellService.java 7 Apr 2008 20:36:22 -0000 >@@ -14,6 +14,7 @@ > * Contributors: > * Martin Oberhuber (Wind River) - Adapted from LocalShellService. > * Sheldon D'souza (Celunite) - Adapted from SshShellService. >+ * Anna Dushistova (MontaVista) - Add ptyType argument to launchShell methods > *******************************************************************************/ > package org.eclipse.rse.internal.services.telnet.shell; > >@@ -39,13 +40,13 @@ > } > > public IHostShell launchShell(String initialWorkingDirectory, >- String[] environment, IProgressMonitor monitor) { >+ String[] environment, String ptyType, IProgressMonitor monitor) { > String defaultEncoding = System.getProperty("file.encoding"); //$NON-NLS-1$ >- return launchShell(initialWorkingDirectory, defaultEncoding, environment, monitor); >+ return launchShell(initialWorkingDirectory, defaultEncoding, environment, ptyType, monitor); > } > > public IHostShell launchShell(String initialWorkingDirectory, >- String encoding, String[] environment, >+ String encoding, String[] environment,String ptyType, > IProgressMonitor monitor) { > TelnetHostShell hostShell = new TelnetHostShell(fTelnetSessionProvider, initialWorkingDirectory, TelnetHostShell.SHELL_INVOCATION, encoding, environment); > return hostShell; >#P org.eclipse.rse.remotecdt >Index: src/org/eclipse/rse/internal/remotecdt/RemoteRunLaunchDelegate.java >=================================================================== >RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/internal/remotecdt/RemoteRunLaunchDelegate.java,v >retrieving revision 1.3 >diff -u -r1.3 RemoteRunLaunchDelegate.java >--- src/org/eclipse/rse/internal/remotecdt/RemoteRunLaunchDelegate.java 14 May 2007 13:03:47 -0000 1.3 >+++ src/org/eclipse/rse/internal/remotecdt/RemoteRunLaunchDelegate.java 7 Apr 2008 20:36:24 -0000 >@@ -9,6 +9,7 @@ > * Ewa Matejska (PalmSource) - Adapted from LocalRunLaunchDelegate > * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API > * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry >+ * Anna Dushistova (MontaVista) - Add ptyType argument to launchShell methods > *******************************************************************************/ > > >@@ -279,7 +280,7 @@ > > // This is necessary because runCommand does not actually run the command right now. > String env[] = new String[0]; >- IHostShell hostShell = shellService.launchShell("", env,new NullProgressMonitor()); //$NON-NLS-1$ >+ IHostShell hostShell = shellService.launchShell("", env, null, new NullProgressMonitor()); //$NON-NLS-1$ > hostShell.writeToShell(remote_command); > > Process p = null;
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=95116">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Flags:
mober.at+eclipse
:
iplog+
mober.at+eclipse
:
review-
Actions:
View
|
Diff
Attachments on
bug 170910
:
94053
|
94054
|
94056
|
94707
|
94709
|
94791
|
94937
|
94965
|
94966
|
94967
|
94968
|
95078
|
95079
|
95107
|
95109
| 95116 |
95117
|
95455
|
95456
|
95680
|
95681
