noisymime
/
Arduino
mirror of https://github.com/noisymime/Arduino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2948 from Lauszus/LibraryDebug 

Library debug
This commit is contained in:
Federico Fissore 2015-04-09 15:17:31 +02:00
parent 7032fcf037 26ae4d13b8
commit 81876495c9
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arduino-core/src/cc/arduino/contributions/libraries/LibraryInstaller.java
View File

@ -97,16 +97,17 @@ public class LibraryInstaller {
rescanLibraryIndex(progress);
}
public void install(ContributedLibrary lib, ContributedLibrary replacedLib) throws Exception {
public void install(ContributedLibrary lib, ContributedLibrary replacedLib) {
if (lib.isInstalled()) {
throw new Exception(_("Library is already installed!"));
System.out.println(_("Library is already installed: \"" + lib.getName() + "\""));
return;
}
final MultiStepProgress progress = new MultiStepProgress(3);
// Step 1: Download library
try {
downloader.download(lib, progress, _("Downloading library."));
downloader.download(lib, progress, _("Downloading library: \"" + lib.getName() + "\""));
} catch (InterruptedException e) {
// Download interrupted... just exit
return;
@ -117,7 +118,7 @@ public class LibraryInstaller {
// all the temporary folders and abort installation.
// Step 2: Unpack library on the correct location
progress.setStatus(_("Installing library..."));
progress.setStatus(_("Installing library: \"" + lib.getName() + "\""));
onProgress(progress);
File libsFolder = indexer.getSketchbookLibrariesFolder();
File tmpFolder = FileUtils.createTempFolderIn(libsFolder);
@ -148,7 +149,7 @@ public class LibraryInstaller {
final MultiStepProgress progress = new MultiStepProgress(2);
// Step 1: Remove library
progress.setStatus(_("Removing library..."));
progress.setStatus(_("Removing library: \"" + lib.getName() + "\""));
onProgress(progress);
FileUtils.recursiveDelete(lib.getInstalledFolder());
progress.stepDone();