diff options
author | Tor Norbye <tnorbye@google.com> | 2012-10-22 19:48:41 -0700 |
---|---|---|
committer | Tor Norbye <tnorbye@google.com> | 2012-10-22 19:48:41 -0700 |
commit | 2403ebca5b60cf0c21bfc64a8588102028187349 (patch) | |
tree | d011009054a8a7f5234b0647319cb37fe784cc36 /eclipse/plugins | |
parent | fd98c69bde3cf80edfb0d65f46d07ffae5a2f15e (diff) | |
download | sdk-2403ebca5b60cf0c21bfc64a8588102028187349.zip sdk-2403ebca5b60cf0c21bfc64a8588102028187349.tar.gz sdk-2403ebca5b60cf0c21bfc64a8588102028187349.tar.bz2 |
Revert "Don't warn about missing SDK when bundled"
This reverts commit df23dac52a3af6e7e4dd485072a125ab3794d9ac.
Diffstat (limited to 'eclipse/plugins')
2 files changed, 9 insertions, 18 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtPlugin.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtPlugin.java index af6f20a..e08d7ea 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtPlugin.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtPlugin.java @@ -46,7 +46,6 @@ import com.android.ide.eclipse.adt.internal.resources.manager.ResourceManager; import com.android.ide.eclipse.adt.internal.sdk.Sdk; import com.android.ide.eclipse.adt.internal.sdk.Sdk.ITargetChangeListener; import com.android.ide.eclipse.adt.internal.ui.EclipseUiHelper; -import com.android.ide.eclipse.base.InstallDetails; import com.android.ide.eclipse.ddms.DdmsPlugin; import com.android.io.StreamException; import com.android.resources.ResourceFolderType; @@ -267,16 +266,14 @@ public class AdtPlugin extends AbstractUIPlugin implements ILogger { // Listen on resource file edits for updates to file inclusion IncludeFinder.start(); - if (!InstallDetails.isAndroidIdePackage()) { - // Parse the SDK content. - // This is deferred in separate jobs to avoid blocking the bundle start. - final boolean isSdkLocationValid = checkSdkLocationAndId(); - if (isSdkLocationValid) { - // parse the SDK resources. - // Wait 2 seconds before starting the job. This leaves some time to the - // other bundles to initialize. - parseSdkContent(2000 /*milliseconds*/); - } + // Parse the SDK content. + // This is deferred in separate jobs to avoid blocking the bundle start. + final boolean isSdkLocationValid = checkSdkLocationAndId(); + if (isSdkLocationValid) { + // parse the SDK resources. + // Wait 2 seconds before starting the job. This leaves some time to the + // other bundles to initialize. + parseSdkContent(2000 /*milliseconds*/); } } @@ -1369,10 +1366,8 @@ public class AdtPlugin extends AbstractUIPlugin implements ILogger { /** * Parses the SDK resources. - * - * @param delay the delay to wait before starting the parsing job */ - public void parseSdkContent(long delay) { + private void parseSdkContent(long delay) { // Perform the update in a thread (here an Eclipse runtime job) // since this should never block the caller (especially the start method) Job job = new Job(Messages.AdtPlugin_Android_SDK_Content_Loader) { diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/welcome/AdtStartup.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/welcome/AdtStartup.java index 206c4f5..8d8b688 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/welcome/AdtStartup.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/welcome/AdtStartup.java @@ -109,10 +109,6 @@ public class AdtStartup implements IStartup, IWindowListener { if (AdtPlugin.getDefault().checkSdkLocationAndId(osSdkPath, new SdkValidator())) { AdtPrefs.getPrefs().setSdkLocation(new File(osSdkPath)); - // parse the SDK resources. - // Wait 2 seconds before starting the job. This leaves some time to the - // other bundles to initialize. - AdtPlugin.getDefault().parseSdkContent(2000 /*milliseconds*/); } } } |