Add highlights to the PMD.

Adding highlights seems broken, but so does nicknames and
that hasn't changed, so likely a bug elsewhere we didn't
notice.  Will fix that soon.

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/profile/ProfileManagerController.java

@@ -75,6 +75,10 @@ public class ProfileManagerController implements ProfilesDialogModelListener {
         setupProfileNicknames(dialog.getProfileNicknames());
         setupProfileRealname(dialog.getProfileRealname());
         setupProfileIdent(dialog.getProfileIdent());
+        setupProfileHighlights(dialog.getProfileHighlights());
+        setupAddHighlight(dialog.getProfileAddHighlight());
+        setupEditHighlight(dialog.getProfileEditHighlight());
+        setupDeleteHighlight(dialog.getProfileDeleteHighlight());
         model.addListener(this);
     }
 
@@ -150,6 +154,32 @@ public class ProfileManagerController implements ProfilesDialogModelListener {
                 .ifPresent(model::removeSelectedProfileNickname));
     }
 
+    private void setupAddHighlight(final JButton addHighlight) {
+        addHighlight.setEnabled(!model.getProfileList().isEmpty());
+        addHighlight.addActionListener(e ->
+                new StandardInputDialog(dialog, Dialog.ModalityType.DOCUMENT_MODAL,
+                        iconManager, "Profile Manager: Add Highlight", "Enter highlight to add",
+                        model.getSelectedProfileAddHighlightValidator(),
+                        model::addSelectedProfileHighlight).display());
+    }
+
+    private void setupEditHighlight(final JButton editHighlight) {
+        editHighlight.setEnabled(model.getSelectedProfileSelectedHighlight().isPresent());
+        editHighlight.addActionListener(l -> model.getSelectedProfileSelectedHighlight().ifPresent(
+                (String oldName) -> new StandardInputDialog(dialog,
+                        Dialog.ModalityType.DOCUMENT_MODAL, iconManager,
+                        "Profile Manager: Edit Highlight", "Enter new highlight",
+                        model.getSelectedProfileEditHighlightValidator(),
+                        (String newName) -> model.editSelectedProfileHighlight(oldName, newName))
+                        .display()));
+    }
+
+    private void setupDeleteHighlight(final JButton deleteHighlight) {
+        deleteHighlight.setEnabled(model.getSelectedProfileSelectedHighlight().isPresent());
+        deleteHighlight.addActionListener(l -> model.getSelectedProfileSelectedHighlight()
+                .ifPresent(model::removeSelectedProfileHighlight));
+    }
+
     private void setupProfileName(final JTextField name) {
         name.setEnabled(model.getSelectedProfileName().isPresent());
         name.setText(model.getSelectedProfileName().orElse(""));
@@ -160,6 +190,13 @@ public class ProfileManagerController implements ProfilesDialogModelListener {
         }));
     }
 
+    private void setupProfileHighlights(final ReorderableJList<String> highlights) {
+        highlights.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+        highlights.setEnabled(model.getSelectedProfileHighlights().isPresent());
+        highlights.addListSelectionListener(l -> model.setSelectedProfileSelectedHighlight(
+                Optional.ofNullable(highlights.getSelectedValue())));
+    }
+
     private void setupProfileNicknames(final ReorderableJList<String> nicknames) {
         nicknames.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         nicknames.setEnabled(model.getSelectedProfileNicknames().isPresent());
@@ -242,8 +279,8 @@ public class ProfileManagerController implements ProfilesDialogModelListener {
     @Override
     public void selectedProfileNicknameEdited(final String oldNickname, final String newNickname) {
         dialog.getOkButton().setEnabled(model.isSaveAllowed());
-        dialog.getProfileNicknames().getModel()
-                .setElementAt(newNickname, dialog.getProfileNicknames().getModel().indexOf(oldNickname));
+        dialog.getProfileNicknames().getModel().setElementAt(newNickname,
+                dialog.getProfileNicknames().getModel().indexOf(oldNickname));
     }
 
     @Override
@@ -258,4 +295,32 @@ public class ProfileManagerController implements ProfilesDialogModelListener {
         dialog.getProfileNicknames().getModel().removeElement(nickname);
     }
 
+    @Override
+    public void selectedHighlightChanged(final Optional<String> highlight) {
+        dialog.getOkButton().setEnabled(model.isSaveAllowed());
+        dialog.getProfileDeleteHighlight()
+                .setEnabled(model.getSelectedProfileSelectedHighlight().isPresent());
+        dialog.getProfileEditHighlight()
+                .setEnabled(model.getSelectedProfileSelectedHighlight().isPresent());
+    }
+
+    @Override
+    public void selectedProfileHighlightEdited(final String oldHighlight, final String newHighlight) {
+        dialog.getOkButton().setEnabled(model.isSaveAllowed());
+        dialog.getProfileHighlights().getModel().setElementAt(newHighlight,
+                dialog.getProfileHighlights().getModel().indexOf(oldHighlight));
+    }
+
+    @Override
+    public void selectedProfileHighlightAdded(final String highlight) {
+        dialog.getOkButton().setEnabled(model.isSaveAllowed());
+        dialog.getProfileHighlights().getModel().addElement(highlight);
+    }
+
+    @Override
+    public void selectedProfileHighlightRemoved(final String highlight) {
+        dialog.getOkButton().setEnabled(model.isSaveAllowed());
+        dialog.getProfileHighlights().getModel().removeElement(highlight);
+    }
+
 }

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/profile/ProfileManagerDialog.java

@@ -58,12 +58,20 @@ public class ProfileManagerDialog extends StandardDialog {
     private final JList<MutableProfile> profileList = new JList<>(new DefaultListModel<>());
     /** List of nicknames for a profile. */
     private final ReorderableJList<String> nicknames = new ReorderableJList<>();
+    /** List of highlights for a profile. */
+    private final ReorderableJList<String> highlights = new ReorderableJList<>();
     /** Adds a new nickname to the active profile. */
     private final JButton addNickname = new JButton("Add");
     /** Edits the active nickname in the active profile. */
     private final JButton editNickname = new JButton("Edit");
     /** Deletes the selected nickname from the active profile. */
     private final JButton deleteNickname = new JButton("Delete");
+    /** Adds a new highlight to the active profile. */
+    private final JButton addHighlight = new JButton("Add");
+    /** Edits the active highlight in the active profile. */
+    private final JButton editHighlight = new JButton("Edit");
+    /** Deletes the selected highlight from the active profile. */
+    private final JButton deleteHighlight = new JButton("Delete");
     /** Edits the name of the active profile. */
     private final JTextField name = new JTextField();
     /** Edits the realname for the active profile. */
@@ -101,9 +109,10 @@ public class ProfileManagerDialog extends StandardDialog {
         add(new TextLabel("Profiles describe the information needed to connect " +
                 "to a server.  You can use a different profile for each " + "connection."),
                 "spanx 3");
-        add(new JScrollPane(profileList), "spany 3, growy, " + "wmin 200, wmax 200");
-        add(addProfile, "grow");
-        add(deleteProfile, "grow, wrap");
+        add(new JScrollPane(profileList), "spany 7, split 3, growy, pushy, "
+                + "wmin 200, wmax 200");
+        add(addProfile, "growx");
+        add(deleteProfile, "growx, wrap");
         add(new JLabel("Name: "), "align label, span 2, split 2, flowx, sgx label");
         add(ValidationFactory
                 .getValidatorPanel(name, model.getSelectedProfileNameValidator(), iconManager),
@@ -123,6 +132,14 @@ public class ProfileManagerDialog extends StandardDialog {
         add(new JLabel("Ident: "), "align label, span 2, split 2, flowx, sgx label");
         add(ValidationFactory.getValidatorPanel(ident, model.getIdentValidator(), iconManager),
                 "growx, pushx, sgx textinput");
+        add(new JLabel("Highlight: "),
+                "align label, span 2, split 2, flowx, sgx label, aligny 50%");
+        add(ValidationFactory.getValidatorPanel(new JScrollPane(highlights), highlights,
+                model.getHighlightsValidator(), iconManager), "grow, push");
+        add(Box.createGlue(), "flowx, span 4, split 4, sgx label");
+        add(addHighlight, "grow");
+        add(editHighlight, "grow");
+        add(deleteHighlight, "grow");
         add(getLeftButton(), "flowx, split 2, right, sg button");
         add(getRightButton(), "right, sg button");
     }
@@ -172,4 +189,20 @@ public class ProfileManagerDialog extends StandardDialog {
     public JButton getDeleteProfile() {
         return deleteProfile;
     }
+
+    public ReorderableJList<String> getProfileHighlights() {
+        return highlights;
+    }
+
+    public JButton getProfileAddHighlight() {
+        return addHighlight;
+    }
+
+    public JButton getProfileEditHighlight() {
+        return editHighlight;
+    }
+
+    public JButton getProfileDeleteHighlight() {
+        return deleteHighlight;
+    }
 }