Attachment #145193 for bug #238679

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




        if (!result) {
            FileObject sourceDirectory = phpModule.getSourceDirectory();
            if (sourceDirectory != null) {
                FileObject bootstrap = getFileObject(sourceDirectory, Constants.COMMON_BOOTSTRAP_PATH);
                result = bootstrap != null && !bootstrap.isFolder() && bootstrap.isValid();
                FileObject config = getFileObject(sourceDirectory, Constants.COMMON_CONFIG_PATH);
                result = result && config != null && config.isFolder() && config.isValid();
            }
        }

        return new Nette2CustomizerExtender(phpModule);
    }

    /**
     * Try to get a FileObject with correct filename case. See bug 238679.
     *
     * @param parent Parent FileObject.
     * @param relPath Relative path, separated by slashes.
     */
    private FileObject getFileObject(FileObject parent, String relPath) {
        File parentFile = FileUtil.toFile(parent);
        if (parentFile != null) {
            String nativePath = relPath.replace('/', File.separatorChar);
            File file = new File(parentFile, nativePath);
            return FileUtil.toFileObject(FileUtil.normalizeFile(file));
        } else {
            return null;
        }
    }
}

Lines 117-123 Link Here

(-)a/php.symfony2/src/org/netbeans/modules/php/symfony2/commands/Symfony2Script.java (-1 / +7 lines)
117	// perhaps deleted app dir? fallback to default and let it fail later...	117	// perhaps deleted app dir? fallback to default and let it fail later...
118	return null;	118	return null;
119	}	119	}
120	return appDir.getFileObject(SCRIPT_NAME);	120	File appDirFile = FileUtil.toFile(appDir); // #238679
		121	if (appDirFile != null) {
		122	File file = new File(appDirFile, SCRIPT_NAME);
		123	return FileUtil.toFileObject(FileUtil.normalizeFile(file));
		124	} else {
		125	return null;
		126	}
121	}	127	}
122		128
123	/**	129	/**

Return to bug 238679

Lines 97-105 Link Here

(-)a/php.nette2/src/org/netbeans/modules/php/nette2/Nette2FrameworkProvider.java (-2 / +18 lines)
97	if (!result) {	97	if (!result) {
98	FileObject sourceDirectory = phpModule.getSourceDirectory();	98	FileObject sourceDirectory = phpModule.getSourceDirectory();
99	if (sourceDirectory != null) {	99	if (sourceDirectory != null) {
100	FileObject bootstrap = sourceDirectory.getFileObject(Constants.COMMON_BOOTSTRAP_PATH);	100	FileObject bootstrap = getFileObject(sourceDirectory, Constants.COMMON_BOOTSTRAP_PATH);
101	result = bootstrap != null && !bootstrap.isFolder() && bootstrap.isValid();	101	result = bootstrap != null && !bootstrap.isFolder() && bootstrap.isValid();
102	FileObject config = sourceDirectory.getFileObject(Constants.COMMON_CONFIG_PATH);	102	FileObject config = getFileObject(sourceDirectory, Constants.COMMON_CONFIG_PATH);
103	result = result && config != null && config.isFolder() && config.isValid();	103	result = result && config != null && config.isFolder() && config.isValid();
104	}	104	}
105	}	105	}
Lines 181-184 Link Here
181	return new Nette2CustomizerExtender(phpModule);	181	return new Nette2CustomizerExtender(phpModule);
182	}	182	}
183		183
		184	/**
		185	* Try to get a FileObject with correct filename case. See bug 238679.
		186	*
		187	* @param parent Parent FileObject.
		188	* @param relPath Relative path, separated by slashes.
		189	*/
		190	private FileObject getFileObject(FileObject parent, String relPath) {
		191	File parentFile = FileUtil.toFile(parent);
		192	if (parentFile != null) {
		193	String nativePath = relPath.replace('/', File.separatorChar);
		194	File file = new File(parentFile, nativePath);
		195	return FileUtil.toFileObject(FileUtil.normalizeFile(file));
		196	} else {
		197	return null;
		198	}
		199	}
184	}	200	}