Skip to content

Commit 8976696

Browse files
committed
removed some obsolete commented code
1 parent b872b67 commit 8976696

File tree

1 file changed

+4
-26
lines changed

1 file changed

+4
-26
lines changed

mode/src/processing/mode/android/SDKDownloader.java

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,6 @@ class SDKUrlHolder {
8181
public String platformVersion, buildToolsVersion;
8282
public String platformToolsUrl, buildToolsUrl, platformUrl, toolsUrl, emulatorUrl;
8383
public String platformToolsFilename, buildToolsFilename, platformFilename, toolsFilename, emulatorFilename;
84-
// public String supportRepoUrl, googleRepoUrl;
85-
// public String supportRepoFilename, googleRepoFilename;
8684
public String usbDriverUrl;
8785
public String usbDriverFilename;
8886
public String haxmFilename, haxmUrl;
@@ -112,9 +110,7 @@ protected Object doInBackground() throws Exception {
112110
File extrasFolder = new File(sdkFolder, "extras");
113111
if (!extrasFolder.exists()) extrasFolder.mkdir();
114112
File googleRepoFolder = new File(extrasFolder, "google");
115-
if (!googleRepoFolder.exists()) googleRepoFolder.mkdir();
116-
// File androidRepoFolder = new File(extrasFolder, "android");
117-
// if (!androidRepoFolder.exists()) androidRepoFolder.mkdir();
113+
if (!googleRepoFolder.exists()) googleRepoFolder.mkdir();
118114
File haxmFolder = new File(extrasFolder, "intel/HAXM");
119115
if (!haxmFolder.exists()) haxmFolder.mkdirs();
120116

@@ -151,14 +147,6 @@ protected Object doInBackground() throws Exception {
151147
// emulator, unpacks directly to sdk folder
152148
File downloadedEmulator = new File(tempFolder, downloadUrls.emulatorFilename);
153149
downloadAndUnpack(downloadUrls.emulatorUrl, downloadedEmulator, sdkFolder, true);
154-
155-
// google repository
156-
// File downloadedGoogleRepo = new File(tempFolder, downloadUrls.googleRepoFilename);
157-
// downloadAndUnpack(downloadUrls.googleRepoUrl, downloadedGoogleRepo, googleRepoFolder, false);
158-
159-
// android repository
160-
// File downloadedSupportRepo = new File(tempFolder, downloadUrls.supportRepoFilename);
161-
// downloadAndUnpack(downloadUrls.supportRepoUrl, downloadedSupportRepo, androidRepoFolder, false);
162150

163151
// usb driver
164152
if (Platform.isWindows()) {
@@ -345,11 +333,11 @@ private void getMainDownloadUrls(SDKUrlHolder urlHolder,
345333

346334
// -----------------------------------------------------------------------
347335
// tools
348-
expr = xpath.compile("//remotePackage[@path=\"tools\"]"); //Matches two items according to xml file
336+
expr = xpath.compile("//remotePackage[@path=\"tools\"]"); // Matches two items according to xml file
349337
remotePackages = (NodeList) expr.evaluate(doc, XPathConstants.NODESET);
350338
found = false;
351339
if (remotePackages != null) {
352-
NodeList childNodes = remotePackages.item(1).getChildNodes(); //Second item is the latest tools for now
340+
NodeList childNodes = remotePackages.item(1).getChildNodes(); // Second item is the latest tools for now
353341
NodeList archives = ((Element) childNodes).getElementsByTagName("archive");
354342

355343
for (int i = 0; i < archives.getLength(); ++i) {
@@ -375,7 +363,7 @@ private void getMainDownloadUrls(SDKUrlHolder urlHolder,
375363

376364
// -----------------------------------------------------------------------
377365
// emulator
378-
expr = xpath.compile("//remotePackage[@path=\"emulator\"]"); //Matches two items according to xml file
366+
expr = xpath.compile("//remotePackage[@path=\"emulator\"]"); // Matches two items according to xml file
379367
remotePackages = (NodeList) expr.evaluate(doc, XPathConstants.NODESET);
380368
found = false;
381369
if (remotePackages != null) {
@@ -510,16 +498,6 @@ private void parseAndSet(SDKUrlHolder urlHolder, NodeList remotePackages, String
510498
urlHolder.platformToolsUrl = REPOSITORY_URL + urlHolder.platformToolsFilename;
511499
urlHolder.totalSize += Integer.parseInt(size.item(0).getTextContent());
512500
break;
513-
// case ANDROID_REPO:
514-
// urlHolder.supportRepoFilename = url.item(0).getTextContent();
515-
// urlHolder.supportRepoUrl = REPOSITORY_URL + urlHolder.supportRepoFilename;
516-
// urlHolder.totalSize += Integer.parseInt(size.item(0).getTextContent());
517-
// break;
518-
// case GOOGLE_REPO:
519-
// urlHolder.googleRepoFilename = url.item(0).getTextContent();
520-
// urlHolder.googleRepoUrl = REPOSITORY_URL + urlHolder.googleRepoFilename;
521-
// urlHolder.totalSize += Integer.parseInt(size.item(0).getTextContent());
522-
// break;
523501
case USB_DRIVER:
524502
urlHolder.usbDriverFilename = url.item(0).getTextContent();
525503
urlHolder.usbDriverUrl = REPOSITORY_URL + urlHolder.usbDriverFilename;

0 commit comments

Comments
 (0)