Created
March 8, 2015 12:40
-
-
Save abderraouf-adjal/0bd81cb2109668b1ed84 to your computer and use it in GitHub Desktop.
frostwire/frostwire-desktop/pull/441
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
64,67c64 | |
< if(supportsIdleTime()) | |
< return idleTime(); | |
< | |
< return 0; | |
--- | |
> return (supportsIdleTime() ? idleTime() : 0); | |
78,85c75 | |
< if(isLoaded) { | |
< if(OSUtils.isGoodWindows()) | |
< return true; | |
< else if(OSUtils.isMacOSX()) | |
< return true; | |
< } | |
< | |
< return false; | |
--- | |
> return ((isLoaded && (OSUtils.isGoodWindows() || OSUtils.isMacOSX())) ? true : false); | |
92,95c82 | |
< if(isLoaded && OSUtils.isMacOSX()) | |
< return setOpenFileLimit0(max); | |
< else | |
< return -1; | |
--- | |
> return ((isLoaded && OSUtils.isMacOSX()) ? setOpenFileLimit0(max) : -1); | |
119,122c106 | |
< if (path.equals("")) | |
< return null; | |
< else | |
< return path; | |
--- | |
> return ((path.equals("")) ? null : path); | |
216,220c200 | |
< if(isLoaded && (OSUtils.isWindows() || OSUtils.isLinux()) ) { | |
< return toggleFullScreenNative(hwnd); | |
< } | |
< | |
< return false; | |
--- | |
> return ((isLoaded && (OSUtils.isWindows() || OSUtils.isLinux())) ? toggleFullScreenNative(hwnd) : false); | |
228,232c208 | |
< if(isLoaded && OSUtils.isWindows()) { | |
< return flushIconCacheNative(); | |
< } | |
< | |
< return false; | |
--- | |
> return ((isLoaded && OSUtils.isWindows()) ? flushIconCacheNative() : false); | |
273,276c249 | |
< if (OSUtils.isWindows() && isLoaded) | |
< return registryWriteNumberNative(root, path, name, value); | |
< else | |
< return false; | |
--- | |
> return ((OSUtils.isWindows() && isLoaded) ? registryWriteNumberNative(root, path, name, value) : false); | |
289,292c262 | |
< if (OSUtils.isWindows() && isLoaded) | |
< return registryWriteTextNative(root, path, name, value); | |
< else | |
< return false; | |
--- | |
> return ((OSUtils.isWindows() && isLoaded) ? registryWriteTextNative(root, path, name, value) : false); | |
303,306c273 | |
< if (OSUtils.isWindows() && isLoaded) | |
< return registryDeleteNative(root, path); | |
< else | |
< return false; | |
--- | |
> return ((OSUtils.isWindows() && isLoaded) ? registryDeleteNative(root, path) : false); | |
315,317c282 | |
< if (OSUtils.isWindows() && isLoaded) | |
< return firewallPresentNative(); | |
< return false; | |
--- | |
> return ((OSUtils.isWindows() && isLoaded) ? firewallPresentNative() : false); | |
328,330c293 | |
< if (OSUtils.isWindows() && isLoaded) | |
< return firewallEnabledNative(); | |
< return false; | |
--- | |
> return ((OSUtils.isWindows() && isLoaded) ? firewallEnabledNative() : false); | |
341,343c304 | |
< if (OSUtils.isWindows() && isLoaded) | |
< return firewallExceptionsNotAllowedNative(); | |
< return false; | |
--- | |
> return ((OSUtils.isWindows() && isLoaded) ? firewallExceptionsNotAllowedNative() : false); | |
353,355c314 | |
< if (OSUtils.isWindows() && isLoaded) | |
< return firewallIsProgramListedNative(path); | |
< return false; | |
--- | |
> return ((OSUtils.isWindows() && isLoaded) ? firewallIsProgramListedNative(path) : false); | |
365,367c324 | |
< if (OSUtils.isWindows() && isLoaded) | |
< return firewallIsProgramEnabledNative(path); | |
< return false; | |
--- | |
> return ((OSUtils.isWindows() && isLoaded) ? firewallIsProgramEnabledNative(path) : false); | |
378,380c335 | |
< if (OSUtils.isWindows() && isLoaded) | |
< return firewallAddNative(path, name); | |
< return false; | |
--- | |
> return ((OSUtils.isWindows() && isLoaded) ? firewallAddNative(path, name) : false); | |
390,392c345 | |
< if (OSUtils.isWindows() && isLoaded) | |
< return firewallRemoveNative(path); | |
< return false; | |
--- | |
> return ((OSUtils.isWindows() && isLoaded) ? firewallRemoveNative(path) : false); | |
462,466c415 | |
< if(OSUtils.isWindows() && isLoaded) { | |
< return getShortFileNameNative(fileName); | |
< } else { | |
< return fileName; | |
< } | |
--- | |
> return ((OSUtils.isWindows() && isLoaded) ? getShortFileNameNative(fileName) : fileName); | |
477d425 | |
< | |
496,500c444 | |
< if (OSUtils.isWindows() && isLoaded) { | |
< return verifyExecutableSignatureNative(executablePath, expectedCertificate); | |
< } else { | |
< return false; | |
< } | |
--- | |
> return ((OSUtils.isWindows() && isLoaded) ? verifyExecutableSignatureNative(executablePath, expectedCertificate) : false); | |
516,519c460 | |
< if ("".equals(progId)) | |
< return ""; | |
< return registryReadText("HKEY_CLASSES_ROOT", | |
< progId+"\\shell\\open\\command",""); | |
--- | |
> return (("".equals(progId)) ? "" : registryReadText("HKEY_CLASSES_ROOT",progId+"\\shell\\open\\command","")); | |
532a474 | |
> | |
542,544c484 | |
< if ("".equals(extention)) | |
< return ""; | |
< return getDefaultExtentionHandler(extention); | |
--- | |
> return (("".equals(extention)) ? "" : getDefaultExtentionHandler(extention)); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment