Monster merge from the integration branch. Still some problems left and JUnits failing.

[deliverable/tracecompass.git] / org.eclipse.linuxtools.lttng.tests / src / org / eclipse / linuxtools / lttng / model / LTTngTreeNodeTest.java

diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/model/LTTngTreeNodeTest.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/model/LTTngTreeNodeTest.java
index 87e68dd60545806f0e00bc32318caae6271ead0d..472199f27fb7dc95672a2a5b4f68ed1be35bb43a 100644 (file)
--- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/model/LTTngTreeNodeTest.java
+++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/model/LTTngTreeNodeTest.java
@@ -42,6 +42,7 @@ public class LTTngTreeNodeTest extends TestCase {
        /* (non-Javadoc)
         * @see junit.framework.TestCase#setUp()
         */
+       @Override
        protected void setUp() throws Exception {
                super.setUp();
                // Create state resources and assign a parent
@@ -86,6 +87,7 @@ public class LTTngTreeNodeTest extends TestCase {
        /* (non-Javadoc)
         * @see junit.framework.TestCase#tearDown()
         */
+       @Override
        protected void tearDown() throws Exception {
                super.tearDown();
        }