This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 257581
Collapse All | Expand All

(-)a/projectui/src/org/netbeans/modules/project/ui/ProjectUtilities.java (-6 / +4 lines)
Lines 50-56 Link Here
50
import java.awt.event.ActionEvent;
50
import java.awt.event.ActionEvent;
51
import java.io.CharConversionException;
51
import java.io.CharConversionException;
52
import java.io.File;
52
import java.io.File;
53
import java.io.IOException;
54
import java.net.MalformedURLException;
53
import java.net.MalformedURLException;
55
import java.net.URL;
54
import java.net.URL;
56
import java.util.Arrays;
55
import java.util.Arrays;
Lines 67-79 Link Here
67
import javax.swing.JFrame;
66
import javax.swing.JFrame;
68
import javax.swing.SwingUtilities;
67
import javax.swing.SwingUtilities;
69
import org.netbeans.api.actions.Openable;
68
import org.netbeans.api.actions.Openable;
70
import org.netbeans.api.project.FileOwnerQuery;
71
import org.netbeans.api.project.Project;
69
import org.netbeans.api.project.Project;
72
import org.netbeans.api.project.ProjectManager;
73
import org.netbeans.api.project.ProjectUtils;
70
import org.netbeans.api.project.ProjectUtils;
74
import static org.netbeans.modules.project.ui.Bundle.*;
71
import static org.netbeans.modules.project.ui.Bundle.*;
75
import org.netbeans.modules.project.ui.groups.Group;
72
import org.netbeans.modules.project.ui.groups.Group;
76
import org.netbeans.spi.project.AuxiliaryConfiguration;
73
import org.netbeans.spi.project.AuxiliaryConfiguration;
74
import org.netbeans.spi.project.ui.support.ProjectConvertors;
77
import org.openide.cookies.EditCookie;
75
import org.openide.cookies.EditCookie;
78
import org.openide.cookies.OpenCookie;
76
import org.openide.cookies.OpenCookie;
79
import org.openide.filesystems.FileObject;
77
import org.openide.filesystems.FileObject;
Lines 160-166 Link Here
160
158
161
                if (dobj != null) {
159
                if (dobj != null) {
162
                    FileObject fobj = dobj.getPrimaryFile();
160
                    FileObject fobj = dobj.getPrimaryFile();
163
                    Project owner = FileOwnerQuery.getOwner(fobj);
161
                    Project owner = ProjectConvertors.getNonConvertorOwner(fobj);
164
                    ERR.log(Level.FINER, "Found {0} owned by {1} in {2} of {3}", new Object[] {fobj, owner, tc.getName(), tc.getClass()});
162
                    ERR.log(Level.FINER, "Found {0} owned by {1} in {2} of {3}", new Object[] {fobj, owner, tc.getName(), tc.getClass()});
165
163
166
                    if (listOfProjects.contains(owner)) {
164
                    if (listOfProjects.contains(owner)) {
Lines 188-194 Link Here
188
            if (notifyUI) {
186
            if (notifyUI) {
189
                for (DataObject dobj : DataObject.getRegistry().getModifiedSet()) {
187
                for (DataObject dobj : DataObject.getRegistry().getModifiedSet()) {
190
                    FileObject fobj = dobj.getPrimaryFile();
188
                    FileObject fobj = dobj.getPrimaryFile();
191
                    Project owner = FileOwnerQuery.getOwner(fobj);
189
                    Project owner = ProjectConvertors.getNonConvertorOwner(fobj);
192
190
193
                    if (listOfProjects.contains(owner) &&
191
                    if (listOfProjects.contains(owner) &&
194
                        !openFiles.contains(dobj)) {
192
                        !openFiles.contains(dobj)) {
Lines 602-608 Link Here
602
            }
600
            }
603
            
601
            
604
            //#109676
602
            //#109676
605
            if (FileOwnerQuery.getOwner(fo) != p) {
603
            if (ProjectConvertors.getNonConvertorOwner(fo) != p) {
606
                ERR.log(Level.FINE, "File {0} doesn''t belong to project at {1}", new Object[] {url, p.getProjectDirectory().getPath()});
604
                ERR.log(Level.FINE, "File {0} doesn''t belong to project at {1}", new Object[] {url, p.getProjectDirectory().getPath()});
607
                continue;
605
                continue;
608
            }
606
            }

Return to bug 257581