Fixes issue 1560

git-svn-id: http://svn.dmdirc.com/trunk@4451 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/addons/mediasource_dcop/DcopMediaSourcePlugin.java

@@ -24,6 +24,7 @@ package com.dmdirc.addons.mediasource_dcop;
 
 import com.dmdirc.addons.nowplaying.MediaSource;
 import com.dmdirc.addons.nowplaying.MediaSourceManager;
+import com.dmdirc.config.prefs.validator.ValidationResponse;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
@@ -71,19 +72,19 @@ public class DcopMediaSourcePlugin extends Plugin
     
     /** {@inheritDoc} */
     @Override
-    public boolean checkPrerequisites() {
+    public ValidationResponse checkPrerequisites() {
         PluginManager.getPluginManager().addPlugin("dcop.jar");
         
         final PluginInfo pi = PluginManager.getPluginManager().getPluginInfoByName("dcop");
         
         if (pi == null) {
-            return false;
+            return new ValidationResponse("DCOP Plugin not found");
         }
         
         if (!pi.isLoaded()) {
             pi.loadPlugin();
         }
 
-        return true;
+        return new ValidationResponse();
     }
 }

src/com/dmdirc/addons/systray/SystrayPlugin.java

@@ -32,6 +32,7 @@ import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesManager;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
+import com.dmdirc.config.prefs.validator.ValidationResponse;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.ui.messages.Styliser;
 import com.dmdirc.ui.swing.MainFrame;
@@ -111,8 +112,12 @@ public final class SystrayPlugin extends Plugin implements ActionListener,
     
     /** {@inheritDoc} */
     @Override
-    public boolean checkPrerequisites() {
-        return SystemTray.isSupported();
+    public ValidationResponse checkPrerequisites() {
+        if (SystemTray.isSupported()) {
+            return new ValidationResponse();
+        } else {
+            return new ValidationResponse("System tray is not supported on this platform.");
+        }
     }
     
     /** {@inheritDoc} */

src/com/dmdirc/plugins/Plugin.java

@@ -25,6 +25,7 @@
 package com.dmdirc.plugins;
 
 import com.dmdirc.config.prefs.PreferencesManager;
+import com.dmdirc.config.prefs.validator.ValidationResponse;
 
 /**
  * Defines the standard methods that should be implemented by plugins.
@@ -45,9 +46,10 @@ public abstract class Plugin implements Comparable<Plugin> {
 	 * Check any further Prerequisites for this plugin to load that can not be
 	 * checked using metainfo.
 	 *
-	 * @return true if the plugin can be used, else false.
+	 * @return ValidationResponse detailign if the plugin passes any extra checks
+	 *         that plugin.info can't handle
 	 */
-	public boolean checkPrerequisites() { return true; }
+	public ValidationResponse checkPrerequisites() { return new ValidationResponse(); }
 		
 	/**
 	 * Called when the plugin is about to be unloaded.

src/com/dmdirc/plugins/PluginInfo.java

@@ -26,6 +26,7 @@ package com.dmdirc.plugins;
 import com.dmdirc.Main;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.config.prefs.validator.ValidationResponse;
 import com.dmdirc.util.resourcemanager.ResourceManager;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.logger.ErrorLevel;
@@ -629,7 +630,8 @@ public class PluginInfo implements Comparable<PluginInfo> {
 				final Object temp = constructor.newInstance(new Object[] {});
 	
 				if (temp instanceof Plugin) {
-					if (((Plugin) temp).checkPrerequisites()) {
+					final ValidationResponse prerequisites = ((Plugin) temp).checkPrerequisites();
+					if (!prerequisites.isFailure()) {
 						plugin = (Plugin) temp;
 						if (!tempLoaded) {
 							try {
@@ -642,7 +644,7 @@ public class PluginInfo implements Comparable<PluginInfo> {
 						}
 					} else {
 						if (!tempLoaded) {
-							lastError = "Prerequisites for plugin not met. ('"+filename+":"+getMainClass()+"')";
+							lastError = "Prerequisites for plugin not met. ('"+filename+":"+getMainClass()+"' -> '"+prerequisites.getFailureReason()+"') ";
 							Logger.userError(ErrorLevel.LOW, lastError);
 						}
 					}