diff options
| author | Siva Velusamy <vsiva@google.com> | 2011-12-21 17:44:48 -0800 |
|---|---|---|
| committer | Siva Velusamy <vsiva@google.com> | 2011-12-21 17:44:48 -0800 |
| commit | 51df3cdbd5377f11e68e205343d56512e6a1c703 (patch) | |
| tree | 76711e8a9d21334f9d03869689e3cfde6e07547c /eclipse/plugins/com.android.ide.eclipse.monitor/src/com/android/ide | |
| parent | ab36f4e7488358dea4ab6b54ee2b7bef3da0232b (diff) | |
| download | sdk-51df3cdbd5377f11e68e205343d56512e6a1c703.zip sdk-51df3cdbd5377f11e68e205343d56512e6a1c703.tar.gz sdk-51df3cdbd5377f11e68e205343d56512e6a1c703.tar.bz2 | |
java6: add missing overrides
Monitor plugin is not built automatically, so this was not caught
earlier.
Change-Id: Ib115ac5a7bfb7adaad8b44a724611725ad5a72aa
Diffstat (limited to 'eclipse/plugins/com.android.ide.eclipse.monitor/src/com/android/ide')
2 files changed, 6 insertions, 0 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.monitor/src/com/android/ide/eclipse/monitor/Application.java b/eclipse/plugins/com.android.ide.eclipse.monitor/src/com/android/ide/eclipse/monitor/Application.java index f852e34..83003fe 100644 --- a/eclipse/plugins/com.android.ide.eclipse.monitor/src/com/android/ide/eclipse/monitor/Application.java +++ b/eclipse/plugins/com.android.ide.eclipse.monitor/src/com/android/ide/eclipse/monitor/Application.java @@ -23,6 +23,7 @@ import org.eclipse.ui.IWorkbench; import org.eclipse.ui.PlatformUI; public class Application implements IApplication { + @Override public Object start(IApplicationContext context) throws Exception { Display display = PlatformUI.createDisplay(); try { @@ -37,12 +38,14 @@ public class Application implements IApplication { } } + @Override public void stop() { if (!PlatformUI.isWorkbenchRunning()) return; final IWorkbench workbench = PlatformUI.getWorkbench(); final Display display = workbench.getDisplay(); display.syncExec(new Runnable() { + @Override public void run() { if (!display.isDisposed()) workbench.close(); diff --git a/eclipse/plugins/com.android.ide.eclipse.monitor/src/com/android/ide/eclipse/monitor/ToolsLocator.java b/eclipse/plugins/com.android.ide.eclipse.monitor/src/com/android/ide/eclipse/monitor/ToolsLocator.java index e08352f..b0cd8a5 100644 --- a/eclipse/plugins/com.android.ide.eclipse.monitor/src/com/android/ide/eclipse/monitor/ToolsLocator.java +++ b/eclipse/plugins/com.android.ide.eclipse.monitor/src/com/android/ide/eclipse/monitor/ToolsLocator.java @@ -31,14 +31,17 @@ public class ToolsLocator implements IToolsLocator { public static final String FN_HPROF_CONV = "hprof-conv" + PLATFORM_EXECUTABLE_EXTENSION; //$NON-NLS-1$ public static final String FN_TRACEVIEW = "traceview" + PLATFORM_SCRIPT_EXTENSION; //$NON-NLS-1$ + @Override public String getAdbLocation() { return getSdkPlatformToolsFolder() + SdkConstants.FN_ADB; } + @Override public String getTraceViewLocation() { return getSdkToolsFolder() + FN_TRACEVIEW; } + @Override public String getHprofConvLocation() { return getSdkToolsFolder() + FN_HPROF_CONV; } |