9 files changed, 216 insertions, 79 deletions

diff --git a/js/components/ui/FilePicker/file-picker-controller.js b/js/components/ui/FilePicker/file-picker-controller.js
index f14857ac..635da3a2 100755
--- a/js/components/ui/FilePicker/file-picker-controller.js
+++ b/js/components/ui/FilePicker/file-picker-controller.js
@@ -8,7 +8,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 var Montage = require("montage/core/core").Montage,
     pickerNavigatorReel = require("js/components/ui/FilePicker/pickerNavigator.reel").PickerNavigator,
     filePickerModelModule = require("js/components/ui/FilePicker/file-picker-model"),
-    fileSystem = require("js/io/system/filesystem").FileSystem,
+    fileSystem = require("js/io/system/coreioapi").CoreIoApi,
     Popup = require("montage/ui/popup/popup.reel").Popup;
 
 //singleton with functions to create a new file picker instance and utilities to format or filter the model data
@@ -101,7 +101,7 @@ var FilePickerController = exports.FilePickerController = Montage.create(require
             var aModel = filePickerModelModule.FilePickerModel.create();
 
             var topLevelDirectories = null;
-            var driveData = fileSystem.shellApiHandler.getDirectoryContents({uri:"", recursive:false, returnType:"all"});
+            var driveData = fileSystem.getDirectoryContents({uri:"", recursive:false, returnType:"all"});
             if(driveData.success){
                 topLevelDirectories = (JSON.parse(driveData.content)).children;
             }else{
@@ -244,7 +244,7 @@ var FilePickerController = exports.FilePickerController = Montage.create(require
                 || !this._directoryContentCache[folderUri].children){
                 //get data using IO api
                 try{
-                    var iodata = fileSystem.shellApiHandler.getDirectoryContents({uri:folderUri, recursive:false, returnType:"all"});
+                    var iodata = fileSystem.getDirectoryContents({uri:folderUri, recursive:false, returnType:"all"});
                     //console.log("IO:getDirectoryContents:Response:\n"+"uri="+folderUri+"\n status="+iodata.status+"\n content= "+iodata.content);
                     if(iodata.success && (iodata.status === 200) && (iodata.content !== null)){
                         folderContent = JSON.parse(iodata.content);
@@ -456,7 +456,7 @@ var FilePickerController = exports.FilePickerController = Montage.create(require
             //check for directory staleness.... if stale query filesystem
             if((new Date()).getTime() > (this._directoryContentCache[folderUri].queriedTimeStamp + this.cacheStaleTime)){
                 try{
-                    var ifModifiedResponse = fileSystem.shellApiHandler.isDirectoryModified({uri:folderUri, recursive:false, returnType:"all"}, this._directoryContentCache[folderUri].queriedTimeStamp);
+                    var ifModifiedResponse = fileSystem.isDirectoryModified({uri:folderUri, recursive:false, returnType:"all"}, this._directoryContentCache[folderUri].queriedTimeStamp);
                     //console.log("ifModifiedResponse");
                     //console.log(ifModifiedResponse);
                 }catch(e){
@@ -468,7 +468,7 @@ var FilePickerController = exports.FilePickerController = Montage.create(require
                     wasStale = true;
                     //uri has changed. so update cache
                     try{
-                        var iodata = fileSystem.shellApiHandler.getDirectoryContents({uri:folderUri, recursive:false, returnType:"all"});
+                        var iodata = fileSystem.getDirectoryContents({uri:folderUri, recursive:false, returnType:"all"});
                         //console.log("IO:getDirectoryContents:Response:\n"+"uri="+folderUri+"\n status="+iodata.status+"\n content= "+iodata.content);
                         if(iodata.success && (iodata.status === 200) && (iodata.content !== null)){
                             folderContent = JSON.parse(iodata.content);
diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css
index 61328ce0..93578ec1 100755..100644
--- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css
+++ b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css
@@ -63,6 +63,7 @@
 
 .picker .driversList:hover{
     cursor:pointer;
+    background-color: #444444;
 }
 
 .picker .highlighted{
diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js
index eec7c8e8..268ec41a 100755..100644
--- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js
+++ b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js
@@ -621,6 +621,16 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
                         this.currentSelectedNode = evt.target;
 
                     }else{
+
+
+                        //test: highlight non-selectable icons too
+                        if(!evt.target.classList.contains("selected")){
+                            evt.target.classList.add("selected");
+                        }
+                        this.currentSelectedNode = evt.target;
+                        //end- test
+
+
                         //disable OK
                         if(!this.okButton.hasAttribute("disabled")){
                             this.okButton.setAttribute("disabled", "true");
@@ -776,6 +786,7 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
                             this.pickerModel.callback.call(this.pickerModel.callbackScope, {"uri":this.selectedItems});
                         }catch(e){
                             success = false;
+                            console.log("[Error] Failed to open "+ this.selectedItems.toString());
                             console.log(e.stack);
                         }
                     }else{//else send an event with the selected files
diff --git a/js/components/ui/icon-list-basic/icon.reel/icon.css b/js/components/ui/icon-list-basic/icon.reel/icon.css
index ca591aff..4d71f6b8 100755..100644
--- a/js/components/ui/icon-list-basic/icon.reel/icon.css
+++ b/js/components/ui/icon-list-basic/icon.reel/icon.css
@@ -17,15 +17,18 @@
 }
 
 .icon .selected{
-    /*background-color: #d1d1d1;*/
     background-color: #919191;
 }
 
+/*highlight on hover*/
+.icon:hover{
+    background-color: #919191;
+}
+/*end- test*/
+
 .icon .iconImg{
     width:35px;
     height:35px;
-    /*border: 1px solid #000000;
-    box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.8);*/
     margin-left: 20px;
     margin-top: 10px;
 }
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 + "/";
+