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

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

diff --git a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/model/LTTngTreeNode.java b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/model/LTTngTreeNode.java
index 65f40aca75a07a073b88d277459af821d1f236f1..65de900fdcd61ec868056ce2b69bc54352dab544 100644 (file)
--- a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/model/LTTngTreeNode.java
+++ b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/model/LTTngTreeNode.java
@@ -60,6 +60,7 @@ public class LTTngTreeNode extends
         * @see
         * org.eclipse.linuxtools.lttng.model.LTTngTreeNodeGeneric#getChildren()
         */
+       @Override
        public LTTngTreeNode[] getChildren() {
                return childrenToArray(fchildren.values(), this.getClass());
        }