tmf: Switch tmf.ui to Java 7 + fix warnings

[deliverable/tracecompass.git] / org.eclipse.linuxtools.tmf.ui / src / org / eclipse / linuxtools / tmf / ui / views / timechart / TimeChartAnalysisEntry.java

diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartAnalysisEntry.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartAnalysisEntry.java
index d7f05ea435fdda8a4007b6a9c7cb3e7a0344d798..627e62ecd81ed3a5ed289dd84c59f82b26836428 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartAnalysisEntry.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartAnalysisEntry.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 Ericsson
+ * Copyright (c) 2010, 2012 Ericsson
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v1.0 which
@@ -13,6 +13,7 @@
 package org.eclipse.linuxtools.tmf.ui.views.timechart;
 
 import java.util.Iterator;
+import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.Vector;
 
@@ -28,7 +29,7 @@ import org.eclipse.linuxtools.tmf.ui.widgets.timegraph.model.ITimeGraphEntry;
  */
 public class TimeChartAnalysisEntry implements ITimeGraphEntry {
 
-    private final ITmfTrace<?> fTrace;
+    private final ITmfTrace fTrace;
     private final Vector<TimeChartEvent> fTraceEvents;
     private int fPower = 0; // 2^fPower nanoseconds per vector position
     private long fReferenceTime = -1; // time corresponding to beginning of index 0
@@ -36,13 +37,16 @@ public class TimeChartAnalysisEntry implements ITimeGraphEntry {
     private long fStopTime = -1; // time of last event
     private long fLastRank = -1; // rank of last processed trace event
 
-    TimeChartAnalysisEntry(ITmfTrace<?> trace, int modelSize) {
+    TimeChartAnalysisEntry(ITmfTrace trace, int modelSize) {
         fTrace = trace;
-        fTraceEvents = new Vector<TimeChartEvent>(modelSize);
+        fTraceEvents = new Vector<>(modelSize);
     }
 
+    /**
+     * @since 2.0
+     */
     @Override
-    public ITimeGraphEntry[] getChildren() {
+    public List<ITimeGraphEntry> getChildren() {
         return null;
     }
 
@@ -248,7 +252,7 @@ public class TimeChartAnalysisEntry implements ITimeGraphEntry {
      *
      * @return The trace object
      */
-    public ITmfTrace<?> getTrace() {
+    public ITmfTrace getTrace() {
         return fTrace;
     }