From 95632fa96ff9a6ec6d8b0b70c7644369201841c7 Mon Sep 17 00:00:00 2001 From: Joel Moniz Date: Sun, 15 Mar 2015 16:51:59 +0530 Subject: [PATCH] Adding dialog to ask if user wants to install imported libs --- .../app/contrib/ContributionManager.java | 6 +++--- java/src/processing/mode/java/JavaEditor.java | 15 +++++++++++++-- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/app/src/processing/app/contrib/ContributionManager.java b/app/src/processing/app/contrib/ContributionManager.java index 17c21ba6a..deccf9534 100644 --- a/app/src/processing/app/contrib/ContributionManager.java +++ b/app/src/processing/app/contrib/ContributionManager.java @@ -334,8 +334,8 @@ public class ContributionManager { String statusMsg = base.getActiveEditor().getStatusMessage(); if (statusMsg.contains("has been installed")) base.getActiveEditor().statusNotice(statusMsg + " " - + "Now downloading " - + ad.name); + + "Downloading " + + ad.name + "..."); else base.getActiveEditor().statusNotice("Downloading " + ad.name + "..."); @@ -377,7 +377,7 @@ public class ContributionManager { base.getActiveEditor().statusEmpty(); System.out.println("The following libraries have been installed:"); for (String l : installedLibList) { - System.out.println(l); + System.out.println(" • " + l); } } diff --git a/java/src/processing/mode/java/JavaEditor.java b/java/src/processing/mode/java/JavaEditor.java index 95a38ad12..6d386fb65 100644 --- a/java/src/processing/mode/java/JavaEditor.java +++ b/java/src/processing/mode/java/JavaEditor.java @@ -1875,8 +1875,19 @@ public class JavaEditor extends Editor { } ArrayList installLibsHeaders = getNotInstalledAvailableLibs(importHeaders); if (!installLibsHeaders.isEmpty()) { - ContributionManager.downloadAndInstallOnImport(base, - installLibsHeaders); + StringBuilder libList = new StringBuilder("Would you like to install them now?"); + for (AvailableContribution ac : installLibsHeaders) { + libList.append("\n • " + ac.getName()); + } + int option = Base + .showYesNoQuestion(this, "Missing Libraries Available", + "The following imported libraries are available for download, but have not been installed.", + libList.toString()); + + if (option == JOptionPane.YES_OPTION) { + ContributionManager.downloadAndInstallOnImport(base, + installLibsHeaders); + } } } }