[incubator-netbeans] 01/02: Ask before downloading nbjavac and co. when opening an existing project

[lkishalmi]

This is an automated email from the ASF dual-hosted git repository.

lkishalmi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git

commit b02cd02d95b1747f1532d7046d6d244f23754260
Author: Jaroslav Tulach <jaroslav.tul...@oracle.com>
AuthorDate: Sat Nov 24 04:39:20 2018 +0100

    Ask before downloading nbjavac and co. when opening an existing project
---
 .../ide/ergonomics/fod/ModulesInstaller.java       | 29 +++-------------------
 1 file changed, 4 insertions(+), 25 deletions(-)

diff --git 
a/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/ModulesInstaller.java
 
b/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/ModulesInstaller.java
index 691bc66..827292f 100644
--- 
a/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/ModulesInstaller.java
+++ 
b/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/ModulesInstaller.java
@@ -39,6 +39,7 @@ import org.netbeans.api.autoupdate.OperationSupport.Restarter;
 import org.netbeans.api.autoupdate.UpdateElement;
 import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandleFactory;
+import org.netbeans.modules.autoupdate.ui.api.PluginManager;
 import org.openide.DialogDisplayer;
 import org.openide.NotifyDescriptor;
 import org.openide.awt.Mnemonics;
@@ -207,32 +208,10 @@ public class ModulesInstaller {
         if (! installContainer.listInvalid ().isEmpty ()) {
             throw new IllegalArgumentException ("Some are invalid for install: 
" + installContainer.listInvalid ());
         }
-        InstallSupport installSupport = installContainer.getSupport ();
-        if (downloadHandle == null) {
-            downloadHandle = ProgressHandleFactory.createHandle (
-                getBundle ("InstallerMissingModules_Download",
-                presentUpdateElements (finder.getVisibleUpdateElements 
(modules4install))));
+        boolean ok = PluginManager.openInstallWizard(installContainer);
+        if (!ok) {
+            progressMonitor.onError("cancel"); // NOI18N
         }
-        progressMonitor.onDownload(downloadHandle);
-        Validator v = installSupport.doDownload (downloadHandle, false);
-        if (verifyHandle == null) {
-            verifyHandle = ProgressHandleFactory.createHandle (
-                    getBundle ("InstallerMissingModules_Verify"));
-            }
-        progressMonitor.onValidate(verifyHandle);
-        Installer i = installSupport.doValidate (v, verifyHandle);
-        if (installHandle == null) {
-            installHandle = ProgressHandleFactory.createHandle (
-                    getBundle ("InstallerMissingModules_Install"));
-            }
-        progressMonitor.onInstall(installHandle);
-        Restarter r = installSupport.doInstall (i, installHandle);
-        if (r != null) {
-            installSupport.doRestartLater (r);
-        } else {
-            waitToModuleLoaded ();
-        }
-        /// XXX FindBrokenModules.clearModulesForRepair ();
     }
     
     public static String presentUpdateElements (Collection<UpdateElement> 
elems) {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists