lttng: Rework the trace type extension points

Move the LTTng 2.0 kernel type to lttng2.kernel.ui.

Also add a "Generic CTF" trace type, which lives directly in tmf.ui,
since TMF contains the CtfAdaptor, so it can read any kind of CTF
trace (albeit with little specific information).

Signed-off-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>

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

diff --git a/org.eclipse.linuxtools.lttng.ui/plugin.xml b/org.eclipse.linuxtools.lttng.ui/plugin.xml
index 55cbd7dfc1c24a3ab0931afd15d8365338e24da9..88dd6d8b60696f22e2339b4932bbe8390037a0b6 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/plugin.xml
+++ b/org.eclipse.linuxtools.lttng.ui/plugin.xml
@@ -433,14 +433,6 @@
                class="org.eclipse.linuxtools.internal.lttng.ui.views.events.EventsTable">
          </eventsTableType>
       </type>
-      <type
-            category="org.eclipse.linuxtools.lttng.ui.category.lttng"
-            event_type="org.eclipse.linuxtools.tmf.core.ctfadaptor.CtfTmfEvent"
-            icon="icons/obj16/tux2.png"
-            id="org.eclipse.linuxtools.lttng2.traceType.kernel"
-            name="LTTng 2.0 Kernel Type"
-            trace_type="org.eclipse.linuxtools.tmf.core.ctfadaptor.CtfTmfTrace">
-      </type>
    </extension>
    
 </plugin>

diff --git a/org.eclipse.linuxtools.lttng2.kernel.core/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng2.kernel.core/META-INF/MANIFEST.MF
index c79dec738f3d7221159e8c78b6561f3bd9bfc5c5..a103e0a1635dd79424c1cec1201b1a329f4d1ea6 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.kernel.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.lttng2.kernel.core/META-INF/MANIFEST.MF
@@ -9,5 +9,6 @@ Bundle-Activator: org.eclipse.linuxtools.internal.lttng2.kernel.core.Activator
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.eclipse.core.resources;bundle-version="3.7.0",
  org.eclipse.linuxtools.tmf.core;bundle-version="0.5.0"
 Export-Package: org.eclipse.linuxtools.lttng2.kernel.core.trace

diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng2.kernel.ui/META-INF/MANIFEST.MF
index 7ac0a191275aab5b1a18abc8188f299efecda14e..7b95ff70217273f33eadddccbcbb06598c03d782 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.kernel.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.lttng2.kernel.ui/META-INF/MANIFEST.MF
@@ -12,4 +12,6 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
  org.eclipse.ui.ide;bundle-version="3.7.0",
  org.eclipse.core.runtime;bundle-version="3.7.0",
  org.eclipse.linuxtools.lttng2.core;bundle-version="0.1.0",
+ org.eclipse.linuxtools.lttng2.kernel.core;bundle-version="0.1.0",
+ org.eclipse.linuxtools.tmf.core;bundle-version="0.5.0",
  org.eclipse.linuxtools.tmf.ui;bundle-version="0.5.0"

diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui/plugin.properties b/org.eclipse.linuxtools.lttng2.kernel.ui/plugin.properties
index 4a9cd44d0a74d84e4a783df22cbfc9f65266aba8..d7bf8832d187e05de5402241baf95f0bada3b7cc 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.kernel.ui/plugin.properties
+++ b/org.eclipse.linuxtools.lttng2.kernel.ui/plugin.properties
@@ -33,7 +33,7 @@ project.propertyPage.tracelibPath = LTTng Trace Library Path
 action.set.label = LTTng Action Set
 action.set.description = LTTng Action Set
 
-tracetype.category.lttng= LTTng
+tracetype.category.lttng = LTTng 2.0
 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 03eb85a579854aa1076ae1a04cdde08332decae6..d6403b81365ea7bc313c2b236803580bf5bf86fd 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.kernel.ui/plugin.xml
+++ b/org.eclipse.linuxtools.lttng2.kernel.ui/plugin.xml
@@ -11,4 +11,18 @@
             name="%perspective.category.name">
       </perspective>
    </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"
+            event_type="org.eclipse.linuxtools.tmf.core.ctfadaptor.CtfTmfEvent"
+            id="org.eclipse.linuxtools.lttng2.kernel.tracetype"
+            name="%tracetype.type.kernel"
+            trace_type="org.eclipse.linuxtools.lttng2.kernel.core.trace.CtfKernelTrace">
+      </type>
+   </extension>
 </plugin>

diff --git a/org.eclipse.linuxtools.tmf.ui/plugin.xml b/org.eclipse.linuxtools.tmf.ui/plugin.xml
index 9d66f8c0b71501bf281e0fb9db1490d6c4cbea40..3f4d4f29ffd2e4b651b440f685fb8f3081739ac7 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ui/plugin.xml
+++ b/org.eclipse.linuxtools.tmf.ui/plugin.xml
@@ -1117,5 +1117,19 @@
             type="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement">\r
       </propertyTester>\r
    </extension>\r
+   <extension\r
+         point="org.eclipse.linuxtools.tmf.ui.tracetype">\r
+      <type\r
+            category="org.eclipse.linuxtools.tmf.ui.category.generic"\r
+            event_type="org.eclipse.linuxtools.tmf.core.ctfadaptor.CtfTmfEvent"\r
+            id="org.eclipse.linuxtools.tmf.ui.type.ctf"\r
+            name="CTF Trace"\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="Generic">\r
+      </category>\r
+   </extension>\r
 \r
 </plugin>\r