From 46959b53a1b5e898b3ade64143cbcc87429f2853 Mon Sep 17 00:00:00 2001 From: Jeff Williams Date: Sat, 29 Sep 2012 21:07:58 -0700 Subject: [PATCH] use Java's File/URI classes to convert between paths and URIs (#203) --- jsdoc.js | 18 ++---------------- rhino_modules/os.js | 15 --------------- 2 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 rhino_modules/os.js diff --git a/jsdoc.js b/jsdoc.js index 46e355c6..37867285 100644 --- a/jsdoc.js +++ b/jsdoc.js @@ -198,7 +198,6 @@ function main() { }, resolver, fs = require('fs'), - os = require('os'), path = require('path'), Config = require('jsdoc/config'); @@ -230,14 +229,7 @@ function main() { scheme; if (env.vm === 'rhino') { - result = result.replace(/\\/g, '/').replace(/ /g, '%20'); - - scheme = 'file:'; - if ( os.platform() === 'win32' ) { - scheme += '/'; - } - - result = scheme + result; + result = new java.io.File(result).toURI() + ''; } return result; @@ -254,13 +246,7 @@ function main() { scheme; if (env.vm === 'rhino') { - result = result.replace(/%20/g, ' '); - - scheme = 'file:'; - if ( os.platform() === 'win32' ) { - scheme += '/'; - } - result = result.replace( new RegExp('^' + scheme), '' ); + result = new java.io.File( new java.net.URI(result) ) + ''; } return result; diff --git a/rhino_modules/os.js b/rhino_modules/os.js deleted file mode 100644 index 18c7f3bf..00000000 --- a/rhino_modules/os.js +++ /dev/null @@ -1,15 +0,0 @@ -/** - * Emulate the Node.js `os` module. - * @see http://nodejs.org/api/os.html - */ -exports.platform = function() { - var osname = java.lang.System.getProperty("os.name").toLowerCase() + ''; - - // obviously this isn't right, but we probably just need to distinguish between Windows/Cygwin/ - // MinGW and everything else - if ( osname.indexOf('windows') !== -1 ) { - return 'win32'; - } else { - return 'linux'; - } -};