From bf0d23a2153502e2123240dd64b9ca8036a1d366 Mon Sep 17 00:00:00 2001 From: Nirothipan Date: Mon, 31 Jul 2017 09:56:07 +0530 Subject: [PATCH] Adding default parameter --- .../org.carbon.android.emulator/TryIt.java | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/TryIt.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/TryIt.java index b1a02a406..54e6fb48c 100644 --- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/TryIt.java +++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/TryIt.java @@ -494,17 +494,29 @@ public class TryIt { /** * This method gets the Android SDK location if available and sets the SDK path else downloads the SDK. */ + private int count = 0; + private void setAndroidSDK() { sdkConfigFile = new File("sdkConfigLocation"); if (!(sdkConfigFile.exists() && !sdkConfigFile.isDirectory())) { //TODO Scanner read = new Scanner(System.in, StandardCharsets.UTF_8.toString()); System.out.print("Do you have an Android SDK installed on your computer (y/N) ? : "); - String response = read.next().toLowerCase(); + String response = read.nextLine().toLowerCase(); if (response.matches("y")) { setSDKPath(); - } else { + } else if (response.matches("n") || response.matches("")) { getAndroidSDK(); + } else { + if (count < 5) { + System.out.println("Please enter a valid parameter ."); + count++; + setAndroidSDK(); + return; + } else { + System.out.println("Terminating process"); + System.exit(1); + } } } else { Scanner scanner = null; @@ -526,6 +538,10 @@ public class TryIt { setExecutePermission(adbLocation); } + private void askForSDKLocation() { + System.out.println("Please enter a valid parameter ."); + } + /** * this method prints the exception and terminate the program. *