Try to fix the layout, so all label is fully visible

Author: gzsombor

org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/breakpoints/JavaBreakpointConditionEditor.java

@@ -356,8 +356,8 @@ public Control createControl(Composite parent) {
 				processMnemonics(PropertyPageMessages.JavaBreakpointConditionEditor_0),
 				null,
 				false,
-				1);
-		fConditional.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
+				2);
+		fConditional.setLayoutData(createHorizontalGridData());
 		fConditional.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -366,11 +366,11 @@ public void widgetSelected(SelectionEvent e) {
 				setDirty(PROP_CONDITION_ENABLED);
 			}
 		});
-		Composite radios = SWTFactory.createComposite(controls, controls.getFont(), 2, 1, GridData.FILL_HORIZONTAL, 0, 0);
+		Composite radios = SWTFactory.createComposite(controls, controls.getFont(), 2, 2, GridData.FILL_HORIZONTAL, 0, 0);
 		fWhenTrue = SWTFactory.createRadioButton(radios, processMnemonics(PropertyPageMessages.JavaBreakpointConditionEditor_1));
-		fWhenTrue.setLayoutData(new GridData());
+		fWhenTrue.setLayoutData(createHorizontalGridData());
 		fWhenChange = SWTFactory.createRadioButton(radios, processMnemonics(PropertyPageMessages.JavaBreakpointConditionEditor_2));
-		fWhenChange.setLayoutData(new GridData());
+		fWhenChange.setLayoutData(createHorizontalGridData());
 		fWhenTrue.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {

org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AbstractJavaBreakpointEditor.java

@@ -17,6 +17,8 @@
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.ListenerList;
 import org.eclipse.jface.action.LegacyActionTools;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.IPropertyListener;
@@ -193,4 +195,8 @@ protected void suppressPropertyChanges(boolean suppress) {
 		fSuppressPropertyChanges = suppress;
 	}
 
+	protected GridData createHorizontalGridData() {
+		return new GridData(SWT.FILL, 0, true, false);
+	}
+
 }

org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/StandardJavaBreakpointEditor.java

@@ -23,10 +23,6 @@
 import org.eclipse.jdt.internal.debug.ui.propertypages.PropertyPageMessages;
 import org.eclipse.jface.util.Util;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
@@ -87,8 +83,9 @@ protected Button createCheckButton(Composite parent, String text) {
 	 *            the parent composite
 	 */
 	protected void createTriggerPointButton(Composite parent) {
-		Composite composite = SWTFactory.createComposite(parent, parent.getFont(), 1, 1, 0, 0, 0);
+		Composite composite = SWTFactory.createComposite(parent, parent.getFont(), 2, 2, GridData.FILL_HORIZONTAL, 0, 0);
 		fTriggerPointButton = createCheckButton(composite, PropertyPageMessages.JavaBreakpointPage_12);
+		fTriggerPointButton.setLayoutData(createHorizontalGridData());
 
 		fTriggerPointButton.setSelection(isTriggerPoint());
 		fTriggerPointButton.addSelectionListener(new SelectionAdapter() {
@@ -102,9 +99,9 @@ public void widgetSelected(SelectionEvent event) {
 	}
 
 	protected Control createStandardControls(Composite parent) {
-		Composite composite = SWTFactory.createComposite(parent, parent.getFont(), 4, 1, 0, 0, 0);
+		Composite composite = SWTFactory.createComposite(parent, parent.getFont(), 2, 2, GridData.FILL_HORIZONTAL, 0, 0);
 		fHitCountButton = SWTFactory.createCheckButton(composite, processMnemonics(PropertyPageMessages.JavaBreakpointPage_4), null, false, 1);
-		fHitCountButton.setLayoutData(new GridData());
+		fHitCountButton.setLayoutData(createHorizontalGridData());
 		fHitCountButton.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent event) {
@@ -119,18 +116,13 @@ public void widgetSelected(SelectionEvent event) {
 		fHitCountText = SWTFactory.createSingleText(composite, 1);
 		GridData gd = (GridData) fHitCountText.getLayoutData();
 		gd.minimumWidth = 50;
-		fHitCountText.addModifyListener(new ModifyListener() {
-			@Override
-			public void modifyText(ModifyEvent e) {
-				setDirty(PROP_HIT_COUNT);
-			}
-		});
-		SWTFactory.createLabel(composite, "", 1); // spacer //$NON-NLS-1$
-		Composite radios = SWTFactory.createComposite(composite, composite.getFont(), 2, 1, GridData.FILL_HORIZONTAL, 0, 0);
-		fSuspendThread = SWTFactory.createRadioButton(radios, processMnemonics(PropertyPageMessages.JavaBreakpointPage_7), 1);
-		fSuspendThread.setLayoutData(new GridData());
-		fSuspendVM = SWTFactory.createRadioButton(radios, processMnemonics(PropertyPageMessages.JavaBreakpointPage_8), 1);
-		fSuspendVM.setLayoutData(new GridData());
+		fHitCountText.addModifyListener(e -> setDirty(PROP_HIT_COUNT));
+
+		Composite radios = SWTFactory.createComposite(composite, composite.getFont(), 2, 2, GridData.FILL_HORIZONTAL, 0, 0);
+		fSuspendThread = SWTFactory.createRadioButton(radios, processMnemonics(PropertyPageMessages.JavaBreakpointPage_7));
+		fSuspendThread.setLayoutData(createHorizontalGridData());
+		fSuspendVM = SWTFactory.createRadioButton(radios, processMnemonics(PropertyPageMessages.JavaBreakpointPage_8));
+		fSuspendVM.setLayoutData(createHorizontalGridData());
 		fSuspendThread.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -143,12 +135,7 @@ public void widgetSelected(SelectionEvent e) {
 				setDirty(PROP_SUSPEND_POLICY);
 			}
 		});
-		composite.addDisposeListener(new DisposeListener() {
-			@Override
-			public void widgetDisposed(DisposeEvent e) {
-				dispose();
-			}
-		});
+		composite.addDisposeListener(e -> dispose());
 		return composite;
 	}