Index: src/org/openide/filesystems/FileUtil.java
===================================================================
RCS file: /cvs/openide/src/org/openide/filesystems/FileUtil.java,v
retrieving revision 1.75
diff -u -r1.75 FileUtil.java
--- src/org/openide/filesystems/FileUtil.java	30 Jan 2004 10:10:43 -0000	1.75
+++ src/org/openide/filesystems/FileUtil.java	30 Jan 2004 12:46:55 -0000
@@ -272,6 +272,7 @@
      * @param file File whose coresponding FileObjects will be looked for
      * @return corresponding FileObjects or empty array  if no 
      * corresponding FileObject exists.
+     * @see #findBestFileObject
      * @since 1.29
      */        
     public static FileObject[] fromFile (File file) {
@@ -316,6 +317,28 @@
         return results;            
     }
 
+    /**
+     * Finds the best FileObject for the given File. If there is multiple
+     * FileObjects available for the File (use {@link #fromFile} method
+     * to list them) the FileObject with minimal number of path components
+     * will be choosen.
+     *
+     * @param file File for which the FileObject will be searched
+     * @return the most suitable FileObject or null if there is not any
+     * @since X.XX
+     */
+    public static FileObject findBestFileObject(File file) {
+        // XXX: consider replacing fromFile() call
+        // with more efficient algorithm
+        FileObject fos[] = fromFile(file);
+        FileObject shortest = fos.length > 0 ? fos[0] : null;
+        for (int i=1; i<fos.length; i++) {
+            if (fos[i].getPath().length() <  shortest.getPath().length()) {
+                shortest = fos[i];
+            }
+        }
+        return shortest;
+    }
 
     
     
Index: src/org/openide/filesystems/URLMapper.java
===================================================================
RCS file: /cvs/openide/src/org/openide/filesystems/URLMapper.java,v
retrieving revision 1.21
diff -u -r1.21 URLMapper.java
--- src/org/openide/filesystems/URLMapper.java	24 Jan 2004 05:20:41 -0000	1.21
+++ src/org/openide/filesystems/URLMapper.java	30 Jan 2004 12:46:56 -0000
@@ -101,6 +101,7 @@
      * <code> findURL(FileObject fo, int type) </code>.
      * @param url to wanted FileObjects
      * @return a suitable arry of FileObjects, or empty array if not successful
+     * @see #findBestFileObject
      * @since  2.22*/
     public static FileObject[] findFileObjects (URL url) {
         /** first basic implementation */
@@ -121,6 +122,29 @@
         return retVal;
     }
 
+    /**
+     * Finds the best FileObject for the given URL. If there is multiple
+     * FileObjects available for the URL (use {@link #findFileObjects} method
+     * to list them) the FileObject with minimal number of path components
+     * will be choosen.
+     *
+     * @param url URL for which the FileObject will be searched
+     * @return the most suitable FileObject or null if there is not any
+     * @since X.XX
+     */
+    public static FileObject findBestFileObject(URL url) {
+        // XXX: consider replacing findFileObjects() call
+        // with more efficient algorithm
+        FileObject fos[] = findFileObjects(url);
+        FileObject shortest = fos.length > 0 ? fos[0] : null;
+        for (int i=1; i<fos.length; i++) {
+            if (fos[i].getPath().length() <  shortest.getPath().length()) {
+                shortest = fos[i];
+            }
+        }
+        return shortest;
+    }
+    
     /** Get an array of FileObjects for this url
      * @param url to wanted FileObjects
      * @return a suitable arry of FileObjects, or null
Index: test/unit/src/org/openide/filesystems/FileUtilTest.java
===================================================================
RCS file: test/unit/src/org/openide/filesystems/FileUtilTest.java
diff -N test/unit/src/org/openide/filesystems/FileUtilTest.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ test/unit/src/org/openide/filesystems/FileUtilTest.java	30 Jan 2004 12:47:02 -0000
@@ -0,0 +1,90 @@
+/*
+ *                 Sun Public License Notice
+ *
+ * The contents of this file are subject to the Sun Public License
+ * Version 1.0 (the "License"). You may not use this file except in
+ * compliance with the License. A copy of the License is available at
+ * http://www.sun.com/
+ *
+ * The Original Code is NetBeans. The Initial Developer of the Original
+ * Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
+ * Microsystems, Inc. All Rights Reserved.
+ */
+
+package org.openide.filesystems;
+
+import java.io.File;
+import java.util.ArrayList;
+import org.netbeans.junit.NbTestCase;
+
+/**
+ * Test functionality of FileUtils methods.
+ *
+ * @author David Konecny
+ */
+public class FileUtilTest extends NbTestCase {
+    
+    public FileUtilTest(String name) {
+        super(name);
+    }
+    
+    public void testFindBestFileObject() throws Exception {
+        // This tests creates three subfolders in working directory and a file
+        // in each subfolder. Then it mounts all subfolders (including the working 
+        // dir) into repository as individual (overlapping) filesystems and 
+        // tests that "best" fileobject is returned for misc io.Files.
+        File workdir = getWorkDir();
+        String path = workdir.getAbsolutePath() + "/folder1/folder2/folder3";
+        File f = new File(path);
+        f.mkdirs();
+        
+        path = workdir.getAbsolutePath() + "/folder1/file1.txt";
+        f = new File(path);
+        f.createNewFile();
+        path = workdir.getAbsolutePath() + "/folder1/folder2/file2.txt";
+        f = new File(path);
+        f.createNewFile();
+        path = workdir.getAbsolutePath() + "/folder1/folder2/folder3/file3.txt";
+        f = new File(path);
+        f.createNewFile();
+        
+        LocalFileSystem lfs = new LocalFileSystem();
+        File folder = workdir;
+        lfs.setRootDirectory(folder);
+        Repository.getDefault().addFileSystem(lfs);
+        lfs = new LocalFileSystem();
+        folder = new File(folder, "folder1");
+        lfs.setRootDirectory(folder);
+        Repository.getDefault().addFileSystem(lfs);
+        lfs = new LocalFileSystem();
+        folder = new File(folder, "folder2");
+        lfs.setRootDirectory(folder);
+        Repository.getDefault().addFileSystem(lfs);
+        lfs = new LocalFileSystem();
+        folder = new File(folder, "folder3");
+        lfs.setRootDirectory(folder);
+        Repository.getDefault().addFileSystem(lfs);
+        
+        String base = workdir.getAbsolutePath();
+        FileObject fos[] = FileUtil.fromFile(new File(base+"/folder1/folder2/folder3/file3.txt"));
+        ArrayList list = new ArrayList();
+        for (int i=0; i<fos.length; i++) {
+            list.add(fos[i].getPath());
+        }
+        assertTrue("list="+list, list.remove("folder1/folder2/folder3/file3.txt"));
+        assertTrue(list.remove("folder2/folder3/file3.txt"));
+        assertTrue(list.remove("folder3/file3.txt"));
+        assertTrue(list.remove("file3.txt"));
+        assertEquals(0, list.size());
+        
+        assertEquals("file3.txt", FileUtil.findBestFileObject(new File(base+"/folder1/folder2/folder3/file3.txt")).getPath());
+        assertEquals("", FileUtil.findBestFileObject(new File(base+"/folder1/folder2/folder3")).getPath());
+        assertEquals("file2.txt", FileUtil.findBestFileObject(new File(base+"/folder1/folder2/file2.txt")).getPath());
+        assertEquals("", FileUtil.findBestFileObject(new File(base+"/folder1/folder2")).getPath());
+        assertEquals("file1.txt", FileUtil.findBestFileObject(new File(base+"/folder1/file1.txt")).getPath());
+        assertEquals("", FileUtil.findBestFileObject(new File(base+"/folder1")).getPath());
+        assertEquals("", FileUtil.findBestFileObject(new File(base)).getPath());
+        
+    }
+    
+}
Index: test/unit/src/org/openide/filesystems/URLMapperTest.java
===================================================================
RCS file: /cvs/openide/test/unit/src/org/openide/filesystems/URLMapperTest.java,v
retrieving revision 1.1
diff -u -r1.1 URLMapperTest.java
--- test/unit/src/org/openide/filesystems/URLMapperTest.java	24 Jan 2004 00:44:51 -0000	1.1
+++ test/unit/src/org/openide/filesystems/URLMapperTest.java	30 Jan 2004 12:47:02 -0000
@@ -17,6 +17,7 @@
 import java.io.FileOutputStream;
 import java.io.OutputStream;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.jar.JarEntry;
@@ -72,6 +73,65 @@
         assertEquals("correct FO -> URL for " + textPath, textU, URLMapper.findURL(textFO, URLMapper.EXTERNAL));
         assertEquals("correct URL -> FO for root", Collections.singletonList(rootFO), Arrays.asList(URLMapper.findFileObjects(rootU)));
         assertEquals("correct URL -> FO for " + textPath, Collections.singletonList(textFO), Arrays.asList(URLMapper.findFileObjects(textU)));
+    }
+    
+    public void testFindBestFileObject() throws Exception {
+        // This tests creates three subfolders in working directory and a file
+        // in each subfolder. Then it mounts all subfolders (including the working 
+        // dir) into repository as individual (overlapping) filesystems and 
+        // tests that "best" fileobject is returned for misc URLs.
+        File workdir = getWorkDir();
+        String path = workdir.getAbsolutePath() + "/folder1/folder2/folder3";
+        File f = new File(path);
+        f.mkdirs();
+        
+        path = workdir.getAbsolutePath() + "/folder1/file1.txt";
+        f = new File(path);
+        f.createNewFile();
+        path = workdir.getAbsolutePath() + "/folder1/folder2/file2.txt";
+        f = new File(path);
+        f.createNewFile();
+        path = workdir.getAbsolutePath() + "/folder1/folder2/folder3/file3.txt";
+        f = new File(path);
+        f.createNewFile();
+        
+        LocalFileSystem lfs = new LocalFileSystem();
+        File folder = workdir;
+        lfs.setRootDirectory(folder);
+        Repository.getDefault().addFileSystem(lfs);
+        lfs = new LocalFileSystem();
+        folder = new File(folder, "folder1");
+        lfs.setRootDirectory(folder);
+        Repository.getDefault().addFileSystem(lfs);
+        lfs = new LocalFileSystem();
+        folder = new File(folder, "folder2");
+        lfs.setRootDirectory(folder);
+        Repository.getDefault().addFileSystem(lfs);
+        lfs = new LocalFileSystem();
+        folder = new File(folder, "folder3");
+        lfs.setRootDirectory(folder);
+        Repository.getDefault().addFileSystem(lfs);
+        
+        String base = workdir.toURI().toURL().toExternalForm();
+        FileObject fos[] = URLMapper.findFileObjects(new URL(base+"/folder1/folder2/folder3/file3.txt"));
+        ArrayList list = new ArrayList();
+        for (int i=0; i<fos.length; i++) {
+            list.add(fos[i].getPath());
+        }
+        assertTrue("list="+list, list.remove("folder1/folder2/folder3/file3.txt"));
+        assertTrue(list.remove("folder2/folder3/file3.txt"));
+        assertTrue(list.remove("folder3/file3.txt"));
+        assertTrue(list.remove("file3.txt"));
+        assertEquals(0, list.size());
+        
+        assertEquals("file3.txt", URLMapper.findBestFileObject(new URL(base+"/folder1/folder2/folder3/file3.txt")).getPath());
+        assertEquals("", URLMapper.findBestFileObject(new URL(base+"/folder1/folder2/folder3")).getPath());
+        assertEquals("file2.txt", URLMapper.findBestFileObject(new URL(base+"/folder1/folder2/file2.txt")).getPath());
+        assertEquals("", URLMapper.findBestFileObject(new URL(base+"/folder1/folder2")).getPath());
+        assertEquals("file1.txt", URLMapper.findBestFileObject(new URL(base+"/folder1/file1.txt")).getPath());
+        assertEquals("", URLMapper.findBestFileObject(new URL(base+"/folder1")).getPath());
+        assertEquals("", URLMapper.findBestFileObject(new URL(base)).getPath());
+        
     }
     
 }