Rename treeview sort config options

issue 3837

Change-Id: I0302e13d8bf72b4af17a52d51ae527d266a7ce5a
Reviewed-on: http://gerrit.dmdirc.com/1180
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>

src/com/dmdirc/addons/ui_swing/SwingController.java

@@ -793,6 +793,12 @@ public final class SwingController extends Plugin implements Serializable,
         general.addSetting(new PreferencesSetting(PreferencesType.INTEGER,
                 "ui", "textPaneFontSize", "Textpane font size",
                 "Font size for the textpane"));
+        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                "ui", "sortrootwindows", "Sort root windows",
+                "Sort child windows in the frame managers?"));
+        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                "ui", "sortchildwindows", "Sort child windows",
+                "Sort root windows in the frame managers?"));
 
         general.addSubCategory(createNicklistCategory());
         general.addSubCategory(createTreeViewCategory());
@@ -869,12 +875,6 @@ public final class SwingController extends Plugin implements Serializable,
                 PreferencesType.OPTIONALCOLOUR,
                 "ui", "treeviewRolloverColour", "Treeview rollover colour",
                 "Background colour to use when the mouse cursor is over a node"));
-        treeview.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                "treeview", "sortwindows", "Sort windows",
-                "Sort windows belonging to servers in the treeview?"));
-        treeview.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                "treeview", "sortservers", "Sort servers",
-                "Sort servers in the treeview?"));
         treeview.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 "ui", "treeviewActiveBold", "Active node bold",
                 "Make the active node bold?"));

src/com/dmdirc/addons/ui_swing/framemanager/tree/TreeFrameManager.java

@@ -278,7 +278,7 @@ public final class TreeFrameManager implements FrameManager,
     /** {@inheritDoc} */
     @Override
     public void configChanged(final String domain, final String key) {
-        if ("sortservers".equals(key) || "sortwindows".equals(key)) {
+        if ("sortrootwindows".equals(key) || "sortchildwindows".equals(key)) {
             redoTreeView();
         } else {
             setColours();

src/com/dmdirc/addons/ui_swing/framemanager/tree/TreeViewModel.java

@@ -106,12 +106,12 @@ public class TreeViewModel extends DefaultTreeModel {
         }
 
         if (parent.equals(root) && !IdentityManager.getGlobalConfig().
-                getOptionBool("treeview", "sortservers")) {
+                getOptionBool("ui", "sortrootwindows")) {
             return parent.getChildCount();
         }
 
-        if (IdentityManager.getGlobalConfig().getOptionBool("treeview",
-                "sortwindows")) {
+        if (IdentityManager.getGlobalConfig().getOptionBool("ui",
+                "sortchildwindows")) {
             for (int i = 0; i < parent.getChildCount(); i++) {
                 final TreeViewNode child = (TreeViewNode) parent.getChildAt(i);
                 if (sortBefore(newChild, child)) {