Move all formatter/icon settings into plugin.configs

Fixes issue 2309

src/com/dmdirc/addons/dcc/DCCPlugin.java

@@ -456,27 +456,6 @@ public final class DCCPlugin extends Plugin implements ActionListener {
 
         defaults.setOption(getDomain(), "receive.savelocation",
                 Main.getConfigDir() + "downloads" + System.getProperty("file.separator"));
-		final String url = "plugin://dcc:com/dmdirc/addons/dcc/res/";
-        
-        defaults.setOption("icon", "category-dcc", url + "transfers.png");
-		defaults.setOption("icon", "dcc", url + "transfers.png");
-		defaults.setOption("icon", "dcc-chat-active", url + "chat.png");
-		defaults.setOption("icon", "dcc-chat-inactive", url + "chat-inactive.png");
-		defaults.setOption("icon", "dcc-send-active", url + "send.png");
-		defaults.setOption("icon", "dcc-send-inactive", url + "send-inactive.png");
-		defaults.setOption("icon", "dcc-send-done", url + "send-done.png");
-		defaults.setOption("icon", "dcc-send-failed", url + "send-failed.png");
-		defaults.setOption("icon", "dcc-receive-active", url + "receive.png");
-		defaults.setOption("icon", "dcc-receive-inactive", url + "receive-inactive.png");
-		defaults.setOption("icon", "dcc-receive-done", url + "receive-done.png");
-		defaults.setOption("icon", "dcc-receive-failed", url + "receive-failed.png");
-
-		defaults.setOption("formatter", "DCCChatStarting", "Starting DCC Chat with: %1$s on %2$s:%3$s");
-		defaults.setOption("formatter", "DCCChatInfo", "%1$s");
-		defaults.setOption("formatter", "DCCChatError", "\u00034 Error: %1$s");
-		defaults.setOption("formatter", "DCCSendError", "\u00034 Error: %1$s");
-		defaults.setOption("formatter", "DCCChatSelfMessage", "<%1$s> %2$s");
-		defaults.setOption("formatter", "DCCChatMessage", "<%1$s> %2$s");
     }
 
 	/**

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

@@ -8,6 +8,8 @@ keysections:
   requires
   updates
   defaults
+  formatters
+  icons
 #  version
 
 metadata:
@@ -47,4 +49,26 @@ defaults:
   firewall.ip=
   firewall.ports.usePortRange=false
   firewall.ports.startPort=11000
-  firewall.ports.endPort=11019
+  firewall.ports.endPort=11019
+
+formatters:
+  DCCChatStarting=Starting DCC Chat with: %1$s on %2$s:%3$s
+  DCCChatInfo=%1$s
+  DCCChatError=\u00034 Error: %1$s
+  DCCSendError=\u00034 Error: %1$s
+  DCCChatSelfMessage=<%1$s> %2$s
+  DCCChatMessage=<%1$s> %2$s
+
+icons:
+  category-dcc=plugin://dcc:com/dmdirc/addons/dcc/res/transfers.png
+  dcc=plugin://dcc:com/dmdirc/addons/dcc/res/transfers.png
+  dcc-chat-active=plugin://dcc:com/dmdirc/addons/dcc/res/chat.png
+  dcc-chat-inactive=plugin://dcc:com/dmdirc/addons/dcc/res/chat-inactive.png
+  dcc-send-active=plugin://dcc:com/dmdirc/addons/dcc/res/send.png
+  dcc-send-inactive=plugin://dcc:com/dmdirc/addons/dcc/res/send-inactive.png
+  dcc-send-done=plugin://dcc:com/dmdirc/addons/dcc/res/send-done.png
+  dcc-send-failed=plugin://dcc:com/dmdirc/addons/dcc/res/send-failed.png
+  dcc-receive-active=plugin://dcc:com/dmdirc/addons/dcc/res/receive.png
+  dcc-receive-inactive=plugin://dcc:com/dmdirc/addons/dcc/res/receive-inactive.png
+  dcc-receive-done=plugin://dcc:com/dmdirc/addons/dcc/res/receive-done.png
+  dcc-receive-failed=plugin://dcc:com/dmdirc/addons/dcc/res/receive-failed.png

src/com/dmdirc/addons/mediasource_vlc/VlcMediaSourcePlugin.java

@@ -192,13 +192,6 @@ public class VlcMediaSourcePlugin extends Plugin implements MediaSource {
         // Do nothing
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public void domainUpdated() {
-        IdentityManager.getAddonIdentity().setOption("icon", "category-vlc",
-                "plugin://vlcmediasource:com/dmdirc/addons/mediasource_vlc/vlc.png");
-    }
-
     /** {@inheritDoc} */
     @Override    
     public void onUnload() {

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

@@ -9,6 +9,7 @@ keysections:
   updates
   version
   defaults
+  icons
 
 metadata:
   author=Chris <chris@dmdirc.com>
@@ -33,4 +34,7 @@ required-services:
   mediasource manager
 
 defaults:
-  host=localhost:8082
+  host=localhost:8082
+
+icons:
+  category-vlc=plugin://vlcmediasource:com/dmdirc/addons/mediasource_vlc/vlc.png

src/com/dmdirc/addons/nowplaying/NowPlayingPlugin.java

@@ -95,13 +95,6 @@ public class NowPlayingPlugin extends Plugin implements ActionListener  {
         
         CommandManager.unregisterCommand(command);
     }
-
-    /** {@inheritDoc} */
-    @Override
-    public void domainUpdated() {
-        IdentityManager.getAddonIdentity().setOption("icon", "category-nowplaying",
-                "plugin://nowplaying:com/dmdirc/addons/nowplaying/nowplaying.png");
-    }
     
     /** {@inheritDoc} */
     @Override

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

@@ -8,6 +8,7 @@ keysections:
   requires
   updates
   defaults
+  icons
 #  version
 
 metadata:
@@ -36,4 +37,7 @@ provides:
   mediasource manager
 
 defaults:
-  format=/me is playing $artist - $title
+  format=/me is playing $artist - $title
+
+icons:
+  category-nowplaying=plugin://nowplaying:com/dmdirc/addons/nowplaying/nowplaying.png