Attachment 97494 Details for Bug 228674 – A patch that fixes the bug.

[patch] A patch that fixes the bug.

patch.228674 (text/plain), 2.36 KB, created by Daniel Felix Ferber

on 2008-04-24 13:48:02 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Felix Ferber

Created: 2008-04-24 13:48:02 EDT

Size: 2.36 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ptp.remotetools.environment.launcher
>Index: src/org/eclipse/ptp/remotetools/environment/launcher/ui/EnhancedSynchronizeTab.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/EnhancedSynchronizeTab.java,v
>retrieving revision 1.1
>diff -u -r1.1 EnhancedSynchronizeTab.java
>--- src/org/eclipse/ptp/remotetools/environment/launcher/ui/EnhancedSynchronizeTab.java	30 Oct 2007 12:12:31 -0000	1.1
>+++ src/org/eclipse/ptp/remotetools/environment/launcher/ui/EnhancedSynchronizeTab.java	24 Apr 2008 15:22:05 -0000
>@@ -35,6 +35,7 @@
> import org.eclipse.ptp.remotetools.environment.launcher.data.OverwritePolicies;
> import org.eclipse.ptp.remotetools.environment.launcher.data.RuleFactory;
> import org.eclipse.ptp.remotetools.environment.launcher.data.UploadRule;
>+import org.eclipse.ptp.remotetools.environment.launcher.preferences.LaunchPreferences;
> import org.eclipse.ptp.remotetools.utils.ui.swt.Frame;
> import org.eclipse.ptp.remotetools.utils.ui.swt.FrameMold;
> import org.eclipse.swt.SWT;
>@@ -306,10 +307,22 @@
> 				ISynchronizationRule rule = RuleFactory.createRuleFromString(string);
> 				rules.add(rule);
> 			}
>+
> //			RemoteLaunchDelegate delegate = new RemoteLaunchDelegate();
> //			ruleLabelProvider.setRemoteWorkingDir(LinuxPath.toString(delegate.getValidatedRemoteDirectory(configuration)));
> //			ruleLabelProvider.setRemoteWorkingDir(LinuxPath.toString(delegate.getRemoteDirectory(configuration)));
>-			ruleLabelProvider.setRemoteWorkingDir(configuration.getAttribute(IRemoteLaunchAttributes.ATTR_REMOTE_DIRECTORY, "")); //$NON-NLS-1$
>+			
>+			String defaultRemoteWorkingDirectory = LaunchPreferences.getPreferenceStore().getString(
>+					LaunchPreferences.ATTR_WORKING_DIRECTORY);
>+			
>+			if( configuration.getAttribute(IRemoteLaunchAttributes.ATTR_AUTOMATIC_WORKING_DIRECTORY, IRemoteLaunchAttributes.DEFAULT_AUTOMATIC_WORKING_DIRECTORY)){
>+				ruleLabelProvider.setRemoteWorkingDir( defaultRemoteWorkingDirectory );
>+			} else {
>+				ruleLabelProvider.setRemoteWorkingDir( configuration.getAttribute(IRemoteLaunchAttributes.ATTR_REMOTE_DIRECTORY, defaultRemoteWorkingDirectory) );
>+			}
>+			
> 			refreshRuleList();
> 		} catch (CoreException e) {
> 			setErrorMessage(LaunchMessages

Flags:

g.watson: iplog+

Actions: View | Diff

Attachments on bug 228674: 97494