Rationalize the trace type structure (bug 380971)

diff --git a/org.eclipse.linuxtools.lttng.ui/plugin.properties b/org.eclipse.linuxtools.lttng.ui/plugin.properties
index 1524c33b880cc44eb35574790806d41a877ecb53..6a3130d0a8c0d9b4bb52b41bd07a7b1eec866d7e 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/plugin.properties
+++ b/org.eclipse.linuxtools.lttng.ui/plugin.properties
@@ -22,7 +22,7 @@ project.propertyPage.tracelibPath = LTTng Trace Library Path
 action.set.label = LTTng Action Set
 action.set.description = LTTng Action Set
 
-tracetype.category.lttng= LTTng 0.x
+tracetype.category.lttng= LTTng (legacy)
 tracetype.type.kernel = Kernel Trace
 
 #Commands and Menus

diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui/plugin.xml b/org.eclipse.linuxtools.lttng2.kernel.ui/plugin.xml
index 185e141fd8d84922fca1859dd1e066508d83386f..907bdc077bb63628bf379a91061e29b15cadca0d 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.kernel.ui/plugin.xml
+++ b/org.eclipse.linuxtools.lttng2.kernel.ui/plugin.xml
@@ -12,12 +12,8 @@
    </extension>
    <extension
          point="org.eclipse.linuxtools.tmf.ui.tracetype">
-      <category
-            id="org.eclipse.linuxtools.lttng2.kernel.ui.category"
-            name="%tracetype.category.lttng">
-      </category>
       <type
-            category="org.eclipse.linuxtools.lttng2.kernel.ui.category"
+            category="org.eclipse.linuxtools.tmf.ui.category.ctf"
             event_type="org.eclipse.linuxtools.tmf.core.ctfadaptor.CtfTmfEvent"
             icon="icons/obj16/garland16.png"
             id="org.eclipse.linuxtools.lttng2.kernel.tracetype"

diff --git a/org.eclipse.linuxtools.tmf.ui/plugin.properties b/org.eclipse.linuxtools.tmf.ui/plugin.properties
index 859f1c05cba7f4df80517ca3fe00db166d6d64ad..883a590dea73af9b156e8196e1a191abc88c2733 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ui/plugin.properties
+++ b/org.eclipse.linuxtools.tmf.ui/plugin.properties
@@ -158,5 +158,5 @@ commands.uml2sd.showstart = Show node start
 commands.uml2sd.showstart.description = Show the node start
  
 # CTF trace type
-tracetype.category.generic = Generic
-tracetype.type.generic = CTF Trace
\ No newline at end of file
+tracetype.category.ctf = Common Trace Format
+tracetype.type.ctf = Generic CTF Trace

diff --git a/org.eclipse.linuxtools.tmf.ui/plugin.xml b/org.eclipse.linuxtools.tmf.ui/plugin.xml
index bc212bd2f936017abe61a27ae694e8e64412eab3..dbfaca3278081a807a43a0739a5278e2cb0fecdd 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ui/plugin.xml
+++ b/org.eclipse.linuxtools.tmf.ui/plugin.xml
@@ -1199,18 +1199,18 @@
    </extension>\r
    <extension\r
          point="org.eclipse.linuxtools.tmf.ui.tracetype">\r
+      <category\r
+            id="org.eclipse.linuxtools.tmf.ui.category.ctf"\r
+            name="%tracetype.category.ctf">\r
+      </category>\r
       <type\r
-            category="org.eclipse.linuxtools.tmf.ui.category.generic"\r
+            category="org.eclipse.linuxtools.tmf.ui.category.ctf"\r
             event_type="org.eclipse.linuxtools.tmf.core.ctfadaptor.CtfTmfEvent"\r
             icon="icons/eview16/events_view.gif"\r
             id="org.eclipse.linuxtools.tmf.ui.type.ctf"\r
-            name="%tracetype.type.generic"\r
+            name="%tracetype.type.ctf"\r
             trace_type="org.eclipse.linuxtools.tmf.core.ctfadaptor.CtfTmfTrace">\r
       </type>\r
-      <category\r
-            id="org.eclipse.linuxtools.tmf.ui.category.generic"\r
-            name="%tracetype.category.generic">\r
-      </category>\r
    </extension>\r
 \r
 </plugin>\r