From dec2d14badb169392f7c4ea26c73f3f862b54a2b Mon Sep 17 00:00:00 2001 From: Joost Kraaijeveld Date: Sat, 15 Feb 2020 11:41:34 +0100 Subject: [PATCH] Bug 560039 - Mark LlvmPreferencePage for deletion - deleted LlvmPreferencePage.java - bumped bundle version to 1.2.0 as per Alexander's advise - added 2 commented filters wrt problems in MANNIFEST.MF Change-Id: I754351f8fe65efadb8d16c5f1dddc81cea2cb341 Signed-off-by: Joost Kraaijeveld --- .../.settings/.api_filters | 19 ++++ .../META-INF/MANIFEST.MF | 2 +- .../ui/preferences/LlvmPreferencePage.java | 97 ------------------- 3 files changed, 20 insertions(+), 98 deletions(-) create mode 100644 llvm/org.eclipse.cdt.managedbuilder.llvm.ui/.settings/.api_filters delete mode 100755 llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/ui/preferences/LlvmPreferencePage.java diff --git a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/.settings/.api_filters b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/.settings/.api_filters new file mode 100644 index 00000000000..3854ec7101f --- /dev/null +++ b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/.settings/.api_filters @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/META-INF/MANIFEST.MF b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/META-INF/MANIFEST.MF index 01d00419c94..5e634f22ec4 100755 --- a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/META-INF/MANIFEST.MF +++ b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.managedbuilder.llvm.ui;singleton:=true -Bundle-Version: 1.1.300.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-Activator: org.eclipse.cdt.managedbuilder.llvm.ui.LlvmUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/ui/preferences/LlvmPreferencePage.java b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/ui/preferences/LlvmPreferencePage.java deleted file mode 100755 index 1c5ff6eeceb..00000000000 --- a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/ui/preferences/LlvmPreferencePage.java +++ /dev/null @@ -1,97 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010-2015 Nokia Siemens Networks Oyj, Finland. - * - * 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 - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Nokia Siemens Networks - initial implementation - * Leo Hippelainen - Initial implementation - * Petri Tuononen - Initial implementation - *******************************************************************************/ -package org.eclipse.cdt.managedbuilder.llvm.ui.preferences; - -import org.eclipse.cdt.managedbuilder.llvm.ui.LlvmUIPlugin; -import org.eclipse.jface.preference.DirectoryFieldEditor; -import org.eclipse.jface.preference.FieldEditorPreferencePage; -import org.eclipse.ui.IWorkbench; -import org.eclipse.ui.IWorkbenchPreferencePage; - -/** - * This class represents a preference page that - * is contributed to the Preferences dialog. By - * subclassing FieldEditorPreferencePage, we - * can use the field support built into JFace that allows - * us to create a page that is small and knows how to - * save, restore and apply itself. - *

- * This page is used to modify preferences only. They - * are stored in the preference store that belongs to - * the main plug-in class. That way, preferences can - * be accessed directly via the preference store. - * - */ -public class LlvmPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage { - - /** - * Constructor. - * Set preference page to use the LLVM preference store. - */ - public LlvmPreferencePage() { - setPreferenceStore(LlvmUIPlugin.getDefault().getPreferenceStore()); - setDescription(Messages.LlvmPreferencePage_0); - } - - /* (non-Javadoc) - * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) - */ - @Override - public void init(IWorkbench workbench) { - } - - @Override - /** - * Get Description name. - * @param String Description - */ - public String getDescription() { - return null; - } - - // @Override - // public boolean performOk() { - // //rebuilt the index of all projects - // IProject[] projects = LlvmToolOptionPathUtil.getProjectsInWorkspace(); - // for (IProject proj : projects) { - // ProjectIndex.rebuiltIndex(proj); - // } - // return true; - // } - - @Override - /** - * Creates field editors for the preference page. - */ - protected void createFieldEditors() { - //field for installation path - addField(new DirectoryFieldEditor(PreferenceConstants.P_LLVM_PATH, Messages.LlvmPreferencePage_1, - getFieldEditorParent())); - //list editor for include paths - IncludePathListEditor includePathListEditor = new IncludePathListEditor(PreferenceConstants.P_LLVM_INCLUDE_PATH, - Messages.LlvmPreferencePage_2, getFieldEditorParent()); - addField(includePathListEditor); - //list editor for libraries - LibraryListEditor libraryListEditor = new LibraryListEditor(PreferenceConstants.P_LLVM_LIBRARIES, - Messages.LlvmPreferencePage_3, getFieldEditorParent()); - addField(libraryListEditor); - //list editor for library paths - LibraryPathListEditor libraryPathListEditor = new LibraryPathListEditor(PreferenceConstants.P_LLVM_LIBRARY_PATH, - Messages.LlvmPreferencePage_4, getFieldEditorParent()); - addField(libraryPathListEditor); - } - -}