aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ddms/libs/ddmlib/src/com/android/ddmlib/testrunner/InstrumentationResultParser.java1
-rw-r--r--traceview/src/com/android/traceview/PropertiesDialog.java2
-rw-r--r--traceview/src/com/android/traceview/TimeBase.java8
3 files changed, 2 insertions, 9 deletions
diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/testrunner/InstrumentationResultParser.java b/ddms/libs/ddmlib/src/com/android/ddmlib/testrunner/InstrumentationResultParser.java
index 7e2e52d..22648a9 100644
--- a/ddms/libs/ddmlib/src/com/android/ddmlib/testrunner/InstrumentationResultParser.java
+++ b/ddms/libs/ddmlib/src/com/android/ddmlib/testrunner/InstrumentationResultParser.java
@@ -418,7 +418,6 @@ public class InstrumentationResultParser extends MultiLineReceiver {
*
* @see IShellOutputReceiver#isCancelled()
*/
- @Override
public boolean isCancelled() {
return mIsCancelled;
}
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();
}