Bug 520145 - GCov Preference page does not change annotations settings
- delete ColorPreferencesPage and ColorPreferenesInitializer from
gcov plug-in
- remove preferences extensions from gcov plugin.xml
- bump up gcov plug-in version
Change-Id: I8a3779e3e542af31a1827158e8e54898c7ad4555
Reviewed-on: https://git.eclipse.org/r/146538
Tested-by: Linux Tools Bot <linuxtools-bot@eclipse.org>
Reviewed-by: Jeff Johnston <jjohnstn@redhat.com>
diff --git a/gcov/org.eclipse.linuxtools.gcov.core/META-INF/MANIFEST.MF b/gcov/org.eclipse.linuxtools.gcov.core/META-INF/MANIFEST.MF
index 3d72772..3db8462 100644
--- a/gcov/org.eclipse.linuxtools.gcov.core/META-INF/MANIFEST.MF
+++ b/gcov/org.eclipse.linuxtools.gcov.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-SymbolicName: org.eclipse.linuxtools.gcov.core;singleton:=true
-Bundle-Version: 6.0.0.qualifier
+Bundle-Version: 6.1.0.qualifier
Bundle-Activator: org.eclipse.linuxtools.internal.gcov.Activator
Bundle-Vendor: %bundleProvider
Require-Bundle: org.eclipse.ui,
diff --git a/gcov/org.eclipse.linuxtools.gcov.core/plugin.xml b/gcov/org.eclipse.linuxtools.gcov.core/plugin.xml
index daabd6c..c612a40 100644
--- a/gcov/org.eclipse.linuxtools.gcov.core/plugin.xml
+++ b/gcov/org.eclipse.linuxtools.gcov.core/plugin.xml
@@ -30,22 +30,7 @@
name="%gcovEditor">
</editor>
</extension>
- <extension
- point="org.eclipse.ui.preferencePages">
- <page
- class="org.eclipse.linuxtools.internal.gcov.preferences.ColorPreferencePage"
- id="org.eclipse.linuxtools.gcov.core.preferences.colors"
- name="%colorprefpage"
- category="org.eclipse.linuxtools.profiling.provider.MainPreferencePage">
- </page>
- </extension>
- <extension
- point="org.eclipse.core.runtime.preferences">
- <initializer
- class="org.eclipse.linuxtools.internal.gcov.preferences.ColorPreferencesInitializer">
- </initializer>
- </extension>
-
+
<extension
point="org.eclipse.ui.editors.markerAnnotationSpecification">
<specification
diff --git a/gcov/org.eclipse.linuxtools.gcov.core/pom.xml b/gcov/org.eclipse.linuxtools.gcov.core/pom.xml
index e67be29..68fabd4 100644
--- a/gcov/org.eclipse.linuxtools.gcov.core/pom.xml
+++ b/gcov/org.eclipse.linuxtools.gcov.core/pom.xml
@@ -19,7 +19,7 @@
</parent>
<artifactId>org.eclipse.linuxtools.gcov.core</artifactId>
- <version>6.0.0-SNAPSHOT</version>
+ <version>6.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<name>Linux Tools GCov Plug-in</name>
diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/preferences/ColorPreferencePage.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/preferences/ColorPreferencePage.java
deleted file mode 100644
index 482e5f9..0000000
--- a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/preferences/ColorPreferencePage.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013, 2018 Kalray.eu and others.
- *
- * 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/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Xavier Raynaud <xavier.raynaud@kalray.eu> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.gcov.preferences;
-
-import org.eclipse.jface.preference.BooleanFieldEditor;
-import org.eclipse.jface.preference.ColorFieldEditor;
-import org.eclipse.jface.preference.FieldEditorPreferencePage;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.linuxtools.internal.gcov.Activator;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * @author Xavier Raynaud <xavier.raynaud@kalray.eu>
- */
-public class ColorPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
-
- public static final String PREFKEY_COV_USE_COLORS = "PREFKEY_COV_USE_COLORS"; //$NON-NLS-1$
- public static final String PREFKEY_COV_USE_GRADIENT = "PREFKEY_COV_USE_GRADIENT"; //$NON-NLS-1$
-
- public static final String PREFKEY_COV_MAX_COLOR = "PREFKEY_COV_MAX_COLOR"; //$NON-NLS-1$
- public static final String PREFKEY_COV_MIN_COLOR = "PREFKEY_COV_MIN_COLOR"; //$NON-NLS-1$
- public static final String PREFKEY_COV_0_COLOR = "PREFKEY_COV_0_COLOR"; //$NON-NLS-1$
-
- private ColorFieldEditor fcfeMax;
- private ColorFieldEditor fcfeMin;
- private ColorFieldEditor fcfeMno;
- private BooleanFieldEditor fbfeUseGradient;
- private BooleanFieldEditor fbfeUseColors;
-
- public ColorPreferencePage() {
- super(Messages.ColorPreferencePage_Title, AbstractUIPlugin.imageDescriptorFromPlugin(Activator.PLUGIN_ID, "icons/toggle.gif"), //$NON-NLS-1$
- FieldEditorPreferencePage.GRID);
- this.setPreferenceStore(Activator.getDefault().getPreferenceStore());
- this.setDescription(Messages.ColorPreferencePage_Description);
- }
-
- @Override
- public void init(IWorkbench workbench) {
- }
-
- @Override
- protected void createFieldEditors() {
- fbfeUseColors = new BooleanFieldEditor(PREFKEY_COV_USE_COLORS, Messages.ColorPreferencePage_ColorizeCode,
- this.getFieldEditorParent());
- this.addField(fbfeUseColors);
- fbfeUseGradient = new BooleanFieldEditor(PREFKEY_COV_USE_GRADIENT, Messages.ColorPreferencePage_UseGradient,
- this.getFieldEditorParent());
- this.addField(fbfeUseGradient);
-
- fcfeMax = new ColorFieldEditor(PREFKEY_COV_MAX_COLOR, Messages.ColorPreferencePage_BackColorHighest,
- this.getFieldEditorParent());
- this.addField(fcfeMax);
- fcfeMin = new ColorFieldEditor(PREFKEY_COV_MIN_COLOR, Messages.ColorPreferencePage_BackColorLowest,
- this.getFieldEditorParent());
- this.addField(fcfeMin);
- fcfeMno = new ColorFieldEditor(PREFKEY_COV_0_COLOR, Messages.ColorPreferencePage_BackColorNotCovered,
- this.getFieldEditorParent());
- this.addField(fcfeMno);
- }
-
- private void update() {
- boolean useColor = fbfeUseColors.getBooleanValue();
- fbfeUseGradient.setEnabled(useColor, this.getFieldEditorParent());
- fcfeMax.setEnabled(useColor, this.getFieldEditorParent());
- fcfeMno.setEnabled(useColor, this.getFieldEditorParent());
- boolean useGradient = useColor && fbfeUseGradient.getBooleanValue();
- fcfeMin.setEnabled(useGradient, this.getFieldEditorParent());
- }
-
- @Override
- protected void initialize() {
- super.initialize();
- update();
- }
-
- @Override
- public void propertyChange(PropertyChangeEvent event) {
- super.propertyChange(event);
- update();
- }
-
-}
diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/preferences/ColorPreferencesInitializer.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/preferences/ColorPreferencesInitializer.java
deleted file mode 100644
index 17bcadd..0000000
--- a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/preferences/ColorPreferencesInitializer.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013, 2018 Kalray.eu and others.
- *
- * 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/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Xavier Raynaud <xavier.raynaud@kalray.eu> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.gcov.preferences;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.linuxtools.internal.gcov.Activator;
-
-/**
- * @author Xavier Raynaud <xavier.raynaud@kalray.eu>
- */
-public class ColorPreferencesInitializer extends AbstractPreferenceInitializer {
-
- public ColorPreferencesInitializer() {
- }
-
- @Override
- public void initializeDefaultPreferences() {
- IPreferenceStore store = Activator.getDefault().getPreferenceStore();
- store.setDefault(ColorPreferencePage.PREFKEY_COV_MAX_COLOR, "0,128,0"); //$NON-NLS-1$
- store.setDefault(ColorPreferencePage.PREFKEY_COV_MIN_COLOR, "192,255,192"); //$NON-NLS-1$
- store.setDefault(ColorPreferencePage.PREFKEY_COV_0_COLOR, "255,96,96"); //$NON-NLS-1$
- store.setDefault(ColorPreferencePage.PREFKEY_COV_USE_COLORS, true);
- store.setDefault(ColorPreferencePage.PREFKEY_COV_USE_GRADIENT, true);
- }
-
-}
