diff --git a/Objective-J/CommonJS/lib/objective-j/plist.js b/Objective-J/CommonJS/lib/objective-j/plist.js deleted file mode 100644 index 1ad67ff44..000000000 --- a/Objective-J/CommonJS/lib/objective-j/plist.js +++ /dev/null @@ -1,17 +0,0 @@ -var FILE = require("file"), - OBJJ = require("objective-j"), - CPPropertyListCreateData = OBJJ.CPPropertyListCreateData, - kCFPropertyListXMLFormat_v1_0 = OBJJ.kCFPropertyListXMLFormat_v1_0; - -exports.readPlist = function(aPath) -{ - var plistData = new OBJJ.objj_data(); - plistData.string = FILE.read(aPath, { charset:"UTF-8" }); - return OBJJ.CPPropertyListCreateFromData(plistData); -} - -exports.writePlist = function(aPath, plist, format) -{ - format = format || OBJJ.kCFPropertyListXMLFormat_v1_0; - FILE.write(aPath, OBJJ.CPPropertyListCreateData(plist, format).string, { charset:"UTF-8" }); -} diff --git a/Tools/capp/Configuration.j b/Tools/capp/Configuration.j index fd3e9aa15..05a71dd28 100644 --- a/Tools/capp/Configuration.j +++ b/Tools/capp/Configuration.j @@ -5,7 +5,7 @@ var FILE = require("file"), SYSTEM = require("system"), - plist = require("objective-j/plist"); + CFPropertyList = require("objective-j/core").CFPropertyList; var DefaultDictionary = nil, @@ -66,7 +66,7 @@ var DefaultDictionary = nil, temporaryDictionary = [CPDictionary dictionary]; if (path && FILE.isReadable(path)) - dictionary = plist.readPlist(path); + dictionary = CFPropertyList.propertyListFromString(FILE.read(path, { charset:"UTF-8" })); // readPlist will return nil if the file is empty if (!dictionary)