Fix #388544.

Drop the empty preference page and make the one with content with it
have the same id.

Change-Id: I53d347127af16c0f55b323d5cd874306b1d6b7e7
Reviewed-on: https://git.eclipse.org/r/9774
Tested-by: Hudson CI
Reviewed-by: Camilo Bernal <cabernal@redhat.com>
IP-Clean: Camilo Bernal <cabernal@redhat.com>
Tested-by: Camilo Bernal <cabernal@redhat.com>

5 files changed, 4 insertions, 44 deletions

diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/plugin.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/plugin.properties
index 467e089065..94b7334470 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/plugin.properties
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/plugin.properties
@@ -5,7 +5,7 @@ perspective.graphing.name=SystemTap Graphing
 
 view.graphSelector.name=Graph Selector
 
-preference.graphing.name=SystemTap Graphing
+preference.graphing.name=Graphing
 
 command.open.name=Open Script Output
 command.open.desc=Open script output file
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/plugin.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/plugin.xml
index 09c64cb119..9c37efbeb6 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/plugin.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/plugin.xml
@@ -26,9 +26,9 @@
 		point="org.eclipse.ui.preferencePages">
 		<page
 			name="%preference.graphing.name"
-			id="org.eclipse.linuxtools.systemtap.prefs.graphing"
 			class="org.eclipse.linuxtools.internal.systemtap.ui.graphing.preferences.GraphingPreferencePage"
-			category="org.eclipse.linuxtools.systemtap.prefs.view"/>
+			category="org.eclipse.linuxtools.systemtap.prefs.view"
+            id="org.eclipse.linuxtools.generic.prefs.graphingapi"/>
 	</extension>
 	
 	<extension
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/plugin.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/plugin.properties
index 2f6de80db0..c0d5b675cd 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/plugin.properties
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/plugin.properties
@@ -1,6 +1,6 @@
 bundleName=SystemTap Graphing API (UI)
 bundleProvider=Eclipse Linux Tools
 
-preference.graphing.name=GraphingAPI
+preference.graphing.name=Graphing
 preference.dataTable.name=Data Table
 preference.graph.name=Graph
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/plugin.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/plugin.xml
index 82f213cab3..b9ded97fbc 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/plugin.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/plugin.xml
@@ -4,11 +4,6 @@
 	<extension
 		point="org.eclipse.ui.preferencePages">
 		<page
-        category="org.eclipse.linuxtools.systemtap.prefs.view"
-        class="org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.preferences.GraphingAPIPreferencePage"
-        id="org.eclipse.linuxtools.generic.prefs.graphingapi"
-        name="%preference.graphing.name"/>
-		<page
 			name="%preference.dataTable.name"
 			id="org.eclipse.linuxtools.generic.prefs.graphing.datatable"
 			class="org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.preferences.DataTablePreferencePage"
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/preferences/GraphingAPIPreferencePage.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/preferences/GraphingAPIPreferencePage.java
deleted file mode 100644
index 0f04643a1b..0000000000
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/preferences/GraphingAPIPreferencePage.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse
- *******************************************************************************/
-
-package org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.preferences;
-
-import org.eclipse.jface.preference.FieldEditorPreferencePage;
-import org.eclipse.linuxtools.internal.systemtap.ui.graphingapi.ui.GraphingAPIUIPlugin;
-import org.eclipse.linuxtools.internal.systemtap.ui.graphingapi.ui.Localization;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-
-
-public class GraphingAPIPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
-	public GraphingAPIPreferencePage() {
-		super(GRID);
-		setPreferenceStore(GraphingAPIUIPlugin.getDefault().getPreferenceStore());
-		setDescription(Localization.getString("GraphingAPIPreferencePage.GraphDisplayPreferences")); //$NON-NLS-1$
-	}
-	
-	@Override
-	public void createFieldEditors() {
-	}
-
-	public void init(IWorkbench workbench) {}
-	
-}
\ No newline at end of file