#4 Move images to a dedicated location

Signed-off-by: Kaur Palang <kaur.palang@brightcodecompany.com>

Author: kpalang

client/src/com/mirth/connect/client/ui/BrandingConstants.java

@@ -1,5 +1,7 @@
 package com.mirth.connect.client.ui;
 
+import javax.swing.ImageIcon;
+
 public class BrandingConstants {
 
     public static final String PRODUCT_NAME = "OpenIntegrationEngine";
@@ -33,4 +35,9 @@ public class BrandingConstants {
 
     // The URL that is opened when clicking "Visit + PRODUCT_NAME" button in Administrator
     public static final String HOMEPAGE_URL = "https://openintegrationengine.org/";
+
+    // Icons
+    public static final ImageIcon FAVICON = new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/branding/NG_MC_Icon_32x32.png"));
+    public static final ImageIcon LOGO = new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/branding/MirthConnect_NLogo_RGB.png"));
+    public static final ImageIcon LOGO_GRAY = new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/branding/rendered/oie_logo_white.png"));
 }

client/src/com/mirth/connect/client/ui/CustomBannerPanelDialog.java

@@ -18,7 +18,6 @@
 
 import javax.swing.AbstractButton;
 import javax.swing.BorderFactory;
-import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JDialog;
 import javax.swing.JFrame;
@@ -58,7 +57,7 @@ public CustomBannerPanelDialog(JFrame parent, String title, String text) {
     private void initComponents() {
         setLayout(new MigLayout("insets 12")); // layout sets 12 pixel border
         setTitle(title);
-        setIconImage(UIConstants.MIRTH_FAVICON.getImage());
+        setIconImage(BrandingConstants.FAVICON.getImage());
         getContentPane().setBackground(UIConstants.BACKGROUND_COLOR); // set dialog box to background color
         setBackground(UIConstants.BACKGROUND_COLOR); // get all other backgrounds for each piece
 

client/src/com/mirth/connect/client/ui/Frame.java

@@ -282,7 +282,7 @@ public Frame() {
 
         setTitle(titleText.toString());
         setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
-        setIconImage(UIConstants.MIRTH_FAVICON.getImage());
+        setIconImage(BrandingConstants.FAVICON.getImage());
         makePaneContainer();
 
         connectionError = false;
@@ -767,7 +767,7 @@ private void buildContentPanel(JXTitledPanel container, JScrollPane component, b
         padlockWarning.setForeground(Color.WHITE);
 
         JLabel mirthConnectImage = new JLabel();
-        ImageIcon imageIcon = UIConstants.MIRTHCONNECT_LOGO_GRAY; // load the image to a imageIcon
+        ImageIcon imageIcon = BrandingConstants.LOGO_GRAY; // load the image to a imageIcon
         Image image = imageIcon.getImage(); // transform it
         Image newimg = image.getScaledInstance(218, 29, java.awt.Image.SCALE_SMOOTH); // scale it the smooth way 
         imageIcon = new ImageIcon(newimg);

client/src/com/mirth/connect/client/ui/LoginPanel.java

@@ -53,8 +53,8 @@ private LoginPanel() {
         jLabel2.setForeground(UIConstants.HEADER_TITLE_TEXT_COLOR);
         jLabel5.setForeground(UIConstants.HEADER_TITLE_TEXT_COLOR);
         setDefaultCloseOperation(EXIT_ON_CLOSE);
-        setIconImage(UIConstants.MIRTH_FAVICON.getImage());
-        ImageIcon imageIcon = UIConstants.MIRTHCORP_LOGO; // load the image to a imageIcon
+        setIconImage(BrandingConstants.FAVICON.getImage());
+        ImageIcon imageIcon = BrandingConstants.LOGO; // load the image to a imageIcon
         Image image = imageIcon.getImage(); // transform it
         Image newimg = image.getScaledInstance(175, 30, java.awt.Image.SCALE_SMOOTH); // scale it the smooth way 
         imageIcon = new ImageIcon(newimg);
@@ -108,7 +108,7 @@ public void initialize(String mirthServer, String version, String user, String p
             PlatformUI.CLIENT_VERSION = version;
 
             setTitle(String.format("%s %s - Login", BrandingConstants.PRODUCT_NAME, version));
-            setIconImage(UIConstants.MIRTH_FAVICON.getImage());
+            setIconImage(BrandingConstants.FAVICON.getImage());
 
             serverName.setText(mirthServer);
 
@@ -172,7 +172,7 @@ private void initComponents() {
 
         setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
         setTitle(String.format("%s - Login", BrandingConstants.PRODUCT_NAME));
-        setIconImage(UIConstants.MIRTH_FAVICON.getImage());
+        setIconImage(BrandingConstants.FAVICON.getImage());
 
         loginMain.setBackground(new java.awt.Color(255, 255, 255));
         loginMain.setName(""); // NOI18N

client/src/com/mirth/connect/client/ui/UIConstants.java

@@ -29,9 +29,6 @@ public class UIConstants {
     public static final int TASK_PANE_WIDTH = 170;
     public static final int MIRTH_WIDTH = 950;
     public static final int MIRTH_HEIGHT = 650;
-    public static final ImageIcon MIRTH_FAVICON = new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/NG_MC_Icon_32x32.png"));
-    public static final ImageIcon MIRTHCORP_LOGO = new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/MirthConnect_NLogo_RGB.png"));
-    public static final ImageIcon MIRTHCONNECT_LOGO_GRAY = new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/MirthConnect_Logo_WM_White.png"));
     public static final String EDIT_FILTER = "Edit Filter";
     public static final String EDIT_TRANSFORMER = "Edit Transformer";
     public static final String EDIT_RESPONSE_TRANSFORMER = "Edit Response";