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

Merge remote-tracking branch

Browse source 
'origin/dev747368_GT-2698_hostile_html_whack_a_mole_UI_stuff'

Conflicts:
	Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AnalysisPanel.java
This commit is contained in:
ghidravore 2019-05-02 14:24:21 -04:00
commit 45222ad4d3
423 changed files with 6234 additions and 5902 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Ghidra/Framework/Generic/src/main/java/resources/ResourceManager.java
View file

@ -474,7 +474,9 @@ public class ResourceManager {
}
/**
* Load the image specified by filename; returns null if problems occur trying to load the file
* Load the image specified by filename; returns the default bomb icon
* if problems occur trying to load the file.
* <p>
*
* @param filename name of file to load, e.g., "images/home.gif"
* @return the image icon stored in the bytes
@ -509,6 +511,22 @@ public class ResourceManager {
return getDefaultIcon();
}
/**
* Load the images specified by filenames; substitutes the default bomb icon
* if problems occur trying to load an individual file.
* <p>
* @param filenames vararg list of string filenames (ie. "images/home.gif")
* @return list of ImageIcons with each image, problem / missing images replaced with
* the default icon.
*/
public static List<ImageIcon> loadImages(String... filenames) {
List<ImageIcon> results = new ArrayList<>(filenames.length);
for (String filename : filenames) {
results.add(loadImage(filename));
}
return results;
}
/**
* A convenience method to force the image denoted by <code>filename</code> to be read
* from disk and to not use the cached version