commit c9b9a3ab93ad7255947daceb5766e189120b5810
author Volodymyr Medvid <volodja_reg@gmx.de> Thu May 04 11:39:25 2023 +0200
committer Ed Merks <ed.merks@gmail.com> Tue May 09 03:20:49 2023 -0400
tree 26accdd1b794029363f2caafa15da4c24bb23170
parent dafa4b644b5fc53651d73ebb3145069b8d7cd251

[581895] Support other splash screen image formats for installed Eclipse

https://bugs.eclipse.org/bugs/show_bug.cgi?id=581895

Change-Id: I867468cb89a37b28b3de9c7646007e44cccc471d
Signed-off-by: Volodymyr Medvid <volodja_reg@gmx.de>

plugins/org.eclipse.oomph.p2.core/src/org/eclipse/oomph/p2/internal/core/AgentImpl.java

diff --git a/plugins/org.eclipse.oomph.p2.core/src/org/eclipse/oomph/p2/internal/core/AgentImpl.java b/plugins/org.eclipse.oomph.p2.core/src/org/eclipse/oomph/p2/internal/core/AgentImpl.java
index 872f3eb..81347f3 100644
--- a/plugins/org.eclipse.oomph.p2.core/src/org/eclipse/oomph/p2/internal/core/AgentImpl.java
+++ b/plugins/org.eclipse.oomph.p2.core/src/org/eclipse/oomph/p2/internal/core/AgentImpl.java
@@ -88,6 +88,13 @@
   private static final Pattern ECLIPSE_INI_SECTION_PATTERN = Pattern.compile("^(-vmargs)([\n\r]+.*)\\z|^(-[^\\n\\r]*[\\n\\r]*)((?:^[^-][^\\n\\r]*)*[\\n\\r]*)", //$NON-NLS-1$
       Pattern.MULTILINE | Pattern.DOTALL);
 
+  private static final String[] SPLASH_IMAGES = { "splash.bmp", //$NON-NLS-1$
+      "splash.png", //$NON-NLS-1$
+      "splash.jpg", //$NON-NLS-1$
+      "splash.jpeg", //$NON-NLS-1$
+      "splash.gif", //$NON-NLS-1$
+  };
+
   private final AgentManagerImpl agentManager;
 
   private final File location;
@@ -814,10 +821,9 @@
       // Look at all that IU's artifacts.
       for (IArtifactKey artifactKey : installableUnit.getArtifacts())
       {
-        // If the file slash.bmp exists in that artifact jar or folder...
+        // If the file slash.(bmp|png|jpg|jpeg|gif) exists in that artifact jar or folder...
         File artifactFile = bundlePool.getFileArtifactRepository().getArtifactFile(artifactKey);
-        if (artifactFile.isDirectory() ? new File(artifactFile, "splash.bmp").exists() //$NON-NLS-1$
-            : URIConverter.INSTANCE.exists(URI.createURI("archive:" + URI.createFileURI(artifactFile.getAbsolutePath() + "!/splash.bmp")), null)) //$NON-NLS-1$ //$NON-NLS-2$
+        if (containsSplashImage(artifactFile))
         {
           return artifactFile;
         }
@@ -827,6 +833,19 @@
     return null;
   }
 
+  private boolean containsSplashImage(File artifactFile)
+  {
+    for (String splashImage : SPLASH_IMAGES)
+    {
+      if (artifactFile.isDirectory() ? new File(artifactFile, splashImage).exists()
+          : URIConverter.INSTANCE.exists(URI.createURI("archive:" + URI.createFileURI(artifactFile.getAbsolutePath() + "!/" + splashImage)), null)) //$NON-NLS-1$ //$NON-NLS-2$
+      {
+        return true;
+      }
+    }
+    return false;
+  }
+
   private void adjustInstallation(IProfile profile)
   {
     // This property should always be in a well-formed profile.