Add method for getting domain from PluginInfo.

Plugins shouldn't be required to have getters and setters for
something that's constant.

Change-Id: I99ebc7d10f558008a7889252cc3c96f39747303e
Reviewed-on: http://gerrit.dmdirc.com/2860
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

src/com/dmdirc/plugins/Plugin.java

@@ -46,8 +46,10 @@ public interface Plugin {
     /**
      * Get the domain name settings for this plugin should be stored in.
      *
+     * @deprecated Domain should be obtained from {@link PluginInfo}
      * @return Domain name for plugin settings
      */
+    @Deprecated
     String getDomain();
 
     /**
@@ -122,8 +124,10 @@ public interface Plugin {
      * Called by PluginInfo to set the domain name.
      * This can only be called once, all other attempts will be ignored.
      *
+     * @deprecated Domain should be obtained from {@link PluginInfo}
      * @param newDomain Domain name for plugin settings
      */
+    @Deprecated
     void setDomain(final String newDomain);
 
     /**

src/com/dmdirc/plugins/PluginInfo.java

@@ -224,16 +224,15 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
      */
     private void getDefaults() {
         final ConfigProvider defaults = IdentityManager.getIdentityManager().getAddonSettings();
-        final String domain = "plugin-" + metaData.getName();
 
         log.trace("{}: Using domain '{}'",
-                new Object[]{metaData.getName(), domain});
+                new Object[]{metaData.getName(), getDomain()});
 
         for (Map.Entry<String, String> entry : metaData.getDefaultSettings().entrySet()) {
             final String key = entry.getKey();
             final String value = entry.getValue();
 
-            defaults.setOption(domain, key, value);
+            defaults.setOption(getDomain(), key, value);
         }
 
         for (Map.Entry<String, String> entry : metaData.getFormatters().entrySet()) {
@@ -717,13 +716,12 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
                             Logger.userError(ErrorLevel.LOW, lastError);
                         }
                     } else {
-                        final String domain = "plugin-" + metaData.getName();
                         plugin = (Plugin) temp;
 
                         log.debug("{}: Setting domain '{}'",
-                                new Object[]{metaData.getName(), domain});
+                                new Object[]{metaData.getName(), getDomain()});
 
-                        plugin.setDomain(domain);
+                        plugin.setDomain(getDomain());
                         if (!tempLoaded) {
                             try {
                                 plugin.load(this, getObjectGraph());
@@ -764,6 +762,15 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
         }
     }
 
+    /**
+     * Gets the configuration domain that should be used by this plugin.
+     *
+     * @return The configuration domain to use.
+     */
+    public String getDomain() {
+        return "plugin-" + metaData.getName();
+    }
+
     /**
      * Unload the plugin if possible.
      */

src/com/dmdirc/plugins/implementations/BasePlugin.java

@@ -43,6 +43,7 @@ public abstract class BasePlugin implements Plugin {
 
     /** {@inheritDoc} */
     @Override
+    @Deprecated
     public void setDomain(final String newDomain) {
         if (!domainSet) {
             domainSet = true;
@@ -86,6 +87,7 @@ public abstract class BasePlugin implements Plugin {
 
     /** {@inheritDoc} */
     @Override
+    @Deprecated
     public String getDomain() {
         return myDomain;
     }
@@ -94,7 +96,10 @@ public abstract class BasePlugin implements Plugin {
      * Called when the domain for plugin settings has been set.
      * This will only be called once (either when the plugin is loading, or when
      * its config is being shown).
+     *
+     * @deprecated Domain should be obtained from {@link PluginInfo}, and will never be updated.
      */
+    @Deprecated
     protected void domainUpdated() {
         //Define this here so only implementations that care have to override
     }