Ident and lag display plugins now set their defaults in their configs

Issue 2244

src/com/dmdirc/addons/identd/IdentdPlugin.java

@@ -67,20 +67,6 @@ public class IdentdPlugin extends Plugin implements ActionListener {
 	public void onLoad() {
 		// Add action hooks
 		ActionManager.addListener(this, CoreActionType.SERVER_CONNECTED, CoreActionType.SERVER_CONNECTING, CoreActionType.SERVER_CONNECTERROR);
-
-		// Set defaults
-		final Identity defaults = IdentityManager.getAddonIdentity();
-		defaults.setOption(getDomain(), "general.useUsername", "false");
-		defaults.setOption(getDomain(), "general.useNickname", "false");
-		defaults.setOption(getDomain(), "general.useCustomName", "false");
-		defaults.setOption(getDomain(), "general.customName", "DMDirc-user");
-		
-		defaults.setOption(getDomain(), "advanced.alwaysOn", "false");
-		defaults.setOption(getDomain(), "advanced.port", "113");
-		defaults.setOption(getDomain(), "advanced.useCustomSystem", "false");
-		defaults.setOption(getDomain(), "advanced.customSystem", "OTHER");
-		defaults.setOption(getDomain(), "advanced.isHiddenUser", "false");
-		defaults.setOption(getDomain(), "advanced.isNoUser", "false");
 		
 		myServer = new IdentdServer(this);
 		if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "advanced.alwaysOn")) {

src/com/dmdirc/addons/identd/plugin.config

@@ -6,6 +6,7 @@
 keysections:
   metadata
   updates
+  defaults
 #  version
 
 metadata:
@@ -25,3 +26,16 @@ provides:
   ident feature
 
 required-services:
+
+defaults:
+  general.useUsername=false
+  general.useNickname=false
+  general.useCustomName=false
+  general.customName=DMDirc-user
+
+  advanced.alwaysOn=false
+  advanced.port=113
+  advanced.useCustomSystem=false
+  advanced.customSystem=OTHER
+  advanced.isHiddenUser=false
+  advanced.isNoUser=false

src/com/dmdirc/addons/lagdisplay/LagDisplayPlugin.java

@@ -29,7 +29,6 @@ import com.dmdirc.ServerState;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.interfaces.ActionType;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesManager;
 import com.dmdirc.config.prefs.PreferencesSetting;
@@ -88,8 +87,6 @@ public final class LagDisplayPlugin extends Plugin implements ActionListener,
     @Override
     public void onLoad() {
         Main.getUI().getStatusBar().addComponent(panel);
-        IdentityManager.getAddonIdentity().setOption("plugin-Lagdisplay",
-                "usealternate", false);
         
         ActionManager.addListener(this, CoreActionType.SERVER_GOTPING,
                 CoreActionType.SERVER_NOPING, CoreActionType.CLIENT_FRAME_CHANGED,
@@ -116,7 +113,7 @@ public final class LagDisplayPlugin extends Plugin implements ActionListener,
         for (Object obj : arguments) {
             if (obj instanceof FrameContainer && ((FrameContainer) obj).getServer() != null) {
                 useAlternate = ((FrameContainer) obj).getServer().getConfigManager()
-                        .getOptionBool("plugin-Lagdisplay", "usealternate");
+                        .getOptionBool(getDomain(), "usealternate");
                 break;
             }
         }
@@ -260,7 +257,7 @@ public final class LagDisplayPlugin extends Plugin implements ActionListener,
         final PreferencesCategory cat = new PreferencesCategory("Lag display plugin",
                                                                 "");
         cat.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                "plugin-Lagdisplay", "usealternate",
+                getDomain(), "usealternate",
                 "Alternate method", "Use an alternate method of determining "
                 + "lag which bypasses bouncers or proxies that may reply."));
         manager.getCategory("Plugins").addSubCategory(cat);

src/com/dmdirc/addons/lagdisplay/plugin.config

@@ -7,6 +7,7 @@ keysections:
   metadata
   updates
   requires
+  defaults
 #  version
 
 metadata:
@@ -29,4 +30,7 @@ provides:
   lagdisplay statusbar_entry
 
 required-services:
-  swing ui
+  swing ui
+
+defaults:
+  usealternate=false