ContributionInstaller: downloadIndex -> download

Federico Fissore · Federico Fissore · commit 19bb40cbb107 · 2015-05-04T12:54:12.000+02:00
diff --git a/arduino-core/src/cc/arduino/contributions/packages/ContributionInstaller.java b/arduino-core/src/cc/arduino/contributions/packages/ContributionInstaller.java
@@ -249,10 +249,10 @@ public List<String> updateIndex() throws Exception {
   }
 
   private void downloadIndexAndSignature(MultiStepProgress progress, List<String> downloadedPackagedIndexFilesAccumulator, String packageIndexUrl) throws Exception {
-    File packageIndex = downloadIndex(progress, packageIndexUrl);
+    File packageIndex = download(progress, packageIndexUrl);
     downloadedPackagedIndexFilesAccumulator.add(packageIndex.getName());
     try {
-      File packageIndexSignature = downloadIndex(progress, packageIndexUrl + ".sig");
+      File packageIndexSignature = download(progress, packageIndexUrl + ".sig");
       boolean signatureVerified = new GPGDetachedSignatureVerifier().verify(packageIndex, packageIndexSignature, new File(BaseNoGui.getContentFile("lib"), "public.gpg.key"));
       if (signatureVerified) {
         downloadedPackagedIndexFilesAccumulator.add(packageIndexSignature.getName());
@@ -267,7 +267,7 @@ private void downloadIndexAndSignature(MultiStepProgress progress, List<String>
     }
   }
 
-  private File downloadIndex(MultiStepProgress progress, String packageIndexUrl) throws Exception {
+  private File download(MultiStepProgress progress, String packageIndexUrl) throws Exception {
     String statusText = _("Downloading platforms index...");
     URL url = new URL(packageIndexUrl);
     String[] urlPathParts = url.getFile().split("/");

Original file line number	Diff line number	Diff line change
`@@ -249,10 +249,10 @@ public List<String> updateIndex() throws Exception {`
`249`	`249`	`}`
`250`	`250`
`251`	`251`	`private void downloadIndexAndSignature(MultiStepProgress progress, List<String> downloadedPackagedIndexFilesAccumulator, String packageIndexUrl) throws Exception {`
`252`		`- File packageIndex = downloadIndex(progress, packageIndexUrl);`
	`252`	`+ File packageIndex = download(progress, packageIndexUrl);`
`253`	`253`	`downloadedPackagedIndexFilesAccumulator.add(packageIndex.getName());`
`254`	`254`	`try {`
`255`		`- File packageIndexSignature = downloadIndex(progress, packageIndexUrl + ".sig");`
	`255`	`+ File packageIndexSignature = download(progress, packageIndexUrl + ".sig");`
`256`	`256`	`boolean signatureVerified = new GPGDetachedSignatureVerifier().verify(packageIndex, packageIndexSignature, new File(BaseNoGui.getContentFile("lib"), "public.gpg.key"));`
`257`	`257`	`if (signatureVerified) {`
`258`	`258`	`downloadedPackagedIndexFilesAccumulator.add(packageIndexSignature.getName());`
`@@ -267,7 +267,7 @@ private void downloadIndexAndSignature(MultiStepProgress progress, List<String>`
`267`	`267`	`}`
`268`	`268`	`}`
`269`	`269`
`270`		`- private File downloadIndex(MultiStepProgress progress, String packageIndexUrl) throws Exception {`
	`270`	`+ private File download(MultiStepProgress progress, String packageIndexUrl) throws Exception {`
`271`	`271`	`String statusText = _("Downloading platforms index...");`
`272`	`272`	`URL url = new URL(packageIndexUrl);`
`273`	`273`	`String[] urlPathParts = url.getFile().split("/");`