# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: /Volumes/work/src/netbeans-jm-server_split
# This patch can be applied using context Tools: Patch action on respective folder.
# It uses platform neutral UTF-8 encoding and \n newlines.
# Above lines and this line are ignored by the patching process.
Index: autoupdate.cli/nbproject/project.xml
--- autoupdate.cli/nbproject/project.xml
+++ autoupdate.cli/nbproject/project.xml
@@ -89,14 +89,6 @@
- org.openide.util
-
-
-
- 9.0
-
-
-
org.openide.util.base
Index: autoupdate.cli/src/org/netbeans/modules/autoupdate/cli/ModuleOptions.java
--- autoupdate.cli/src/org/netbeans/modules/autoupdate/cli/ModuleOptions.java
+++ autoupdate.cli/src/org/netbeans/modules/autoupdate/cli/ModuleOptions.java
@@ -43,8 +43,6 @@
*/
package org.netbeans.modules.autoupdate.cli;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
import java.io.IOException;
import java.io.PrintStream;
import java.net.MalformedURLException;
@@ -62,14 +60,12 @@
import java.util.prefs.Preferences;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
-import javax.swing.JLabel;
import org.netbeans.api.autoupdate.*;
import org.netbeans.api.autoupdate.InstallSupport.Installer;
import org.netbeans.api.autoupdate.InstallSupport.Validator;
import org.netbeans.api.autoupdate.OperationContainer.OperationInfo;
import org.netbeans.api.autoupdate.OperationSupport.Restarter;
import org.netbeans.api.progress.ProgressHandle;
-import org.netbeans.api.progress.ProgressHandleFactory;
import org.netbeans.api.sendopts.CommandException;
import org.netbeans.spi.sendopts.Env;
import org.netbeans.spi.sendopts.Option;
@@ -78,6 +74,10 @@
import org.openide.util.*;
import static org.netbeans.modules.autoupdate.cli.Bundle.*;
+import org.netbeans.modules.progress.spi.Controller;
+import org.netbeans.modules.progress.spi.InternalHandle;
+import org.netbeans.modules.progress.spi.ProgressEvent;
+import org.netbeans.modules.progress.spi.ProgressUIWorker;
/**
*
@@ -335,36 +335,15 @@
return;
}
env.getOutputStream().println("updates=" + operate.listAll().size()); // NOI18N
- ProgressHandle downloadHandle = ProgressHandleFactory.createHandle("downloading-updates"); // NOI18N
+ ProgressHandle downloadHandle = new CLIProgressHandle("downloading-updates", env); // NOI18N
downloadHandle.setInitialDelay(0);
- JLabel downloadDetailLabel = ProgressHandleFactory.createDetailLabelComponent(downloadHandle);
- downloadDetailLabel.addPropertyChangeListener(new PropertyChangeListener() {
- @Override
- public void propertyChange(PropertyChangeEvent evt) {
- if ("text".equals(evt.getPropertyName())) { // NOI18N
- env.getOutputStream().println(
- Bundle.MSG_Download(evt.getNewValue()));
- LOG.fine(" ... downloading update " + evt.getNewValue());
- }
- }
- });
try {
final Validator res1 = support.doDownload(downloadHandle, null, false);
Installer res2 = support.doValidate(res1, null);
- ProgressHandle installHandle = ProgressHandleFactory.createHandle("installing-updates"); // NOI18N
+ ProgressHandle installHandle = new CLIProgressHandle("installing-updates", env); // NOI18N
installHandle.setInitialDelay(0);
- JLabel installDetailLabel = ProgressHandleFactory.createDetailLabelComponent(installHandle);
- installDetailLabel.addPropertyChangeListener(new PropertyChangeListener() {
- @Override
- public void propertyChange(PropertyChangeEvent evt) {
- if ("text".equals(evt.getPropertyName())) {
- env.getOutputStream().println(evt.getNewValue());
- LOG.fine(" ... installing update " + evt.getNewValue());
- }
- }
- });
Restarter res3 = support.doInstall(res2, installHandle);
if (res3 != null) {
support.doRestart(res3, null);
@@ -445,35 +424,14 @@
}
try {
env.getOutputStream().println("modules=" + operate.listAll().size()); // NOI18N
- ProgressHandle downloadHandle = ProgressHandleFactory.createHandle("downloading-modules"); // NOI18N
+ ProgressHandle downloadHandle = new CLIProgressHandle("downloading-modules", env); // NOI18N
downloadHandle.setInitialDelay(0);
- JLabel downloadDetailLabel = ProgressHandleFactory.createDetailLabelComponent(downloadHandle);
- downloadDetailLabel.addPropertyChangeListener(new PropertyChangeListener() {
- @Override
- public void propertyChange(PropertyChangeEvent evt) {
- if ("text".equals(evt.getPropertyName())) { // NOI18N
- env.getOutputStream().println(
- Bundle.MSG_Download(evt.getNewValue()));
- LOG.fine(" ... downloading module " + evt.getNewValue());
- }
- }
- });
final Validator res1 = support.doDownload(downloadHandle, null, false);
Installer res2 = support.doValidate(res1, null);
- ProgressHandle installHandle = ProgressHandleFactory.createHandle("installing-modules"); // NOI18N
+ ProgressHandle installHandle = new CLIProgressHandle("installing-modules", env); // NOI18N
installHandle.setInitialDelay(0);
- JLabel installDetailLabel = ProgressHandleFactory.createDetailLabelComponent(installHandle);
- installDetailLabel.addPropertyChangeListener(new PropertyChangeListener() {
- @Override
- public void propertyChange(PropertyChangeEvent evt) {
- if ("text".equals(evt.getPropertyName())) { // NOI18N
- env.getOutputStream().println(evt.getNewValue());
- LOG.fine(" ... installing module " + evt.getNewValue());
- }
- }
- });
Restarter res3 = support.doInstall(res2, installHandle);
if (res3 != null) {
support.doRestart(res3, null);
@@ -537,4 +495,32 @@
return res;
}
+ private class CLIProgressHandle extends ProgressHandle {
+ public CLIProgressHandle(String displayName, Env env) {
+ super(new CLIInternalHandle(displayName, env));
}
+ }
+
+ private class CLIInternalHandle extends InternalHandle {
+ public CLIInternalHandle(String displayName, Env env) {
+ super(displayName, null, false);
+ setController(new Controller(new CLIProgressUIWorker(env)));
+ }
+ }
+
+ private class CLIProgressUIWorker implements ProgressUIWorker {
+ private final Env env;
+ public CLIProgressUIWorker(Env env) {
+ this.env = env;
+ }
+ @Override
+ public void processProgressEvent(ProgressEvent event) {
+ env.getOutputStream().println(event.getMessage());
+ }
+ @Override
+ public void processSelectedProgressEvent(ProgressEvent event) {
+ env.getOutputStream().println(event.getMessage());
+ }
+ }
+
+}