Display SDK/plug-in incompatibility messages.

Hmm this used to work. But the lines displaying the error
messages are gone...

Change-Id: I83cf7d3e8a471fe6b2166818db9fad4f60d3d392

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 c4aaebd..4bd5121 100644 (file)
--- 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
@@ -744,11 +744,13 @@ public class AdtPlugin extends AbstractUIPlugin {
         return checkSdkLocationAndId(sdkLocation, new CheckSdkErrorHandler() {
             @Override
             public boolean handleError(String message) {
+                AdtPlugin.displayError("Android SDK Verification", message);
                 return false;
             }
 
             @Override
             public boolean handleWarning(String message) {
+                AdtPlugin.displayWarning("Android SDK Verification", message);
                 return true;
             }
         });
@@ -780,7 +782,14 @@ public class AdtPlugin extends AbstractUIPlugin {
                             SdkConstants.FD_TOOLS, osSdkLocation));
         }
 
-        // check the path to various tools we use
+        // first check the min plug-in requirement as its error message is easier to figure
+        // out for the user
+        if (VersionCheck.checkVersion(osSdkLocation, errorHandler) == false) {
+            return false;
+        }
+
+        // check the path to various tools we use to make sure nothing is missing. This is
+        // not meant to be exhaustive.
         String[] filesToCheck = new String[] {
                 osSdkLocation + getOsRelativeAdb(),
                 osSdkLocation + getOsRelativeEmulator()
@@ -791,8 +800,7 @@ public class AdtPlugin extends AbstractUIPlugin {
             }
         }
 
-        // check the SDK build id/version and the plugin version.
-        return VersionCheck.checkVersion(osSdkLocation, errorHandler);
+        return true;
     }
 
     /**

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/VersionCheck.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/VersionCheck.java
index 6199ef9..4ddc87f 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/VersionCheck.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/VersionCheck.java
@@ -107,7 +107,7 @@ public final class VersionCheck {
         }
 
         if (valid == false) {
-            return errorHandler.handleWarning(
+            return errorHandler.handleError(
                     String.format(Messages.VersionCheck_Plugin_Too_Old,
                             minMajorVersion, minMinorVersion, minMicroVersion, versionString));
         }

diff --git a/files/plugin.prop b/files/plugin.prop
index a24b984..7d50146 100644 (file)
--- a/files/plugin.prop
+++ b/files/plugin.prop
@@ -1,3 +1,3 @@
 # begin plugin.prop
-plugin.version=0.9.6
+plugin.version=8.0.0
 # end plugin.prop
\ No newline at end of file