From 5d786ef50b622b081d7cbfccd211554d99a5884c Mon Sep 17 00:00:00 2001
From: Francois Chouinard <fchouinard@gmail.com>
Date: Tue, 29 May 2012 16:53:33 -0400
Subject: [PATCH] Move the legacy LTTng New Project wizard under the Tracing
 category (bug 380967)

---
 org.eclipse.linuxtools.lttng.ui/plugin.properties | 5 ++---
 org.eclipse.linuxtools.lttng.ui/plugin.xml        | 6 +-----
 org.eclipse.linuxtools.tmf.ui/plugin.properties   | 2 +-
 org.eclipse.linuxtools.tmf.ui/plugin.xml          | 2 +-
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/org.eclipse.linuxtools.lttng.ui/plugin.properties b/org.eclipse.linuxtools.lttng.ui/plugin.properties
index 9bec4d3b89..1524c33b88 100644
--- a/org.eclipse.linuxtools.lttng.ui/plugin.properties
+++ b/org.eclipse.linuxtools.lttng.ui/plugin.properties
@@ -15,9 +15,8 @@ resources.view.name = Resources (legacy)
 statistics.view.name = Statistics (legacy)
 latency.view.name = Latency View (legacy)
 
-wizard.category.name = LTTng
-project.new.wizard.name = LTTng Project
-project.new.wizard.description = Create a new LTTng project
+project.new.wizard.name = LTTng Project (legacy)
+project.new.wizard.description = Create a new (legacy) LTTng project
 
 project.propertyPage.tracelibPath = LTTng Trace Library Path
 action.set.label = LTTng Action Set
diff --git a/org.eclipse.linuxtools.lttng.ui/plugin.xml b/org.eclipse.linuxtools.lttng.ui/plugin.xml
index 88dd6d8b60..64d5bc213f 100644
--- a/org.eclipse.linuxtools.lttng.ui/plugin.xml
+++ b/org.eclipse.linuxtools.lttng.ui/plugin.xml
@@ -66,12 +66,8 @@
    </extension>
    <extension
          point="org.eclipse.ui.newWizards">
-      <category
-            id="org.eclipse.linuxtools.lttng.ui.wizards.new"
-            name="%wizard.category.name">
-      </category>
       <wizard
-            category="org.eclipse.linuxtools.lttng.ui.wizards.new"
+            category="org.eclipse.linuxtools.tmf.ui.wizards.new"
             class="org.eclipse.linuxtools.internal.lttng.ui.project.dialogs.NewLTTngProjectWizard"
             descriptionImage="icons/obj16/garland16.png"
             finalPerspective="org.eclipse.linuxtools.lttng.ui.perspective"
diff --git a/org.eclipse.linuxtools.tmf.ui/plugin.properties b/org.eclipse.linuxtools.tmf.ui/plugin.properties
index 96ad3a80c6..859f1c05cb 100644
--- a/org.eclipse.linuxtools.tmf.ui/plugin.properties
+++ b/org.eclipse.linuxtools.tmf.ui/plugin.properties
@@ -17,7 +17,7 @@ uml2sd.view.name = Sequence Diagram
 histogram.view.name = Histogram
 environment.view.name = Environment Variables
 
-wizard.category.name = Tracing
+project.new.category.name = Tracing
 project.new.wizard.name = Tracing Project
 project.new.wizard.description = Create a new Tracing project
 project.new.wizard.custom.text.parser = Custom Text Parser
diff --git a/org.eclipse.linuxtools.tmf.ui/plugin.xml b/org.eclipse.linuxtools.tmf.ui/plugin.xml
index 577b2b061e..bc212bd2f9 100644
--- a/org.eclipse.linuxtools.tmf.ui/plugin.xml
+++ b/org.eclipse.linuxtools.tmf.ui/plugin.xml
@@ -117,7 +117,7 @@
          point="org.eclipse.ui.newWizards">
       <category
             id="org.eclipse.linuxtools.tmf.ui.wizards.new"
-            name="%wizard.category.name">
+            name="%project.new.category.name">
       </category>
       <wizard
             category="org.eclipse.linuxtools.tmf.ui.wizards.new"
-- 
2.34.1