Fix funky alias delete behaviour.

Change-Id: Ic4c38d8245f4a88d1b3d1ce4fdf9ecb1c620d1da
Reviewed-on: http://gerrit.dmdirc.com/3562
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/addons/ui_swing/dialogs/aliases/AliasManagerLinker.java

@@ -94,6 +94,8 @@ public class AliasManagerLinker {
                 final int index = commandList.getSelectedRow();
                 if (index == -1) {
                     model.setSelectedAlias(Optional.<Alias>absent());
+                } else if (index >= commandModel.getRowCount()) {
+                    model.setSelectedAlias(Optional.fromNullable(commandModel.getValue(index - 1)));
                 } else {
                     model.setSelectedAlias(Optional.fromNullable(commandModel.getValue(index)));
                 }
@@ -141,6 +143,16 @@ public class AliasManagerLinker {
             public void propertyChange(final PropertyChangeEvent evt) {
                 if (evt.getOldValue() != null) {
                     commandModel.removeValue((Alias) evt.getOldValue());
+                    final int index = commandList.getSelectedRow();
+                    if (index == -1) {
+                        model.setSelectedAlias(Optional.<Alias>absent());
+                    } else if (index >= commandModel.getRowCount()) {
+                        model.setSelectedAlias(Optional.fromNullable(commandModel.
+                                getValue(index - 1)));
+                        commandList.getSelectionModel().setLeadSelectionIndex(index - 1);
+                    } else {
+                        model.setSelectedAlias(Optional.fromNullable(commandModel.getValue(index)));
+                    }
                 }
             }
         });