From 24fd8328a50765304d8b252203746e6bcb9ef800 Mon Sep 17 00:00:00 2001
From: Andrew Tram <andrew.tram@ibm.com>
Date: Fri, 29 May 2026 13:12:38 -0400
Subject: [PATCH] Address Snippet issues

---
 .../META-INF/MANIFEST.MF                         |  3 ++-
 plugins/org.eclipse.wst.common.snippets/pom.xml  |  4 ++--
 .../common/snippets/internal/SnippetsPlugin.java | 16 +++++++++++++++-
 .../snippets/internal/model/SnippetManager.java  |  3 ++-
 .../palette/SnippetCustomizerDialog.java         | 13 +++----------
 .../internal/palette/UserModelDumper.java        |  6 ++----
 .../snippets/internal/ui/SnippetsView.java       |  5 ++---
 .../internal/util/AccessibleTableViewer.java     |  7 +++++--
 8 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/plugins/org.eclipse.wst.common.snippets/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.snippets/META-INF/MANIFEST.MF
index b67623bd0..b73e02b48 100644
--- a/plugins/org.eclipse.wst.common.snippets/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.common.snippets/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Snippets_View.name
 Bundle-SymbolicName: org.eclipse.wst.common.snippets; singleton:=true
 Automatic-Module-Name: org.eclipse.wst.common.snippets
-Bundle-Version: 1.3.200.qualifier
+Bundle-Version: 1.3.300.qualifier
 Bundle-Activator: org.eclipse.wst.common.snippets.internal.SnippetsPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -19,6 +19,7 @@ Export-Package: org.eclipse.wst.common.snippets.core,
  org.eclipse.wst.common.snippets.internal.util;x-internal:=true,
  org.eclipse.wst.common.snippets.ui
 Require-Bundle: org.eclipse.gef;bundle-version="[3.10.0,6.0.0)",
+ org.eclipse.jface;bundle-version="[3.33.0,4.0.0)",
  org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)",
  org.eclipse.ui.workbench.texteditor;bundle-version="[3.10.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
diff --git a/plugins/org.eclipse.wst.common.snippets/pom.xml b/plugins/org.eclipse.wst.common.snippets/pom.xml
index 40fbc89ef..4a97c76b7 100644
--- a/plugins/org.eclipse.wst.common.snippets/pom.xml
+++ b/plugins/org.eclipse.wst.common.snippets/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2012, 2018 Eclipse Foundation and others.
+  Copyright (c) 2012, 2026 Eclipse Foundation and others.
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Distribution License v1.0
   which accompanies this distribution, and is available at
@@ -21,7 +21,7 @@
 
   <groupId>org.eclipse.webtools.common</groupId>
   <artifactId>org.eclipse.wst.common.snippets</artifactId>
-  <version>1.3.200-SNAPSHOT</version>
+  <version>1.3.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/SnippetsPlugin.java b/plugins/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/SnippetsPlugin.java
index f96b4da91..e72b54c94 100644
--- a/plugins/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/SnippetsPlugin.java
+++ b/plugins/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/SnippetsPlugin.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2024 IBM Corporation and others.
+ * Copyright (c) 2004, 2026 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -14,6 +14,7 @@
 
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.eclipse.wst.common.snippets.internal.model.SnippetManager;
+import org.osgi.framework.BundleContext;
 
 
 /**
@@ -73,4 +74,17 @@ public SnippetsPlugin() {
 		super();
 		fInstance = this;
 	}
+
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		try {
+			SnippetManager.getInstance().saveDefinitions();
+		}
+		catch (Exception e) {
+			Logger.logException("could not save snippet definitions on shutdown", e); //$NON-NLS-1$
+		}
+		finally {
+			super.stop(context);
+		}
+	}
 }
diff --git a/plugins/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/model/SnippetManager.java b/plugins/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/model/SnippetManager.java
index 8b20c82d3..39d9d6d97 100644
--- a/plugins/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/model/SnippetManager.java
+++ b/plugins/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/model/SnippetManager.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2024 IBM Corporation and others.
+ * Copyright (c) 2004, 2026 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -210,6 +210,7 @@ public IEntryChangeListener[] getListeners() {
 	public SnippetPaletteRoot getPaletteRoot() {
 		if (fRoot == null) {
 			fRoot = new SnippetPaletteRoot(getDefinitions());
+			fRoot.connect();
 		}
 		return fRoot;
 	}
diff --git a/plugins/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/palette/SnippetCustomizerDialog.java b/plugins/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/palette/SnippetCustomizerDialog.java
index 50a15695e..8fc84222c 100644
--- a/plugins/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/palette/SnippetCustomizerDialog.java
+++ b/plugins/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/palette/SnippetCustomizerDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2022 IBM Corporation and others.
+ * Copyright (c) 2004, 2026 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -246,7 +246,7 @@ public void update() {
 
 	private class ImportAction extends PaletteCustomizationAction {
 		public ImportAction() {
-			setEnabled(false);
+			setEnabled(true);
 			setText(SnippetsMessages.SnippetCustomizerDialog_0);
 			SnippetsPluginImageHelper pluginImageHelper = SnippetsPluginImageHelper.getInstance();
 			setImageDescriptor(pluginImageHelper.getImageDescriptor(SnippetsPluginImages.IMG_ELCL_IMPORT));
@@ -325,14 +325,7 @@ public void run() {
 		}
 
 		public void update() {
-			boolean enabled = false;
-			PaletteEntry entry = getSelectedPaletteEntry();
-			if (entry != null) {
-				if (getCustomizer() instanceof SnippetsCustomizer) {
-					enabled = ((SnippetsCustomizer) getCustomizer()).canImport(entry);
-				}
-			}
-			setEnabled(enabled);
+			setEnabled(getCustomizer() instanceof SnippetsCustomizer);
 		}
 	}
 
diff --git a/plugins/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/palette/UserModelDumper.java b/plugins/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/palette/UserModelDumper.java
index da29dfcc0..af5f65091 100644
--- a/plugins/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/palette/UserModelDumper.java
+++ b/plugins/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/palette/UserModelDumper.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2022 IBM Corporation and others.
+ * Copyright (c) 2004, 2026 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -264,8 +264,7 @@ public String toXML(ISnippetsEntry entry) {
 	}
 
 	public void write(SnippetDefinitions definitions) {
-		try {
-			FileOutputStream ostream = new FileOutputStream(getFilename());
+		try (FileOutputStream ostream = new FileOutputStream(getFilename())) {
 			write(definitions, ostream);
 		}
 		catch (IOException e) {
@@ -283,7 +282,6 @@ public void write(SnippetDefinitions definitions, OutputStream stream) {
 			Logger.log(Logger.ERROR, "could not save " + stream, e); //$NON-NLS-1$
 		}
 		finally {
-			//				stream.close();
 			document = null;
 		}
 	}
diff --git a/plugins/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/ui/SnippetsView.java b/plugins/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/ui/SnippetsView.java
index 31719cce6..12c8394fc 100644
--- a/plugins/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/ui/SnippetsView.java
+++ b/plugins/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/ui/SnippetsView.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2024 IBM Corporation and others.
+ * Copyright (c) 2004, 2026 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -609,8 +609,7 @@ protected PaletteRoot createRoot(SnippetDefinitions defs) {
 	 */
 	public void dispose() {
 		super.dispose();
-		if (fRoot != null)
-			fRoot.disconnect();
+		SnippetManager.getInstance().getPaletteRoot().disconnect();
 		if (clipboard != null)
 			clipboard.dispose();
 		if (fPartActionUpdateListener != null)
diff --git a/plugins/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/util/AccessibleTableViewer.java b/plugins/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/util/AccessibleTableViewer.java
index 039b7a895..d2169db2b 100644
--- a/plugins/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/util/AccessibleTableViewer.java
+++ b/plugins/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/util/AccessibleTableViewer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2024 IBM Corporation and others.
+ * Copyright (c) 2004, 2026 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -229,10 +229,13 @@ protected void doUpdateItem(Widget widget, Object element, boolean fullMap) {
 
 			IBaseLabelProvider prov = getLabelProvider();
 			ITableLabelProvider tprov = null;
-			ILabelProvider lprov = (ILabelProvider) prov;
+			ILabelProvider lprov = null;
 			if (prov instanceof ITableLabelProvider) {
 				tprov = (ITableLabelProvider) prov;
 			}
+			else if (prov instanceof ILabelProvider) {
+				lprov = (ILabelProvider) prov;
+			}
 			int columnCount = fTable.getColumnCount();
 			// Also enter loop if no columns added. See 1G9WWGZ: JFUIF:WINNT -
 			// TableViewer with 0 columns does not work