GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-12 16:47:31 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

Resolves issues with NPE handling and loading external icons.

Browse Source
This commit is contained in:
Denny
2018-01-01 07:24:37 -05:00
parent c7f00ea124
commit e9aeb09011
3 changed files with 46 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/io/github/dsheirer/icon/IconManager.java
View File

@@ -129,7 +129,7 @@ public class IconManager
/**
* All icons in a sorted array
*/
public io.github.dsheirer.icon.Icon[] getIcons()
public Icon[] getIcons()
{
return getModel().getIconsAsArray();
}
@@ -159,7 +159,11 @@ public class IconManager
Icon icon = getModel().getIcon(name);
ImageIcon scaledIcon = getScaledIcon(icon.getIcon(), height);
mResizedIcons.put(scaledIconName, scaledIcon);
if(scaledIcon != null)
{
mResizedIcons.put(scaledIconName, scaledIcon);
}
return scaledIcon;
}
@@ -173,14 +177,19 @@ public class IconManager
*/
public static ImageIcon getScaledIcon(ImageIcon original, int height)
{
double scale = (double) original.getIconHeight() / (double) height;
if(original != null)
{
double scale = (double) original.getIconHeight() / (double) height;
int scaledWidth = (int) ((double) original.getIconWidth() / scale);
int scaledWidth = (int) ((double) original.getIconWidth() / scale);
Image scaledImage = original.getImage().getScaledInstance(scaledWidth,
height, java.awt.Image.SCALE_SMOOTH);
Image scaledImage = original.getImage().getScaledInstance(scaledWidth,
height, java.awt.Image.SCALE_SMOOTH);
return new ImageIcon(scaledImage);
return new ImageIcon(scaledImage);
}
return null;
}
/**
@@ -191,9 +200,14 @@ public class IconManager
*/
public static ImageIcon getScaledIcon(String path, int height)
{
Icon icon = new Icon("", path);
if(path != null)
{
Icon icon = new Icon("", path);
return getScaledIcon(icon.getIcon(), height);
return getScaledIcon(icon.getIcon(), height);
}
return null;
}
/**