mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-14 20:45:22 +02:00
[272032][ssh][telnet][local] shell output not setting line numbers when available
This commit is contained in:
parent
e088c79b13
commit
c603b0e645
3 changed files with 14 additions and 1 deletions
|
@ -1,5 +1,5 @@
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
* Copyright (c) 2006, 2008 IBM Corporation and others.
|
* Copyright (c) 2006, 2009 IBM Corporation and others.
|
||||||
* All rights reserved. This program and the accompanying materials
|
* All rights reserved. This program and the accompanying materials
|
||||||
* are made available under the terms of the Eclipse Public License v1.0
|
* are made available under the terms of the Eclipse Public License v1.0
|
||||||
* which accompanies this distribution, and is available at
|
* which accompanies this distribution, and is available at
|
||||||
|
@ -13,6 +13,7 @@
|
||||||
*
|
*
|
||||||
* Contributors:
|
* Contributors:
|
||||||
* Martin Oberhuber (Wind River) - [225510][api] Fix OutputRefreshJob API leakage
|
* Martin Oberhuber (Wind River) - [225510][api] Fix OutputRefreshJob API leakage
|
||||||
|
* David McKnight (IBM) - [272032][ssh][telnet][local] shell output not setting line numbers when available
|
||||||
*******************************************************************************/
|
*******************************************************************************/
|
||||||
|
|
||||||
package org.eclipse.rse.internal.subsystems.shells.local.model;
|
package org.eclipse.rse.internal.subsystems.shells.local.model;
|
||||||
|
@ -135,6 +136,9 @@ public class LocalServiceCommandShell extends ServiceCommandShell
|
||||||
{
|
{
|
||||||
output.setAbsolutePath(_workingDir + File.separatorChar + file);
|
output.setAbsolutePath(_workingDir + File.separatorChar + file);
|
||||||
}
|
}
|
||||||
|
if (parsedMsg.line > 0){
|
||||||
|
output.setLine(parsedMsg.line);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
addOutput(output);
|
addOutput(output);
|
||||||
|
|
|
@ -16,6 +16,7 @@
|
||||||
* Martin Oberhuber (Wind River) - [225510][api] Fix OutputRefreshJob API leakage
|
* Martin Oberhuber (Wind River) - [225510][api] Fix OutputRefreshJob API leakage
|
||||||
* Anna Dushistova (MontaVista) - [259414][api] refactor the "SSH Shell" to use the generic Terminal->IHostShell converter
|
* Anna Dushistova (MontaVista) - [259414][api] refactor the "SSH Shell" to use the generic Terminal->IHostShell converter
|
||||||
* Anna Dushistova (MontaVista) - [261478] Remove SshShellService, SshHostShell (or deprecate and schedule for removal in 3.2)
|
* Anna Dushistova (MontaVista) - [261478] Remove SshShellService, SshHostShell (or deprecate and schedule for removal in 3.2)
|
||||||
|
* David McKnight (IBM) - [272032][ssh][telnet][local] shell output not setting line numbers when available
|
||||||
*******************************************************************************/
|
*******************************************************************************/
|
||||||
|
|
||||||
package org.eclipse.rse.internal.subsystems.shells.ssh;
|
package org.eclipse.rse.internal.subsystems.shells.ssh;
|
||||||
|
@ -146,6 +147,7 @@ public class SshServiceCommandShell extends ServiceCommandShell
|
||||||
else {
|
else {
|
||||||
output = new RemoteOutput(this, type);
|
output = new RemoteOutput(this, type);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
output.setText(line);
|
output.setText(line);
|
||||||
if (parsedMsg != null)
|
if (parsedMsg != null)
|
||||||
|
@ -165,6 +167,9 @@ public class SshServiceCommandShell extends ServiceCommandShell
|
||||||
{
|
{
|
||||||
output.setAbsolutePath(file);
|
output.setAbsolutePath(file);
|
||||||
}
|
}
|
||||||
|
if (parsedMsg.line > 0){
|
||||||
|
output.setLine(parsedMsg.line);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
addOutput(output);
|
addOutput(output);
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
* Martin Oberhuber (Wind River) - [225510][api] Fix OutputRefreshJob API leakage
|
* Martin Oberhuber (Wind River) - [225510][api] Fix OutputRefreshJob API leakage
|
||||||
* Anna Dushistova (MontaVista) - [240523] [rseterminals] Provide a generic adapter factory that adapts any ITerminalService to an IShellService
|
* Anna Dushistova (MontaVista) - [240523] [rseterminals] Provide a generic adapter factory that adapts any ITerminalService to an IShellService
|
||||||
* Anna Dushistova (MontaVista) - [261478] Remove SshShellService, SshHostShell (or deprecate and schedule for removal in 3.2)
|
* Anna Dushistova (MontaVista) - [261478] Remove SshShellService, SshHostShell (or deprecate and schedule for removal in 3.2)
|
||||||
|
* David McKnight (IBM) - [272032][ssh][telnet][local] shell output not setting line numbers when available
|
||||||
*******************************************************************************/
|
*******************************************************************************/
|
||||||
package org.eclipse.rse.internal.subsystems.shells.telnet;
|
package org.eclipse.rse.internal.subsystems.shells.telnet;
|
||||||
|
|
||||||
|
@ -158,6 +159,9 @@ public class TelnetServiceCommandShell extends ServiceCommandShell {
|
||||||
{
|
{
|
||||||
output.setAbsolutePath(file);
|
output.setAbsolutePath(file);
|
||||||
}
|
}
|
||||||
|
if (parsedMsg.line > 0){
|
||||||
|
output.setLine(parsedMsg.line);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
addOutput(output);
|
addOutput(output);
|
||||||
|
|
Loading…
Add table
Reference in a new issue