summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorScott Tepavich2012-08-30 20:54:39 (EDT)
committer Eugene Tarassov2012-09-04 21:21:10 (EDT)
commit43dd852807de52ed7147e31733e5b310008246d4 (patch)
tree13783726a155ad0fdcbd91e46f8b917fe06e3bb0
parent55d91b24ed9d4db94f733e499d3f4620cd4ec8fc (diff)
downloadorg.eclipse.tcf-43dd852807de52ed7147e31733e5b310008246d4.zip
org.eclipse.tcf-43dd852807de52ed7147e31733e5b310008246d4.tar.gz
org.eclipse.tcf-43dd852807de52ed7147e31733e5b310008246d4.tar.bz2
Bug [388488] Change the layout of the checkbox, to match others on the common breakpoint property page.
-rw-r--r--plugins/org.eclipse.tcf.cdt.ui/src/org/eclipse/tcf/internal/cdt/ui/breakpoints/HardwareFieldEditor.java13
1 files changed, 4 insertions, 9 deletions
diff --git a/plugins/org.eclipse.tcf.cdt.ui/src/org/eclipse/tcf/internal/cdt/ui/breakpoints/HardwareFieldEditor.java b/plugins/org.eclipse.tcf.cdt.ui/src/org/eclipse/tcf/internal/cdt/ui/breakpoints/HardwareFieldEditor.java
index e480b08..2d1cb11 100644
--- a/plugins/org.eclipse.tcf.cdt.ui/src/org/eclipse/tcf/internal/cdt/ui/breakpoints/HardwareFieldEditor.java
+++ b/plugins/org.eclipse.tcf.cdt.ui/src/org/eclipse/tcf/internal/cdt/ui/breakpoints/HardwareFieldEditor.java
@@ -29,7 +29,6 @@ import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
import org.eclipse.tcf.debug.ui.ITCFObject;
import org.eclipse.tcf.protocol.IChannel;
import org.eclipse.tcf.protocol.IToken;
@@ -40,6 +39,7 @@ import org.eclipse.ui.IWorkbenchPropertyPage;
public class HardwareFieldEditor extends FieldEditor {
private Composite fParent;
+ private final String HARDWARE = "Hardware"; //$NON-NLS-1$
/**
* The previously selected, or "before", value.
@@ -52,7 +52,7 @@ public class HardwareFieldEditor extends FieldEditor {
private Button checkBox;
public HardwareFieldEditor(Composite parent) {
- super(ICBreakpointType.TYPE, "Hardware", parent);
+ super(ICBreakpointType.TYPE, "", parent);
fParent = parent;
}
@@ -147,9 +147,8 @@ public class HardwareFieldEditor extends FieldEditor {
* (non-Javadoc) Method declared on FieldEditor.
*/
protected void doFillIntoGrid(Composite parent, int numColumns) {
- getLabelControl(parent);
- numColumns--;
checkBox = getChangeControl(parent);
+ checkBox.setText(HARDWARE);
GridData gd = new GridData();
gd.horizontalSpan = numColumns;
checkBox.setLayoutData(gd);
@@ -257,7 +256,7 @@ public class HardwareFieldEditor extends FieldEditor {
* (non-Javadoc) Method declared on FieldEditor.
*/
public int getNumberOfControls() {
- return 2;
+ return 1;
}
/*
@@ -274,10 +273,6 @@ public class HardwareFieldEditor extends FieldEditor {
*/
public void setLabelText(String text) {
super.setLabelText(text);
- Label label = getLabelControl();
- if (label == null && checkBox != null) {
- checkBox.setText(text);
- }
}
/**