mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-06-07 17:56:01 +02:00
[249227] Removing of old Verbose Console launch option, which was not being used and is not gonna be needed.
This commit is contained in:
parent
4b1e7ea794
commit
a3a586a886
3 changed files with 4 additions and 65 deletions
|
@ -47,8 +47,6 @@ public class GdbDebuggerPage extends AbstractCDebuggerPage implements Observer {
|
||||||
protected Text fGDBInitText;
|
protected Text fGDBInitText;
|
||||||
protected Button fNonStopCheckBox;
|
protected Button fNonStopCheckBox;
|
||||||
protected Button fReverseCheckBox;
|
protected Button fReverseCheckBox;
|
||||||
protected Button fVerboseModeButton;
|
|
||||||
|
|
||||||
|
|
||||||
private IMILaunchConfigurationComponent fSolibBlock;
|
private IMILaunchConfigurationComponent fSolibBlock;
|
||||||
private boolean fIsInitializing = false;
|
private boolean fIsInitializing = false;
|
||||||
|
@ -73,8 +71,6 @@ public class GdbDebuggerPage extends AbstractCDebuggerPage implements Observer {
|
||||||
IGDBLaunchConfigurationConstants.DEBUGGER_NON_STOP_DEFAULT);
|
IGDBLaunchConfigurationConstants.DEBUGGER_NON_STOP_DEFAULT);
|
||||||
configuration.setAttribute(IGDBLaunchConfigurationConstants.ATTR_DEBUGGER_REVERSE,
|
configuration.setAttribute(IGDBLaunchConfigurationConstants.ATTR_DEBUGGER_REVERSE,
|
||||||
IGDBLaunchConfigurationConstants.DEBUGGER_REVERSE_DEFAULT);
|
IGDBLaunchConfigurationConstants.DEBUGGER_REVERSE_DEFAULT);
|
||||||
configuration.setAttribute(IGDBLaunchConfigurationConstants.ATTR_DEBUGGER_VERBOSE_MODE,
|
|
||||||
IGDBLaunchConfigurationConstants.DEBUGGER_VERBOSE_MODE_DEFAULT);
|
|
||||||
|
|
||||||
if (fSolibBlock != null)
|
if (fSolibBlock != null)
|
||||||
fSolibBlock.setDefaults(configuration);
|
fSolibBlock.setDefaults(configuration);
|
||||||
|
@ -100,8 +96,6 @@ public class GdbDebuggerPage extends AbstractCDebuggerPage implements Observer {
|
||||||
String gdbInit = IGDBLaunchConfigurationConstants.DEBUGGER_GDB_INIT_DEFAULT;
|
String gdbInit = IGDBLaunchConfigurationConstants.DEBUGGER_GDB_INIT_DEFAULT;
|
||||||
boolean nonStopMode = IGDBLaunchConfigurationConstants.DEBUGGER_NON_STOP_DEFAULT;
|
boolean nonStopMode = IGDBLaunchConfigurationConstants.DEBUGGER_NON_STOP_DEFAULT;
|
||||||
boolean reverseEnabled = IGDBLaunchConfigurationConstants.DEBUGGER_REVERSE_DEFAULT;
|
boolean reverseEnabled = IGDBLaunchConfigurationConstants.DEBUGGER_REVERSE_DEFAULT;
|
||||||
|
|
||||||
boolean verboseMode = IGDBLaunchConfigurationConstants.DEBUGGER_VERBOSE_MODE_DEFAULT;
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
gdbCommand = configuration.getAttribute(IGDBLaunchConfigurationConstants.ATTR_DEBUG_NAME,
|
gdbCommand = configuration.getAttribute(IGDBLaunchConfigurationConstants.ATTR_DEBUG_NAME,
|
||||||
|
@ -130,21 +124,13 @@ public class GdbDebuggerPage extends AbstractCDebuggerPage implements Observer {
|
||||||
catch(CoreException e) {
|
catch(CoreException e) {
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
|
||||||
verboseMode = configuration.getAttribute(IGDBLaunchConfigurationConstants.ATTR_DEBUGGER_VERBOSE_MODE,
|
|
||||||
IGDBLaunchConfigurationConstants.DEBUGGER_VERBOSE_MODE_DEFAULT );
|
|
||||||
}
|
|
||||||
catch(CoreException e) {
|
|
||||||
}
|
|
||||||
|
|
||||||
if (fSolibBlock != null)
|
if (fSolibBlock != null)
|
||||||
fSolibBlock.initializeFrom(configuration);
|
fSolibBlock.initializeFrom(configuration);
|
||||||
fGDBCommandText.setText(gdbCommand);
|
fGDBCommandText.setText(gdbCommand);
|
||||||
fGDBInitText.setText(gdbInit);
|
fGDBInitText.setText(gdbInit);
|
||||||
fNonStopCheckBox.setSelection(nonStopMode);
|
fNonStopCheckBox.setSelection(nonStopMode);
|
||||||
fReverseCheckBox.setSelection(reverseEnabled);
|
fReverseCheckBox.setSelection(reverseEnabled);
|
||||||
fVerboseModeButton.setSelection(verboseMode);
|
|
||||||
|
|
||||||
setInitializing(false);
|
setInitializing(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -157,8 +143,6 @@ public class GdbDebuggerPage extends AbstractCDebuggerPage implements Observer {
|
||||||
fNonStopCheckBox.getSelection());
|
fNonStopCheckBox.getSelection());
|
||||||
configuration.setAttribute(IGDBLaunchConfigurationConstants.ATTR_DEBUGGER_REVERSE,
|
configuration.setAttribute(IGDBLaunchConfigurationConstants.ATTR_DEBUGGER_REVERSE,
|
||||||
fReverseCheckBox.getSelection());
|
fReverseCheckBox.getSelection());
|
||||||
configuration.setAttribute(IGDBLaunchConfigurationConstants.ATTR_DEBUGGER_VERBOSE_MODE,
|
|
||||||
fVerboseModeButton.getSelection() );
|
|
||||||
|
|
||||||
if (fSolibBlock != null)
|
if (fSolibBlock != null)
|
||||||
fSolibBlock.performApply(configuration);
|
fSolibBlock.performApply(configuration);
|
||||||
|
@ -318,20 +302,6 @@ public class GdbDebuggerPage extends AbstractCDebuggerPage implements Observer {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
fVerboseModeButton = ControlFactory.createCheckBox( subComp, LaunchUIMessages.getString( "StandardGDBDebuggerPage.13" ) ); //$NON-NLS-1$
|
|
||||||
fVerboseModeButton.addSelectionListener(new SelectionAdapter() {
|
|
||||||
@Override
|
|
||||||
public void widgetDefaultSelected(SelectionEvent e) {
|
|
||||||
if (!isInitializing())
|
|
||||||
updateLaunchConfigurationDialog();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void widgetSelected(SelectionEvent e) {
|
|
||||||
if (!isInitializing())
|
|
||||||
updateLaunchConfigurationDialog();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// fit options one per line
|
// fit options one per line
|
||||||
gd = new GridData();
|
gd = new GridData();
|
||||||
|
@ -340,14 +310,6 @@ public class GdbDebuggerPage extends AbstractCDebuggerPage implements Observer {
|
||||||
gd = new GridData();
|
gd = new GridData();
|
||||||
gd.horizontalSpan = 3;
|
gd.horizontalSpan = 3;
|
||||||
fReverseCheckBox.setLayoutData(gd);
|
fReverseCheckBox.setLayoutData(gd);
|
||||||
gd = new GridData();
|
|
||||||
gd.horizontalSpan = 3;
|
|
||||||
fVerboseModeButton.setLayoutData(gd);
|
|
||||||
// Grayed out until bug 249227 is resolved
|
|
||||||
//
|
|
||||||
fVerboseModeButton.setVisible(false);
|
|
||||||
//
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void createSolibTab(TabFolder tabFolder) {
|
public void createSolibTab(TabFolder tabFolder) {
|
||||||
|
|
|
@ -76,12 +76,6 @@ public class IGDBLaunchConfigurationConstants {
|
||||||
*/
|
*/
|
||||||
public static final String ATTR_DEBUGGER_AUTO_SOLIB_LIST = GdbPlugin.PLUGIN_ID + ".AUTO_SOLIB_LIST"; //$NON-NLS-1$
|
public static final String ATTR_DEBUGGER_AUTO_SOLIB_LIST = GdbPlugin.PLUGIN_ID + ".AUTO_SOLIB_LIST"; //$NON-NLS-1$
|
||||||
|
|
||||||
/**
|
|
||||||
* Launch configuration attribute key. The value is a boolean specifying the mode of the gdb console.
|
|
||||||
* @since 1.1
|
|
||||||
*/
|
|
||||||
public static final String ATTR_DEBUGGER_VERBOSE_MODE = GdbPlugin.PLUGIN_ID + ".verboseMode"; //$NON-NLS-1$
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Launch configuration attribute key. Boolean value to enable reverse debugging at launch time.
|
* Launch configuration attribute key. Boolean value to enable reverse debugging at launch time.
|
||||||
* @since 2.0
|
* @since 2.0
|
||||||
|
@ -115,12 +109,6 @@ public class IGDBLaunchConfigurationConstants {
|
||||||
*/
|
*/
|
||||||
public static final boolean DEBUGGER_USE_SOLIB_SYMBOLS_FOR_APP_DEFAULT = false;
|
public static final boolean DEBUGGER_USE_SOLIB_SYMBOLS_FOR_APP_DEFAULT = false;
|
||||||
|
|
||||||
/**
|
|
||||||
* Launch configuration attribute value. The key is ATTR_DEBUGGER_VERBOSE_MODE.
|
|
||||||
* @since 1.1
|
|
||||||
*/
|
|
||||||
public static final boolean DEBUGGER_VERBOSE_MODE_DEFAULT = false;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Launch configuration attribute value. The key is ATTR_DEBUGGER_REVERSE.
|
* Launch configuration attribute value. The key is ATTR_DEBUGGER_REVERSE.
|
||||||
* @since 2.0
|
* @since 2.0
|
||||||
|
|
|
@ -228,9 +228,9 @@ public class LaunchUtils {
|
||||||
version = matcher.group(2);
|
version = matcher.group(2);
|
||||||
// Temporary for cygwin, until GDB 7 is released
|
// Temporary for cygwin, until GDB 7 is released
|
||||||
// Any cygwin GDB staring with 6.8 should be treated as plain 6.8
|
// Any cygwin GDB staring with 6.8 should be treated as plain 6.8
|
||||||
if (line.toLowerCase().indexOf("cygwin") != -1 &&
|
if (line.toLowerCase().indexOf("cygwin") != -1 && //$NON-NLS-1$
|
||||||
version.startsWith("6.8")) {
|
version.startsWith("6.8")) { //$NON-NLS-1$
|
||||||
version = "6.8";
|
version = "6.8"; //$NON-NLS-1$
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -279,16 +279,5 @@ public class LaunchUtils {
|
||||||
}
|
}
|
||||||
return SessionType.LOCAL;
|
return SessionType.LOCAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean getConsoleVerboseMode(ILaunchConfiguration config) {
|
|
||||||
boolean verboseMode = IGDBLaunchConfigurationConstants.DEBUGGER_VERBOSE_MODE_DEFAULT;
|
|
||||||
try {
|
|
||||||
verboseMode = config.getAttribute(IGDBLaunchConfigurationConstants.ATTR_DEBUGGER_VERBOSE_MODE,
|
|
||||||
IGDBLaunchConfigurationConstants.DEBUGGER_VERBOSE_MODE_DEFAULT);
|
|
||||||
} catch (CoreException e) {
|
|
||||||
}
|
|
||||||
return verboseMode;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue