diff options
author | Xavier Ducrohet <xav@android.com> | 2011-07-06 17:28:42 -0700 |
---|---|---|
committer | Xavier Ducrohet <xav@android.com> | 2011-07-06 17:29:22 -0700 |
commit | 9bf4d207657f00adda8d5347ab5911b4f3d30fc4 (patch) | |
tree | 3dcae80806a7b0fe8b7c2da14e8e53552de2372d /traceview/src | |
parent | cfdcd47c6af4b1b0efc25cb44427646f9ce3c25e (diff) | |
download | sdk-9bf4d207657f00adda8d5347ab5911b4f3d30fc4.zip sdk-9bf4d207657f00adda8d5347ab5911b4f3d30fc4.tar.gz sdk-9bf4d207657f00adda8d5347ab5911b4f3d30fc4.tar.bz2 |
Fix some override issues.
SDK tools must compile using Java 1.5
Change-Id: I39b708fcb6f1e225bece6b12c1b5909865825ac9
Diffstat (limited to 'traceview/src')
-rw-r--r-- | traceview/src/com/android/traceview/PropertiesDialog.java | 2 | ||||
-rw-r--r-- | traceview/src/com/android/traceview/TimeBase.java | 8 |
2 files changed, 2 insertions, 8 deletions
diff --git a/traceview/src/com/android/traceview/PropertiesDialog.java b/traceview/src/com/android/traceview/PropertiesDialog.java index cbae0a8..9f5eff9 100644 --- a/traceview/src/com/android/traceview/PropertiesDialog.java +++ b/traceview/src/com/android/traceview/PropertiesDialog.java @@ -68,6 +68,7 @@ public class PropertiesDialog extends Dialog { TableViewerColumn propertyColumn = new TableViewerColumn(tableViewer, SWT.NONE); propertyColumn.getColumn().setText("Property"); propertyColumn.setLabelProvider(new ColumnLabelProvider() { + @Override @SuppressWarnings("unchecked") public String getText(Object element) { Entry<String, String> entry = (Entry<String, String>) element; @@ -79,6 +80,7 @@ public class PropertiesDialog extends Dialog { TableViewerColumn valueColumn = new TableViewerColumn(tableViewer, SWT.NONE); valueColumn.getColumn().setText("Value"); valueColumn.setLabelProvider(new ColumnLabelProvider() { + @Override @SuppressWarnings("unchecked") public String getText(Object element) { Entry<String, String> entry = (Entry<String, String>) element; diff --git a/traceview/src/com/android/traceview/TimeBase.java b/traceview/src/com/android/traceview/TimeBase.java index b6b23cb..b29a46b 100644 --- a/traceview/src/com/android/traceview/TimeBase.java +++ b/traceview/src/com/android/traceview/TimeBase.java @@ -26,44 +26,36 @@ interface TimeBase { public long getElapsedInclusiveTime(ProfileData profileData); public static final class CpuTimeBase implements TimeBase { - @Override public long getTime(ThreadData threadData) { return threadData.getCpuTime(); } - @Override public long getElapsedInclusiveTime(MethodData methodData) { return methodData.getElapsedInclusiveCpuTime(); } - @Override public long getElapsedExclusiveTime(MethodData methodData) { return methodData.getElapsedExclusiveCpuTime(); } - @Override public long getElapsedInclusiveTime(ProfileData profileData) { return profileData.getElapsedInclusiveCpuTime(); } } public static final class RealTimeBase implements TimeBase { - @Override public long getTime(ThreadData threadData) { return threadData.getRealTime(); } - @Override public long getElapsedInclusiveTime(MethodData methodData) { return methodData.getElapsedInclusiveRealTime(); } - @Override public long getElapsedExclusiveTime(MethodData methodData) { return methodData.getElapsedExclusiveRealTime(); } - @Override public long getElapsedInclusiveTime(ProfileData profileData) { return profileData.getElapsedInclusiveRealTime(); } |