5 files changed, 137 insertions, 138 deletions

diff --git a/js/io/system/config.xml b/js/io/system/config.xml
deleted file mode 100644
index 4660d647..00000000
--- a/js/io/system/config.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- COPY TO 'MainApp/cloud' and set your own URLs -->
-<services>
-        <file><![CDATA[http://file.services.ninja.motorola.com/]]></file>
-        <directory><![CDATA[http://directory.services.ninja.motorola.com/]]></directory>
-</services>
diff --git a/js/io/system/shellapi.js b/js/io/system/coreioapi.js
index 9976dbed..c920d8cd 100644..100755
--- a/js/io/system/shellapi.js
+++ b/js/io/system/coreioapi.js
@@ -6,104 +6,26 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 
 /* /////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
-NOTES:  All logic should be handled in the FileSystem and I/O classes
-
-Dialog methods on NativeShellApp
-ShowFileOpenDialog(initialDir) - shows a file open dialog
-initialDir is optional and if specified will cause the dialog to initially display that directory as the open location
-ShowFileSaveAsDialog(initialURI) - shows a file Save As dialog
-initialURI is optional and if specified will cause the dialog to initially display the directory as the default location
-and the filename as the current filename.
-ShowSelectDirectoryDialog(initialDir, dialogTitle) - displays a directory select/chooser dialog
-intitalDir is optional and specifies the directory that should be selected/shown when the dialog opens
-dialogTitle is optional and specifies the title that should appear in the dialog caption
+NOTES:
+These methods should only be access through the file and project IO classes.
 ////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////// */
+var Montage =           require("montage/core/core").Montage,
+    Component =         require("montage/ui/component").Component;
+////////////////////////////////////////////////////////////////////////
 //Exporting as Project I/O
-exports.ShellApi = (require("montage/core/core").Montage).create(require("montage/ui/component").Component, {
-        ////////////////////////////////////////////////////////////////////
-    //
-    init: {
-        enumerable: false,
-        value: function() {
-                try {
-                var xhr = new XMLHttpRequest(), file, directory;
-                //
-                xhr.open("GET", 'cloud/config.xml', false);
-                xhr.send();
-                                //
-                if (xhr.readyState === 4) {
-                        file = xhr.responseXML.getElementsByTagName('file')[0].firstChild.nodeValue;
-                        directory = xhr.responseXML.getElementsByTagName('directory')[0].firstChild.nodeValue;
-                        if (file.length)
-                                this._fileServiceURL = file;
-                        if (directory.length)
-                                this._directoryServiceURL = directory;
-                        //
-                        //console.log(file, directory);
-                }
-                }
-            catch(error) {
-                console.log(error);
-                }
-        }
-    },
-    ////////////////////////////////////////////////////////////////////
-    //
-    openShellDialog: {
-        enumerable: false,
-        value: function(dialog) {
-                //Initializing return variable
-                var input = null;
-                //Checking for the type of prompt set via object
-                switch (dialog.type) {
-                        case 'file':
-                                //Checking for action the prompt will ask the user
-                                if (dialog.action.toLowerCase() == 'open') {
-                                        //File open dialog
-                                        input = window.NativeShellApp.ShowFileOpenDialog();
-                                } else if (dialog.action.toLowerCase() == 'new') {
-                                        //File new dialog
-                                        input = window.NativeShellApp.ShowFileSaveAsDialog();
-                                }
-                                break;
-                        case 'directory':
-                                //Checking for action the prompt will ask the user
-                                if (dialog.action.toLowerCase() == 'open') {
-                                        //Directory open dialog
-                                        input = window.NativeShellApp.ShowSelectDirectoryDialog();
-                                } else if (dialog.action.toLowerCase() == 'new') {
-                                        //Directory new dialog
-                                        input = window.NativeShellApp.ShowSelectDirectoryDialog();
-                                }
-                                break;
-                                break;
-                        default:
-                                break;
-                }
-                return input;
-        }
-    },
-    ////////////////////////////////////////////////////////////////////
-    //
-    startServer: {
-        enumerable: false,
-        value: function (dir) {
-                var server = window.NativeShellApp.StartWebServer(dir);
-                return server;
-        }
-    },
+exports.CoreIoApi = Montage.create(Component, {
         ////////////////////////////////////////////////////////////////////
     // private property containing the file service URL to use for all file IO calls
     _fileServiceURL: {
         enumerable: false,
-        value: "http://localhost:16380/file" //default value.. updated with base uri in config.xml
+        value: "http://localhost:16380/file"
     },
         ////////////////////////////////////////////////////////////////////
     // private property containing the directory service URL to use for all file IO calls
     _directoryServiceURL: {
         enumerable: false,
-        value: "http://localhost:16380/directory"  //default value.. updated with base uri in config.xml
+        value: "http://localhost:16380/directory"
     },
         ////////////////////////////////////////////////////////////////////
     // private helper to parse URIs and append them to the service URL
@@ -117,6 +39,11 @@ exports.ShellApi = (require("montage/core/core").Montage).create(require("montag
             if((urlOut.length > 0) && (urlOut.charAt(0) !== "/")){
                 urlOut = "/" + urlOut;
             }
+            //remove extra / at the end
+            if((urlOut.length > 1) && (urlOut.charAt(urlOut.length - 1) === "/")){
+                urlOut = urlOut.substring(0, (urlOut.length - 1));
+            }
+
             return serviceURL + urlOut;
         }
     },
@@ -413,7 +340,7 @@ exports.ShellApi = (require("montage/core/core").Montage).create(require("montag
         enumerable: false,
         value: function(file) {
                 //
-            var retValue = { success:null, content:null, status:null };
+            var retValue = { success:null, content:null, status:null};
             //
             if(file && file.uri && file.uri.length) {
                 try {
@@ -736,7 +663,7 @@ exports.ShellApi = (require("montage/core/core").Montage).create(require("montag
         writable:false,
         value:function(file, lastQueriedTimestamp){
             var retValue = { success:null, status:null };
-            if(file && file.uri) {
+            if(file && file.uri && (typeof lastQueriedTimestamp !== "undefined")) {
                 try {
                     var serviceURL = this._prepareServiceURL(this._fileServiceURL, file.uri),
                     xhr = new XMLHttpRequest();
@@ -778,7 +705,7 @@ exports.ShellApi = (require("montage/core/core").Montage).create(require("montag
         writable:false,
         value:function(file, lastQueriedTimestamp){
             var retValue = { success:null, status:null };
-            if(file && file.uri) {
+            if(file && file.uri && (typeof lastQueriedTimestamp !== "undefined")) {
                 try {
                     var serviceURL = this._prepareServiceURL(this._directoryServiceURL, file.uri),
                     xhr = new XMLHttpRequest();
@@ -797,6 +724,92 @@ exports.ShellApi = (require("montage/core/core").Montage).create(require("montag
             }
             return retValue;
         }
+    },
+
+    ////////////////////////////////////////////////////////////////////
+    // Checks if the file is writable
+    // Parameters:
+    //      the file parameter must contain the following properties
+    //          uri: string value containing the full file path/URI i.e. "c:/foo/bar.html"
+    //
+    // Return values:
+    //    returns an object with two properties
+    //      success: boolean indicating if the call succeeded or failed
+    //      status: int indicating the request HTTP status code
+    //              204 -  The file exists and response body has writable flag
+    //              404 - the file does not exist
+    //              500 - unknown server error occurred
+    //TODO:to be finalized
+    isFileWritable:{
+        enumerable:true,
+        writable:false,
+        value:function(file){
+            var retValue = { success:null, status:null };
+            if(file && file.uri) {
+                try {
+                    var serviceURL = this._prepareServiceURL(this._fileServiceURL, file.uri),
+                    xhr = new XMLHttpRequest();
+                    xhr.open("GET", serviceURL, false);
+                    xhr.setRequestHeader("get-attributes", "true");
+                    xhr.send();
+                    if (xhr.readyState === 4) {
+                        retValue.status = xhr.status;
+                        if(xhr.status == 200) {
+                            retValue.content = xhr.responseText;
+                        }
+                        retValue.success = true;
+                    }
+                }
+                catch(error) {
+                    xhr = null;
+                    retValue.success = false;
+                }
+            }
+            return retValue;
+        }