Merge "Remove obsolete stuff."

2 files changed, 3 insertions, 72 deletions

diff --git a/sdkmanager/app/src/com/android/sdkmanager/Main.java b/sdkmanager/app/src/com/android/sdkmanager/Main.java
index 3b2afc8..c4e71b3 100644
--- a/sdkmanager/app/src/com/android/sdkmanager/Main.java
+++ b/sdkmanager/app/src/com/android/sdkmanager/Main.java
@@ -24,17 +24,16 @@ import com.android.io.FileWrapper;
 import com.android.prefs.AndroidLocation;
 import com.android.prefs.AndroidLocation.AndroidLocationException;
 import com.android.sdklib.IAndroidTarget;
-import com.android.sdklib.IAndroidTarget.IOptionalLibrary;
 import com.android.sdklib.ISystemImage;
 import com.android.sdklib.SdkManager;
+import com.android.sdklib.IAndroidTarget.IOptionalLibrary;
 import com.android.sdklib.internal.avd.AvdInfo;
 import com.android.sdklib.internal.avd.AvdManager;
 import com.android.sdklib.internal.avd.HardwareProperties;
 import com.android.sdklib.internal.avd.HardwareProperties.HardwareProperty;
-import com.android.sdklib.internal.build.MakeIdentity;
 import com.android.sdklib.internal.project.ProjectCreator;
-import com.android.sdklib.internal.project.ProjectCreator.OutputLevel;
 import com.android.sdklib.internal.project.ProjectProperties;
+import com.android.sdklib.internal.project.ProjectCreator.OutputLevel;
 import com.android.sdklib.internal.project.ProjectProperties.PropertyType;
 import com.android.sdklib.internal.repository.DownloadCache;
 import com.android.sdklib.internal.repository.DownloadCache.Strategy;
@@ -45,8 +44,8 @@ import com.android.sdklib.repository.SdkRepoConstants;
 import com.android.sdkuilib.internal.repository.SdkUpdaterNoWindow;
 import com.android.sdkuilib.internal.widgets.MessageBoxLog;
 import com.android.sdkuilib.repository.AvdManagerWindow;
-import com.android.sdkuilib.repository.AvdManagerWindow.AvdInvocationContext;
 import com.android.sdkuilib.repository.SdkUpdaterWindow;
+import com.android.sdkuilib.repository.AvdManagerWindow.AvdInvocationContext;
 import com.android.sdkuilib.repository.SdkUpdaterWindow.SdkInvocationContext;
 import com.android.utils.ILogger;
 import com.android.utils.Pair;
@@ -276,9 +275,6 @@ public class Main {
             } else if (SdkCommandLine.OBJECT_LIB_PROJECT.equals(directObject)) {
                 createProject(true /*library*/);
 
-            } else if (SdkCommandLine.OBJECT_IDENTITY.equals(directObject)) {
-                createIdentity();
-
             }
         } else if (SdkCommandLine.VERB_UPDATE.equals(verb)) {
             if (SdkCommandLine.OBJECT_AVD.equals(directObject)) {
@@ -1307,50 +1303,6 @@ public class Main {
     }
 
 
-    private void createIdentity() {
-        try {
-            String account = (String) mSdkCommandLine.getValue(
-                    SdkCommandLine.VERB_CREATE,
-                    SdkCommandLine.OBJECT_IDENTITY,
-                    SdkCommandLine.KEY_ACCOUNT);
-
-            String keystorePath = (String) mSdkCommandLine.getValue(
-                    SdkCommandLine.VERB_CREATE,
-                    SdkCommandLine.OBJECT_IDENTITY,
-                    SdkCommandLine.KEY_KEYSTORE);
-
-            String aliasName = (String) mSdkCommandLine.getValue(
-                    SdkCommandLine.VERB_CREATE,
-                    SdkCommandLine.OBJECT_IDENTITY,
-                    SdkCommandLine.KEY_ALIAS);
-
-            String keystorePass = (String) mSdkCommandLine.getValue(
-                    SdkCommandLine.VERB_CREATE,
-                    SdkCommandLine.OBJECT_IDENTITY,
-                    SdkCommandLine.KEY_STOREPASS);
-
-            if (keystorePass == null) {
-                keystorePass = promptPassword("Keystore Password:  ").trim();
-            }
-
-            String aliasPass = (String) mSdkCommandLine.getValue(
-                    SdkCommandLine.VERB_CREATE,
-                    SdkCommandLine.OBJECT_IDENTITY,
-                    SdkCommandLine.KEY_KEYPASS);
-
-            if (aliasPass == null) {
-                aliasPass = promptPassword("Alias Password:  ").trim();
-            }
-
-            MakeIdentity mi = new MakeIdentity(account, keystorePath, keystorePass,
-                    aliasName, aliasPass);
-
-            mi.make(System.out, mSdkLog);
-        } catch (Exception e) {
-            errorAndExit("Unexpected error: %s", e.getMessage());
-        }
-    }
-
 
     /**
      * Prompts the user to setup a hardware config for a Platform-based AVD.
diff --git a/sdkmanager/app/src/com/android/sdkmanager/SdkCommandLine.java b/sdkmanager/app/src/com/android/sdkmanager/SdkCommandLine.java
index a487881..68b1943 100644
--- a/sdkmanager/app/src/com/android/sdkmanager/SdkCommandLine.java
+++ b/sdkmanager/app/src/com/android/sdkmanager/SdkCommandLine.java
@@ -56,7 +56,6 @@ class SdkCommandLine extends CommandLineParser {
     public static final String OBJECT_TEST_PROJECT   = "test-project";              //$NON-NLS-1$
     public static final String OBJECT_LIB_PROJECT    = "lib-project";               //$NON-NLS-1$
     public static final String OBJECT_ADB            = "adb";                       //$NON-NLS-1$
-    public static final String OBJECT_IDENTITY       = "identity";                  //$NON-NLS-1$
 
     public static final String ARG_ALIAS        = "alias";                          //$NON-NLS-1$
     public static final String ARG_ACTIVITY     = "activity";                       //$NON-NLS-1$
@@ -156,9 +155,6 @@ class SdkCommandLine extends CommandLineParser {
 
             { VERB_UPDATE, OBJECT_SDK,
                 "Updates the SDK by suggesting new platforms to install if available." },
-
-            { VERB_CREATE, OBJECT_IDENTITY,
-                "Creates an identity file." },
     };
 
     public SdkCommandLine(ILogger logger) {
@@ -419,23 +415,6 @@ class SdkCommandLine extends CommandLineParser {
                 VERB_UPDATE, OBJECT_LIB_PROJECT, "t", KEY_TARGET_ID,                //$NON-NLS-1$
                 "Target ID to set for the project.", null);
 
-        // --- create identity file ---
-
-        define(Mode.STRING, true,
-                VERB_CREATE, OBJECT_IDENTITY, "a", KEY_ACCOUNT,                      //$NON-NLS-1$
-                "The publisher account.", null);
-        define(Mode.STRING, true,
-                VERB_CREATE, OBJECT_IDENTITY, "s", KEY_KEYSTORE,                     //$NON-NLS-1$
-                "The keystore path.", null);
-        define(Mode.STRING, true,
-                VERB_CREATE, OBJECT_IDENTITY, "k", KEY_ALIAS,                        //$NON-NLS-1$
-                "The key alias.", null);
-        define(Mode.STRING, false,
-                VERB_CREATE, OBJECT_IDENTITY, "p", KEY_STOREPASS,                    //$NON-NLS-1$
-                "The keystore password. Default is to prompt.", null);
-        define(Mode.STRING, false,
-                VERB_CREATE, OBJECT_IDENTITY, "w", KEY_KEYPASS,                      //$NON-NLS-1$
-                "The alias password. Default is to prompt.", null);
     }
 
     @Override