mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Cosmetics.

Browse source
This commit is contained in:
Sergey Prigogin 2011-05-25 20:48:13 +00:00
parent 5226c0b13a
commit b26d21eb32
1 changed files with 35 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/GdbDebuggerPage.java
View file

@ -45,7 +45,6 @@ import org.eclipse.ui.PlatformUI;
* The dynamic tab for gdb-based debugger implementations. * The dynamic tab for gdb-based debugger implementations.
*/ */
public class GdbDebuggerPage extends AbstractCDebuggerPage implements Observer { public class GdbDebuggerPage extends AbstractCDebuggerPage implements Observer {
protected TabFolder fTabFolder; protected TabFolder fTabFolder;
protected Text fGDBCommandText; protected Text fGDBCommandText;
protected Text fGDBInitText; protected Text fGDBInitText;
@ -93,8 +92,7 @@ public class GdbDebuggerPage extends AbstractCDebuggerPage implements Observer {
if (valid) { if (valid) {
setErrorMessage(null); setErrorMessage(null);
setMessage(null); setMessage(null);
} } else {
else {
setErrorMessage(LaunchUIMessages.getString("GDBDebuggerPage.gdb_executable_not_specified")); //$NON-NLS-1$ setErrorMessage(LaunchUIMessages.getString("GDBDebuggerPage.gdb_executable_not_specified")); //$NON-NLS-1$
setMessage(null); setMessage(null);
} }
@ -105,8 +103,7 @@ public class GdbDebuggerPage extends AbstractCDebuggerPage implements Observer {
private String getStringAttr(ILaunchConfiguration config, String attributeName, String defaultValue) { private String getStringAttr(ILaunchConfiguration config, String attributeName, String defaultValue) {
try { try {
return config.getAttribute(attributeName, defaultValue); return config.getAttribute(attributeName, defaultValue);
} } catch (CoreException exc) {
catch (CoreException exc) {
return defaultValue; return defaultValue;
} }
} }
@ -114,8 +111,7 @@ public class GdbDebuggerPage extends AbstractCDebuggerPage implements Observer {
private boolean getBooleanAttr(ILaunchConfiguration config, String attributeName, boolean defaultValue) { private boolean getBooleanAttr(ILaunchConfiguration config, String attributeName, boolean defaultValue) {
try { try {
return config.getAttribute(attributeName, defaultValue); return config.getAttribute(attributeName, defaultValue);
} } catch (CoreException exc) {
catch (CoreException exc) {
return defaultValue; return defaultValue;
} }
} }
@ -210,11 +206,11 @@ public class GdbDebuggerPage extends AbstractCDebuggerPage implements Observer {
TabItem tabItem = new TabItem(tabFolder, SWT.NONE); TabItem tabItem = new TabItem(tabFolder, SWT.NONE);
tabItem.setText(LaunchUIMessages.getString("GDBDebuggerPage.main_tab_name")); //$NON-NLS-1$ tabItem.setText(LaunchUIMessages.getString("GDBDebuggerPage.main_tab_name")); //$NON-NLS-1$
Composite comp = ControlFactory.createCompositeEx(tabFolder, 1, GridData.FILL_BOTH); Composite comp = ControlFactory.createCompositeEx(tabFolder, 1, GridData.FILL_BOTH);
((GridLayout)comp.getLayout()).makeColumnsEqualWidth = false; ((GridLayout) comp.getLayout()).makeColumnsEqualWidth = false;
comp.setFont(tabFolder.getFont()); comp.setFont(tabFolder.getFont());
tabItem.setControl(comp); tabItem.setControl(comp);
Composite subComp = ControlFactory.createCompositeEx(comp, 3, GridData.FILL_HORIZONTAL); Composite subComp = ControlFactory.createCompositeEx(comp, 3, GridData.FILL_HORIZONTAL);
((GridLayout)subComp.getLayout()).makeColumnsEqualWidth = false; ((GridLayout) subComp.getLayout()).makeColumnsEqualWidth = false;
subComp.setFont(tabFolder.getFont()); subComp.setFont(tabFolder.getFont());
Label label = ControlFactory.createLabel(subComp, LaunchUIMessages.getString("GDBDebuggerPage.gdb_debugger")); //$NON-NLS-1$ Label label = ControlFactory.createLabel(subComp, LaunchUIMessages.getString("GDBDebuggerPage.gdb_debugger")); //$NON-NLS-1$
GridData gd = new GridData(); GridData gd = new GridData();
@ -230,7 +226,6 @@ public class GdbDebuggerPage extends AbstractCDebuggerPage implements Observer {
}); });
Button button = createPushButton(subComp, LaunchUIMessages.getString("GDBDebuggerPage.gdb_browse"), null); //$NON-NLS-1$ Button button = createPushButton(subComp, LaunchUIMessages.getString("GDBDebuggerPage.gdb_browse"), null); //$NON-NLS-1$
button.addSelectionListener(new SelectionAdapter() { button.addSelectionListener(new SelectionAdapter() {
@Override @Override
public void widgetSelected(SelectionEvent evt) { public void widgetSelected(SelectionEvent evt) {
handleGDBButtonSelected(); handleGDBButtonSelected();
@ -268,7 +263,6 @@ public class GdbDebuggerPage extends AbstractCDebuggerPage implements Observer {
}); });
button = createPushButton(subComp, LaunchUIMessages.getString("GDBDebuggerPage.gdb_cmdfile_browse"), null); //$NON-NLS-1$ button = createPushButton(subComp, LaunchUIMessages.getString("GDBDebuggerPage.gdb_cmdfile_browse"), null); //$NON-NLS-1$
button.addSelectionListener(new SelectionAdapter() { button.addSelectionListener(new SelectionAdapter() {
@Override @Override
public void widgetSelected(SelectionEvent evt) { public void widgetSelected(SelectionEvent evt) {
handleGDBInitButtonSelected(); handleGDBInitButtonSelected();
@ -322,7 +316,7 @@ public class GdbDebuggerPage extends AbstractCDebuggerPage implements Observer {
tabItem.setControl(comp); tabItem.setControl(comp);
fSolibBlock = createSolibBlock(comp); fSolibBlock = createSolibBlock(comp);
if (fSolibBlock instanceof Observable) if (fSolibBlock instanceof Observable)
((Observable)fSolibBlock).addObserver(this); ((Observable) fSolibBlock).addObserver(this);
} }
/** Used to add a checkbox to the tab. Each checkbox has its own line. */ /** Used to add a checkbox to the tab. Each checkbox has its own line. */
@ -350,7 +344,7 @@ public class GdbDebuggerPage extends AbstractCDebuggerPage implements Observer {
public void dispose() { public void dispose() {
if (fSolibBlock != null) { if (fSolibBlock != null) {
if (fSolibBlock instanceof Observable) if (fSolibBlock instanceof Observable)
((Observable)fSolibBlock).deleteObserver(this); ((Observable) fSolibBlock).deleteObserver(this);
fSolibBlock.dispose(); fSolibBlock.dispose();
} }
super.dispose(); super.dispose();