Simplify breakpoint editors

Author: gzsombor

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

@@ -170,6 +170,7 @@ public final class JavaBreakpointConditionEditor extends AbstractJavaBreakpointE
 	 * Creates a new Java breakpoint condition editor.
 	 */
 	public JavaBreakpointConditionEditor() {
+		this(null);
 	}
 
 	/**
@@ -180,7 +181,8 @@ public JavaBreakpointConditionEditor() {
 	 * @since 3.6
 	 */
 	public JavaBreakpointConditionEditor(IDialogSettings dialogSettings) {
-		fConditionHistoryDialogSettings= dialogSettings != null ? dialogSettings : DialogSettings.getOrCreateSection(JDIDebugUIPlugin.getDefault().getDialogSettings(), DS_SECTION_CONDITION_HISTORY);
+		fConditionHistoryDialogSettings = dialogSettings != null ? dialogSettings
+				: DialogSettings.getOrCreateSection(JDIDebugUIPlugin.getDefault().getDialogSettings(), DS_SECTION_CONDITION_HISTORY);
 	}
 
 	/**
@@ -842,5 +844,4 @@ private void checkIfUsedInBreakpointsView() {
 			}
 		}
 	}
-
 }

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

@@ -31,7 +31,7 @@ public class CompositeBreakpointEditor extends AbstractJavaBreakpointEditor {
 
 	private AbstractJavaBreakpointEditor[] fEditors;
 
-	public CompositeBreakpointEditor(AbstractJavaBreakpointEditor[] editors) {
+	public CompositeBreakpointEditor(AbstractJavaBreakpointEditor... editors) {
 		fEditors = editors;
 	}
 

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

@@ -43,8 +43,7 @@ public LineBreakpointDetailPane() {
 	 */
 	@Override
 	protected AbstractJavaBreakpointEditor createEditor(Composite parent) {
-		return new CompositeBreakpointEditor(
-			new AbstractJavaBreakpointEditor[] {new StandardJavaBreakpointEditor(), new JavaBreakpointConditionEditor(null)});
+		return new CompositeBreakpointEditor(new StandardJavaBreakpointEditor(), new JavaBreakpointConditionEditor());
 	}
 
 }

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

@@ -47,8 +47,7 @@ public MethodBreakpointDetailPane() {
 	 */
 	@Override
 	protected AbstractJavaBreakpointEditor createEditor(Composite parent) {
-		return new CompositeBreakpointEditor(new AbstractJavaBreakpointEditor[]
-			{new MethodBreakpointEditor(), new JavaBreakpointConditionEditor(null)});
+		return new CompositeBreakpointEditor(new MethodBreakpointEditor(), new JavaBreakpointConditionEditor());
 	}
 
 }

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

@@ -46,7 +46,7 @@ public WatchpointDetailPane() {
 	 */
 	@Override
 	protected AbstractJavaBreakpointEditor createEditor(Composite parent) {
-		return new CompositeBreakpointEditor(new AbstractJavaBreakpointEditor[] { new WatchpointEditor(), new JavaBreakpointConditionEditor(null) });
+		return new CompositeBreakpointEditor(new WatchpointEditor(), new JavaBreakpointConditionEditor());
 	}
 
 }

org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/JavaBreakpointPage.java

@@ -334,19 +334,16 @@ protected void createTypeSpecificEditors(Composite parent) {
 			fEditor = new StandardJavaBreakpointEditor();
 		} else if (JavaLineBreakpoint.JAVA_LINE_BREAKPOINT.equals(type)) {
 			setTitle(PropertyPageMessages.JavaLineBreakpointPage_18);
-			fEditor = new CompositeBreakpointEditor(new AbstractJavaBreakpointEditor[]
-			    {new StandardJavaBreakpointEditor(), new JavaBreakpointConditionEditor(null)});
+			fEditor = new CompositeBreakpointEditor(new StandardJavaBreakpointEditor(), new JavaBreakpointConditionEditor());
 		} else if (JavaExceptionBreakpoint.JAVA_EXCEPTION_BREAKPOINT.equals(type)) {
 			setTitle(PropertyPageMessages.JavaExceptionBreakpointPage_5);
 			fEditor = new ExceptionBreakpointEditor();
 		} else if (JavaWatchpoint.JAVA_WATCHPOINT.equals(type)) {
 			setTitle(PropertyPageMessages.JavaLineBreakpointPage_19);
-				fEditor = new CompositeBreakpointEditor(new AbstractJavaBreakpointEditor[] { new WatchpointEditor(),
-						new JavaBreakpointConditionEditor(null) });
+			fEditor = new CompositeBreakpointEditor(new WatchpointEditor(), new JavaBreakpointConditionEditor());
 		} else if (JavaMethodBreakpoint.JAVA_METHOD_BREAKPOINT.equals(type)) {
 			setTitle(PropertyPageMessages.JavaLineBreakpointPage_20);
-			fEditor = new CompositeBreakpointEditor(new AbstractJavaBreakpointEditor[]
-			    {new MethodBreakpointEditor(), new JavaBreakpointConditionEditor(null)});
+			fEditor = new CompositeBreakpointEditor(new MethodBreakpointEditor(), new JavaBreakpointConditionEditor());
 		} else {
 			// use standard editor for any other kind of breakpoint (@see bug 325161)
 			fEditor = new StandardJavaBreakpointEditor();