mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-06-06 09:16:02 +02:00
Bug 333453: checkbox cleared when changing tab in remote application debug configuration.
This commit is contained in:
parent
dd3fcbb7a3
commit
be117ed8e8
2 changed files with 22 additions and 2 deletions
|
@ -1,5 +1,5 @@
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
* Copyright (c) 2006, 2010 PalmSource, Inc. and others.
|
* Copyright (c) 2006, 2011 PalmSource, Inc. 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
|
||||||
|
@ -86,6 +86,8 @@ public class RemoteCDSFMainTab extends CMainTab {
|
||||||
private Text preRunText;
|
private Text preRunText;
|
||||||
private Label preRunLabel;
|
private Label preRunLabel;
|
||||||
|
|
||||||
|
private boolean isInitializing = false;
|
||||||
|
|
||||||
public RemoteCDSFMainTab() {
|
public RemoteCDSFMainTab() {
|
||||||
super(CMainTab.INCLUDE_BUILD_SETTINGS);
|
super(CMainTab.INCLUDE_BUILD_SETTINGS);
|
||||||
}
|
}
|
||||||
|
@ -519,6 +521,11 @@ public class RemoteCDSFMainTab extends CMainTab {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void useDefaultsFromConnection() {
|
private void useDefaultsFromConnection() {
|
||||||
|
// During initialization, we don't want to use the default
|
||||||
|
// values of the connection, but we want to use the ones
|
||||||
|
// that are part of the configuration
|
||||||
|
if (isInitializing) return;
|
||||||
|
|
||||||
if ((remoteProgText != null) && !remoteProgText.isDisposed()) {
|
if ((remoteProgText != null) && !remoteProgText.isDisposed()) {
|
||||||
String remoteName = remoteProgText.getText().trim();
|
String remoteName = remoteProgText.getText().trim();
|
||||||
String remoteWsRoot = getRemoteWSRoot();
|
String remoteWsRoot = getRemoteWSRoot();
|
||||||
|
@ -600,6 +607,7 @@ public class RemoteCDSFMainTab extends CMainTab {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void initializeFrom(ILaunchConfiguration config) {
|
public void initializeFrom(ILaunchConfiguration config) {
|
||||||
|
isInitializing = true;
|
||||||
String remoteConnection = null;
|
String remoteConnection = null;
|
||||||
try {
|
try {
|
||||||
remoteConnection = config
|
remoteConnection = config
|
||||||
|
@ -629,6 +637,7 @@ public class RemoteCDSFMainTab extends CMainTab {
|
||||||
updateTargetProgFromConfig(config);
|
updateTargetProgFromConfig(config);
|
||||||
updateSkipDownloadFromConfig(config);
|
updateSkipDownloadFromConfig(config);
|
||||||
updatePropertiesButton();
|
updatePropertiesButton();
|
||||||
|
isInitializing = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
* Copyright (c) 2006, 2010 PalmSource, Inc. and others.
|
* Copyright (c) 2006, 2011 PalmSource, Inc. 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
|
||||||
|
@ -19,6 +19,7 @@
|
||||||
* Anna Dushistova (Mentor Graphics) - [314659] move remote launch/debug to DSF
|
* Anna Dushistova (Mentor Graphics) - [314659] move remote launch/debug to DSF
|
||||||
* Anna Dushistova (Mentor Graphics) - moved to org.eclipse.cdt.launch.remote.tabs
|
* Anna Dushistova (Mentor Graphics) - moved to org.eclipse.cdt.launch.remote.tabs
|
||||||
* Anna Dushistova (Mentor Graphics) - [318052] [remote launch] Properties are not saved/used
|
* Anna Dushistova (Mentor Graphics) - [318052] [remote launch] Properties are not saved/used
|
||||||
|
* Anna Dushistova (Mentor Graphics) - [333453] adapted the fix from RemoteCDSFMainTab.java
|
||||||
*******************************************************************************/
|
*******************************************************************************/
|
||||||
|
|
||||||
package org.eclipse.cdt.launch.remote.tabs;
|
package org.eclipse.cdt.launch.remote.tabs;
|
||||||
|
@ -87,6 +88,8 @@ public class RemoteCMainTab extends CMainTab {
|
||||||
private Text preRunText;
|
private Text preRunText;
|
||||||
private Label preRunLabel;
|
private Label preRunLabel;
|
||||||
|
|
||||||
|
private boolean isInitializing = false;
|
||||||
|
|
||||||
public RemoteCMainTab() {
|
public RemoteCMainTab() {
|
||||||
this(true);
|
this(true);
|
||||||
}
|
}
|
||||||
|
@ -332,6 +335,8 @@ public class RemoteCMainTab extends CMainTab {
|
||||||
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom
|
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom
|
||||||
*/
|
*/
|
||||||
public void initializeFrom(ILaunchConfiguration config) {
|
public void initializeFrom(ILaunchConfiguration config) {
|
||||||
|
isInitializing = true;
|
||||||
|
|
||||||
String remoteConnection = null;
|
String remoteConnection = null;
|
||||||
try {
|
try {
|
||||||
remoteConnection = config
|
remoteConnection = config
|
||||||
|
@ -361,6 +366,7 @@ public class RemoteCMainTab extends CMainTab {
|
||||||
updateTargetProgFromConfig(config);
|
updateTargetProgFromConfig(config);
|
||||||
updateSkipDownloadFromConfig(config);
|
updateSkipDownloadFromConfig(config);
|
||||||
updatePropertiesButton();
|
updatePropertiesButton();
|
||||||
|
isInitializing = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void handleNewRemoteConnectionSelected() {
|
protected void handleNewRemoteConnectionSelected() {
|
||||||
|
@ -597,6 +603,11 @@ public class RemoteCMainTab extends CMainTab {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void useDefaultsFromConnection() {
|
private void useDefaultsFromConnection() {
|
||||||
|
// During initialization, we don't want to use the default
|
||||||
|
// values of the connection, but we want to use the ones
|
||||||
|
// that are part of the configuration
|
||||||
|
if (isInitializing) return;
|
||||||
|
|
||||||
if ((remoteProgText != null) && !remoteProgText.isDisposed()) {
|
if ((remoteProgText != null) && !remoteProgText.isDisposed()) {
|
||||||
String remoteName = remoteProgText.getText().trim();
|
String remoteName = remoteProgText.getText().trim();
|
||||||
String remoteWsRoot = getRemoteWSRoot();
|
String remoteWsRoot = getRemoteWSRoot();
|
||||||
|
|
Loading…
Add table
Reference in a new issue