mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-09 01:55:24 +02:00
Fix N-builds by allowing "assert" in org.eclipse.rse.ui
This commit is contained in:
parent
d2c9c78b57
commit
09a60b80fb
4 changed files with 6 additions and 3 deletions
|
@ -491,7 +491,7 @@ public class SftpFileService extends AbstractFileService implements IFileService
|
||||||
}
|
}
|
||||||
|
|
||||||
public IHostFile getUserHome() {
|
public IHostFile getUserHome() {
|
||||||
//TODO assert: this is only called after we are connected
|
//TODO Assert: this is only called after we are connected
|
||||||
int lastSlash = fUserHome.lastIndexOf('/');
|
int lastSlash = fUserHome.lastIndexOf('/');
|
||||||
String name = fUserHome.substring(lastSlash + 1);
|
String name = fUserHome.substring(lastSlash + 1);
|
||||||
String parent = fUserHome.substring(0, lastSlash);
|
String parent = fUserHome.substring(0, lastSlash);
|
||||||
|
|
|
@ -185,7 +185,7 @@ public class SshServiceCommandShell extends ServiceCommandShell
|
||||||
*/
|
*/
|
||||||
protected String getPromptCommand() {
|
protected String getPromptCommand() {
|
||||||
IHostShell shell = getHostShell();
|
IHostShell shell = getHostShell();
|
||||||
//assert shell instanceof SshHostShell;
|
//Assert shell instanceof SshHostShell;
|
||||||
if (shell instanceof SshHostShell) {
|
if (shell instanceof SshHostShell) {
|
||||||
return ((SshHostShell)shell).getPromptCommand();
|
return ((SshHostShell)shell).getPromptCommand();
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,3 +24,6 @@ source.. = filters/,\
|
||||||
subsystems/,\
|
subsystems/,\
|
||||||
systems/,\
|
systems/,\
|
||||||
UI/
|
UI/
|
||||||
|
|
||||||
|
javacSource=1.4
|
||||||
|
javacTarget=1.4
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#
|
#
|
||||||
# Contributors:
|
# Contributors:
|
||||||
# IBM Corporation - initial API and implementation
|
# IBM Corporation - initial API and implementation
|
||||||
# Martin Oberhuber (Wind River) - fix ant build for "assert", make consistent
|
# Martin Oberhuber (Wind River) - fix ant build for "Assert", make consistent
|
||||||
###############################################################################
|
###############################################################################
|
||||||
pluginName=RSE Unit Tests
|
pluginName=RSE Unit Tests
|
||||||
providerName=Eclipse.org
|
providerName=Eclipse.org
|
||||||
|
|
Loading…
Add table
Reference in a new issue