arg/scriptcraft
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

removed unneeded getCanonicalPath() call

Browse source
This commit is contained in:
walterhiggins 2013-01-06 21:31:37 +00:00
parent 5ae9837901
commit d2a3b637aa
1 changed files with 14 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
bukkit/ScriptCraft/src/net/walterhiggins/scriptcraft/ScriptCraftPlugin.java
View file

@ -1,6 +1,6 @@
package net.walterhiggins.scriptcraft; package net.walterhiggins.scriptcraft;
import java.io.File; import java.io.File;
import java.io.IOException;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import org.bukkit.command.*; import org.bukkit.command.*;
import org.mozilla.javascript.*; import org.mozilla.javascript.*;
@ -25,31 +25,24 @@ public class ScriptCraftPlugin extends JavaPlugin
String userDir = System.getProperty("user.dir"); String userDir = System.getProperty("user.dir");
File jsPlugins = new File(userDir + System.getProperty("file.separator") + "js-plugins"); File jsPlugins = new File(userDir + System.getProperty("file.separator") + "js-plugins");
if (jsPlugins.exists()){ 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){ private void loadJsPlugins (File directory){
File[] files = directory.listFiles(); File[] files = directory.listFiles();
for (File f: files){ for (File f: files){
String canonicalPath = null; if (f.isDirectory()){
try { loadJsPlugins(f);
this.getLogger().info("Loading javascript source file " + f); }else{
if (f.isDirectory()){ if (f.getAbsolutePath().endsWith(".js")){
loadJsPlugins(f); this.getLogger().info("Loading javascript source file " + f);
}else{ ScriptCraftEvaluator.loadJsFile(f,this.evaluator.ctx,this.evaluator.scope);
// }
// 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();
} }
} }
} }