1.1 --- a/cnd.api.remote/src/org/netbeans/modules/cnd/api/remote/RemoteSyncSupport.java	Thu Oct 14 12:42:14 2010 +0200
     1.2 +++ b/cnd.api.remote/src/org/netbeans/modules/cnd/api/remote/RemoteSyncSupport.java	Fri Oct 15 13:30:17 2010 +0400
     1.3 @@ -86,7 +86,16 @@
     1.4          if (remoteProject == null) {
     1.5              return null;
     1.6          } else {
     1.7 -            return remoteProject.getSyncFactory().getPathMap(remoteProject.getDevelopmentHost());
     1.8 +            PathMap pathMap = null;
     1.9 +            ExecutionEnvironment execEnv = remoteProject.getDevelopmentHost();
    1.10 +            RemoteSyncFactory syncFactory = remoteProject.getSyncFactory();
    1.11 +            if (syncFactory != null) {
    1.12 +                pathMap = syncFactory.getPathMap(execEnv);
    1.13 +            }
    1.14 +            if (pathMap == null) {
    1.15 +                pathMap = HostInfoProvider.getMapper(execEnv);
    1.16 +            }
    1.17 +            return pathMap;
    1.18          }
    1.19      }
    1.20  

     2.1 --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/NativeProjectListenerImpl.java	Thu Oct 14 12:42:14 2010 +0200
     2.2 +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/NativeProjectListenerImpl.java	Fri Oct 15 13:30:17 2010 +0400
     2.3 @@ -371,7 +371,7 @@
     2.4          @Override
     2.5          public void fileDeleted(FileEvent fe) {
     2.6              FileObject fo = fe.getFile();
     2.7 -            project.onFileRemoved(FileUtil.toFile(fo));
     2.8 +            project.onFileRemoved(CndFileUtils.toFile(fo));
     2.9              fo.removeFileChangeListener(this);
    2.10          }
    2.11      };

     3.1 --- a/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/ProjectBase.java	Thu Oct 14 12:42:14 2010 +0200
     3.2 +++ b/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/core/ProjectBase.java	Fri Oct 15 13:30:17 2010 +0400
     3.3 @@ -1880,7 +1880,7 @@
     3.4      }
     3.5  
     3.6      public final FileImpl getFile(FileObject file, boolean treatSymlinkAsSeparateFile) {
     3.7 -        return getFileContainer().getFile(FileUtil.toFile(file), treatSymlinkAsSeparateFile); // XXX:FileObject conversion
     3.8 +        return getFileContainer().getFile(CndFileUtils.toFile(file), treatSymlinkAsSeparateFile); // XXX:FileObject conversion
     3.9      }
    3.10  
    3.11      public final CsmUID<CsmFile> getFileUID(File file, boolean treatSymlinkAsSeparateFile) {

     4.1 --- a/cnd.remote/src/org/netbeans/modules/cnd/remote/fs/RemoteFileSystemsProvider.java	Thu Oct 14 12:42:14 2010 +0200
     4.2 +++ b/cnd.remote/src/org/netbeans/modules/cnd/remote/fs/RemoteFileSystemsProvider.java	Fri Oct 15 13:30:17 2010 +0400
     4.3 @@ -87,7 +87,7 @@
     4.4  
     4.5      @Override
     4.6      protected File toFileImpl(FileObject fileObject) {
     4.7 -        return null;
     4.8 +        return (fileObject instanceof RemoteFileObjectBase) ? ((RemoteFileObjectBase) fileObject).cache : null ;
     4.9      }
    4.10  
    4.11      @Override

     5.1 --- a/cnd.utils/src/org/netbeans/modules/cnd/utils/cache/CndFileUtils.java	Thu Oct 14 12:42:14 2010 +0200
     5.2 +++ b/cnd.utils/src/org/netbeans/modules/cnd/utils/cache/CndFileUtils.java	Fri Oct 15 13:30:17 2010 +0400
     5.3 @@ -502,7 +502,7 @@
     5.4          }
     5.5  
     5.6          private File clearCachesAboutFile(FileEvent fe) {
     5.7 -            return clearCachesAboutFile(FileUtil.toFile(fe.getFile()), true);
     5.8 +            return clearCachesAboutFile(CndFileUtils.toFile(fe.getFile()), true);
     5.9          }
    5.10          
    5.11          private File clearCachesAboutFile(File f, boolean withParent) {