Merge pull request #729 from HL7/do-20230728-gui-fixes

Various GUI fixes
HL7 · Jul 28, 2023 · 68fba84 · 68fba84
2 parents 1a13d11 + 23fbab7
commit 68fba84
Show file tree

Hide file tree

Showing 4 changed files with 194 additions and 161 deletions.
diff --git a/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/Publisher.java b/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/Publisher.java
@@ -20,7 +20,6 @@
  * #L%
  */
 
-import java.awt.EventQueue;
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -63,7 +62,6 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
-import javax.swing.UIManager;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
@@ -76,7 +74,7 @@
 import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.SystemUtils;
-import org.apache.xmlbeans.XmlOptionCharEscapeMap;
+
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.hl7.fhir.convertors.advisors.impl.BaseAdvisor_10_50;
 import org.hl7.fhir.convertors.factory.VersionConvertorFactory_10_50;
@@ -85,7 +83,7 @@
 import org.hl7.fhir.convertors.factory.VersionConvertorFactory_30_50;
 import org.hl7.fhir.convertors.factory.VersionConvertorFactory_40_50;
 import org.hl7.fhir.convertors.factory.VersionConvertorFactory_43_50;
-import org.hl7.fhir.convertors.misc.DicomPackageBuilder;
+
 import org.hl7.fhir.convertors.misc.NpmPackageVersionConverter;
 import org.hl7.fhir.convertors.txClient.TerminologyClientFactory;
 import org.hl7.fhir.exceptions.DefinitionException;
@@ -318,9 +316,7 @@
 import org.hl7.fhir.utilities.ZipGenerator;
 import org.hl7.fhir.utilities.i18n.I18nConstants;
 import org.hl7.fhir.utilities.i18n.JsonLangFileProducer;
-import org.hl7.fhir.utilities.i18n.JsonLangFileProducer.JsonLangProducerSession;
-import org.hl7.fhir.utilities.i18n.LanguageFileProducer.LanguageProducerLanguageSession;
-import org.hl7.fhir.utilities.i18n.LanguageFileProducer.LanguageProducerSession;
+
 import org.hl7.fhir.utilities.i18n.LanguageFileProducer.TranslationUnit;
 import org.hl7.fhir.utilities.i18n.PoGetTextProducer;
 import org.hl7.fhir.utilities.i18n.XLIFFProducer;
@@ -11173,17 +11169,7 @@ public String getConfigFile() {
  }
 
  private static void runGUI() throws InterruptedException, InvocationTargetException {
- EventQueue.invokeLater(new Runnable() {
- public void run() {
- try {
- UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
- GraphicalPublisher window = new GraphicalPublisher();
- window.frame.setVisible(true);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- });
+ GraphicalPublisher.launchUI();
  }
 
  public void setTxServer(String s) {

diff --git a/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/ui/GraphicalPublisher.java b/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/ui/GraphicalPublisher.java
@@ -21,6 +21,7 @@
  */
 
 
+import javax.swing.*;
 import java.awt.EventQueue;
 import java.io.IOException;
 
@@ -32,9 +33,14 @@ public class GraphicalPublisher {
  * Launch the application.
  */
  public static void main(String[] args) {
+ launchUI();
+ }
+
+ public static void launchUI() {
  EventQueue.invokeLater(new Runnable() {
  public void run() {
  try {
+ UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
  GraphicalPublisher window = new GraphicalPublisher();
  window.frame.setVisible(true);
  } catch (Exception e) {