Attachment #144988 for bug #240180

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 240180
Collapse All | Expand All

Lines 51-56 Link Here

(-)a/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/utils/FileInfo.java (-1 / +4 lines)
51	import org.netbeans.modules.masterfs.filebasedfs.naming.FileNaming;	51	import org.netbeans.modules.masterfs.filebasedfs.naming.FileNaming;
52	import org.netbeans.modules.masterfs.filebasedfs.naming.NamingFactory;	52	import org.netbeans.modules.masterfs.filebasedfs.naming.NamingFactory;
53	import org.openide.filesystems.FileObject;	53	import org.openide.filesystems.FileObject;
		54	import org.openide.filesystems.FileUtil;
		55	import org.openide.util.Utilities;
54		56
55		57
56	public final class FileInfo {	58	public final class FileInfo {
Lines 170-176 Link Here
170		172
171	public boolean isConvertibleToFileObject() {	173	public boolean isConvertibleToFileObject() {
172	if (isConvertibleToFileObject == -1) {	174	if (isConvertibleToFileObject == -1) {
173	isConvertibleToFileObject = (isSupportedFile() && exists()) ? 1 : 0;	175	isConvertibleToFileObject = (isSupportedFile() && exists() &&
		176	(!Utilities.isMac() \|\| getFile().equals(FileUtil.normalizeFile(getFile())))) ? 1 : 0;
174	}	177	}
175		178
176	return (isConvertibleToFileObject == 1) ? true : false;	179	return (isConvertibleToFileObject == 1) ? true : false;

Lines 241-247 Link Here

(-)a/openide.filesystems/src/org/openide/filesystems/FileChangeImpl.java (-1 / +3 lines)
241	}	241	}
242		242
243	static FileChangeListener removeFileChangeListenerImpl(Logger logger, FileChangeListener listener, File path) {	243	static FileChangeListener removeFileChangeListenerImpl(Logger logger, FileChangeListener listener, File path) {
244	assert path.equals(FileUtil.normalizeFile(path)) : "Need to normalize " + FileUtil.toDebugString(path) + "!";	244	assert (Utilities.isMac()
		245	? path.toString().equalsIgnoreCase(FileUtil.normalizeFile(path).toString())
		246	: path.equals(FileUtil.normalizeFile(path))) : "Need to normalize " + FileUtil.toDebugString(path) + "!";
245	logger.log(Level.FINE, "removeFileChangeListener {0} @ {1}", new Object[]{listener, path});	247	logger.log(Level.FINE, "removeFileChangeListener {0} @ {1}", new Object[]{listener, path});
246	synchronized (holders) {	248	synchronized (holders) {
247	Map<File, FileChangeImpl> f2H = holders.get(listener);	249	Map<File, FileChangeImpl> f2H = holders.get(listener);




        try {
            VCSFileProxyOperations fileProxyOperations = getFileProxyOperations(fileObject.getFileSystem());
            if (fileProxyOperations == null) {
                File file = toFile(fileObject);
                if(file != null) {
                    final VCSFileProxy p = createFileProxy(file);
                    p.isDirectory = fileObject.isFolder();

    VCSFileProxyOperations getFileProxyOperations() {
         return proxy;
    }

    /**
     * Get a File instance for a FileObject. Workaround for bug 240180.
     *
     * @param fo FileObject instance.
     * @return Associated File instance.
     */
    private static File toFile(FileObject fo) {
        Object fileAtt = fo.getAttribute("java.io.File");               //NOI18N
        if (fileAtt instanceof File) {
            return (File) fileAtt;
        } else {
            return FileUtil.toFile(fo);
        }
    }
}

Return to bug 240180

Lines 165-171 Link Here

(-)a/versioning.core/src/org/netbeans/modules/versioning/core/api/VCSFileProxy.java (-1 / +16 lines)
165	try {	165	try {
166	VCSFileProxyOperations fileProxyOperations = getFileProxyOperations(fileObject.getFileSystem());	166	VCSFileProxyOperations fileProxyOperations = getFileProxyOperations(fileObject.getFileSystem());
167	if (fileProxyOperations == null) {	167	if (fileProxyOperations == null) {
168	File file = FileUtil.toFile(fileObject);	168	File file = toFile(fileObject);
169	if(file != null) {	169	if(file != null) {
170	final VCSFileProxy p = createFileProxy(file);	170	final VCSFileProxy p = createFileProxy(file);
171	p.isDirectory = fileObject.isFolder();	171	p.isDirectory = fileObject.isFolder();
Lines 494-497 Link Here
494	VCSFileProxyOperations getFileProxyOperations() {	494	VCSFileProxyOperations getFileProxyOperations() {
495	return proxy;	495	return proxy;
496	}	496	}
		497
		498	/**
		499	* Get a File instance for a FileObject. Workaround for bug 240180.
		500	*
		501	* @param fo FileObject instance.
		502	* @return Associated File instance.
		503	*/
		504	private static File toFile(FileObject fo) {
		505	Object fileAtt = fo.getAttribute("java.io.File"); //NOI18N
		506	if (fileAtt instanceof File) {
		507	return (File) fileAtt;
		508	} else {
		509	return FileUtil.toFile(fo);
		510	}
		511	}
497	}	512	}