diff options
4 files changed, 3 insertions, 13 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 1f89a01..429a7f3 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 @@ -874,21 +874,17 @@ public class AdtPlugin extends AbstractUIPlugin { private boolean checkSdkLocationAndId() { String sdkLocation = AdtPrefs.getPrefs().getOsSdkFolder(); if (sdkLocation == null || sdkLocation.length() == 0) { - displayError(Messages.Dialog_Title_SDK_Location, Messages.SDK_Not_Setup); return false; } return checkSdkLocationAndId(sdkLocation, new CheckSdkErrorHandler() { @Override public boolean handleError(String message) { - AdtPlugin.displayError(Messages.Dialog_Title_SDK_Location, - String.format(Messages.Error_Check_Prefs, message)); return false; } @Override public boolean handleWarning(String message) { - AdtPlugin.displayWarning(Messages.Dialog_Title_SDK_Location, message); return true; } }); diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/Messages.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/Messages.java index 3288ddb..6225632 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/Messages.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/Messages.java @@ -24,12 +24,6 @@ public class Messages extends NLS { public static String Could_Not_Find_Folder_In_SDK; - public static String Dialog_Title_SDK_Location; - - public static String Error_Check_Prefs; - - public static String SDK_Not_Setup; - public static String VersionCheck_Plugin_Too_Old; public static String VersionCheck_Plugin_Version_Failed; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/actions/AvdManagerAction.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/actions/AvdManagerAction.java index 15c31f9..4bc4496 100755 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/actions/AvdManagerAction.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/actions/AvdManagerAction.java @@ -61,6 +61,9 @@ public class AvdManagerAction implements IWorkbenchWindowActionDelegate, IObject }
});
window.open();
+ } else {
+ AdtPlugin.displayError("Android SDK",
+ "Location of the Android SDK has not been setup in the preferences.");
}
}
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/messages.properties b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/messages.properties index 5e38035..a65e50d 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/messages.properties +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/messages.properties @@ -1,6 +1,3 @@ -Dialog_Title_SDK_Location=Android SDK Location -SDK_Not_Setup=The location of the Android SDK has not been setup. Please go to Preferences > Android and set it up -Error_Check_Prefs=%1$s\nPlease check the Android plugin's preferences. Could_Not_Find_Folder=Could not find SDK folder '%1$s'. Could_Not_Find_Folder_In_SDK=Could not find folder '%1$s' inside SDK '%2$s'. Could_Not_Find=Could not find %1$s\! |