Merge pull request #309 from DSheirer/308-icon-manager-npe

308 IconManager throws NPE when loading external icons
This commit is contained in:
Denny Sheirer
2018-01-01 07:25:29 -05:00
committed by GitHub
3 changed files with 46 additions and 19 deletions

View File

@@ -80,6 +80,12 @@ public class Icon implements Comparable<Icon>
if(mImageIcon == null && mPath != null)
{
try
{
if(mPath.startsWith("/"))
{
mImageIcon = new ImageIcon(mPath);
}
else
{
URL imageURL = Icon.class.getResource(mPath);
@@ -93,6 +99,7 @@ public class Icon implements Comparable<Icon>
mImageIcon = new ImageIcon(imageURL);
}
}
}
catch(Exception e)
{
mLog.error("Error loading Icon [" + mPath + "]", e);

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);
if(scaledIcon != null)
{
mResizedIcons.put(scaledIconName, scaledIcon);
}
return scaledIcon;
}
@@ -172,6 +176,8 @@ public class IconManager
* @return
*/
public static ImageIcon getScaledIcon(ImageIcon original, int height)
{
if(original != null)
{
double scale = (double) original.getIconHeight() / (double) height;
@@ -183,6 +189,9 @@ public class IconManager
return new ImageIcon(scaledImage);
}
return null;
}
/**
* Constructs an icon and scales it to the specified height
* @param path
@@ -190,12 +199,17 @@ public class IconManager
* @return
*/
public static ImageIcon getScaledIcon(String path, int height)
{
if(path != null)
{
Icon icon = new Icon("", path);
return getScaledIcon(icon.getIcon(), height);
}
return null;
}
/**
* Folder where icon, backup and lock files are stored
*/

View File

@@ -20,10 +20,16 @@ package io.github.dsheirer.icon;
import net.miginfocom.swing.MigLayout;
import javax.swing.*;
import javax.swing.JButton;
import javax.swing.JDialog;
import javax.swing.JFileChooser;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JTextField;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import java.awt.*;
import java.awt.Dimension;
import java.awt.Frame;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.File;
@@ -119,7 +125,7 @@ public class IconSelector extends JDialog implements DocumentListener
String name = mNameText.getText();
String path = mFileLabel.getText();
io.github.dsheirer.icon.Icon icon = new io.github.dsheirer.icon.Icon(name, path);
Icon icon = new Icon(name, path);
mIconTableModel.add(icon);
IconSelector.this.dispose();