From d2a3b637aa4e045b42d74c8e61e754a98db07cf7 Mon Sep 17 00:00:00 2001
From: walterhiggins <walter.higgins@gmail.com>
Date: Sun, 6 Jan 2013 21:31:37 +0000
Subject: [PATCH] removed unneeded getCanonicalPath() call

---
 .../scriptcraft/ScriptCraftPlugin.java        | 35 ++++++++-----------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/bukkit/ScriptCraft/src/net/walterhiggins/scriptcraft/ScriptCraftPlugin.java b/bukkit/ScriptCraft/src/net/walterhiggins/scriptcraft/ScriptCraftPlugin.java
index 50e2a5d..e691f88 100644
--- a/bukkit/ScriptCraft/src/net/walterhiggins/scriptcraft/ScriptCraftPlugin.java
+++ b/bukkit/ScriptCraft/src/net/walterhiggins/scriptcraft/ScriptCraftPlugin.java
@@ -1,6 +1,6 @@
 package net.walterhiggins.scriptcraft;
 import java.io.File;
-import java.io.IOException;
+
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.command.*;
 import org.mozilla.javascript.*;
@@ -25,31 +25,24 @@ public class ScriptCraftPlugin extends JavaPlugin
             String userDir = System.getProperty("user.dir");
             File jsPlugins = new File(userDir + System.getProperty("file.separator") + "js-plugins");
             if (jsPlugins.exists()){
-            	loadJsPlugins(jsPlugins);
+                loadJsPlugins(jsPlugins);
             }
         }
     }
-    
+    //
+    // called recursively to load all js plugins in the js-plugins directory and 
+    // sub-directories
+    //
     private void loadJsPlugins (File directory){
-    	File[] files = directory.listFiles();
+        File[] files = directory.listFiles();
         for (File f: files){
-            String canonicalPath = null;
-        	try {
-                this.getLogger().info("Loading javascript source file " + f);
-        		if (f.isDirectory()){
-        			loadJsPlugins(f);
-        		}else{
-        			//
-        			// fix for bug #11
-        			//
-        			canonicalPath = f.getCanonicalPath().replaceAll("\\\\", "/");
-        			if (canonicalPath.endsWith(".js")){
-        				ScriptCraftEvaluator.loadJsFile(f,this.evaluator.ctx,this.evaluator.scope);
-        			}
-        		}
-            }catch(IOException e) {
-            	// TODO Auto-generated catch block
-            	e.printStackTrace();
+            if (f.isDirectory()){
+                loadJsPlugins(f);
+            }else{
+                if (f.getAbsolutePath().endsWith(".js")){
+                    this.getLogger().info("Loading javascript source file " + f);
+                    ScriptCraftEvaluator.loadJsFile(f,this.evaluator.ctx,this.evaluator.scope);
+                }
             }
         }
     }