From: Francois Chouinard Date: Mon, 1 Mar 2010 19:16:30 +0000 (+0000) Subject: Fixed a number of annotation warnings X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=b9fb2d51c5aff1d5c9adbdb89a604e497c9fded1;p=deliverable%2Ftracecompass.git Fixed a number of annotation warnings --- diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniMarker.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniMarker.java index d9785e20b4..d08bd73561 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniMarker.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniMarker.java @@ -132,7 +132,6 @@ public abstract class JniMarker extends Jni_C_Common * @param markerName Name of the parent marker * @param markerFieldPtr C Pointer (converted in long) to marker_field C Structure */ - @SuppressWarnings("unused") private void addMarkerFieldFromC(String markerFieldName, long markerFieldPtr) { // Create a new Jaf_markerField object and insert it in the map // the maker field fill itself with LTT data while being constructed diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniParser.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniParser.java index 9869e14b66..bcd4f10408 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniParser.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniParser.java @@ -162,7 +162,6 @@ public abstract class JniParser extends Jni_C_Common * @param stringToAdd The parsed data to add * @param formatToAdd The format of the raw data */ - @SuppressWarnings("unused") static private void addStringToParsingFromC(Object contentHolder, String stringToAdd) { ((ParsedObjectContent)contentHolder).setData( stringToAdd); } @@ -179,7 +178,6 @@ public abstract class JniParser extends Jni_C_Common * @param pointerToAdd The parsed data to add (in 64 bits long!) * @param formatToAdd The format of the raw data */ - @SuppressWarnings("unused") static private void addLongPointerToParsingFromC(Object contentHolder, long pointerToAdd) { ((ParsedObjectContent)contentHolder).setData( new Jni_C_Pointer((long) pointerToAdd)); } @@ -196,7 +194,6 @@ public abstract class JniParser extends Jni_C_Common * @param pointerToAdd The parsed data to add (converted in 64 bits long!) * @param formatToAdd The format of the raw data */ - @SuppressWarnings("unused") static private void addIntPointerToParsingFromC(Object contentHolder, long pointerToAdd) { ((ParsedObjectContent)contentHolder).setData( new Jni_C_Pointer((int) pointerToAdd)); } @@ -213,7 +210,6 @@ public abstract class JniParser extends Jni_C_Common * @param shortToAdd The parsed data to add * @param formatToAdd The format of the raw data */ - @SuppressWarnings("unused") static private void addShortToParsingFromC(Object contentHolder, short shortToAdd) { ((ParsedObjectContent)contentHolder).setData( new Short(shortToAdd)); } @@ -230,7 +226,6 @@ public abstract class JniParser extends Jni_C_Common * @param intToAdd The parsed data to add * @param formatToAdd The format of the raw data */ - @SuppressWarnings("unused") static private void addIntegerToParsingFromC(Object contentHolder, int intToAdd) { ((ParsedObjectContent)contentHolder).setData( new Integer(intToAdd)); } @@ -247,7 +242,6 @@ public abstract class JniParser extends Jni_C_Common * @param longToAdd The parsed data to add * @param formatToAdd The format of the raw data */ - @SuppressWarnings("unused") static private void addLongToParsingFromC(Object contentHolder, long longToAdd) { ((ParsedObjectContent)contentHolder).setData( new Long(longToAdd)); } @@ -264,7 +258,6 @@ public abstract class JniParser extends Jni_C_Common * @param floatToAdd The parsed data to add * @param formatToAdd The format of the raw data */ - @SuppressWarnings("unused") static private void addFloatToParsingFromC(Object contentHolder, float floatToAdd) { ((ParsedObjectContent)contentHolder).setData( new Float(floatToAdd)); } @@ -282,7 +275,6 @@ public abstract class JniParser extends Jni_C_Common * @param doubleToAdd The parsed data to add * @param formatToAdd The format of the raw data */ - @SuppressWarnings("unused") static private void addDoubleToParsingFromC(Object contentHolder, double doubleToAdd) { ((ParsedObjectContent)contentHolder).setData( new Double(doubleToAdd)); } diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniTrace.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniTrace.java index 34492ec1c0..2dbe6c7c94 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniTrace.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniTrace.java @@ -207,7 +207,8 @@ public abstract class JniTrace extends Jni_C_Common { } - public void finalize() { + @Override + public void finalize() { // If the trace is open, close it if (thisTracePtr.getPointer() != NULL) { closeTrace(); diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniTracefile.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniTracefile.java index 4f064921cc..d5bdc54b49 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniTracefile.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniTracefile.java @@ -267,7 +267,6 @@ public abstract class JniTracefile extends Jni_C_Common { * @param markerId Id of the marker (int) * @param markerInfoPtr C Pointer to a marker_info C structure */ - @SuppressWarnings("unused") private void addMarkersFromC(int markerId, long markerInfoPtr) { // Create a new tracefile object and insert it in the map // the tracefile fill itself with LTT data while being constructed diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/factory/JniTraceVersion.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/factory/JniTraceVersion.java index 9e2854faf6..3f6797606a 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/factory/JniTraceVersion.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/factory/JniTraceVersion.java @@ -18,7 +18,6 @@ public class JniTraceVersion { private int majorNumber = 0; private int minorNumber = 0; - @SuppressWarnings("unused") private JniTraceVersion() { } @@ -52,12 +51,12 @@ public class JniTraceVersion { return minorNumber; } - @SuppressWarnings("unused") private void setTraceVersionFromC(int newMajor, int newMinor) { majorNumber = newMajor; minorNumber = newMinor; } + @Override public String toString() { return majorNumber + "." + minorNumber; } diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniMarker_v2_3.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniMarker_v2_3.java index 85bba7a70e..06fed6e750 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniMarker_v2_3.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniMarker_v2_3.java @@ -22,7 +22,8 @@ public class JniMarker_v2_3 extends JniMarker { } - public JniMarkerField allocateNewJniMarkerField(Jni_C_Pointer newMarkerFieldPtr) throws JniException { + @Override + public JniMarkerField allocateNewJniMarkerField(Jni_C_Pointer newMarkerFieldPtr) throws JniException { return new JniMarkerField_v2_3(newMarkerFieldPtr); } diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniTrace_v2_3.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniTrace_v2_3.java index 567b2e4d08..887c60f5b7 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniTrace_v2_3.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniTrace_v2_3.java @@ -7,6 +7,7 @@ import org.eclipse.linuxtools.lttng.jni.exception.JniException; public class JniTrace_v2_3 extends JniTrace { + @SuppressWarnings("unused") private static final String LIBRARY_NAME = "liblttvtraceread2.3.so"; protected JniTrace_v2_3() { @@ -31,7 +32,8 @@ public class JniTrace_v2_3 extends JniTrace { } - public boolean initializeLibrary() { + @Override + public boolean initializeLibrary() { // *** FIXME *** // To change as soon as the library will be able to load multiple version at once //return ltt_initializeHandle(LIBRARY_NAME); @@ -41,7 +43,8 @@ public class JniTrace_v2_3 extends JniTrace { } - public JniTracefile allocateNewJniTracefile(Jni_C_Pointer newPtr, JniTrace newParentTrace) throws JniException { + @Override + public JniTracefile allocateNewJniTracefile(Jni_C_Pointer newPtr, JniTrace newParentTrace) throws JniException { return new JniTracefile_v2_3(newPtr, newParentTrace); } diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniTracefile_v2_3.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniTracefile_v2_3.java index 4c645eff94..1e2da28632 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniTracefile_v2_3.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniTracefile_v2_3.java @@ -24,12 +24,14 @@ public class JniTracefile_v2_3 extends JniTracefile { } - public JniEvent allocateNewJniEvent(Jni_C_Pointer newEventPtr, HashMap newMarkersMap, JniTracefile newParentTracefile) throws JniException { + @Override + public JniEvent allocateNewJniEvent(Jni_C_Pointer newEventPtr, HashMap newMarkersMap, JniTracefile newParentTracefile) throws JniException { return new JniEvent_v2_3(newEventPtr, newMarkersMap, newParentTracefile); } - public JniMarker allocateNewJniMarker(Jni_C_Pointer newMarkerPtr) throws JniException { + @Override + public JniMarker allocateNewJniMarker(Jni_C_Pointer newMarkerPtr) throws JniException { return new JniMarker_v2_3(newMarkerPtr); } diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniMarker_v2_5.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniMarker_v2_5.java index 0ff3acde87..5620782944 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniMarker_v2_5.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniMarker_v2_5.java @@ -22,7 +22,8 @@ public class JniMarker_v2_5 extends JniMarker { } - public JniMarkerField allocateNewJniMarkerField(Jni_C_Pointer newMarkerFieldPtr) throws JniException { + @Override + public JniMarkerField allocateNewJniMarkerField(Jni_C_Pointer newMarkerFieldPtr) throws JniException { return new JniMarkerField_v2_5(newMarkerFieldPtr); } diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniTrace_v2_5.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniTrace_v2_5.java index 43a90515cb..81ca133bb8 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniTrace_v2_5.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniTrace_v2_5.java @@ -7,6 +7,7 @@ import org.eclipse.linuxtools.lttng.jni.exception.JniException; public class JniTrace_v2_5 extends JniTrace { + @SuppressWarnings("unused") private static final String LIBRARY_NAME = "liblttvtraceread2.5.so"; protected JniTrace_v2_5() { @@ -31,7 +32,8 @@ public class JniTrace_v2_5 extends JniTrace { } - public boolean initializeLibrary() { + @Override + public boolean initializeLibrary() { // *** FIXME *** // To change as soon as the library will be able to load multiple version at once //return ltt_initializeHandle(LIBRARY_NAME); @@ -40,7 +42,8 @@ public class JniTrace_v2_5 extends JniTrace { return true; } - public JniTracefile allocateNewJniTracefile(Jni_C_Pointer newPtr, JniTrace newParentTrace) throws JniException { + @Override + public JniTracefile allocateNewJniTracefile(Jni_C_Pointer newPtr, JniTrace newParentTrace) throws JniException { return new JniTracefile_v2_5(newPtr, newParentTrace); } diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniTracefile_v2_5.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniTracefile_v2_5.java index 6f4518bf47..60b07bac2a 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniTracefile_v2_5.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniTracefile_v2_5.java @@ -24,12 +24,14 @@ public class JniTracefile_v2_5 extends JniTracefile { } - public JniEvent allocateNewJniEvent(Jni_C_Pointer newEventPtr, HashMap newMarkersMap, JniTracefile newParentTracefile) throws JniException { + @Override + public JniEvent allocateNewJniEvent(Jni_C_Pointer newEventPtr, HashMap newMarkersMap, JniTracefile newParentTracefile) throws JniException { return new JniEvent_v2_5(newEventPtr, newMarkersMap, newParentTracefile); } - public JniMarker allocateNewJniMarker(Jni_C_Pointer newMarkerPtr) throws JniException { + @Override + public JniMarker allocateNewJniMarker(Jni_C_Pointer newMarkerPtr) throws JniException { return new JniMarker_v2_5(newMarkerPtr); } diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniMarker_v2_6.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniMarker_v2_6.java index f20a3cd4da..0d233269a8 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniMarker_v2_6.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniMarker_v2_6.java @@ -22,7 +22,8 @@ public class JniMarker_v2_6 extends JniMarker { } - public JniMarkerField allocateNewJniMarkerField(Jni_C_Pointer newMarkerFieldPtr) throws JniException { + @Override + public JniMarkerField allocateNewJniMarkerField(Jni_C_Pointer newMarkerFieldPtr) throws JniException { return new JniMarkerField_v2_6(newMarkerFieldPtr); } diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniTrace_v2_6.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniTrace_v2_6.java index 476cb9aa06..2a1dee4f24 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniTrace_v2_6.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniTrace_v2_6.java @@ -7,6 +7,7 @@ import org.eclipse.linuxtools.lttng.jni.exception.JniException; public class JniTrace_v2_6 extends JniTrace { + @SuppressWarnings("unused") private static final String LIBRARY_NAME = "liblttvtraceread2.6.so"; protected JniTrace_v2_6() { @@ -31,7 +32,8 @@ public class JniTrace_v2_6 extends JniTrace { } - public boolean initializeLibrary() { + @Override + public boolean initializeLibrary() { // *** FIXME *** // To change as soon as the library will be able to load multiple version at once //return ltt_initializeHandle(LIBRARY_NAME); @@ -40,7 +42,8 @@ public class JniTrace_v2_6 extends JniTrace { return true; } - public JniTracefile allocateNewJniTracefile(Jni_C_Pointer newPtr, JniTrace newParentTrace) throws JniException { + @Override + public JniTracefile allocateNewJniTracefile(Jni_C_Pointer newPtr, JniTrace newParentTrace) throws JniException { return new JniTracefile_v2_6(newPtr, newParentTrace); } diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniTracefile_v2_6.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniTracefile_v2_6.java index 6404ae41b7..6087fdc5d8 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniTracefile_v2_6.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniTracefile_v2_6.java @@ -24,12 +24,14 @@ public class JniTracefile_v2_6 extends JniTracefile { } - public JniEvent allocateNewJniEvent(Jni_C_Pointer newEventPtr, HashMap newMarkersMap, JniTracefile newParentTracefile) throws JniException { + @Override + public JniEvent allocateNewJniEvent(Jni_C_Pointer newEventPtr, HashMap newMarkersMap, JniTracefile newParentTracefile) throws JniException { return new JniEvent_v2_6(newEventPtr, newMarkersMap, newParentTracefile); } - public JniMarker allocateNewJniMarker(Jni_C_Pointer newMarkerPtr) throws JniException { + @Override + public JniMarker allocateNewJniMarker(Jni_C_Pointer newMarkerPtr) throws JniException { return new JniMarker_v2_6(newMarkerPtr); } diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/block_0 b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/block_0 new file mode 100644 index 0000000000..5f1f849af8 Binary files /dev/null and b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/block_0 differ diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0 b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0 new file mode 100644 index 0000000000..25731fb7ab Binary files /dev/null and b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fd_state_0 differ diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0 b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0 new file mode 100644 index 0000000000..0c6f8d4017 Binary files /dev/null and b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/fs_0 differ diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/global_state_0 b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/global_state_0 new file mode 100644 index 0000000000..e44498e5fd Binary files /dev/null and b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/global_state_0 differ diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/input_0 b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/input_0 new file mode 100644 index 0000000000..c1e9a33204 Binary files /dev/null and b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/input_0 differ diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/ipc_0 b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/ipc_0 new file mode 100644 index 0000000000..1c18a5f35f Binary files /dev/null and b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/ipc_0 differ diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0 b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0 new file mode 100644 index 0000000000..3d44102da2 Binary files /dev/null and b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/irq_state_0 differ diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/jbd2_0 b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/jbd2_0 new file mode 100644 index 0000000000..5f1f849af8 Binary files /dev/null and b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/jbd2_0 differ diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0 b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0 new file mode 100644 index 0000000000..e9aea48cc9 Binary files /dev/null and b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/kernel_0 differ diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0 b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0 new file mode 100644 index 0000000000..b9d02c8c42 Binary files /dev/null and b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/metadata_0 differ diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0 b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0 new file mode 100644 index 0000000000..583a19e8f0 Binary files /dev/null and b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/mm_0 differ diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0 b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0 new file mode 100644 index 0000000000..34dd48418a Binary files /dev/null and b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/module_state_0 differ diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/net_0 b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/net_0 new file mode 100644 index 0000000000..5f1f849af8 Binary files /dev/null and b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/net_0 differ diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/netif_state_0 b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/netif_state_0 new file mode 100644 index 0000000000..61e8d486d8 Binary files /dev/null and b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/netif_state_0 differ diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/pm_0 b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/pm_0 new file mode 100644 index 0000000000..1de854a684 Binary files /dev/null and b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/pm_0 differ diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/rcu_0 b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/rcu_0 new file mode 100644 index 0000000000..f23f4d0d6d Binary files /dev/null and b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/rcu_0 differ diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/softirq_state_0 b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/softirq_state_0 new file mode 100644 index 0000000000..9b0175f52f Binary files /dev/null and b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/softirq_state_0 differ diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/swap_state_0 b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/swap_state_0 new file mode 100644 index 0000000000..106d11e5e8 Binary files /dev/null and b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/swap_state_0 differ diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0 b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0 new file mode 100644 index 0000000000..2f86ccc0ca Binary files /dev/null and b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/syscall_state_0 differ diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0 b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0 new file mode 100644 index 0000000000..0500381645 Binary files /dev/null and b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/task_state_0 differ diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/userspace_0 b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/userspace_0 new file mode 100644 index 0000000000..0ced16d8cd Binary files /dev/null and b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/userspace_0 differ diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0 b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0 new file mode 100644 index 0000000000..949491f773 Binary files /dev/null and b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat/vm_state_0 differ diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0 b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0 new file mode 100644 index 0000000000..349b684e2b Binary files /dev/null and b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/block_0 differ diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0 b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0 new file mode 100644 index 0000000000..6ddab99c52 Binary files /dev/null and b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fd_state_0 differ diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0 b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0 new file mode 100644 index 0000000000..bcb5a92334 Binary files /dev/null and b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/fs_0 differ diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/global_state_0 b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/global_state_0 new file mode 100644 index 0000000000..3768df38d8 Binary files /dev/null and b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/global_state_0 differ diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/input_0 b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/input_0 new file mode 100644 index 0000000000..2558157b14 Binary files /dev/null and b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/input_0 differ diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/ipc_0 b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/ipc_0 new file mode 100644 index 0000000000..2558157b14 Binary files /dev/null and b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/ipc_0 differ diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0 b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0 new file mode 100644 index 0000000000..92396db878 Binary files /dev/null and b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/irq_state_0 differ diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/jbd2_0 b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/jbd2_0 new file mode 100644 index 0000000000..2558157b14 Binary files /dev/null and b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/jbd2_0 differ diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0 b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0 new file mode 100644 index 0000000000..1a83a3c57c Binary files /dev/null and b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/kernel_0 differ diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0 b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0 new file mode 100644 index 0000000000..2d00d06bfd Binary files /dev/null and b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/metadata_0 differ diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0 b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0 new file mode 100644 index 0000000000..addf51b7a3 Binary files /dev/null and b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/mm_0 differ diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0 b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0 new file mode 100644 index 0000000000..7e2fbaaf20 Binary files /dev/null and b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/module_state_0 differ diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/net_0 b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/net_0 new file mode 100644 index 0000000000..84065ae569 Binary files /dev/null and b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/net_0 differ diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/netif_state_0 b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/netif_state_0 new file mode 100644 index 0000000000..07560e4225 Binary files /dev/null and b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/netif_state_0 differ diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/pm_0 b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/pm_0 new file mode 100644 index 0000000000..471396f15a Binary files /dev/null and b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/pm_0 differ diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/rcu_0 b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/rcu_0 new file mode 100644 index 0000000000..f924e97d82 Binary files /dev/null and b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/rcu_0 differ diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/softirq_state_0 b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/softirq_state_0 new file mode 100644 index 0000000000..482cad3dea Binary files /dev/null and b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/softirq_state_0 differ diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/swap_state_0 b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/swap_state_0 new file mode 100644 index 0000000000..ecfaeebb14 Binary files /dev/null and b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/swap_state_0 differ diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0 b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0 new file mode 100644 index 0000000000..7e402af63b Binary files /dev/null and b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/syscall_state_0 differ diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0 b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0 new file mode 100644 index 0000000000..dba778bc7b Binary files /dev/null and b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/task_state_0 differ diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/userspace_0 b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/userspace_0 new file mode 100644 index 0000000000..2558157b14 Binary files /dev/null and b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/userspace_0 differ diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0 b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0 new file mode 100644 index 0000000000..ae2d8b4cb2 Binary files /dev/null and b/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat/vm_state_0 differ diff --git a/org.eclipse.linuxtools.lttng.ui.tests/.classpath b/org.eclipse.linuxtools.lttng.ui.tests/.classpath index 64c5e31b7a..978c0d27e1 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/.classpath +++ b/org.eclipse.linuxtools.lttng.ui.tests/.classpath @@ -3,5 +3,6 @@ + diff --git a/org.eclipse.linuxtools.lttng.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng.ui.tests/META-INF/MANIFEST.MF index f0d7f0eae8..bd6d7de636 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.lttng.ui.tests/META-INF/MANIFEST.MF @@ -7,5 +7,6 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %Bundle-Vendor Require-Bundle: org.junit, org.eclipse.linuxtools.lttng;bundle-version="0.2.0", - org.eclipse.linuxtools.lttng.ui;bundle-version="0.2.0" + org.eclipse.linuxtools.lttng.ui;bundle-version="0.2.0", + org.eclipse.linuxtools.tmf;bundle-version="0.2.0" Bundle-Localization: plugin diff --git a/org.eclipse.linuxtools.lttng.ui.tests/build.properties b/org.eclipse.linuxtools.lttng.ui.tests/build.properties index 33230c0457..0a6de547fd 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/build.properties +++ b/org.eclipse.linuxtools.lttng.ui.tests/build.properties @@ -1,4 +1,5 @@ -source.. = src/ +source.. = src/,\ + stubs/ output.. = bin/ bin.includes = META-INF/,\ .,\ diff --git a/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngEventParserStub.java b/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngEventParserStub.java index 8ad81c3035..480fd4b23b 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngEventParserStub.java +++ b/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngEventParserStub.java @@ -17,7 +17,7 @@ import java.io.IOException; import org.eclipse.linuxtools.tmf.event.TmfEvent; import org.eclipse.linuxtools.tmf.parser.ITmfEventParser; import org.eclipse.linuxtools.tmf.trace.ITmfTrace; -import org.eclipse.linuxtools.tmf.trace.TmfContext; +import org.eclipse.linuxtools.tmf.trace.TmfTraceContext; /** * TmfEventParserStub @@ -26,7 +26,7 @@ import org.eclipse.linuxtools.tmf.trace.TmfContext; */ public class LTTngEventParserStub implements ITmfEventParser { - public TmfEvent parseNextEvent(ITmfTrace stream, TmfContext context) + public TmfEvent parseNextEvent(ITmfTrace stream, TmfTraceContext context) throws IOException { // TODO Auto-generated method stub return null; diff --git a/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTraceStub.java b/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTraceStub.java index 91ba9941e5..ebe6b20184 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTraceStub.java +++ b/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTraceStub.java @@ -19,11 +19,8 @@ import java.io.RandomAccessFile; import org.eclipse.linuxtools.lttng.event.LttngEvent; import org.eclipse.linuxtools.tmf.event.TmfEvent; import org.eclipse.linuxtools.tmf.parser.ITmfEventParser; -import org.eclipse.linuxtools.tmf.trace.ITmfLocation; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; -import org.eclipse.linuxtools.tmf.trace.TmfContext; -import org.eclipse.linuxtools.tmf.trace.TmfLocation; import org.eclipse.linuxtools.tmf.trace.TmfTrace; +import org.eclipse.linuxtools.tmf.trace.TmfTraceContext; /** * LTTngTraceStub @@ -62,23 +59,12 @@ public class LTTngTraceStub extends TmfTrace { * @throws FileNotFoundException */ public LTTngTraceStub(String filename, int cacheSize) throws FileNotFoundException { - super(filename, LttngEvent.class, filename, cacheSize); + super(LttngEvent.class, filename, cacheSize); fTrace = new RandomAccessFile(filename, "r"); fParser = new LTTngEventParserStub(); -// indexTrace(true); + indexTrace(true); } - - public ITmfTrace createTraceCopy() { - ITmfTrace returnedValue = null; - try { - returnedValue = new LTTngTraceStub(this.getName()); - } - catch (FileNotFoundException e) { - e.printStackTrace(); - } - return returnedValue; - } - + // ======================================================================== // Accessors // ======================================================================== @@ -94,14 +80,12 @@ public class LTTngTraceStub extends TmfTrace { /* (non-Javadoc) * @see org.eclipse.linuxtools.tmf.eventlog.ITmfStreamLocator#seekLocation(java.lang.Object) */ - @Override - @SuppressWarnings("unchecked") - public TmfContext seekLocation(ITmfLocation location) { - TmfContext context = null; + public TmfTraceContext seekLocation(Object location) { + TmfTraceContext context = null; try { synchronized(fTrace) { - fTrace.seek((location != null) ? ((TmfLocation) location).getLocation() : 0); - context = new TmfContext(getCurrentLocation(), 0); + fTrace.seek((location != null) ? (Long) location : 0); + context = new TmfTraceContext(getCurrentLocation(), 0); // TmfTraceContext context2 = new TmfTraceContext(getCurrentLocation(), 0); // TmfEvent event = parseEvent(context2); // context.setTimestamp(event.getTimestamp()); @@ -117,9 +101,9 @@ public class LTTngTraceStub extends TmfTrace { * @see org.eclipse.linuxtools.tmf.eventlog.ITmfStreamLocator#getCurrentLocation() */ @Override - public ITmfLocation getCurrentLocation() { + public Object getCurrentLocation() { try { - return new TmfLocation(fTrace.getFilePointer()); + return new Long(fTrace.getFilePointer()); } catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -131,7 +115,7 @@ public class LTTngTraceStub extends TmfTrace { * @see org.eclipse.linuxtools.tmf.trace.ITmfTrace#parseEvent() */ @Override - public TmfEvent parseEvent(TmfContext context) { + public TmfEvent parseEvent(TmfTraceContext context) { try { // paserNextEvent updates the context TmfEvent event = fParser.parseNextEvent(this, context); diff --git a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/LttngStateInputRef.java b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/LttngStateInputRef.java index 2bb7bcea7c..42bb8c6492 100644 --- a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/LttngStateInputRef.java +++ b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/LttngStateInputRef.java @@ -11,6 +11,7 @@ *******************************************************************************/ package org.eclipse.linuxtools.lttng.state; +import org.eclipse.linuxtools.lttng.event.LttngEvent; import org.eclipse.linuxtools.lttng.state.model.ILttngStateInputRef; import org.eclipse.linuxtools.lttng.trace.LTTngTextTrace; import org.eclipse.linuxtools.lttng.trace.LTTngTrace; @@ -30,12 +31,12 @@ public class LttngStateInputRef implements ILttngStateInputRef { // ======================================================================== // Table data // ======================================================================= - TmfTrace log = null; + TmfTrace log = null; // ======================================================================== // Constructor // ======================================================================== - LttngStateInputRef(TmfTrace log) { + LttngStateInputRef(TmfTrace log) { this.log = log; if ( log instanceof LTTngTrace) { diff --git a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/StateStacksHandler.java b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/StateStacksHandler.java index ce64ab2b5d..8fa9669b49 100644 --- a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/StateStacksHandler.java +++ b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/StateStacksHandler.java @@ -55,7 +55,7 @@ public class StateStacksHandler { * @param log * */ - void init(TmfTrace log) throws LttngStateException { + void init(TmfTrace log) throws LttngStateException { if (log == null) { throw new LttngStateException("No TmfTrace object available!"); } diff --git a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/LttngTrapState.java b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/LttngTrapState.java index c61ec5b8e8..94dba7db07 100644 --- a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/LttngTrapState.java +++ b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/LttngTrapState.java @@ -78,6 +78,7 @@ public class LttngTrapState implements Cloneable { } } + @Override public String toString() { return "running : " + running; } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/TmfEventsView.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/TmfEventsView.java index 8f6ff97aae..7c04a59924 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/TmfEventsView.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/TmfEventsView.java @@ -137,7 +137,8 @@ public class TmfEventsView extends TmfView { // Handle the table item requests fTable.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { TmfTimestamp ts = (TmfTimestamp) fTable.getSelection()[0].getData(); broadcast(new TmfTimeSynchSignal(fTable, ts)); } diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentContext.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentContext.java index c868d0bc16..01b48fd2b3 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentContext.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentContext.java @@ -36,6 +36,7 @@ public class TmfExperimentContext implements ITmfContext, Cloneable { fEvents = new TmfEvent[fTraces.length]; } + @Override public TmfExperimentContext clone() { try { return (TmfExperimentContext) super.clone(); diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfTraceContext.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfTraceContext.java index 78cced43b7..c38a417322 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfTraceContext.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfTraceContext.java @@ -50,6 +50,7 @@ public class TmfTraceContext implements ITmfContext, Cloneable { this(other.location, other.rank); } + @Override public TmfTraceContext clone() { try { return (TmfTraceContext) super.clone();