Skip to content

Commit ad1e707

Browse files
author
Chris
committed
Uncommented code.
1 parent 22c49d4 commit ad1e707

File tree

1 file changed

+21
-16
lines changed

1 file changed

+21
-16
lines changed

src/org/chrisle/netbeans/plugins/nbinstallplugin/actions/InstallPluginAction.java

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import java.awt.event.ActionEvent;
44
import java.awt.event.ActionListener;
5-
import javax.swing.JOptionPane;
65
import org.netbeans.api.autoupdate.InstallSupport;
76
import org.netbeans.api.autoupdate.OperationContainer;
87
import org.openide.awt.ActionID;
@@ -26,13 +25,19 @@
2625
import java.util.logging.Logger;
2726
import java.util.prefs.Preferences;
2827
import static org.chrisle.netbeans.plugins.nbinstallplugin.actions.Bundle.CTL_OsgiBundleFilterDescription;
28+
import org.netbeans.api.autoupdate.InstallSupport.Installer;
29+
import org.netbeans.api.autoupdate.OperationException;
30+
import org.netbeans.api.autoupdate.OperationSupport.Restarter;
2931
import org.netbeans.api.autoupdate.UpdateManager;
3032
import org.netbeans.api.autoupdate.UpdateUnit;
3133
import org.netbeans.api.autoupdate.UpdateUnitProvider;
3234
import org.netbeans.api.autoupdate.UpdateUnitProviderFactory;
35+
import org.netbeans.api.progress.ProgressHandle;
36+
import org.netbeans.api.progress.ProgressHandleFactory;
3337
import org.openide.DialogDisplayer;
3438
import org.openide.NotifyDescriptor;
3539
import org.openide.filesystems.FileUtil;
40+
import org.openide.util.Cancellable;
3641
import org.openide.util.NbBundle;
3742
import org.openide.util.NbBundle.Messages;
3843
import org.openide.util.NbPreferences;
@@ -295,21 +300,21 @@ private static boolean isOSGiBundle(File jarFile) {
295300
return false;
296301
}
297302

298-
// static Restarter doInstall(InstallSupport support, Installer installer) throws OperationException {
299-
// final String displayName = "Installing plugin...";
300-
// System.out.println(displayName);
301-
// ProgressHandle installHandle = ProgressHandleFactory.createHandle(
302-
// displayName,
303-
// new Cancellable() {
304-
// @Override
305-
// public boolean cancel() {
306-
// return true;
307-
// }
308-
// }
309-
// );
310-
//
311-
// return support.doInstall(installer, installHandle);
312-
// }
303+
static Restarter doInstall(InstallSupport support, Installer installer) throws OperationException {
304+
final String displayName = "Installing plugin...";
305+
System.out.println(displayName);
306+
ProgressHandle installHandle = ProgressHandleFactory.createHandle(
307+
displayName,
308+
new Cancellable() {
309+
@Override
310+
public boolean cancel() {
311+
return true;
312+
}
313+
}
314+
);
315+
316+
return support.doInstall(installer, installHandle);
317+
}
313318
//
314319
// static Installer doVerify(InstallSupport support, Validator validator) throws OperationException {
315320
// final String displayName = "Validating Gradle plugin...";

0 commit comments

Comments
 (0)