When a component is being deleted, it will always be swapped to the component selected in the combo box, ignoring the "Remove component from all issues" option.

Something has gone wrong with the checking:

if(swapComponentId != null)
{
  // ...

It should be doing this instead:

if(action.equalsIgnoreCase("swap") && swapComponentId != null)
{
  // ...