fixes after review IDEA-CR-14783

java/debugger/impl/src/org/jetbrains/java/debugger/breakpoints/JavaBreakpointFiltersPanel.java

@@ -267,8 +267,7 @@ public class JavaBreakpointFiltersPanel<T extends JavaBreakpointProperties, B ex
         }
       }
     }
-    StreamEx.of(myInstanceFilters).remove(InstanceFilter::isEnabled).forEach(idxs::add);
-    myInstanceFilters = idxs.toArray(new InstanceFilter[idxs.size()]);
+    myInstanceFilters = StreamEx.of(myInstanceFilters).remove(InstanceFilter::isEnabled).prepend(idxs).toArray(InstanceFilter[]::new);
   }
 
   private static String concatWithEx(List<String> s, String concator, int N, String NthConcator) {

platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerUtilImpl.java

@@ -93,7 +93,7 @@ public class XDebuggerUtilImpl extends XDebuggerUtil {
   @Override
   public XLineBreakpointType<?>[] getLineBreakpointTypes() {
     if (myLineBreakpointTypes == null) {
-      myLineBreakpointTypes = XBreakpointUtil.getBreakpointTypes().select(XLineBreakpointType.class).toArray(XLineBreakpointType<?>[]::new);
+      myLineBreakpointTypes = XBreakpointUtil.breakpointTypes().select(XLineBreakpointType.class).toArray(XLineBreakpointType<?>[]::new);
     }
     return myLineBreakpointTypes;
   }
@@ -289,7 +289,7 @@ public class XDebuggerUtilImpl extends XDebuggerUtil {
   @Override
   public <T extends XBreakpointType> T findBreakpointType(@NotNull Class<T> typeClass) {
     if (myBreakpointTypeByClass == null) {
-      myBreakpointTypeByClass = XBreakpointUtil.getBreakpointTypes().toMap(XBreakpointType::getClass, t -> t);
+      myBreakpointTypeByClass = XBreakpointUtil.breakpointTypes().toMap(XBreakpointType::getClass, t -> t);
     }
     XBreakpointType type = myBreakpointTypeByClass.get(typeClass);
     //noinspection unchecked

platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointManagerImpl.java

@@ -75,7 +75,7 @@ public class XBreakpointManagerImpl implements XBreakpointManager, PersistentSta
         HttpVirtualFileListener httpVirtualFileListener = this::updateBreakpointInFile;
         HttpFileSystem.getInstance().addFileListener(httpVirtualFileListener, project);
       }
-      XBreakpointUtil.getBreakpointTypes().forEach(this::addDefaultBreakpoint);
+      XBreakpointUtil.breakpointTypes().forEach(this::addDefaultBreakpoint);
     }
   }
 
@@ -397,7 +397,7 @@ public class XBreakpointManagerImpl implements XBreakpointManager, PersistentSta
     ApplicationManager.getApplication().runReadAction(() -> {
       state.getDefaultBreakpoints().forEach(breakpointState -> loadBreakpoint(breakpointState, true));
 
-      XBreakpointUtil.getBreakpointTypes().remove(myDefaultBreakpoints::containsKey).forEach(this::addDefaultBreakpoint);
+      XBreakpointUtil.breakpointTypes().remove(myDefaultBreakpoints::containsKey).forEach(this::addDefaultBreakpoint);
 
       myBreakpoints.values().forEach(this::doRemoveBreakpoint);
 

platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointUtil.java

@@ -64,10 +64,10 @@ public class XBreakpointUtil {
 
   @Nullable
   public static XBreakpointType<?, ?> findType(@NotNull @NonNls String id) {
-    return getBreakpointTypes().filter(breakpointType -> id.equals(breakpointType.getId())).findFirst().orElse(null);
+    return breakpointTypes().filter(breakpointType -> id.equals(breakpointType.getId())).findFirst().orElse(null);
   }
 
-  public static StreamEx<XBreakpointType> getBreakpointTypes() {
+  public static StreamEx<XBreakpointType> breakpointTypes() {
     return StreamEx.of(XBreakpointType.EXTENSION_POINT_NAME.getExtensions());
   }
 

platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/BreakpointsDialog.java

@@ -306,11 +306,10 @@ public class BreakpointsDialog extends DialogWrapper {
       }
     }.registerCustomShortcutSet(ActionManager.getInstance().getAction(IdeActions.ACTION_EDIT_SOURCE).getShortcutSet(), tree, myDisposable);
 
-    DefaultActionGroup breakpointTypes = new DefaultActionGroup();
-    XBreakpointUtil.getBreakpointTypes()
+    DefaultActionGroup breakpointTypes = XBreakpointUtil.breakpointTypes()
       .filter(XBreakpointType::isAddBreakpointButtonVisible)
       .map(AddXBreakpointAction::new)
-      .forEach(breakpointTypes::add);
+      .toListAndThen(DefaultActionGroup::new);
 
     ToolbarDecorator decorator = ToolbarDecorator.createDecorator(tree).
       setAddAction(new AnActionButtonRunnable() {

platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/grouping/XBreakpointTypeGroup.java

@@ -74,6 +74,6 @@ public class XBreakpointTypeGroup extends XBreakpointGroup {
   }
 
   private static int indexOfType(XBreakpointType type) {
-    return (int)XBreakpointUtil.getBreakpointTypes().indexOf(type).orElse(-1);
+    return (int)XBreakpointUtil.breakpointTypes().indexOf(type).orElse(-1);
   }
 }

platform/xdebugger-impl/testSrc/com/intellij/xdebugger/XDebuggerTestUtil.java

@@ -438,15 +438,14 @@ public class XDebuggerTestUtil {
                                                                       @NotNull final XBreakpointProperties properties) {
     XBreakpointManager breakpointManager = XDebuggerManager.getInstance(project).getBreakpointManager();
     Ref<XBreakpoint> breakpoint = Ref.create(null);
-    XBreakpointUtil.getBreakpointTypes().select(exceptionType).findFirst().ifPresent(type -> {
-      final T breakpointType = exceptionType.cast(type);
+    XBreakpointUtil.breakpointTypes().select(exceptionType).findFirst().ifPresent(type ->
       new WriteAction() {
         @Override
         protected void run(@NotNull Result result) throws Throwable {
-          breakpoint.set(breakpointManager.addBreakpoint(breakpointType, properties));
+          breakpoint.set(breakpointManager.addBreakpoint(type, properties));
         }
-      }.execute();
-    });
+      }.execute()
+    );
     return breakpoint.get();
   }