Index: src/org/netbeans/modules/openfile/OpenFile.java
===================================================================
RCS file: /cvs/utilities/src/org/netbeans/modules/openfile/OpenFile.java,v
retrieving revision 1.43
diff -u -r1.43 OpenFile.java
--- src/org/netbeans/modules/openfile/OpenFile.java	7 Nov 2001 14:22:58 -0000	1.43
+++ src/org/netbeans/modules/openfile/OpenFile.java	19 Dec 2001 10:56:25 -0000
@@ -360,8 +360,30 @@
         FileObject[] fObjects = FileUtil.fromFile(f);
 
         // Has found something from already mounted filesystems.
-        if(fObjects.length > 0) {
-            return fObjects[0];
+        if ( fObjects.length > 0 ) {
+            FileObject fileObj = fObjects[0];
+
+            // And if there is more Java FileObjects, try to find one int correct package
+            if ( ( fObjects.length > 1 ) &&
+                 ( fileNameUpper.endsWith (JAVA_EXT) ) ) {
+                // file package
+                String pkg = findJavaPackage (f);
+                
+                for ( int i = 0; i < fObjects.length; i++ ) {
+                    // FileObject package
+                    String pkg_i = ""; // NOI18N
+                    if ( fObjects[i].isRoot() == false ) {
+                        FileObject parent = fObjects[i].getParent();
+                        pkg_i = parent.getPackageName ('.');
+                    }
+                    
+                    if ( pkg.equals (pkg_i) ) { // yes, this is right package
+                        fileObj = fObjects[i];
+                        break;
+                    }
+                }
+            }
+            return fileObj;
         }
         
         // Not found. For Java files, it is reasonable to mount the package root.