#4 Second pass at centralizing branding

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

Author: kpalang

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

@@ -100,7 +100,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
         question.setBackground(new java.awt.Color(224, 223, 227));
         question.setBorder(null);
         question.setEditable(false);
-        question.setText("An unexpected error has occurred.  If this is a severe error and you are on NextGen Healthcare Support, please contact the NextGen Healthcare Help Desk.");
+        question.setText("An unexpected error has occurred. If this is a severe error and you are on NextGen Healthcare Support, please contact the NextGen Healthcare Help Desk.");
         question.setFocusable(false);
         questionPane.setViewportView(question);
 

manager/src/com/mirth/connect/manager/BrandingConstants.java

@@ -0,0 +1,6 @@
+package com.mirth.connect.manager;
+
+public class BrandingConstants {
+
+    public static final String PRODUCT_NAME = "OpenIntegrationEngine";
+}

manager/src/com/mirth/connect/manager/ManagerController.java

@@ -26,7 +26,6 @@
 import javax.swing.JOptionPane;
 import javax.swing.SwingWorker;
 
-import com.mirth.connect.client.ui.BrandingConstants;
 import org.apache.commons.configuration2.PropertiesConfiguration;
 import org.apache.commons.configuration2.builder.ReloadingFileBasedConfigurationBuilder;
 import org.apache.commons.configuration2.ex.ConfigurationException;

manager/src/com/mirth/connect/manager/ManagerDialog.java

@@ -35,7 +35,6 @@
 import javax.swing.UIManager;
 import javax.swing.event.ListSelectionEvent;
 
-import com.mirth.connect.client.ui.BrandingConstants;
 import net.miginfocom.swing.MigLayout;
 
 import org.apache.commons.configuration2.ex.ConfigurationException;

manager/src/com/mirth/connect/manager/ManagerTray.java

@@ -9,8 +9,6 @@
 
 package com.mirth.connect.manager;
 
-import com.mirth.connect.client.ui.BrandingConstants;
-
 import java.awt.MenuItem;
 import java.awt.PopupMenu;
 import java.awt.SystemTray;

manager/src/com/mirth/connect/manager/MirthHeadingPanel.java

@@ -18,7 +18,6 @@
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 
-import com.mirth.connect.client.ui.BrandingConstants;
 import net.miginfocom.swing.MigLayout;
 
 /**

manager/src/com/mirth/connect/manager/WindowsServiceController.java

@@ -9,8 +9,6 @@
 
 package com.mirth.connect.manager;
 
-import com.mirth.connect.client.ui.BrandingConstants;
-
 import java.io.File;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

server/src/com/mirth/connect/client/core/BrandingConstants.java

@@ -0,0 +1,6 @@
+package com.mirth.connect.client.core;
+
+public class BrandingConstants {
+
+    public static final String PRODUCT_NAME = "OpenIntegrationEngine";
+}

server/src/com/mirth/connect/connectors/http/HttpDispatcher.java

@@ -26,7 +26,7 @@
 import javax.mail.internet.MimeMultipart;
 import javax.mail.util.ByteArrayDataSource;
 
-import com.mirth.connect.client.ui.BrandingConstants;
+import com.mirth.connect.client.core.BrandingConstants;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.map.CaseInsensitiveMap;
 import org.apache.commons.fileupload.FileUploadBase;

server/src/com/mirth/connect/model/ServerConfiguration.java

@@ -24,7 +24,7 @@
 
 import javax.swing.text.DateFormatter;
 
-import com.mirth.connect.client.ui.BrandingConstants;
+import com.mirth.connect.client.core.BrandingConstants;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;

server/src/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2ResponseGenerationProperties.java

@@ -15,7 +15,7 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import com.mirth.connect.client.ui.BrandingConstants;
+import com.mirth.connect.client.core.BrandingConstants;
 import org.apache.commons.lang3.StringUtils;
 
 import com.mirth.connect.donkey.util.DonkeyElement;

server/src/com/mirth/connect/server/ExtensionLoader.java

@@ -17,7 +17,7 @@
 import java.util.List;
 import java.util.Map;
 
-import com.mirth.connect.client.ui.BrandingConstants;
+import com.mirth.connect.client.core.BrandingConstants;
 import org.apache.commons.configuration2.PropertiesConfiguration;
 import org.apache.commons.configuration2.ex.ConfigurationException;
 import org.apache.commons.io.FileUtils;

server/src/com/mirth/connect/server/Mirth.java

@@ -24,7 +24,7 @@
 import java.util.Timer;
 import java.util.TimerTask;
 
-import com.mirth.connect.client.ui.BrandingConstants;
+import com.mirth.connect.client.core.BrandingConstants;
 import org.apache.commons.configuration2.PropertiesConfiguration;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;

server/src/com/mirth/connect/server/alert/AlertWorker.java

@@ -23,7 +23,7 @@
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
-import com.mirth.connect.client.ui.BrandingConstants;
+import com.mirth.connect.client.core.BrandingConstants;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;

server/src/com/mirth/connect/server/api/servlets/SystemServlet.java

@@ -18,7 +18,7 @@
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.SecurityContext;
 
-import com.mirth.connect.client.ui.BrandingConstants;
+import com.mirth.connect.client.core.BrandingConstants;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;

server/src/com/mirth/connect/server/controllers/DefaultConfigurationController.java

@@ -53,7 +53,7 @@
 import javax.net.ssl.SSLSocketFactory;
 import javax.xml.parsers.DocumentBuilderFactory;
 
-import com.mirth.connect.client.ui.BrandingConstants;
+import com.mirth.connect.client.core.BrandingConstants;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;

server/src/com/mirth/connect/server/controllers/DefaultExtensionController.java

@@ -36,7 +36,7 @@
 
 import javax.xml.parsers.DocumentBuilderFactory;
 
-import com.mirth.connect.client.ui.BrandingConstants;
+import com.mirth.connect.client.core.BrandingConstants;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;