5 files changed, 193 insertions, 71 deletions

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
 
     isValidUri:{
         value: function(uri){
-            var isWindowsUri=false, isUnixUri=false,status=false;
+            var status= fileUtils.isValidUri(uri);
             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;}
-
                 if(!status){
                     this.showError("! Invalid directory.");
                 }
@@ -355,14 +346,8 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
     },
     isValidFileName:{
         value: function(fileName){
-            var status = false;
+            var status = fileUtils.isValidFileName(fileName);
             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));
-                }
-
                 if(!status){
                     this.showError("! Invalid file name.");
                 }
@@ -372,25 +357,9 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
     },
     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
-
-            uri = ""+folderUri+fileUri;
-
-            response = fileSystem.shellApiHandler.fileExists({"uri":uri});
-            if(!!response && response.success && (response.status === 204)){
+            var status= fileUtils.checkFileExists(fileUri, folderUri, fileType);
+            if(status){
                 this.showError("! File already exists.");
-                status = true;
-            }else if(!!response && response.success && (response.status === 404)){
-                status = false;
-            }else{
-                this.showError("! Cloud Service Error.");
             }
             return status;
         }
diff --git a/js/io/workflow/save-as-dialog.reel/save-as-dialog.css b/js/io/workflow/save-as-dialog.reel/save-as-dialog.css
index 75f57125..7082f485 100755..100644
--- a/js/io/workflow/save-as-dialog.reel/save-as-dialog.css
+++ b/js/io/workflow/save-as-dialog.reel/save-as-dialog.css
@@ -1,3 +1,9 @@
+/* <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> */
+
 .saveAsDialog{
     font-size:12px;
     width:450px;
diff --git a/js/io/workflow/save-as-dialog.reel/save-as-dialog.html b/js/io/workflow/save-as-dialog.reel/save-as-dialog.html
index 1f20ee16..eca6801f 100755..100644
--- a/js/io/workflow/save-as-dialog.reel/save-as-dialog.html
+++ b/js/io/workflow/save-as-dialog.reel/save-as-dialog.html
@@ -54,7 +54,9 @@
             "properties": {
                 "element": {"#": "saveAsDialog"},
                 "fileInputField": {"@": "fileInputField"},
-                "newFileName": {"#": "newFileName"}
+                "newFileName": {"#": "newFileName"},
+                "error":{"#": "error"},
+                "okButton":{"#": "okButton"}