Changeset 3136

Timestamp:

03/02/10 18:46:42 (5 months ago)

Author:

martijn

Message:

Avoid unnecessary exception when looking for plugins, patch by Mark (#1105)

Location:

trunk/src/swing/org/pathvisio

Files:

• gui/swing/GuiMain.java (modified) (1 diff)
• plugin/PluginManager.java (modified) (3 diffs)

trunk/src/swing/org/pathvisio/gui/swing/GuiMain.java

@@ -409 +409 @@
 
                 // load plugins from the default plugin dir
-                pluginLocations.add("" + new File (GlobalPreference.getApplicationDir(), "plugins"));
+                File pluginDir = new File (GlobalPreference.getApplicationDir(), "plugins");
+                if (pluginDir.exists()) {
+                        pluginLocations.add("" + pluginDir);
+                }
                 processOptions();
         }

trunk/src/swing/org/pathvisio/plugin/PluginManager.java

@@ -109 +109 @@
                                 return;
                         }
+                        // see if it is a jar file.
                         if(file.getName().endsWith(".jar"))
                         {
@@ -116 +117 @@
                         }
                 }
-                //Otherwise, try to load the class directly
+                //It's not a directory or a jar file. 
+                //Try to load the class directly
                 Logger.log.info("No jar or dir found, assuming plugin argument is a class " + param);
                 PluginInfo inf = new PluginInfo();
@@ -206 +208 @@
                         }
                 } catch(Throwable ex) {
-                        Logger.log.error("\tUnable to load plugin", ex);
+                        Logger.log.error("\tUnable to load plugin '" + className + "'", ex);
                         inf.error = ex;
                         info.add(inf);