From 4ab3dc5c43d8576a1059e94fe87542b3293c71d8 Mon Sep 17 00:00:00 2001 From: Mitch Gaffigan Date: Fri, 30 May 2025 17:34:52 -0500 Subject: [PATCH 1/3] Added .gitattributes Signed-off-by: Mitch Gaffigan --- .gitattributes | 146 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 146 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..290a75834 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,146 @@ +# Common settings that generally should always be used with your language specific settings + +# Auto detect text files and perform LF normalization +* text=auto + +# +# The above will handle all files NOT found below +# + +# Documents +*.bibtex text diff=bibtex +*.doc diff=astextplain +*.DOC diff=astextplain +*.docx diff=astextplain +*.DOCX diff=astextplain +*.dot diff=astextplain +*.DOT diff=astextplain +*.pdf diff=astextplain +*.PDF diff=astextplain +*.rtf diff=astextplain +*.RTF diff=astextplain +*.md text diff=markdown +*.mdx text diff=markdown +*.tex text diff=tex +*.adoc text +*.textile text +*.mustache text +*.csv text eol=crlf +*.tab text +*.tsv text +*.txt text +*.sql text +*.epub diff=astextplain + +# Graphics +*.png binary +*.jpg binary +*.jpeg binary +*.gif binary +*.tif binary +*.tiff binary +*.ico binary +*.svg text +*.eps binary + +# Fonts +*.otf binary +*.ttf binary +*.woff binary +*.woff2 binary + +# Scripts +*.bash text eol=lf +*.fish text eol=lf +*.ksh text eol=lf +*.sh text eol=lf +*.zsh text eol=lf +# These are explicitly windows files and should use crlf +*.bat text eol=crlf +*.cmd text eol=crlf +*.ps1 text eol=crlf + +# Serialisation +*.json text +*.toml text +*.xml text +*.xsd text +*.yaml text +*.yml text + +# Archives +*.7z binary +*.bz binary +*.bz2 binary +*.bzip2 binary +*.gz binary +*.lz binary +*.lzma binary +*.rar binary +*.tar binary +*.taz binary +*.tbz binary +*.tbz2 binary +*.tgz binary +*.tlz binary +*.txz binary +*.xz binary +*.Z binary +*.zip binary +*.zst binary + +# Text files where line endings should be preserved +*.patch -text + +# +# Exclude files from exporting +# + +.gitattributes export-ignore +.gitignore export-ignore +.gitkeep export-ignore + +# Java sources +*.java text diff=java +*.kt text diff=kotlin +*.groovy text diff=java +*.scala text diff=java +*.gradle text diff=java +*.gradle.kts text diff=kotlin +*.form text +*.classpath text +*.vmoptions text + +# These files are text and should be normalized (Convert crlf => lf) +*.css text diff=css +*.scss text diff=css +*.sass text +*.df text +*.htm text diff=html +*.html text diff=html +*.js text +*.mjs text +*.cjs text +*.jsp text +*.jspf text +*.jspx text +*.properties text +*.tld text +*.tag text +*.tagx text +*.xml text +*.hl7 text + +# These files are binary and should be left untouched +# (binary is a macro for -text -diff) +*.class binary +*.dll binary +*.ear binary +*.jar binary +*.so binary +*.war binary +*.jks binary + +# Common build-tool wrapper scripts ('.cmd' versions are handled by 'Common.gitattributes') +mvnw text eol=lf +gradlew text eol=lf From 593ca859a8fb4750ee73c68863924a99a1c158f4 Mon Sep 17 00:00:00 2001 From: Mitch Gaffigan Date: Sun, 1 Jun 2025 13:56:51 -0500 Subject: [PATCH 2/3] Avoid text without auto to prevent complaining about mix of crlf/lf Signed-off-by: Mitch Gaffigan --- .gitattributes | 70 +------------------------------------------------- 1 file changed, 1 insertion(+), 69 deletions(-) diff --git a/.gitattributes b/.gitattributes index 290a75834..aa7e4349d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,36 +1,8 @@ -# Common settings that generally should always be used with your language specific settings - # Auto detect text files and perform LF normalization * text=auto -# -# The above will handle all files NOT found below -# - # Documents -*.bibtex text diff=bibtex -*.doc diff=astextplain -*.DOC diff=astextplain -*.docx diff=astextplain -*.DOCX diff=astextplain -*.dot diff=astextplain -*.DOT diff=astextplain -*.pdf diff=astextplain -*.PDF diff=astextplain -*.rtf diff=astextplain -*.RTF diff=astextplain -*.md text diff=markdown -*.mdx text diff=markdown -*.tex text diff=tex -*.adoc text -*.textile text -*.mustache text *.csv text eol=crlf -*.tab text -*.tsv text -*.txt text -*.sql text -*.epub diff=astextplain # Graphics *.png binary @@ -40,7 +12,6 @@ *.tif binary *.tiff binary *.ico binary -*.svg text *.eps binary # Fonts @@ -55,19 +26,12 @@ *.ksh text eol=lf *.sh text eol=lf *.zsh text eol=lf + # These are explicitly windows files and should use crlf *.bat text eol=crlf *.cmd text eol=crlf *.ps1 text eol=crlf -# Serialisation -*.json text -*.toml text -*.xml text -*.xsd text -*.yaml text -*.yml text - # Archives *.7z binary *.bz binary @@ -95,42 +59,10 @@ # # Exclude files from exporting # - .gitattributes export-ignore .gitignore export-ignore .gitkeep export-ignore -# Java sources -*.java text diff=java -*.kt text diff=kotlin -*.groovy text diff=java -*.scala text diff=java -*.gradle text diff=java -*.gradle.kts text diff=kotlin -*.form text -*.classpath text -*.vmoptions text - -# These files are text and should be normalized (Convert crlf => lf) -*.css text diff=css -*.scss text diff=css -*.sass text -*.df text -*.htm text diff=html -*.html text diff=html -*.js text -*.mjs text -*.cjs text -*.jsp text -*.jspf text -*.jspx text -*.properties text -*.tld text -*.tag text -*.tagx text -*.xml text -*.hl7 text - # These files are binary and should be left untouched # (binary is a macro for -text -diff) *.class binary From f20c4ed0f374b86bef3a748224886cac6aaafa64 Mon Sep 17 00:00:00 2001 From: Mitch Gaffigan Date: Sun, 1 Jun 2025 14:06:01 -0500 Subject: [PATCH 3/3] Avoid mixed-eol files Signed-off-by: Mitch Gaffigan --- .../connect/client/ui/CustomErrorDialog.java | 164 +++++++++--------- .../connect/client/ui/MirthHeadingPanel.java | 80 ++++----- .../connect/client/ui/ViewContentDialog.java | 116 ++++++------- .../serverlog/ViewServerLogContentDialog.java | 86 ++++----- .../thirdparty/MYSQL-CONNECTOR-LICENSE.txt | 20 +-- 5 files changed, 233 insertions(+), 233 deletions(-) diff --git a/client/src/com/mirth/connect/client/ui/CustomErrorDialog.java b/client/src/com/mirth/connect/client/ui/CustomErrorDialog.java index 081acab4d..cf10d8af6 100644 --- a/client/src/com/mirth/connect/client/ui/CustomErrorDialog.java +++ b/client/src/com/mirth/connect/client/ui/CustomErrorDialog.java @@ -1,68 +1,68 @@ -/* - * Copyright (c) Mirth Corporation. All rights reserved. - * - * http://www.mirthcorp.com - * - * The software in this package is published under the terms of the MPL license a copy of which has - * been included with this distribution in the LICENSE.txt file. - */ - -package com.mirth.connect.client.ui; - -import java.awt.Dimension; -import java.awt.Point; - -import javax.swing.Icon; -import javax.swing.UIManager; - -/** Creates the error dialog. */ -public class CustomErrorDialog extends MirthDialog { - - private Frame parent; - public static final String ERROR_SAVING_CHANNEL = "There was an error in the validation of your channel. It has been DISABLED and saved. Before you can deploy you must fix the following error(s):"; - public static final String ERROR_VALIDATING_CONNECTOR = "There was an error in the validation of your connector. Please fix the following error(s):"; - public static final String ERROR_ENABLING_CHANNEL = "The channel was not configured properly. Please fix the following problem(s) in the channel before trying to enable it again:"; - public static final String ERROR_VALIDATING_GLOBAL_SCRIPTS = "There was an error in the validation of your global scripts. Please fix the following error(s):"; - - public CustomErrorDialog(java.awt.Frame owner, String errorMessage, String errorQuestion) { - super(owner); - initialize(errorMessage, errorQuestion); - } - - public CustomErrorDialog(java.awt.Dialog owner, String errorMessage, String errorQuestion) { - super(owner); - initialize(errorMessage, errorQuestion); - } - - private void initialize(String errorMessage, String errorQuestion) { - this.parent = PlatformUI.MIRTH_FRAME; - initComponents(); - - question.setText(errorQuestion); - - question.setBackground(UIManager.getColor("Control")); - errorContent.setBackground(UIManager.getColor("Control")); - image.setIcon((Icon) UIManager.get("OptionPane.errorIcon")); - questionPane.setBorder(null); - errorContent.setText(errorMessage); - errorContent.setCaretPosition(0); - setDefaultCloseOperation(DISPOSE_ON_CLOSE); - setModal(true); - pack(); - Dimension dlgSize = getPreferredSize(); - Dimension frmSize = parent.getSize(); - Point loc = parent.getLocation(); - - if ((frmSize.width == 0 && frmSize.height == 0) || (loc.x == 0 && loc.y == 0)) { - setLocationRelativeTo(null); - } else { - setLocation((frmSize.width - dlgSize.width) / 2 + loc.x, (frmSize.height - dlgSize.height) / 2 + loc.y); - } - - cancel.requestFocusInWindow(); - setVisible(true); - } - +/* + * Copyright (c) Mirth Corporation. All rights reserved. + * + * http://www.mirthcorp.com + * + * The software in this package is published under the terms of the MPL license a copy of which has + * been included with this distribution in the LICENSE.txt file. + */ + +package com.mirth.connect.client.ui; + +import java.awt.Dimension; +import java.awt.Point; + +import javax.swing.Icon; +import javax.swing.UIManager; + +/** Creates the error dialog. */ +public class CustomErrorDialog extends MirthDialog { + + private Frame parent; + public static final String ERROR_SAVING_CHANNEL = "There was an error in the validation of your channel. It has been DISABLED and saved. Before you can deploy you must fix the following error(s):"; + public static final String ERROR_VALIDATING_CONNECTOR = "There was an error in the validation of your connector. Please fix the following error(s):"; + public static final String ERROR_ENABLING_CHANNEL = "The channel was not configured properly. Please fix the following problem(s) in the channel before trying to enable it again:"; + public static final String ERROR_VALIDATING_GLOBAL_SCRIPTS = "There was an error in the validation of your global scripts. Please fix the following error(s):"; + + public CustomErrorDialog(java.awt.Frame owner, String errorMessage, String errorQuestion) { + super(owner); + initialize(errorMessage, errorQuestion); + } + + public CustomErrorDialog(java.awt.Dialog owner, String errorMessage, String errorQuestion) { + super(owner); + initialize(errorMessage, errorQuestion); + } + + private void initialize(String errorMessage, String errorQuestion) { + this.parent = PlatformUI.MIRTH_FRAME; + initComponents(); + + question.setText(errorQuestion); + + question.setBackground(UIManager.getColor("Control")); + errorContent.setBackground(UIManager.getColor("Control")); + image.setIcon((Icon) UIManager.get("OptionPane.errorIcon")); + questionPane.setBorder(null); + errorContent.setText(errorMessage); + errorContent.setCaretPosition(0); + setDefaultCloseOperation(DISPOSE_ON_CLOSE); + setModal(true); + pack(); + Dimension dlgSize = getPreferredSize(); + Dimension frmSize = parent.getSize(); + Point loc = parent.getLocation(); + + if ((frmSize.width == 0 && frmSize.height == 0) || (loc.x == 0 && loc.y == 0)) { + setLocationRelativeTo(null); + } else { + setLocation((frmSize.width - dlgSize.width) / 2 + loc.x, (frmSize.height - dlgSize.height) / 2 + loc.y); + } + + cancel.requestFocusInWindow(); + setVisible(true); + } + // @formatter:off /** * This method is called from within the constructor to initialize the form. @@ -137,20 +137,20 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { ); pack(); - }// //GEN-END:initComponents - // @formatter:on - - private void cancelActionPerformed(java.awt.event.ActionEvent evt)// GEN-FIRST:event_cancelActionPerformed - {// GEN-HEADEREND:event_cancelActionPerformed - this.dispose(); - }// GEN-LAST:event_cancelActionPerformed - // Variables declaration - do not modify//GEN-BEGIN:variables - - private javax.swing.JButton cancel; - private javax.swing.JTextPane errorContent; - private javax.swing.JLabel image; - private javax.swing.JScrollPane jScrollPane1; - private javax.swing.JTextPane question; - private javax.swing.JScrollPane questionPane; - // End of variables declaration//GEN-END:variables -} + }// //GEN-END:initComponents + // @formatter:on + + private void cancelActionPerformed(java.awt.event.ActionEvent evt)// GEN-FIRST:event_cancelActionPerformed + {// GEN-HEADEREND:event_cancelActionPerformed + this.dispose(); + }// GEN-LAST:event_cancelActionPerformed + // Variables declaration - do not modify//GEN-BEGIN:variables + + private javax.swing.JButton cancel; + private javax.swing.JTextPane errorContent; + private javax.swing.JLabel image; + private javax.swing.JScrollPane jScrollPane1; + private javax.swing.JTextPane question; + private javax.swing.JScrollPane questionPane; + // End of variables declaration//GEN-END:variables +} diff --git a/client/src/com/mirth/connect/client/ui/MirthHeadingPanel.java b/client/src/com/mirth/connect/client/ui/MirthHeadingPanel.java index 258d81181..1dba6bedc 100644 --- a/client/src/com/mirth/connect/client/ui/MirthHeadingPanel.java +++ b/client/src/com/mirth/connect/client/ui/MirthHeadingPanel.java @@ -1,37 +1,37 @@ -/* - * Copyright (c) Mirth Corporation. All rights reserved. - * - * http://www.mirthcorp.com - * - * The software in this package is published under the terms of the MPL license a copy of which has - * been included with this distribution in the LICENSE.txt file. - */ - -package com.mirth.connect.client.ui; - -import java.awt.Dimension; -import java.awt.Graphics; - -/** - * Creates the heading panel that is used for wizards, login, etc. - */ -public class MirthHeadingPanel extends javax.swing.JPanel { - - /** Creates new form MirthHeadingPanel */ - public MirthHeadingPanel() { - initComponents(); - setOpaque(false); - setPreferredSize(new Dimension(138, 22)); - } - - protected void paintComponent(Graphics g) { - // Dispaly image at at full size - if (PlatformUI.BACKGROUND_IMAGE != null) { - g.drawImage(PlatformUI.BACKGROUND_IMAGE.getImage(), 0, 0, this.getWidth(), this.getHeight(), null); - } - super.paintComponent(g); - } - +/* + * Copyright (c) Mirth Corporation. All rights reserved. + * + * http://www.mirthcorp.com + * + * The software in this package is published under the terms of the MPL license a copy of which has + * been included with this distribution in the LICENSE.txt file. + */ + +package com.mirth.connect.client.ui; + +import java.awt.Dimension; +import java.awt.Graphics; + +/** + * Creates the heading panel that is used for wizards, login, etc. + */ +public class MirthHeadingPanel extends javax.swing.JPanel { + + /** Creates new form MirthHeadingPanel */ + public MirthHeadingPanel() { + initComponents(); + setOpaque(false); + setPreferredSize(new Dimension(138, 22)); + } + + protected void paintComponent(Graphics g) { + // Dispaly image at at full size + if (PlatformUI.BACKGROUND_IMAGE != null) { + g.drawImage(PlatformUI.BACKGROUND_IMAGE.getImage(), 0, 0, this.getWidth(), this.getHeight(), null); + } + super.paintComponent(g); + } + // @formatter:off /** * This method is called from within the constructor to initialize the form. @@ -52,9 +52,9 @@ private void initComponents() { layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGap(0, 300, Short.MAX_VALUE) ); - }// //GEN-END:initComponents - // @formatter:on - - // Variables declaration - do not modify//GEN-BEGIN:variables - // End of variables declaration//GEN-END:variables -} + }// //GEN-END:initComponents + // @formatter:on + + // Variables declaration - do not modify//GEN-BEGIN:variables + // End of variables declaration//GEN-END:variables +} diff --git a/client/src/com/mirth/connect/client/ui/ViewContentDialog.java b/client/src/com/mirth/connect/client/ui/ViewContentDialog.java index c24c6bcc6..3bed78519 100644 --- a/client/src/com/mirth/connect/client/ui/ViewContentDialog.java +++ b/client/src/com/mirth/connect/client/ui/ViewContentDialog.java @@ -1,44 +1,44 @@ -/* - * Copyright (c) Mirth Corporation. All rights reserved. - * - * http://www.mirthcorp.com - * - * The software in this package is published under the terms of the MPL license a copy of which has - * been included with this distribution in the LICENSE.txt file. - */ - -package com.mirth.connect.client.ui; - -import java.awt.Color; -import java.awt.Dimension; -import java.awt.Point; - -public class ViewContentDialog extends MirthDialog { - - private Frame parent; - - public ViewContentDialog(String text) { - super(PlatformUI.MIRTH_FRAME); - this.parent = PlatformUI.MIRTH_FRAME; - initComponents(); - messageContent.setText(text.replaceAll("\\t", "\n")); - messageContent.setCaretPosition(0); - messageContent.setLineWrap(true); - setDefaultCloseOperation(DISPOSE_ON_CLOSE); - setModal(true); - pack(); - Dimension dlgSize = getPreferredSize(); - Dimension frmSize = parent.getSize(); - Point loc = parent.getLocation(); - - if ((frmSize.width == 0 && frmSize.height == 0) || (loc.x == 0 && loc.y == 0)) { - setLocationRelativeTo(null); - } else { - setLocation((frmSize.width - dlgSize.width) / 2 + loc.x, (frmSize.height - dlgSize.height) / 2 + loc.y); - } - setVisible(true); - } - +/* + * Copyright (c) Mirth Corporation. All rights reserved. + * + * http://www.mirthcorp.com + * + * The software in this package is published under the terms of the MPL license a copy of which has + * been included with this distribution in the LICENSE.txt file. + */ + +package com.mirth.connect.client.ui; + +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Point; + +public class ViewContentDialog extends MirthDialog { + + private Frame parent; + + public ViewContentDialog(String text) { + super(PlatformUI.MIRTH_FRAME); + this.parent = PlatformUI.MIRTH_FRAME; + initComponents(); + messageContent.setText(text.replaceAll("\\t", "\n")); + messageContent.setCaretPosition(0); + messageContent.setLineWrap(true); + setDefaultCloseOperation(DISPOSE_ON_CLOSE); + setModal(true); + pack(); + Dimension dlgSize = getPreferredSize(); + Dimension frmSize = parent.getSize(); + Point loc = parent.getLocation(); + + if ((frmSize.width == 0 && frmSize.height == 0) || (loc.x == 0 && loc.y == 0)) { + setLocationRelativeTo(null); + } else { + setLocation((frmSize.width - dlgSize.width) / 2 + loc.x, (frmSize.height - dlgSize.height) / 2 + loc.y); + } + setVisible(true); + } + // @formatter:off /** * This method is called from within the constructor to initialize the form. @@ -51,7 +51,7 @@ public ViewContentDialog(String text) { private void initComponents() { jPanel1 = new javax.swing.JPanel(); - jScrollPane1 = new javax.swing.JScrollPane(); + jScrollPane1 = new javax.swing.JScrollPane(); messageContent = new javax.swing.JTextArea(); jButton1 = new javax.swing.JButton(); @@ -60,7 +60,7 @@ private void initComponents() { jPanel1.setBackground(new java.awt.Color(255, 255, 255)); - messageContent.setEditable(false); + messageContent.setEditable(false); messageContent.setBackground(UIConstants.BACKGROUND_COLOR); jScrollPane1.setViewportView(messageContent); @@ -104,18 +104,18 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { ); pack(); - }// //GEN-END:initComponents - // @formatter:on - - private void jButton1ActionPerformed(java.awt.event.ActionEvent evt)// GEN-FIRST:event_jButton1ActionPerformed - {// GEN-HEADEREND:event_jButton1ActionPerformed - this.dispose(); - }// GEN-LAST:event_jButton1ActionPerformed - // Variables declaration - do not modify//GEN-BEGIN:variables - - private javax.swing.JButton jButton1; - private javax.swing.JPanel jPanel1; - private javax.swing.JScrollPane jScrollPane1; - private javax.swing.JTextArea messageContent; - // End of variables declaration//GEN-END:variables -} + }// //GEN-END:initComponents + // @formatter:on + + private void jButton1ActionPerformed(java.awt.event.ActionEvent evt)// GEN-FIRST:event_jButton1ActionPerformed + {// GEN-HEADEREND:event_jButton1ActionPerformed + this.dispose(); + }// GEN-LAST:event_jButton1ActionPerformed + // Variables declaration - do not modify//GEN-BEGIN:variables + + private javax.swing.JButton jButton1; + private javax.swing.JPanel jPanel1; + private javax.swing.JScrollPane jScrollPane1; + private javax.swing.JTextArea messageContent; + // End of variables declaration//GEN-END:variables +} diff --git a/client/src/com/mirth/connect/plugins/serverlog/ViewServerLogContentDialog.java b/client/src/com/mirth/connect/plugins/serverlog/ViewServerLogContentDialog.java index 1112e4e8d..58cdec5ff 100644 --- a/client/src/com/mirth/connect/plugins/serverlog/ViewServerLogContentDialog.java +++ b/client/src/com/mirth/connect/plugins/serverlog/ViewServerLogContentDialog.java @@ -1,31 +1,31 @@ -/* - * Copyright (c) Mirth Corporation. All rights reserved. - * - * http://www.mirthcorp.com - * - * The software in this package is published under the terms of the MPL license a copy of which has - * been included with this distribution in the LICENSE.txt file. - */ - -package com.mirth.connect.plugins.serverlog; - -import com.mirth.connect.client.ui.MirthDialog; - -public class ViewServerLogContentDialog extends MirthDialog { - - public ViewServerLogContentDialog(com.mirth.connect.client.ui.Frame parent, String text) { - super(parent); - initComponents(); - serverLogTextPane1.setText(text.replaceAll("\\t", "\n\t")); - serverLogTextPane1.setCaretPosition(0); - setDefaultCloseOperation(DISPOSE_ON_CLOSE); - setModal(true); - this.setSize(700, 400); - jScrollPane1.getViewport().setBackground(new java.awt.Color(255, 255, 255)); - setLocationRelativeTo(null); - setVisible(true); - } - +/* + * Copyright (c) Mirth Corporation. All rights reserved. + * + * http://www.mirthcorp.com + * + * The software in this package is published under the terms of the MPL license a copy of which has + * been included with this distribution in the LICENSE.txt file. + */ + +package com.mirth.connect.plugins.serverlog; + +import com.mirth.connect.client.ui.MirthDialog; + +public class ViewServerLogContentDialog extends MirthDialog { + + public ViewServerLogContentDialog(com.mirth.connect.client.ui.Frame parent, String text) { + super(parent); + initComponents(); + serverLogTextPane1.setText(text.replaceAll("\\t", "\n\t")); + serverLogTextPane1.setCaretPosition(0); + setDefaultCloseOperation(DISPOSE_ON_CLOSE); + setModal(true); + this.setSize(700, 400); + jScrollPane1.getViewport().setBackground(new java.awt.Color(255, 255, 255)); + setLocationRelativeTo(null); + setVisible(true); + } + // @formatter:off /** * This method is called from within the constructor to initialize the form. @@ -94,18 +94,18 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { ); pack(); - }// //GEN-END:initComponents - // @formatter:on - - private void jButton1ActionPerformed(java.awt.event.ActionEvent evt)// GEN-FIRST:event_jButton1ActionPerformed - {// GEN-HEADEREND:event_jButton1ActionPerformed - this.dispose(); - }// GEN-LAST:event_jButton1ActionPerformed - // Variables declaration - do not modify//GEN-BEGIN:variables - - private javax.swing.JButton jButton1; - private javax.swing.JPanel jPanel1; - private javax.swing.JScrollPane jScrollPane1; - private com.mirth.connect.plugins.serverlog.ServerLogTextPane serverLogTextPane1; - // End of variables declaration//GEN-END:variables -} + }// //GEN-END:initComponents + // @formatter:on + + private void jButton1ActionPerformed(java.awt.event.ActionEvent evt)// GEN-FIRST:event_jButton1ActionPerformed + {// GEN-HEADEREND:event_jButton1ActionPerformed + this.dispose(); + }// GEN-LAST:event_jButton1ActionPerformed + // Variables declaration - do not modify//GEN-BEGIN:variables + + private javax.swing.JButton jButton1; + private javax.swing.JPanel jPanel1; + private javax.swing.JScrollPane jScrollPane1; + private com.mirth.connect.plugins.serverlog.ServerLogTextPane serverLogTextPane1; + // End of variables declaration//GEN-END:variables +} diff --git a/server/docs/thirdparty/MYSQL-CONNECTOR-LICENSE.txt b/server/docs/thirdparty/MYSQL-CONNECTOR-LICENSE.txt index 98cbd718b..f28fd0149 100644 --- a/server/docs/thirdparty/MYSQL-CONNECTOR-LICENSE.txt +++ b/server/docs/thirdparty/MYSQL-CONNECTOR-LICENSE.txt @@ -1,13 +1,13 @@ -MySQL FOSS License Exception -We want free and open source software applications under -certain licenses to be able to use the GPL-licensed MySQL -Connector/J (specified GPL-licensed MySQL client libraries) -despite the fact that not all such FOSS licenses are -compatible with version 2 of the GNU General Public License. -Therefore there are special exceptions to the terms and -conditions of the GPLv2 as applied to these client libraries, -which are identified and described in more detail in the -FOSS License Exception at +MySQL FOSS License Exception +We want free and open source software applications under +certain licenses to be able to use the GPL-licensed MySQL +Connector/J (specified GPL-licensed MySQL client libraries) +despite the fact that not all such FOSS licenses are +compatible with version 2 of the GNU General Public License. +Therefore there are special exceptions to the terms and +conditions of the GPLv2 as applied to these client libraries, +which are identified and described in more detail in the +FOSS License Exception at