Move the legacy LTTng New Project wizard under the Tracing category (bug

380967)

diff --git a/org.eclipse.linuxtools.lttng.ui/plugin.properties b/org.eclipse.linuxtools.lttng.ui/plugin.properties
index 9bec4d3b891586893f6abf7e38d72be0d45dd639..1524c33b880cc44eb35574790806d41a877ecb53 100644 (file)
--- 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 88dd6d8b60696f22e2339b4932bbe8390037a0b6..64d5bc213fc00ccd0c530ad60578c6a848f61918 100644 (file)
--- 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 96ad3a80c67a105c955d57bb7836e3da8cbbede0..859f1c05cba7f4df80517ca3fe00db166d6d64ad 100644 (file)
--- 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 577b2b061e7d81351cd21b647c4af5259eeb038b..bc212bd2f936017abe61a27ae694e8e64412eab3 100644 (file)
--- 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">\r
       <category\r
             id="org.eclipse.linuxtools.tmf.ui.wizards.new"\r
-            name="%wizard.category.name">\r
+            name="%project.new.category.name">\r
       </category>\r
       <wizard\r
             category="org.eclipse.linuxtools.tmf.ui.wizards.new"\r