View | Details | Raw Unified | Return to bug 228674
Collapse All | Expand All

(-)src/org/eclipse/ptp/remotetools/environment/launcher/ui/EnhancedSynchronizeTab.java (-1 / +12 lines)
Lines 35-40 Link Here
35
import org.eclipse.ptp.remotetools.environment.launcher.data.OverwritePolicies;
35
import org.eclipse.ptp.remotetools.environment.launcher.data.OverwritePolicies;
36
import org.eclipse.ptp.remotetools.environment.launcher.data.RuleFactory;
36
import org.eclipse.ptp.remotetools.environment.launcher.data.RuleFactory;
37
import org.eclipse.ptp.remotetools.environment.launcher.data.UploadRule;
37
import org.eclipse.ptp.remotetools.environment.launcher.data.UploadRule;
38
import org.eclipse.ptp.remotetools.environment.launcher.preferences.LaunchPreferences;
38
import org.eclipse.ptp.remotetools.utils.ui.swt.Frame;
39
import org.eclipse.ptp.remotetools.utils.ui.swt.Frame;
39
import org.eclipse.ptp.remotetools.utils.ui.swt.FrameMold;
40
import org.eclipse.ptp.remotetools.utils.ui.swt.FrameMold;
40
import org.eclipse.swt.SWT;
41
import org.eclipse.swt.SWT;
Lines 306-315 Link Here
306
				ISynchronizationRule rule = RuleFactory.createRuleFromString(string);
307
				ISynchronizationRule rule = RuleFactory.createRuleFromString(string);
307
				rules.add(rule);
308
				rules.add(rule);
308
			}
309
			}
310
309
//			RemoteLaunchDelegate delegate = new RemoteLaunchDelegate();
311
//			RemoteLaunchDelegate delegate = new RemoteLaunchDelegate();
310
//			ruleLabelProvider.setRemoteWorkingDir(LinuxPath.toString(delegate.getValidatedRemoteDirectory(configuration)));
312
//			ruleLabelProvider.setRemoteWorkingDir(LinuxPath.toString(delegate.getValidatedRemoteDirectory(configuration)));
311
//			ruleLabelProvider.setRemoteWorkingDir(LinuxPath.toString(delegate.getRemoteDirectory(configuration)));
313
//			ruleLabelProvider.setRemoteWorkingDir(LinuxPath.toString(delegate.getRemoteDirectory(configuration)));
312
			ruleLabelProvider.setRemoteWorkingDir(configuration.getAttribute(IRemoteLaunchAttributes.ATTR_REMOTE_DIRECTORY, "")); //$NON-NLS-1$
314
			
315
			String defaultRemoteWorkingDirectory = LaunchPreferences.getPreferenceStore().getString(
316
					LaunchPreferences.ATTR_WORKING_DIRECTORY);
317
			
318
			if( configuration.getAttribute(IRemoteLaunchAttributes.ATTR_AUTOMATIC_WORKING_DIRECTORY, IRemoteLaunchAttributes.DEFAULT_AUTOMATIC_WORKING_DIRECTORY)){
319
				ruleLabelProvider.setRemoteWorkingDir( defaultRemoteWorkingDirectory );
320
			} else {
321
				ruleLabelProvider.setRemoteWorkingDir( configuration.getAttribute(IRemoteLaunchAttributes.ATTR_REMOTE_DIRECTORY, defaultRemoteWorkingDirectory) );
322
			}
323
			
313
			refreshRuleList();
324
			refreshRuleList();
314
		} catch (CoreException e) {
325
		} catch (CoreException e) {
315
			setErrorMessage(LaunchMessages
326
			setErrorMessage(LaunchMessages

Return to bug 228674