Index: src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/BaseFileObj.java
===================================================================
RCS file: /cvs/openide/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/BaseFileObj.java,v
retrieving revision 1.17
diff -u -r1.17 BaseFileObj.java
--- src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/BaseFileObj.java	21 Sep 2005 09:18:03 -0000	1.17
+++ src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/BaseFileObj.java	27 Oct 2005 09:56:05 -0000
@@ -234,7 +234,6 @@
             final File file = parent.getFile();
             retVal = localFileSystem.getFactory().get(file);
             retVal = (retVal == null) ? localFileSystem.findFileObject(file) : retVal;
-            assert retVal == null || ((BaseFileObj) retVal).getFileName().getFile().equals(this.getFileName().getFile().getParentFile()) ;
         } else {
             retVal = getLocalFileSystem().getRoot();
         }
@@ -257,18 +256,6 @@
     final FileBasedFileSystem getLocalFileSystem() {
         return FileBasedFileSystem.getInstance(getFileName().getFile());
     }
-
-    static boolean createRecursiveFolder(File f) {
-        if (f.exists()) return true;
-        if (!f.isAbsolute())
-            f = f.getAbsoluteFile();
-        final String par = f.getParent();
-        if (par == null) return false;
-        if (!BaseFileObj.createRecursiveFolder(new File(par))) return false;
-        f.mkdir();
-        return f.exists();
-    }
-
 
     final void fireFileDataCreatedEvent(final boolean expected) {
         Statistics.StopWatch stopWatch = Statistics.getStopWatch(Statistics.LISTENERS_CALLS);
Index: src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/FileObjectFactory.java
===================================================================
RCS file: /cvs/openide/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/FileObjectFactory.java,v
retrieving revision 1.13
diff -u -r1.13 FileObjectFactory.java
--- src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/FileObjectFactory.java	14 Apr 2005 15:50:13 -0000	1.13
+++ src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/FileObjectFactory.java	27 Oct 2005 09:56:05 -0000
@@ -83,16 +83,19 @@
 
         
         if (name.isFile()) {
+            assert name.getFile() != null &&  (name.getFile().isFile() || !name.getFile().isDirectory()) : name;
             final FileObj realRoot = new FileObj(file, name);
             return putInCache(realRoot, realRoot.getFileName().getId());
         }
         
         if (!name.isFile() || fInfo.isUNCFolder()) {            
+            assert name.getFile() != null &&  (!name.getFile().isFile() || name.getFile().isDirectory()) : name;
             final FolderObj realRoot = new FolderObj(file, name);
             return putInCache(realRoot, realRoot.getFileName().getId());
         }
 
         if (fInfo.isUnixSpecialFile()) {
+            assert name.getFile() != null &&  (name.getFile().isFile() == name.getFile().isDirectory()) : name;            
             final FileObj realRoot = new FileObj(file, name);
             return putInCache(realRoot, realRoot.getFileName().getId());
         }
Index: src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/FolderObj.java
===================================================================
RCS file: /cvs/openide/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/FolderObj.java,v
retrieving revision 1.12
diff -u -r1.12 FolderObj.java
--- src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/FolderObj.java	21 Aug 2005 20:36:15 -0000	1.12
+++ src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/FolderObj.java	27 Oct 2005 09:56:06 -0000
@@ -129,7 +129,7 @@
                 FSException.io("EXC_CannotCreateFolder", name, getPath());// NOI18N   
             }
 
-            if (!BaseFileObj.createRecursiveFolder(folder2Create)) {
+            if (!folder2Create.mkdirs()) {
                 FSException.io("EXC_CannotCreateFolder", getNameExt(), getPath());// NOI18N   
             }
 
@@ -141,6 +141,7 @@
 
         final FileBasedFileSystem localFileBasedFileSystem = getLocalFileSystem();
         if (localFileBasedFileSystem != null) {
+            assert folder2Create.exists() && folder2Create.isDirectory() : folder2Create.getAbsolutePath();
             retVal = (FolderObj) localFileBasedFileSystem.findFileObject(folder2Create);
         }
         assert retVal != null : folder2Create.getAbsolutePath();
@@ -180,6 +181,7 @@
         final FileBasedFileSystem localFileBasedFileSystem = getLocalFileSystem();
         retVal = null;
         if (localFileBasedFileSystem != null) {
+            assert f.exists() && !f.isDirectory() : f.getAbsolutePath();            
             retVal = (FileObj) localFileBasedFileSystem.findFileObject(f);
         }