Improved plugin scanning so that if you attempt to create a Plugins instance with a

non-existant plugins directory path, it throws an IO exception.


git-svn-id: file:///home/sven/projects/JOGL/git-svn/svn-server-sync/jutils/trunk@9 052365b4-98e0-4bc5-a281-465471b020e0

3 files changed, 28 insertions, 4 deletions

diff --git a/build.xml b/build.xml
index 0e38d9d..e907291 100644
--- a/build.xml
+++ b/build.xml
@@ -84,6 +84,19 @@
             <!-- <arg file="myfile.txt"/> -->
         </java>
     </target>
+    <target name="testnodir" depends="init,all" description="Try running it.">
+        <java classname="net.java.games.util.plugins.test.PluginTest" 
+              fork="true" dir="." failonerror="true">
+            <classpath>
+               <!-- <pathelement location= "classes" /> -->
+                <pathelement location="bin/jutils.jar"/>
+            </classpath>
+            <!-- Pass some args, perhaps: -->
+            <!-- <arg value="-myfile"/> -->
+            <!-- Will be given as an absolute path: -->
+            <!-- <arg file="myfile.txt"/> -->
+        </java>
+    </target>
 
     <target name="javadoc" depends="init" description="Javadoc for input API.">
         <javadoc packagenames="net.java.games.util.plugins.*" 
diff --git a/src/java/net/java/games/util/plugins/Plugins.java b/src/java/net/java/games/util/plugins/Plugins.java
index 7a7e5f4..87e6146 100644
--- a/src/java/net/java/games/util/plugins/Plugins.java
+++ b/src/java/net/java/games/util/plugins/Plugins.java
@@ -69,12 +69,16 @@ public class Plugins {
      * @param pluginRoot The root od the directory tree to scan for Jars
      * containing plugins.
      */
-    public Plugins(File pluginRoot) {
-        scanPlugins(pluginRoot);
+    public Plugins(File pluginRoot) throws IOException {
+            scanPlugins(pluginRoot);    
     }
     
-    private void scanPlugins(File dir) {
+    private void scanPlugins(File dir) throws IOException {
         File[] files = dir.listFiles();
+        if (files == null) {
+            throw new FileNotFoundException("Plugin directory "+dir.getName()+
+                " not found.");
+        }
         for(int i=0;i<files.length;i++){
             File f = files[i];
             if (f.getName().endsWith(".jar")) { // process JAR file
diff --git a/src/java/net/java/games/util/plugins/test/PluginTest.java b/src/java/net/java/games/util/plugins/test/PluginTest.java
index a5ea39d..af7ef82 100644
--- a/src/java/net/java/games/util/plugins/test/PluginTest.java
+++ b/src/java/net/java/games/util/plugins/test/PluginTest.java
@@ -82,11 +82,18 @@ class ListUpdater implements Runnable{
 
 public class PluginTest {
     static final boolean DEBUG = false;
-    Plugins plugins = new Plugins(new File("test_plugins"));
+    
+    Plugins plugins;
     JList plist;
     Class[] piList; // holder for current list of plugins
     /** Creates a new instance of PluginTest */
     public PluginTest() {
+        try {
+            plugins = new Plugins(new File("test_plugins"));
+        } catch (IOException e) {
+            e.printStackTrace();
+            System.exit(1);
+        }
         JFrame f = new JFrame("PluginTest");
         plist = new JList(new DefaultListModel());
         plist.setCellRenderer(new ClassRenderer());