Use SVG icon for splashscreen

gradle.properties

@@ -66,7 +66,7 @@ commons-math3.version=3.6.1
 commons-net.version=3.6
 commons-pool2.version=2.8.0
 commons-text.version=1.8
-darklaf-core.version=1.4.2.0
+darklaf.version=1.4.2.0
 dec.version=0.1.2
 dnsjava.version=2.1.9
 equalsverifier.version=3.1.12
@@ -113,6 +113,7 @@ Saxon-HE.version=9.9.1-7
 slf4j.version=1.7.30
 spock-core.version=1.2-groovy-2.4
 springframework.version=4.3.17.RELEASE
+svgSalamander.version=1.1.2.1
 tika.version=1.23
 xalan.version=2.7.2
 xercesImpl.version=2.12.0

src/bom/build.gradle.kts

@@ -48,7 +48,6 @@ dependencies {
         // dependency on it during compilation
         runtimev("org.apache.tika:tika-parsers", "tika")
         runtimev("org.ow2.asm:asm")
-        apiv("com.github.weisj:darklaf-core")
 
         // activemq-all should not be used as it provides secondary slf4j binding
         runtimev("org.apache.activemq:activemq-broker", "activemq")
@@ -63,8 +62,11 @@ dependencies {
         apiv("com.fasterxml.jackson.core:jackson-core", "jackson")
         apiv("com.fasterxml.jackson.core:jackson-databind", "jackson-databind")
         apiv("com.fifesoft:rsyntaxtextarea")
+        apiv("com.formdev:svgSalamander")
         apiv("com.github.ben-manes.caffeine:caffeine")
         apiv("com.github.tomakehurst:wiremock-jre8")
+        apiv("com.github.weisj:darklaf-core", "darklaf")
+        apiv("com.github.weisj:darklaf-property-loader", "darklaf")
         apiv("com.helger:ph-commons")
         apiv("com.helger:ph-css")
         apiv("com.jayway.jsonpath:json-path")

src/core/build.gradle.kts

@@ -24,7 +24,6 @@ dependencies {
     api(project(":src:jorphan"))
     testCompile(project(":src:jorphan", "testClasses"))
 
-    implementation("com.github.weisj:darklaf-core")
     api("bsf:bsf") {
         because("protected BSFManager BSFTestElement#getManager()")
     }
@@ -62,23 +61,22 @@ dependencies {
         because("Groovy is a default JSR232 engine")
     }
 
-    implementation("org.slf4j:jcl-over-slf4j")
-    implementation("commons-codec:commons-codec") {
-        because("DigestUtils")
-    }
-    implementation("commons-collections:commons-collections")
-    implementation("com.github.ben-manes.caffeine:caffeine")
     implementation("com.fasterxml.jackson.core:jackson-annotations")
     implementation("com.fasterxml.jackson.core:jackson-core")
     implementation("com.fasterxml.jackson.core:jackson-databind")
+    implementation("com.formdev:svgSalamander")
+    implementation("com.github.ben-manes.caffeine:caffeine")
+    implementation("com.github.weisj:darklaf-core")
+    implementation("com.github.weisj:darklaf-property-loader")
     implementation("com.miglayout:miglayout-swing")
-    implementation("org.freemarker:freemarker")
-    implementation("org.mozilla:rhino")
-    implementation("org.apache.xmlgraphics:xmlgraphics-commons")
-    implementation("org.apache.commons:commons-text")
+    implementation("commons-codec:commons-codec") {
+        because("DigestUtils")
+    }
+    implementation("commons-collections:commons-collections")
     implementation("org.apache.commons:commons-math3") {
         because("Mean, DescriptiveStatistics")
     }
+    implementation("org.apache.commons:commons-text")
     // For some reason JMeter bundles just tika-core and tika-parsers without transitive
     // dependencies. So we exclude those
     implementation("org.apache.tika:tika-core") {
@@ -87,8 +85,12 @@ dependencies {
     runtimeOnly("org.apache.tika:tika-parsers") {
         isTransitive = false
     }
+    implementation("org.apache.xmlgraphics:xmlgraphics-commons")
+    implementation("org.freemarker:freemarker")
     implementation("org.jodd:jodd-core")
     implementation("org.jodd:jodd-props")
+    implementation("org.mozilla:rhino")
+    implementation("org.slf4j:jcl-over-slf4j")
     // TODO: JMeter bundles Xerces, however the reason is unknown
     runtimeOnly("xerces:xercesImpl")
     runtimeOnly("xml-apis:xml-apis")
@@ -119,3 +121,9 @@ val versionClass by tasks.registering(Sync::class) {
 ide {
     generatedJavaSources(versionClass.get(), generatedVersionDir)
 }
+
+tasks.jar {
+    into("org/apache/jmeter/images") {
+        from("$rootDir/xdocs/images/logo.svg")
+    }
+}

src/core/src/main/java/org/apache/jmeter/SplashScreen.java

@@ -18,39 +18,73 @@
 package org.apache.jmeter;
 
 import java.awt.BorderLayout;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
 
+import javax.swing.Icon;
+import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JProgressBar;
 import javax.swing.JWindow;
 import javax.swing.SwingUtilities;
 import javax.swing.border.EmptyBorder;
 
 import org.apache.jmeter.util.JMeterUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.github.weisj.darklaf.icons.ThemedSVGIcon;
 
 /**
  * Splash Screen
  * @since 3.2
  */
 public class SplashScreen extends JWindow {
+    private static final Logger log = LoggerFactory.getLogger(SplashScreen.class);
 
     private static final long serialVersionUID = 1L;
-    private BorderLayout borderLayout = new BorderLayout();
-    private JLabel imageLabel = new JLabel();
-    private JProgressBar progressBar = new JProgressBar(0, 100);
+    private final JProgressBar progressBar = new JProgressBar(0, 100);
 
     /**
      * Constructor
      */
     public SplashScreen() {
-        imageLabel.setIcon(JMeterUtils.getImage("jmeter.png"));
-        imageLabel.setBorder(new EmptyBorder(10, 10, 10, 10));
-        setLayout(borderLayout);
-        add(imageLabel, BorderLayout.CENTER);
+        setLayout(new BorderLayout());
+        add(loadLogo(), BorderLayout.CENTER);
         add(progressBar, BorderLayout.SOUTH);
         pack();
         setLocationRelativeTo(null);
     }
 
+    public static JComponent loadLogo() {
+        JLabel logo = new JLabel();
+        logo.setBorder(new EmptyBorder(10, 10, 10, 10));
+        URI svgUri = null;
+        String svgResourcePath = "/org/apache/jmeter/images/logo.svg";
+        try {
+            URL svgUrl = JMeterUtils.class.getResource(svgResourcePath);
+            if (svgUrl != null) {
+                svgUri = svgUrl.toURI();
+            }
+        } catch (URISyntaxException e) {
+            log.warn("Unable to find logo " + svgResourcePath, e);
+        }
+
+        if (svgUri != null) {
+            Icon icon = new ThemedSVGIcon(svgUri, 521, 177);
+            logo.setIcon(icon);
+        } else {
+            // Fallback logo
+            logo.setText("<html>" +
+                    "<span style=\"font-size:36px;font-family:'Lucida Grande',Corbel,Arial;color:#D11123\">&nbsp;&nbsp;APACHE<br></span>" +
+                    "<span style=\"font-size:100px;font-family:'Lucida Grande',Corbel,Arial;font-weight:bold\">" +
+                    "<span style=\"color:#D11123\">J</span>Meter" +
+                    "<span style=\"color:#4d4d4d\">™</span></span></html>");
+        }
+        return logo;
+    }
+
     /**
      * Show screen
      */

src/core/src/main/java/org/apache/jmeter/gui/action/AboutCommand.java

@@ -18,8 +18,8 @@
 package org.apache.jmeter.gui.action;
 
 import java.awt.BorderLayout;
-import java.awt.Color;
 import java.awt.Container;
+import java.awt.Cursor;
 import java.awt.Dimension;
 import java.awt.GridLayout;
 import java.awt.Point;
@@ -37,6 +37,7 @@
 import javax.swing.SwingConstants;
 import javax.swing.border.EmptyBorder;
 
+import org.apache.jmeter.SplashScreen;
 import org.apache.jmeter.gui.GuiPackage;
 import org.apache.jmeter.gui.util.EscapeDialog;
 import org.apache.jmeter.util.JMeterUtils;
@@ -109,11 +110,11 @@ public void mouseClicked(MouseEvent e) {
             }
         });
 
-        JLabel jmeterLogo = new JLabel(JMeterUtils.getImage("jmeter.png"));
         JLabel copyright = new JLabel(JMeterUtils.getJMeterCopyright(), SwingConstants.CENTER);
         JLabel rights = new JLabel("All Rights Reserved.", SwingConstants.CENTER);
         JLabel version = new JLabel("Apache JMeter Version " + JMeterUtils.getJMeterVersion(), SwingConstants.CENTER);
         JLabel releaseNotes = new JLabel("<html><a href=\"https://jmeter.apache.org/changes.html\">Release notes</a></html>", SwingConstants.CENTER);
+        releaseNotes.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
         releaseNotes.addMouseListener(new MouseAdapter() {
             @Override
             public void mouseClicked(MouseEvent e) {
@@ -133,8 +134,7 @@ public void mouseClicked(MouseEvent e) {
         infos.add(releaseNotes);
         Container panel = about.getContentPane();
         panel.setLayout(new BorderLayout());
-        panel.setBackground(Color.white);
-        panel.add(jmeterLogo, BorderLayout.NORTH);
+        panel.add(SplashScreen.loadLogo(), BorderLayout.NORTH);
         panel.add(infos, BorderLayout.SOUTH);
         about.pack();
         return about;