mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
Eliminate focus killer
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup Label="ProjectConfigurations">
|
||||
<ProjectConfiguration Include="Debug|Win32">
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup>
|
||||
<Filter Include="Source Files">
|
||||
|
||||
@@ -346,16 +346,6 @@ public class StartupUtil {
|
||||
IdeaWin32.isAvailable(); // logging is done there
|
||||
}
|
||||
|
||||
if (SystemInfo.isWin2kOrNewer && !Main.isHeadless()) {
|
||||
try {
|
||||
UrlClassLoader.loadPlatformLibrary("focusKiller");
|
||||
log.info("Using \"FocusKiller\" library to prevent focus stealing.");
|
||||
}
|
||||
catch (Throwable t) {
|
||||
log.info("\"FocusKiller\" library not found or there were problems loading it.", t);
|
||||
}
|
||||
}
|
||||
|
||||
if (SystemInfo.isWindows) {
|
||||
// WinP should not unpack .dll files into parent directory
|
||||
System.setProperty("winp.unpack.dll.to.parent.dir", "false");
|
||||
|
||||
@@ -33,7 +33,6 @@ public class DigesterTest extends UpdaterTestCase {
|
||||
assertEquals(Digester.DIRECTORY, Digester.digestRegularFile(libDir, true));
|
||||
|
||||
assertEquals(CHECKSUMS.README_TXT, Digester.digestRegularFile(new File(dataDir, "Readme.txt"), false));
|
||||
assertEquals(CHECKSUMS.FOCUS_KILLER_DLL, Digester.digestRegularFile(new File(binDir, "focuskiller.dll"), false));
|
||||
assertEquals(CHECKSUMS.BOOTSTRAP_JAR_BIN, Digester.digestRegularFile(new File(libDir, "bootstrap.jar"), false));
|
||||
assertEquals(CHECKSUMS.ANNOTATIONS_JAR, Digester.digestRegularFile(new File(libDir, "annotations.jar"), true));
|
||||
assertEquals(CHECKSUMS.ANNOTATIONS_CHANGED_JAR, Digester.digestRegularFile(new File(libDir, "annotations_changed.jar"), true));
|
||||
|
||||
@@ -554,7 +554,6 @@ public abstract class PatchApplyingRevertingTest extends PatchTestCase {
|
||||
@Test
|
||||
public void testUpdatingMissingOptionalDirectory() throws Exception {
|
||||
FileUtil.copy(new File(myOlderDir, "bin/idea.bat"), new File(myOlderDir, "jre/bin/java"));
|
||||
FileUtil.copy(new File(myOlderDir, "bin/focuskiller.dll"), new File(myOlderDir, "jre/bin/jvm.dll"));
|
||||
FileUtil.copy(new File(myOlderDir, "lib/annotations.jar"), new File(myOlderDir, "jre/lib/rt.jar"));
|
||||
FileUtil.copy(new File(myOlderDir, "lib/boot.jar"), new File(myOlderDir, "jre/lib/tools.jar"));
|
||||
resetNewerDir();
|
||||
|
||||
Reference in New Issue
Block a user