From 09a60b80fb91d7fc55b321d66cc96165539a13b5 Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Tue, 13 Feb 2007 12:15:38 +0000 Subject: [PATCH] Fix N-builds by allowing "assert" in org.eclipse.rse.ui --- .../org/eclipse/rse/services/ssh/files/SftpFileService.java | 2 +- .../rse/subsystems/shells/ssh/SshServiceCommandShell.java | 2 +- rse/plugins/org.eclipse.rse.ui/build.properties | 3 +++ rse/tests/org.eclipse.rse.tests/plugin.properties | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/files/SftpFileService.java b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/files/SftpFileService.java index afa1629877a..277afe523d1 100644 --- a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/files/SftpFileService.java +++ b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/files/SftpFileService.java @@ -491,7 +491,7 @@ public class SftpFileService extends AbstractFileService implements IFileService } 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('/'); String name = fUserHome.substring(lastSlash + 1); String parent = fUserHome.substring(0, lastSlash); diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/src/org/eclipse/rse/subsystems/shells/ssh/SshServiceCommandShell.java b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/src/org/eclipse/rse/subsystems/shells/ssh/SshServiceCommandShell.java index 9d2c8ca10ce..2ba7a1c2521 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/src/org/eclipse/rse/subsystems/shells/ssh/SshServiceCommandShell.java +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/src/org/eclipse/rse/subsystems/shells/ssh/SshServiceCommandShell.java @@ -185,7 +185,7 @@ public class SshServiceCommandShell extends ServiceCommandShell */ protected String getPromptCommand() { IHostShell shell = getHostShell(); - //assert shell instanceof SshHostShell; + //Assert shell instanceof SshHostShell; if (shell instanceof SshHostShell) { return ((SshHostShell)shell).getPromptCommand(); } diff --git a/rse/plugins/org.eclipse.rse.ui/build.properties b/rse/plugins/org.eclipse.rse.ui/build.properties index 21f51937288..9fb6038c702 100644 --- a/rse/plugins/org.eclipse.rse.ui/build.properties +++ b/rse/plugins/org.eclipse.rse.ui/build.properties @@ -24,3 +24,6 @@ source.. = filters/,\ subsystems/,\ systems/,\ UI/ + +javacSource=1.4 +javacTarget=1.4 diff --git a/rse/tests/org.eclipse.rse.tests/plugin.properties b/rse/tests/org.eclipse.rse.tests/plugin.properties index 578d463a617..0b614ab177d 100644 --- a/rse/tests/org.eclipse.rse.tests/plugin.properties +++ b/rse/tests/org.eclipse.rse.tests/plugin.properties @@ -7,7 +7,7 @@ # # Contributors: # 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 providerName=Eclipse.org