yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 02:39:44 +02:00
Code Issues Releases Wiki Activity

Correct Java 1.8 compliance bug for Generic module

Browse source
This commit is contained in:
ghidra1 2020-07-14 13:39:41 -04:00
parent 262b1c1d16
commit 3246e69e99
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ghidra/Framework/Utility/src/main/java/ghidra/GhidraJarApplicationLayout.java
View file

@ -78,6 +78,6 @@ public class GhidraJarApplicationLayout extends GhidraApplicationLayout {
protected List<ResourceFile> findExtensionInstallationDirectories() { protected List<ResourceFile> findExtensionInstallationDirectories() {
ResourceFile extensionInstallDir = new ResourceFile( ResourceFile extensionInstallDir = new ResourceFile(
ApplicationLayout.class.getResource("/_Root/Ghidra/Extensions").toExternalForm()); ApplicationLayout.class.getResource("/_Root/Ghidra/Extensions").toExternalForm());
return List.of(extensionInstallDir); return Collections.singletonList(extensionInstallDir);
} }
} }

3
Ghidra/Framework/Utility/src/main/java/ghidra/GhidraTestApplicationLayout.java
View file

@ -16,6 +16,7 @@
package ghidra; package ghidra;
import java.io.*; import java.io.*;
import java.util.Collections;
import java.util.List; import java.util.List;
import generic.jar.ResourceFile; import generic.jar.ResourceFile;
@ -54,7 +55,7 @@ public class GhidraTestApplicationLayout extends GhidraApplicationLayout {
@Override @Override
protected List<ResourceFile> findExtensionInstallationDirectories() { protected List<ResourceFile> findExtensionInstallationDirectories() {
File installDir = new File(getUserTempDir(), "ExtensionInstallDir"); File installDir = new File(getUserTempDir(), "ExtensionInstallDir");
return List.of(new ResourceFile(installDir)); return Collections.singletonList(new ResourceFile(installDir));
} }
@Override @Override