7 files changed, 202 insertions, 120 deletions

diff --git a/js/io/document/document-controller.js b/js/io/document/document-controller.js
index 6f363bc7..7cf7f409 100755
--- a/js/io/document/document-controller.js
+++ b/js/io/document/document-controller.js
@@ -15,7 +15,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 var Montage = require("montage/core/core").Montage,
     Component = require("montage/ui/component").Component,
     Uuid = require("montage/core/uuid").Uuid,
-    fileSystem = require("js/io/system/filesystem").FileSystem;
+    fileSystem = require("js/io/system/coreioapi").CoreIoApi;
 
 var HTMLDocument = require("js/io/document/html-document").HTMLDocument;
 var TextDocument = require("js/io/document/text-document").TextDocument;
@@ -104,7 +104,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
 
             // Get file from Jose Code with a callback to here
             if(!!uri){
-                response = fileSystem.shellApiHandler.openFile({"uri":uri});
+                response = fileSystem.openFile({"uri":uri});
                 if((response.success === true) && ((response.status === 200) || (response.status === 304))){
                     fileContent = response.content;
                 }
@@ -417,10 +417,10 @@ _createTextAreaElement: {
 
             codeMirrorDiv.appendChild(textArea);
 
-            if(!this._textHolder) this._textHolder = document.getElementById("codeViewContainer");
-            this._textHolder.appendChild(codeMirrorDiv);
+//            if(!this._textHolder) this._textHolder = document.getElementById("codeViewContainer");
+//            this._textHolder.appendChild(codeMirrorDiv);
 
-            return codeMirrorDiv;
+            return textArea;
         }
     }
 });
\ No newline at end of file
diff --git a/js/io/system/coreioapi.js b/js/io/system/coreioapi.js
index 33c7bc28..5deeae73 100755
--- a/js/io/system/coreioapi.js
+++ b/js/io/system/coreioapi.js
@@ -134,6 +134,9 @@ exports.CoreIoApi = Montage.create(Component, {
     directoryServiceURL: {
         enumerable: false,
         get: function() {
+            if(!this.rootUrl){
+                this.rootUrl = 'http://localhost:16380';
+            }
             return String(this.rootUrl+this._directoryServiceURL);
         },
         set: function(value) {
@@ -863,50 +866,7 @@ exports.CoreIoApi = Montage.create(Component, {
                     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;
-        }
-    },
-
-    ////////////////////////////////////////////////////////////////////
-    // Checks if the directory is writable
-    // Parameters:
-    //      the file parameter must contain the following properties
-    //          uri: string value containing the full directory path/URI i.e. "c:/foo"
-    //
-    // 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
-    isDirectoryWritable:{
-        enumerable:true,
-        writable:false,
-        value:function(file){
-            var retValue = { success:null, status:null };
-            if(file && file.uri) {
-                try {
-                    var serviceURL = this._prepareServiceURL(this.directoryServiceURL, file.uri),
-                    xhr = new XMLHttpRequest();
-                    xhr.open("GET", serviceURL, false);
-                    xhr.setRequestHeader("get-attributes", "true");
+                    xhr.setRequestHeader("get-file-info", "true");
                     xhr.send();
                     if (xhr.readyState === 4) {
                         retValue.status = xhr.status;
diff --git a/js/io/utils/file-utils.js b/js/io/utils/file-utils.js
new file mode 100644
index 00000000..0afdffc6
--- /dev/null
+++ b/js/io/utils/file-utils.js
@@ -0,0 +1,75 @@
+/* <copyright>
+This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+</copyright> */
+
+var fileSystem = require("js/io/system/coreioapi").CoreIoApi;
+
+var FileUtils = exports.FileUtils = Object.create(Object.prototype, {
+
+    /***
+     * checks for valid uri pattern
+     * also flags if Windows uri pattern and Unix uri patterns are mixed
+     */
+    isValidUri:{
+        value: function(uri){
+            var isWindowsUri=false, isUnixUri=false,status=false;
+            if(uri !== ""){
+                uri = uri.replace(/^\s+|\s+$/g,"");  // strip any leading or trailing spaces
+
+                //for local machine folder uri
+                isWindowsUri = /^([a-zA-Z]:)(\\[^<>:"/\\|?*]+)*\\?$/gi.test(uri);
+                isUnixUri = /^(\/)?(\/(?![.])[^/]*)*\/?$/gi.test(uri);//folders beginning with . are hidden on Mac / Unix
+                status = isWindowsUri || isUnixUri;
+                if(isWindowsUri && isUnixUri){status = false;}
+            }
+            return status;
+        }
+    },
+
+    /***
+     * file name validation
+     */
+    isValidFileName:{
+        value: function(fileName){
+            var status = false;
+            if(fileName !== ""){
+                fileName = fileName.replace(/^\s+|\s+$/g,"");
+                status = !(/[/\\]/g.test(fileName));
+                if(status && navigator.userAgent.indexOf("Macintosh") != -1){//for Mac files beginning with . are hidden
+                    status = !(/^\./g.test(fileName));
+                }
+            }
+            return status;
+        }
+    },
+
+    /***
+     * check if the file exists
+     */
+    checkFileExists:{
+        value: function(fileUri, folderUri, fileType){
+            var uri = "", response=null, status=true;
+
+            //prepare absolute uri
+            if(/[^/\\]$/g.test(folderUri)){
+                folderUri = folderUri + "/";
+            }
+
+            //todo:add file extension check if fileType present
+
+            uri = ""+folderUri+fileUri;
+
+            response = fileSystem.fileExists({"uri":uri});
+            if(!!response && response.success && (response.status === 204)){
+                status = true;
+            }else if(!!response && response.success && (response.status === 404)){
+                status = false;
+            }else{
+                status = false;
+            }
+            return status;
+        }
+    }
+});
\ No newline at end of file
diff --git a/js/io/workflow/newFileDialog/new-file-options-navigator.reel/new-file-options-navigator.js b/js/io/workflow/newFileDialog/new-file-options-navigator.reel/new-file-options-navigator.js
index 61b963b3..7702b1a2 100755..100644
--- a/js/io/workflow/newFileDialog/new-file-options-navigator.reel/new-file-options-navigator.js
+++ b/js/io/workflow/newFileDialog/new-file-options-navigator.reel/new-file-options-navigator.js
@@ -9,7 +9,7 @@ var Montage = require("montage/core/core").Montage,
      iconsListModule = require("js/components/ui/icon-list-basic/iconsList.reel"),
     treeModule = require("js/components/ui/tree-basic/tree.reel"),
     newFileLocationSelectionModule = require("js/io/workflow/newFileDialog/new-file-workflow-controller"),
-    fileSystem = require("js/io/system/filesystem").FileSystem;
+    fileUtils = require("js/io/utils/file-utils").FileUtils;
 
 var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(Component, {
 
@@ -244,7 +244,6 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
                     this.okButton.setAttribute("disabled", "true");
                 }
             }
-
         }
     },
 
@@ -336,16 +335,8 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C