Fixes issue 1488: PluginInfo should look for "persistent" not "persistant"

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

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

@@ -6,6 +6,6 @@ name=dcc
 nicename=DCC Plugin
 minversion=0
 require-ui=com.dmdirc.ui.swing
-persistant-com.dmdirc.addons.dcc.actions.DCCActions=true
-persistant-com.dmdirc.addons.dcc.actions.DCCEvents=true
+persistent-com.dmdirc.addons.dcc.actions.DCCActions=true
+persistent-com.dmdirc.addons.dcc.actions.DCCEvents=true
 addonid=23

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

@@ -5,6 +5,6 @@ description=Adds a command to show nowplaying information
 name=nowplaying
 nicename=Now Playing Plugin
 minversion=0
-persistant-com.dmdirc.addons.nowplaying.MediaSource=true
-persistant-com.dmdirc.addons.nowplaying.MediaSourceManager=true
+persistent-com.dmdirc.addons.nowplaying.MediaSource=true
+persistent-com.dmdirc.addons.nowplaying.MediaSourceManager=true
 addonid=8

src/com/dmdirc/addons/timeplugin/plugin.info

@@ -5,7 +5,7 @@ description=Provides time-based actions and commands
 name=timeplugin
 nicename=Time Plugin
 minversion=0
-persistant-com.dmdirc.addons.timeplugin.TimeActionMetaType=true
-persistant-com.dmdirc.addons.timeplugin.TimeActionMetaType$1=true
-persistant-com.dmdirc.addons.timeplugin.TimeActionType=true
+persistent-com.dmdirc.addons.timeplugin.TimeActionMetaType=true
+persistent-com.dmdirc.addons.timeplugin.TimeActionMetaType$1=true
+persistent-com.dmdirc.addons.timeplugin.TimeActionType=true
 addonid=6

src/com/dmdirc/addons/userlevel/plugin.info

@@ -7,5 +7,5 @@ nicename=User Levels
 minversion=0
 addonid=21
 
-persistant-com.dmdirc.addons.userlevel.AccessLevelComponent=true
-persistant-com.dmdirc.addons.userlevel.ChannelAccessLevelComponent=tre
+persistent-com.dmdirc.addons.userlevel.AccessLevelComponent=true
+persistent-com.dmdirc.addons.userlevel.ChannelAccessLevelComponent=tre

src/com/dmdirc/plugins/GlobalClassLoader.java

@@ -32,7 +32,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * This classloader knows about plugins and is used to store persistant classes.
+ * This classloader knows about plugins and is used to store persistent classes.
  */
 public final class GlobalClassLoader extends ClassLoader {
 
@@ -83,7 +83,7 @@ public final class GlobalClassLoader extends ClassLoader {
 	 * @throws ClassNotFoundException if the class to be loaded could not be found.
 	 */
 	public Class<?> loadClass(final String name, final PluginInfo pi) throws ClassNotFoundException {
-		for (String classname : pi.getPersistantClasses()) {
+		for (String classname : pi.getPersistentClasses()) {
 			if (!resourcesList.containsKey(classname)) {
 				resourcesList.put(classname, pi.getFullFilename());
 			}

src/com/dmdirc/plugins/PluginClassLoader.java

@@ -86,8 +86,8 @@ public class PluginClassLoader extends ClassLoader {
 
 		final String fileName = name.replace('.', '/')+".class";
 		try {
-			if (pluginInfo.isPersistant(name) || !res.resourceExists(fileName)) {
-				if (!pluginInfo.isPersistant(name) && askGlobal) {
+			if (pluginInfo.isPersistent(name) || !res.resourceExists(fileName)) {
+				if (!pluginInfo.isPersistent(name) && askGlobal) {
 					return GlobalClassLoader.getGlobalClassLoader().loadClass(name);
 				} else {
 					// Try to load class from previous load.
@@ -118,7 +118,7 @@ public class PluginClassLoader extends ClassLoader {
 		}
 		
 		try {
-			if (pluginInfo.isPersistant(name)) {
+			if (pluginInfo.isPersistent(name)) {
 				GlobalClassLoader.getGlobalClassLoader().defineClass(name, data);
 			} else {
 				loadedClass = defineClass(name, data, 0, data.length);

src/com/dmdirc/plugins/PluginInfo.java

@@ -66,6 +66,9 @@ public class PluginInfo implements Comparable<PluginInfo> {
 	
 	/** Last Error Message. */
 	private String lastError = "No Error";
+	
+	/** Are we trying to load? */
+	private boolean isLoading = false;
 
 	/**
 	 * Create a new PluginInfo.
@@ -166,7 +169,7 @@ public class PluginInfo implements Comparable<PluginInfo> {
 				}
 			}
 
-			if (isPersistant() && loadAll()) { loadEntirePlugin(); }
+			if (isPersistent() && loadAll()) { loadEntirePlugin(); }
 		} else {
 			lastError = "One or more requirements not met ("+requirementsError+")";
 			throw new PluginException("Plugin "+filename+" was not loaded. "+lastError);
@@ -572,22 +575,31 @@ public class PluginInfo implements Comparable<PluginInfo> {
 	 * Load the plugin files.
 	 */
 	public void loadPlugin() {
+		System.out.println("["+getName()+"] loadPlugin called");
 		if (isTempLoaded()) {
 			tempLoaded = false;
+			System.out.println("["+getName()+"] temp -> full");
+			System.out.println("["+getName()+"] loadingRequirements");
 			loadRequired();
+			System.out.println("["+getName()+"] calling onLoad");
 			plugin.onLoad();
+			System.out.println("["+getName()+"] onLoad Result: "+lastError);
 		} else {
-			if (isLoaded() || metaData == null) {
-				lastError = "Not Loading: ("+isLoaded()+"||"+(metaData == null)+")";
+			if (isLoaded() || metaData == null || isLoading) {
+				lastError = "Not Loading: ("+isLoaded()+"||"+(metaData == null)+"||"+isLoading+")";
+				System.out.println("["+getName()+"] loadPlugin failed: "+lastError);
 				return;
 			}
-			
+			isLoading = true;
+			System.out.println("["+getName()+"] loadingRequirements");
 			loadRequired();
-			
+			System.out.println("["+getName()+"] loading Main class");
 			loadClass(getMainClass());
+			System.out.println("["+getName()+"] load Result: "+lastError);
 			if (isLoaded()) {
 				ActionManager.processEvent(CoreActionType.PLUGIN_LOADED, null, this);
 			}
+			isLoading = false;
 		}
 	}
 
@@ -667,7 +679,7 @@ public class PluginInfo implements Comparable<PluginInfo> {
 	 * Unload the plugin if possible.
 	 */
 	public void unloadPlugin() {
-		if (!isPersistant() && (isLoaded() || isTempLoaded())) {
+		if (!isPersistent() && (isLoaded() || isTempLoaded())) {
 			if (!isTempLoaded()) {
 				try {
 					plugin.onUnload();
@@ -761,27 +773,27 @@ public class PluginInfo implements Comparable<PluginInfo> {
 	}
 
 	/**
-	 * Is this a persistant plugin?
+	 * Is this a persistent plugin?
 	 *
-	 * @return true if persistant, else false
+	 * @return true if persistent, else false
 	 */
-	public boolean isPersistant() {
-		final String persistance = metaData.getProperty("persistant","no");
-		return persistance.equalsIgnoreCase("true") || persistance.equalsIgnoreCase("yes");
+	public boolean isPersistent() {
+		final String persistence = metaData.getProperty("persistent","no");
+		return persistence.equalsIgnoreCase("true") || persistence.equalsIgnoreCase("yes");
 	}
 
 	/**
-	 * Does this plugin contain any persistant classes?
+	 * Does this plugin contain any persistent classes?
 	 *
-	 * @return true if this plugin contains any persistant classes, else false
+	 * @return true if this plugin contains any persistent classes, else false
 	 */
-	public boolean hasPersistant() {
-		final String persistance = metaData.getProperty("persistant","no");
-		if (persistance.equalsIgnoreCase("true")) {
+	public boolean hasPersistent() {
+		final String persistence = metaData.getProperty("persistent","no");
+		if (persistence.equalsIgnoreCase("true")) {
 			return true;
 		} else {
 			for (Object keyObject : metaData.keySet()) {
-				if (keyObject.toString().toLowerCase().startsWith("persistant-")) {
+				if (keyObject.toString().toLowerCase().startsWith("persistent-")) {
 					return true;
 				}
 			}
@@ -790,14 +802,14 @@ public class PluginInfo implements Comparable<PluginInfo> {
 	}
 
 	/**
-	 * Get a list of all persistant classes in this plugin
+	 * Get a list of all persistent classes in this plugin
 	 *
-	 * @return List of all persistant classes in this plugin
+	 * @return List of all persistent classes in this plugin
 	 */
-	public List<String> getPersistantClasses() {
+	public List<String> getPersistentClasses() {
 		final List<String> result = new ArrayList<String>();
-		final String persistance = metaData.getProperty("persistant","no");
-		if (persistance.equalsIgnoreCase("true")) {
+		final String persistence = metaData.getProperty("persistent","no");
+		if (persistence.equalsIgnoreCase("true")) {
 			try {
 				ResourceManager res = getResourceManager();
 
@@ -811,7 +823,7 @@ public class PluginInfo implements Comparable<PluginInfo> {
 			}
 		} else {
 			for (Object keyObject : metaData.keySet()) {
-				if (keyObject.toString().toLowerCase().startsWith("persistant-")) {
+				if (keyObject.toString().toLowerCase().startsWith("persistent-")) {
 					result.add(keyObject.toString().substring(11));
 				}
 			}
@@ -820,17 +832,17 @@ public class PluginInfo implements Comparable<PluginInfo> {
 	}
 
 	/**
-	 * Is this a persistant class?
+	 * Is this a persistent class?
 	 *
-	 * @param classname class to check persistance of
-	 * @return true if file (or whole plugin) is persistant, else false
+	 * @param classname class to check persistence of
+	 * @return true if file (or whole plugin) is persistent, else false
 	 */
-	public boolean isPersistant(final String classname) {
-		if (isPersistant()) {
+	public boolean isPersistent(final String classname) {
+		if (isPersistent()) {
 			return true;
 		} else {
-			final String persistance = metaData.getProperty("persistant-"+classname,"no");
-			return persistance.equalsIgnoreCase("true") || persistance.equalsIgnoreCase("yes");
+			final String persistence = metaData.getProperty("persistent-"+classname,"no");
+			return persistence.equalsIgnoreCase("true") || persistence.equalsIgnoreCase("yes");
 		}
 	}
 

src/com/dmdirc/ui/swing/components/pluginpanel/PluginPanel.java

@@ -195,7 +195,7 @@ public final class PluginPanel extends JPanel implements
                 toggleButton.setEnabled(true);
                 
                 if (pluginInfo.getState()) {
-                    if (pluginInfo.getPluginInfo().isPersistant()) {
+                    if (pluginInfo.getPluginInfo().isPersistent()) {
                         toggleButton.setEnabled(false);
                     }
                     toggleButton.setText("Disable");

src/com/dmdirc/updater/components/PluginComponent.java

@@ -92,11 +92,11 @@ public class PluginComponent implements UpdateComponent {
     public boolean doInstall(final String path) throws Throwable {
         final File target = new File(plugin.getFullFilename());
         
-        if (!plugin.hasPersistant() && target.exists()) {
+        if (!plugin.hasPersistent() && target.exists()) {
             target.delete();
         }
         
-        if (plugin.hasPersistant() || !new File(path).renameTo(target)) {
+        if (plugin.hasPersistent() || !new File(path).renameTo(target)) {
             // Windows rocks!
             final File newTarget = new File(plugin.getFullFilename() + ".update");