diff --git a/bundles/org.eclipse.cdt.lsp/src/org/eclipse/cdt/lsp/editor/EditorMetadata.java b/bundles/org.eclipse.cdt.lsp/src/org/eclipse/cdt/lsp/editor/EditorMetadata.java index 83b6229b..5b429cef 100644 --- a/bundles/org.eclipse.cdt.lsp/src/org/eclipse/cdt/lsp/editor/EditorMetadata.java +++ b/bundles/org.eclipse.cdt.lsp/src/org/eclipse/cdt/lsp/editor/EditorMetadata.java @@ -17,10 +17,6 @@ import org.eclipse.core.runtime.preferences.PreferenceMetadata; public interface EditorMetadata extends ConfigurationMetadata { - /** - * @since 3.0 - */ - public static final String PREFER_LSP_KEY = "prefer_lsp"; //$NON-NLS-1$ /** * The predefined metadata for the "Prefer C/C++ Editor (LSP)" option @@ -30,7 +26,8 @@ public interface EditorMetadata extends ConfigurationMetadata { * @since 3.0 */ PreferenceMetadata preferLspEditor = new PreferenceMetadata<>(Boolean.class, // - PREFER_LSP_KEY, false, // + "prefer_lsp", //$NON-NLS-1$ + false, // LspUiMessages.LspEditorConfigurationPage_preferLspEditor, LspUiMessages.LspEditorConfigurationPage_preferLspEditor_description); diff --git a/bundles/org.eclipse.cdt.lsp/src/org/eclipse/cdt/lsp/editor/EditorOptions.java b/bundles/org.eclipse.cdt.lsp/src/org/eclipse/cdt/lsp/editor/EditorOptions.java index 9d7b22fb..8b95cd70 100644 --- a/bundles/org.eclipse.cdt.lsp/src/org/eclipse/cdt/lsp/editor/EditorOptions.java +++ b/bundles/org.eclipse.cdt.lsp/src/org/eclipse/cdt/lsp/editor/EditorOptions.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2023, 2025 Contributors to the Eclipse Foundation. + * Copyright (c) 2023 Contributors to the Eclipse Foundation. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -12,8 +12,6 @@ package org.eclipse.cdt.lsp.editor; -import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener; - public interface EditorOptions { /** @@ -44,14 +42,4 @@ public interface EditorOptions { */ boolean formatEditedLines(); - /** - * @since 3.0 - */ - void addPreferenceChangedListener(IPreferenceChangeListener listener); - - /** - * @since 3.0 - */ - void removePreferenceChangedListener(IPreferenceChangeListener listener); - } diff --git a/bundles/org.eclipse.cdt.lsp/src/org/eclipse/cdt/lsp/internal/editor/EditorPreferredOptions.java b/bundles/org.eclipse.cdt.lsp/src/org/eclipse/cdt/lsp/internal/editor/EditorPreferredOptions.java index 94490aec..32359f7f 100644 --- a/bundles/org.eclipse.cdt.lsp/src/org/eclipse/cdt/lsp/internal/editor/EditorPreferredOptions.java +++ b/bundles/org.eclipse.cdt.lsp/src/org/eclipse/cdt/lsp/internal/editor/EditorPreferredOptions.java @@ -12,14 +12,11 @@ package org.eclipse.cdt.lsp.internal.editor; -import java.util.Optional; - import org.eclipse.cdt.lsp.PreferredOptions; import org.eclipse.cdt.lsp.editor.EditorMetadata; import org.eclipse.cdt.lsp.editor.EditorOptions; import org.eclipse.cdt.lsp.editor.LanguageServerEnable; import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener; import org.eclipse.core.runtime.preferences.IScopeContext; public final class EditorPreferredOptions extends PreferredOptions implements EditorOptions, LanguageServerEnable { @@ -59,18 +56,4 @@ public boolean isEnabledFor(IProject project) { return booleanValue(EditorMetadata.preferLspEditor); } - @Override - public void addPreferenceChangedListener(IPreferenceChangeListener listener) { - for (var scope : scopes) { - Optional.ofNullable(scope.getNode(qualifier)).ifPresent(n -> n.addPreferenceChangeListener(listener)); - } - } - - @Override - public void removePreferenceChangedListener(IPreferenceChangeListener listener) { - for (var scope : scopes) { - Optional.ofNullable(scope.getNode(qualifier)).ifPresent(n -> n.removePreferenceChangeListener(listener)); - } - } - }