Updated popup windows to now use the top level RomRaider icon instead of the default Java icon.

src/com/romraider/swing/CompareImagesForm.java

@@ -22,46 +22,46 @@ package com.romraider.swing;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Cursor;
+import java.awt.Image;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.util.Vector;
 
+import javax.swing.DefaultListModel;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
 import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JList;
 import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.ListCellRenderer;
+import javax.swing.ListSelectionModel;
 import javax.swing.border.EmptyBorder;
+import javax.swing.border.EtchedBorder;
 
 import com.romraider.maps.Rom;
 import com.romraider.maps.Table;
 
-import javax.swing.border.EtchedBorder;
-import javax.swing.DefaultListModel;
-import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.JComboBox;
-import javax.swing.JScrollPane;
-import javax.swing.ListCellRenderer;
-import javax.swing.JButton;
-import javax.swing.ListSelectionModel;
-
-import java.awt.event.ActionListener;
-import java.awt.event.ActionEvent;
-
 public class CompareImagesForm extends JFrame implements ActionListener {
 
     private static final long serialVersionUID = -8937472127815934398L;
-    private Vector<Rom> roms;
+    private final Vector<Rom> roms;
-    private JPanel contentPane;
+    private final JPanel contentPane;
-    private JComboBox comboBoxImageLeft;
+    private final JComboBox comboBoxImageLeft;
-    private JComboBox comboBoxImageRight;
+    private final JComboBox comboBoxImageRight;
-    private JButton btnCompare;
+    private final JButton btnCompare;
-    private JList listChanges;
+    private final JList listChanges;
-    private DefaultListModel listModelChanges = new DefaultListModel();
+    private final DefaultListModel listModelChanges = new DefaultListModel();
-    private ChangeListCellRenderer changeRenderer = new ChangeListCellRenderer();
+    private final ChangeListCellRenderer changeRenderer = new ChangeListCellRenderer();
-    private JScrollPane scrollPaneResults;
+    private final JScrollPane scrollPaneResults;
-    private JLabel lblImageResultString;
+    private final JLabel lblImageResultString;
     public static Color equal = new Color(52,114,53);
     public static Color different = new Color(193, 27, 23);
     public static Color missing = new Color(251,185,23);
 
-    public CompareImagesForm(Vector<Rom> roms) {
+    public CompareImagesForm(Vector<Rom> roms, Image parentImage) {
+        this.setIconImage(parentImage);
         setResizable(false);
         this.roms = roms;
 

src/com/romraider/swing/DefinitionManager.java

@@ -19,15 +19,17 @@
 
 package com.romraider.swing;
 
-import com.romraider.editor.ecu.ECUEditor;
-import javax.swing.JFileChooser;
-import javax.swing.ListSelectionModel;
 import java.awt.Font;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
 import java.util.Vector;
 
+import javax.swing.JFileChooser;
+import javax.swing.ListSelectionModel;
+
+import com.romraider.editor.ecu.ECUEditor;
+
 public class DefinitionManager extends javax.swing.JFrame implements ActionListener {
 
     private static final long serialVersionUID = -3920843496218196737L;
@@ -38,6 +40,7 @@ public class DefinitionManager extends javax.swing.JFrame implements ActionListe
     Vector<String> fileNames;
 
     public DefinitionManager(ECUEditor parent) {
+        this.setIconImage(parent.getIconImage());
         initComponents();
         this.parent = parent;
         initSettings();
@@ -162,6 +165,7 @@ public class DefinitionManager extends javax.swing.JFrame implements ActionListe
         pack();
     }// </editor-fold>//GEN-END:initComponents
 
+    @Override
     public void actionPerformed(ActionEvent e) {
         if (e.getSource() == btnCancel) {
             dispose();

src/com/romraider/swing/ECUEditorMenuBar.java

@@ -307,7 +307,7 @@ public class ECUEditorMenuBar extends JMenuBar implements ActionListener {
             form.setVisible(true);
 
         } else if (e.getSource() == compareImages){
-            CompareImagesForm form = new CompareImagesForm(parent.getImages());
+            CompareImagesForm form = new CompareImagesForm(parent.getImages(), parent.getIconImage());
             form.setLocationRelativeTo(parent);
             form.setVisible(true);
 

src/com/romraider/swing/SettingsForm.java

@@ -54,6 +54,7 @@ public class SettingsForm extends JFrame implements MouseListener {
     ECUEditor parent;
 
     public SettingsForm(ECUEditor parent) {
+        this.setIconImage(parent.getIconImage());
         this.parent = parent;
         settings = parent.getSettings();
         initComponents();