From 63b321ad69292ea65c8981814cfa6e753e4daa12 Mon Sep 17 00:00:00 2001
From: aboyko <aboyko@vmware.com>
Date: Wed, 8 Feb 2023 10:54:12 -0500
Subject: [PATCH] Boot LS prefs under Spring

---
 .../plugin.xml                                | 11 +++--
 .../CategoryProblemsSeverityPrefsPage.java    |  4 +-
 .../plugin.xml                                |  5 ---
 .../commons/ui/CommonsPreferencePage.java     | 40 -------------------
 4 files changed, 7 insertions(+), 53 deletions(-)
 delete mode 100644 eclipse-language-servers/org.springsource.ide.eclipse.commons.ui/src/org/springsource/ide/eclipse/commons/ui/CommonsPreferencePage.java

diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls/plugin.xml b/eclipse-language-servers/org.springframework.tooling.boot.ls/plugin.xml
index 12e079f49..fa588014b 100644
--- a/eclipse-language-servers/org.springframework.tooling.boot.ls/plugin.xml
+++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/plugin.xml
@@ -175,25 +175,24 @@
    <extension
          point="org.eclipse.ui.preferencePages">
       <page
-            category="org.springframework.tooling.boot.ls.preferences"
+            category="org.springsource.ide.eclipse.commons.preferencePage"
             class="org.springframework.tooling.boot.ls.prefs.RemoteAppsPrefsPage"
             id="org.springframework.tooling.boot.ls.prefs.RemoteAppsPrefsPage"
             name="Remote Boot Apps">
       </page>
       <page
-            category="org.springframework.tooling.boot.ls.preferences"
+            category="org.springsource.ide.eclipse.commons.preferencePage"
             class="org.springframework.tooling.boot.ls.XmlConfigPreferencePage"
             id="org.springframework.tooling.boot.xml.ls.preferences"
             name="Spring XML Config">
       </page>
       <page
-            category="org.springframework.tooling.ls.eclipse.commons.console.preferences"
             class="org.springframework.tooling.boot.ls.BootJavaPreferencesPage"
-            id="org.springframework.tooling.boot.ls.preferences"
-            name="Spring Boot Language Server">
+            id="org.springsource.ide.eclipse.commons.preferencePage"
+            name="Spring">
       </page>
       <page
-            category="org.springframework.tooling.boot.ls.preferences"
+            category="org.springsource.ide.eclipse.commons.preferencePage"
             class="org.springframework.tooling.boot.ls.RewritePreferencePage"
             id="org.springframework.tooling.boot.ls.rewrite"
             name="OpenRewrite">
diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/prefs/CategoryProblemsSeverityPrefsPage.java b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/prefs/CategoryProblemsSeverityPrefsPage.java
index 2ea327034..830fecb45 100644
--- a/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/prefs/CategoryProblemsSeverityPrefsPage.java
+++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/prefs/CategoryProblemsSeverityPrefsPage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2022 VMware, Inc.
+ * Copyright (c) 2022, 2023 VMware, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -108,7 +108,7 @@ public class CategoryProblemsSeverityPrefsPage extends ProblemSeverityPreferityP
 			//use workbenches's preference manager
 			PreferenceManager pm= PlatformUI.getWorkbench().getPreferenceManager();
 
-			pm.addTo("org.eclipse.lsp4e.preferences/org.springframework.tooling.ls.eclipse.commons.console.preferences/org.springframework.tooling.boot.ls.preferences", node); //add the node in the PreferenceManager
+			pm.addTo("org.springsource.ide.eclipse.commons.preferencePage", node); //add the node in the PreferenceManager
 		}
 		
 		ALL_PROBLEM_CATEGORIES = ImmutableList.copyOf(categories);
diff --git a/eclipse-language-servers/org.springsource.ide.eclipse.commons.ui/plugin.xml b/eclipse-language-servers/org.springsource.ide.eclipse.commons.ui/plugin.xml
index 595634f09..c01b8cbee 100644
--- a/eclipse-language-servers/org.springsource.ide.eclipse.commons.ui/plugin.xml
+++ b/eclipse-language-servers/org.springsource.ide.eclipse.commons.ui/plugin.xml
@@ -6,11 +6,6 @@
 
    <extension
          point="org.eclipse.ui.preferencePages">
-      <page
-            class="org.springsource.ide.eclipse.commons.ui.CommonsPreferencePage"
-            id="org.springsource.ide.eclipse.commons.preferencePage"
-            name="Spring">
-      </page>
       <page
             category="org.springsource.ide.eclipse.commons.preferencePage"
             class="org.springsource.ide.eclipse.commons.ui.PreferencesCurator"
diff --git a/eclipse-language-servers/org.springsource.ide.eclipse.commons.ui/src/org/springsource/ide/eclipse/commons/ui/CommonsPreferencePage.java b/eclipse-language-servers/org.springsource.ide.eclipse.commons.ui/src/org/springsource/ide/eclipse/commons/ui/CommonsPreferencePage.java
deleted file mode 100644
index a39fdac4b..000000000
--- a/eclipse-language-servers/org.springsource.ide.eclipse.commons.ui/src/org/springsource/ide/eclipse/commons/ui/CommonsPreferencePage.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012, 2015 Pivotal Software, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Pivotal Software, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springsource.ide.eclipse.commons.ui;
-
-import org.eclipse.jface.preference.FieldEditorPreferencePage;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.springsource.ide.eclipse.commons.internal.ui.UiPlugin;
-
-/**
- * A header page for all preference pages contributed to the
- * org.springsource.ide.eclipse.commons.preferencePage category
- *
- * @author Leo Dos Santos
- * @author Andrew Eisenberg
- */
-public class CommonsPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
-
-	public CommonsPreferencePage() {
-		super(GRID);
-		setPreferenceStore(UiPlugin.getDefault().getPreferenceStore());
-	}
-
-	@Override
-	protected void createFieldEditors() {
-	}
-
-	public void init(IWorkbench workbench) {
-		noDefaultAndApplyButton();
-	}
-
-}