Merge pull request #96 from jGauravGupta/FISH-13358

jGauravGupta · web-flow · commit 1f25d5a824e0 · 2026-04-23T16:12:23.000+05:30
FISH-13358 Fix IllegalArgumentException in SWT Image.init
diff --git a/bundles/fish.payara.eclipse.tools.micro/META-INF/MANIFEST.MF b/bundles/fish.payara.eclipse.tools.micro/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Payara Micro Tools
 Bundle-SymbolicName: fish.payara.eclipse.tools.micro;singleton:=true
-Bundle-Version: 2.5.0
+Bundle-Version: 2.6.0.qualifier
 Bundle-ClassPath: .
 Bundle-Localization: plugin
 Bundle-Activator: fish.payara.eclipse.tools.micro.PayaraMicroPlugin
diff --git a/bundles/fish.payara.eclipse.tools.micro/icons/payara-micro.png b/bundles/fish.payara.eclipse.tools.micro/icons/payara-micro.png
diff --git a/bundles/fish.payara.eclipse.tools.micro/pom.xml b/bundles/fish.payara.eclipse.tools.micro/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>fish.payara.eclipse</groupId>
         <artifactId>fish.payara.eclipse.bundles</artifactId>
-        <version>2.5.0</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
     <build>
         <sourceDirectory>src</sourceDirectory>
diff --git a/bundles/fish.payara.eclipse.tools.server/META-INF/MANIFEST.MF b/bundles/fish.payara.eclipse.tools.server/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Payara Server Tools
 Bundle-SymbolicName: fish.payara.eclipse.tools.server;singleton:=true
-Bundle-Version: 2.5.0
+Bundle-Version: 2.6.0.qualifier
 Bundle-ClassPath: .
 Bundle-Localization: plugin
 Bundle-Activator: fish.payara.eclipse.tools.server.PayaraServerPlugin
diff --git a/bundles/fish.payara.eclipse.tools.server/icons/obj16/glassfishserver_1.gif b/bundles/fish.payara.eclipse.tools.server/icons/obj16/glassfishserver_1.gif
diff --git a/bundles/fish.payara.eclipse.tools.server/icons/obj16/payara-blue.png b/bundles/fish.payara.eclipse.tools.server/icons/obj16/payara-blue.png
diff --git a/bundles/fish.payara.eclipse.tools.server/icons/obj16/payara-blue@2x.png b/bundles/fish.payara.eclipse.tools.server/icons/obj16/payara-blue@2x.png
diff --git a/bundles/fish.payara.eclipse.tools.server/icons/obj16/payara-blue@2x_1.png b/bundles/fish.payara.eclipse.tools.server/icons/obj16/payara-blue@2x_1.png
diff --git a/bundles/fish.payara.eclipse.tools.server/icons/obj16/payara-blue_1.png b/bundles/fish.payara.eclipse.tools.server/icons/obj16/payara-blue_1.png
diff --git a/bundles/fish.payara.eclipse.tools.server/icons/payara-blue.png b/bundles/fish.payara.eclipse.tools.server/icons/payara-blue.png
diff --git a/bundles/fish.payara.eclipse.tools.server/pom.xml b/bundles/fish.payara.eclipse.tools.server/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>fish.payara.eclipse</groupId>
         <artifactId>fish.payara.eclipse.bundles</artifactId>
-        <version>2.5.0</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
     <build>
         <sourceDirectory>src</sourceDirectory>
diff --git a/bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/PayaraServerPlugin.java b/bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/PayaraServerPlugin.java
@@ -8,7 +8,7 @@
  ******************************************************************************/
 
 /******************************************************************************
- * Copyright (c) 2018-2022 Payara Foundation
+ * Copyright (c) 2018-2026 Payara Foundation
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -23,10 +23,12 @@
 import static java.nio.charset.Charset.defaultCharset;
 import static org.eclipse.core.runtime.IStatus.ERROR;
 import static org.eclipse.core.runtime.IStatus.INFO;
-import static org.eclipse.jface.resource.ImageDescriptor.createFromURL;
 import static org.eclipse.wst.server.core.ServerCore.addRuntimeLifecycleListener;
 
+import java.io.ByteArrayInputStream;
 import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -39,7 +41,9 @@
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.resource.ImageRegistry;
+import org.eclipse.swt.SWTException;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.ImageData;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.eclipse.wst.server.core.IRuntime;
 import org.eclipse.wst.server.core.internal.ResourceManager;
@@ -89,18 +93,37 @@ public void start(BundleContext context) throws Exception {
     @Override
     protected void initializeImageRegistry(ImageRegistry reg) {
         super.initializeImageRegistry(reg);
-        reg.put(GF_SERVER_IMG, createFromURL(getBundle().getEntry("icons/obj16/payara-blue.png")));
-        reg.put(EAR_MODULE_IMG, createFromURL(getBundle().getEntry("icons/obj16/ear.gif")));
-        reg.put(EJB_MODULE_IMG, createFromURL(getBundle().getEntry("icons/obj16/ejb_module.gif")));
-        reg.put(LOG_FILE_IMG, createFromURL(getBundle().getEntry("icons/obj16/logfile.png")));
-        reg.put(WEB_MODULE_IMG, createFromURL(getBundle().getEntry("icons/obj16/web_module.gif")));
-        reg.put(WEBSERVICE_IMG, createFromURL(getBundle().getEntry("icons/obj16/webservice.png")));
-        reg.put(RESOURCES_IMG, createFromURL(getBundle().getEntry("icons/obj16/resources.gif")));
-        reg.put(GF_WIZARD, createFromURL(getBundle().getEntry("icons/wizard75x66.png")));
+        reg.put(GF_SERVER_IMG, createImageDescriptor("icons/obj16/payara-blue.png"));
+        reg.put(EAR_MODULE_IMG, createImageDescriptor("icons/obj16/ear.gif"));
+        reg.put(EJB_MODULE_IMG, createImageDescriptor("icons/obj16/ejb_module.gif"));
+        reg.put(LOG_FILE_IMG, createImageDescriptor("icons/obj16/logfile.png"));
+        reg.put(WEB_MODULE_IMG, createImageDescriptor("icons/obj16/web_module.gif"));
+        reg.put(WEBSERVICE_IMG, createImageDescriptor("icons/obj16/webservice.png"));
+        reg.put(RESOURCES_IMG, createImageDescriptor("icons/obj16/resources.gif"));
+        reg.put(GF_WIZARD, createImageDescriptor("icons/wizard75x66.png"));
 	}
 
+    public static ImageDescriptor createImageDescriptor(String path) {
+        if (BUNDLE == null) {
+            return ImageDescriptor.getMissingImageDescriptor();
+        }
 
-    	/**
+        var imageUrl = BUNDLE.getEntry(path);
+        if (imageUrl == null) {
+            logError("Unable to locate image resource: " + path);
+            return ImageDescriptor.getMissingImageDescriptor();
+        }
+
+        try (InputStream input = imageUrl.openStream()) {
+            byte[] imageBytes = input.readAllBytes();
+            return ImageDescriptor.createFromImageData(new ImageData(new ByteArrayInputStream(imageBytes)));
+        } catch (IOException | SWTException | IllegalArgumentException e) {
+            logError("Unable to load image resource: " + path, e);
+            return ImageDescriptor.getMissingImageDescriptor();
+        }
+    }
+
+    /**
 	 * Return the image with the given key from the image registry.
 	 * @param key java.lang.String
 	 * @return org.eclipse.jface.parts.IImage
@@ -118,26 +141,6 @@ public static ImageDescriptor getImageDescriptor(String key) {
 		 return getInstance().getImageRegistry().getDescriptor(key);
 	}
 
-//        /**
-//	 * Register an image with the registry.
-//	 * @param key java.lang.String
-//	 * @param partialURL java.lang.String
-//	 */
-//	private void registerImage(ImageRegistry registry, String key, String partialURL) {
-//		if (ICON_BASE_URL == null) {
-//			String pathSuffix = "icons/";
-//			ICON_BASE_URL = singleton.getBundle().getEntry(pathSuffix);
-//		}
-//
-//		try {
-//			ImageDescriptor id = ImageDescriptor.createFromURL(new URL(ICON_BASE_URL, partialURL));
-//			registry.put(key, id);
-//			imageDescriptors.put(key, id);
-//		} catch (Exception e) {
-//			Trace.trace(Trace.WARNING, "Error registering image", e);
-//		}
-//	}
-
     @Override
     public void stop(BundleContext v) throws Exception {
         logMessage("STOP IS CALLED!!!!!!!!!!!!!!!!");
@@ -216,4 +219,4 @@ public static boolean is31OrAbove(IRuntime runtime) {
         return runtime.getRuntimeType().getId().equals(RUNTIME_TYPE);
     }
 
-}
+}
diff --git a/bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/ui/PayaraToolsUIPlugin.java b/bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/ui/PayaraToolsUIPlugin.java
@@ -8,7 +8,7 @@
  ******************************************************************************/
 
 /******************************************************************************
- * Copyright (c) 2018-2022 Payara Foundation
+ * Copyright (c) 2018-2026 Payara Foundation
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -18,7 +18,6 @@
 
 package fish.payara.eclipse.tools.server.ui;
 
-import static org.eclipse.jface.resource.ImageDescriptor.createFromURL;
 import static org.eclipse.wst.server.core.IServer.STATE_UNKNOWN;
 
 import org.eclipse.core.runtime.NullProgressMonitor;
@@ -31,6 +30,7 @@
 import org.eclipse.wst.server.core.internal.UpdateServerJob;
 
 import fish.payara.eclipse.tools.server.PayaraServer;
+import fish.payara.eclipse.tools.server.PayaraServerPlugin;
 
 /**
  * This is used as the OSGi bundle activator, as well as the central place to get images from.
@@ -96,14 +96,14 @@ public static Image getImg(String key) {
     protected void initializeImageRegistry(ImageRegistry reg) {
         super.initializeImageRegistry(reg);
 
-        reg.put(EAR_MODULE_IMG, createFromURL(getBundle().getEntry("icons/obj16/ear.gif")));
-        reg.put(EJB_MODULE_IMG, createFromURL(getBundle().getEntry("icons/obj16/ejb_module.gif")));
-        reg.put(GF_SERVER_IMG, createFromURL(getBundle().getEntry("icons/obj16/payara-blue.png")));
-        reg.put(LOG_FILE_IMG, createFromURL(getBundle().getEntry("icons/obj16/logfile.png")));
-        reg.put(WEB_MODULE_IMG, createFromURL(getBundle().getEntry("icons/obj16/web_module.gif")));
-        reg.put(WEBSERVICE_IMG, createFromURL(getBundle().getEntry("icons/obj16/webservice.png")));
-        reg.put(RESOURCES_IMG, createFromURL(getBundle().getEntry("icons/obj16/resources.gif")));
-        reg.put(GF_WIZARD, createFromURL(getBundle().getEntry("icons/wizard75x66.png")));
+        reg.put(EAR_MODULE_IMG, PayaraServerPlugin.createImageDescriptor("icons/obj16/ear.gif"));
+        reg.put(EJB_MODULE_IMG, PayaraServerPlugin.createImageDescriptor("icons/obj16/ejb_module.gif"));
+        reg.put(GF_SERVER_IMG, PayaraServerPlugin.createImageDescriptor("icons/obj16/payara-blue.png"));
+        reg.put(LOG_FILE_IMG, PayaraServerPlugin.createImageDescriptor("icons/obj16/logfile.png"));
+        reg.put(WEB_MODULE_IMG, PayaraServerPlugin.createImageDescriptor("icons/obj16/web_module.gif"));
+        reg.put(WEBSERVICE_IMG, PayaraServerPlugin.createImageDescriptor("icons/obj16/webservice.png"));
+        reg.put(RESOURCES_IMG, PayaraServerPlugin.createImageDescriptor("icons/obj16/resources.gif"));
+        reg.put(GF_WIZARD, PayaraServerPlugin.createImageDescriptor("icons/wizard75x66.png"));
     }
 
-}
+}
diff --git a/bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/utils/PayaraLocationUtils.java b/bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/utils/PayaraLocationUtils.java
@@ -8,7 +8,7 @@
  ******************************************************************************/
 
 /******************************************************************************
- * Copyright (c) 2018-2024 Payara Foundation
+ * Copyright (c) 2018-2026 Payara Foundation
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -188,7 +188,7 @@ public static synchronized PayaraLocationUtils find(File location) {
 		return payaraLocation;
 	}
 
-	String GLASSFISH_VERSION_PROPERTIES = "glassfish\\config\\branding\\glassfish-version.properties";
+	private static final String GLASSFISH_VERSION_PROPERTIES = "glassfish/config/branding/glassfish-version.properties";
 
 	// #### PayaraLocation instance methods
 
diff --git a/bundles/pom.xml b/bundles/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>fish.payara.eclipse</groupId>
         <artifactId>fish.payara.eclipse.root</artifactId>
-        <version>2.5.0</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <modules>
diff --git a/features/fish.payara.eclipse.tools.micro.feature/feature.xml b/features/fish.payara.eclipse.tools.micro.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="fish.payara.eclipse.tools.micro.feature"
       label="%featureName"
-      version="2.5.0"
+      version="2.6.0.qualifier"
       provider-name="%providerName">
 
    <description url="https://www.payara.fish/products/ecosystem-catalog/">
diff --git a/features/fish.payara.eclipse.tools.server.feature/feature.xml b/features/fish.payara.eclipse.tools.server.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="fish.payara.eclipse.tools.server.feature"
       label="%featureName"
-      version="2.5.0"
+      version="2.6.0.qualifier"
       provider-name="%providerName">
 
    <description url="https://www.payara.fish/products/ecosystem-catalog/">
diff --git a/features/pom.xml b/features/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>fish.payara.eclipse</groupId>
         <artifactId>fish.payara.eclipse.root</artifactId>
-        <version>2.5.0</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <modules>
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>fish.payara.eclipse</groupId>
     <artifactId>fish.payara.eclipse.root</artifactId>
-    <version>2.5.0</version>
+    <version>2.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <prerequisites>
diff --git a/releng/fish.payara.eclipse.202212/pom.xml b/releng/fish.payara.eclipse.202212/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>fish.payara.eclipse</groupId>
     <artifactId>fish.payara.eclipse.releng</artifactId>
-    <version>2.5.0</version>
+    <version>2.6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>fish.payara.eclipse.202212</artifactId>
diff --git a/releng/fish.payara.eclipse.update/category.xml b/releng/fish.payara.eclipse.update/category.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/fish.payara.eclipse.tools.micro.feature_2.2.0.jar" id="fish.payara.eclipse.tools.micro.feature" version="2.5.0">
+   <feature url="features/fish.payara.eclipse.tools.micro.feature_2.6.0.qualifier.jar" id="fish.payara.eclipse.tools.micro.feature" version="2.6.0.qualifier">
       <category name="fish.payara.category"/>
    </feature>
-   <feature url="features/fish.payara.eclipse.tools.server.feature_2.2.0.jar" id="fish.payara.eclipse.tools.server.feature" version="2.5.0">
+   <feature url="features/fish.payara.eclipse.tools.server.feature_2.6.0.qualifier.jar" id="fish.payara.eclipse.tools.server.feature" version="2.6.0.qualifier">
       <category name="fish.payara.category"/>
    </feature>
    <category-def name="fish.payara.category" label="Payara Tools"/>
diff --git a/releng/fish.payara.eclipse.update/pom.xml b/releng/fish.payara.eclipse.update/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>fish.payara.eclipse</groupId>
         <artifactId>fish.payara.eclipse.releng</artifactId>
-        <version>2.5.0</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
     <artifactId>fish.payara.eclipse.update</artifactId>
     <packaging>eclipse-repository</packaging>
diff --git a/releng/pom.xml b/releng/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>fish.payara.eclipse</groupId>
         <artifactId>fish.payara.eclipse.root</artifactId>
-        <version>2.5.0</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <modules>
