[2/3] Removed deprecated ProgressUtils / AggregateProgressFactory usage

replaced with BaseProgressUtils and BasicAggregateProgressFactory calls

Author: mbien

apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/java/hints/errors/SearchModuleDependency.java

@@ -50,7 +50,7 @@
 import org.netbeans.api.lexer.Token;
 import org.netbeans.api.lexer.TokenHierarchy;
 import org.netbeans.api.lexer.TokenSequence;
-import org.netbeans.api.progress.ProgressUtils;
+import org.netbeans.api.progress.BaseProgressUtils;
 import org.netbeans.api.project.FileOwnerQuery;
 import org.netbeans.api.project.Project;
 import org.netbeans.api.project.ProjectManager;
@@ -377,7 +377,7 @@ public ChangeInfo implement() throws Exception {
             SingleModuleProperties props = SingleModuleProperties.getInstance(project);
             final ModuleDependency[] newDeps = AddModulePanel.selectDependencies(props, clazz);
             final AtomicBoolean cancel = new AtomicBoolean();
-            ProgressUtils.runOffEventDispatchThread(new Runnable() {
+            BaseProgressUtils.runOffEventDispatchThread(new Runnable() {
                 public @Override
                 void run() {
                     ProjectXMLManager pxm = new ProjectXMLManager(project);

apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/LibrariesNode.java

@@ -40,7 +40,7 @@
 import javax.swing.Action;
 import javax.swing.Icon;
 import javax.swing.ImageIcon;
-import org.netbeans.api.progress.ProgressUtils;
+import org.netbeans.api.progress.BaseProgressUtils;
 import org.netbeans.api.project.Project;
 import org.netbeans.api.project.ProjectManager;
 import org.netbeans.api.project.ui.OpenProjects;
@@ -557,7 +557,7 @@ public void run() {
             }
             if(dependencies.size() > 0)
             {
-                ProgressUtils.runOffEventDispatchThread(new Runnable() {
+                BaseProgressUtils.runOffEventDispatchThread(new Runnable() {
                     public @Override void run() {
                         ProjectXMLManager pxm = new ProjectXMLManager(project);
                         try {
@@ -613,7 +613,7 @@ public void actionPerformed(ActionEvent ev) {
                 if (descriptor.getValue().equals(DialogDescriptor.OK_OPTION)) {
                     final ModuleDependency editedDep = editPanel.getEditedDependency();
                     final AtomicBoolean cancel = new AtomicBoolean();
-                    ProgressUtils.runOffEventDispatchThread(new Runnable() {
+                    BaseProgressUtils.runOffEventDispatchThread(new Runnable() {
                         public @Override void run() {
                             try {
                                 SortedSet<ModuleDependency> deps = new TreeSet<ModuleDependency>(pxm.getDirectDependencies());

apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/BasicCustomizer.java

@@ -28,11 +28,10 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 import javax.swing.JDialog;
-import org.netbeans.api.progress.ProgressUtils;
+import org.netbeans.api.progress.BaseProgressUtils;
 import org.netbeans.api.project.Project;
 import org.netbeans.api.project.ProjectManager;
 import org.netbeans.api.project.ProjectUtils;
-import static org.netbeans.modules.apisupport.project.ui.customizer.Bundle.*;
 import org.netbeans.spi.project.ui.CustomizerProvider;
 import org.netbeans.spi.project.ui.support.ProjectCustomizer;
 import org.openide.ErrorManager;
@@ -43,6 +42,8 @@
 import org.openide.util.lookup.Lookups;
 import org.openide.util.lookup.ProxyLookup;
 
+import static org.netbeans.modules.apisupport.project.ui.customizer.Bundle.*;
+
 /**
  * Convenient class to be used by {@link CustomizerProvider} implementations.
  *
@@ -110,7 +111,7 @@ public void showCustomizer(String preselectedCategory, final String preselectedS
         } else {
             final String category = (preselectedCategory != null) ? preselectedCategory : lastSelectedCategory;
             final AtomicReference<Lookup> context = new AtomicReference<Lookup>();
-            ProgressUtils.runOffEventDispatchThread(new Runnable() {
+            BaseProgressUtils.runOffEventDispatchThread(new Runnable() {
                 @Override public void run() {
                     context.set(new ProxyLookup(prepareData(), Lookups.fixed(new SubCategoryProvider(category, preselectedSubCategory))));
                 }

apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizer.java

@@ -31,7 +31,7 @@
 import javax.swing.JPanel;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
-import org.netbeans.api.progress.ProgressUtils;
+import org.netbeans.api.progress.BaseProgressUtils;
 import org.netbeans.modules.apisupport.project.api.BasicWizardPanel;
 import static org.netbeans.modules.apisupport.project.ui.platform.Bundle.*;
 import org.netbeans.modules.apisupport.project.universe.NbPlatform;
@@ -84,7 +84,7 @@ public static ActionListener showCustomizerAction() {
     })
     public static Object showCustomizer() {
         final AtomicBoolean canceled = new AtomicBoolean();
-        ProgressUtils.runOffEventDispatchThread(new Runnable() { // #207451
+        BaseProgressUtils.runOffEventDispatchThread(new Runnable() { // #207451
             @Override public void run() {
                 HarnessUpgrader.checkForUpgrade();
             }

contrib/cordova.platforms.ios/src/org/netbeans/modules/cordova/platforms/ios/IOSBrowser.java

@@ -26,7 +26,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.swing.SwingUtilities;
-import org.netbeans.api.progress.ProgressUtils;
+import org.netbeans.api.progress.BaseProgressUtils;
 import org.netbeans.api.project.Project;
 import org.netbeans.modules.cordova.platforms.api.WebKitDebuggingSupport;
 import org.netbeans.modules.web.browser.api.BrowserSupport;
@@ -137,7 +137,7 @@ public void setURL(final URL url) {
             return;
         }
         try {
-            ProgressUtils.runOffEventDispatchThread(new Runnable() {
+            BaseProgressUtils.runOffEventDispatchThread(new Runnable() {
                 @Override
                 public void run() {
                     if (kind == Kind.IOS_DEVICE_DEFAULT) {

contrib/cordova.platforms.ios/src/org/netbeans/modules/cordova/platforms/ios/IOSBrowserActionProvider.java

@@ -19,7 +19,7 @@
 package org.netbeans.modules.cordova.platforms.ios;
 
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.netbeans.api.progress.ProgressUtils;
+import org.netbeans.api.progress.BaseProgressUtils;
 import org.netbeans.api.project.Project;
 import org.netbeans.modules.cordova.platforms.api.WebKitDebuggingSupport;
 import org.netbeans.modules.web.browser.api.BrowserSupport;
@@ -54,7 +54,7 @@ public String[] getSupportedActions() {
     @Override
     public void invokeAction(final String command, final Lookup context) throws IllegalArgumentException {
         try {
-            ProgressUtils.runOffEventDispatchThread(new Runnable() {
+            BaseProgressUtils.runOffEventDispatchThread(new Runnable() {
                 @Override
                 public void run() {
                     WebKitDebuggingSupport.getDefault().stopDebugging(true);

enterprise/maven.j2ee/src/org/netbeans/modules/maven/j2ee/ui/customizer/impl/CustomizerFrameworks.java

@@ -40,7 +40,7 @@
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import javax.swing.event.ListSelectionListener;
-import org.netbeans.api.progress.ProgressUtils;
+import org.netbeans.api.progress.BaseProgressUtils;
 import org.netbeans.api.project.Project;
 import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment;
 import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException;
@@ -476,7 +476,7 @@ private void handleExtenders() {
                 @Override
                 public void run() {
                     // it mostly results into lenghty opperation, show progress dialog
-                    ProgressUtils.showProgressDialogAndRun(new Runnable() {
+                    BaseProgressUtils.showProgressDialogAndRun(new Runnable() {
                         @Override
                         public void run() {
                             // include newly added extenders into webmodule
@@ -516,7 +516,7 @@ public Void call() throws Exception {
                         Exceptions.printStackTrace(ex);
                     } catch (TimeoutException ex) {
                         // End of the 300ms period, continue in processing but display progress dialog
-                        ProgressUtils.showProgressDialogAndRun(new Runnable() {
+                        BaseProgressUtils.showProgressDialogAndRun(new Runnable() {
                             @Override
                             public void run() {
                                 try {

enterprise/maven.jaxws/src/org/netbeans/modules/maven/jaxws/wizards/JaxWsClientCreator.java

@@ -36,7 +36,7 @@
 import java.io.IOException;
 
 import java.util.Collections;
-import org.netbeans.api.progress.ProgressUtils;
+import org.netbeans.api.progress.BaseProgressUtils;
 import org.netbeans.api.project.Project;
 
 import org.netbeans.modules.maven.jaxws.MavenJAXWSSupportImpl;
@@ -188,7 +188,7 @@ public void run() {
             }
         };
         AtomicBoolean isCancelled = new AtomicBoolean();
-        ProgressUtils.runOffEventDispatchThread(runnable, NbBundle.getMessage(
+        BaseProgressUtils.runOffEventDispatchThread(runnable, NbBundle.getMessage(
                 JaxWsClientCreator.class, "LBL_RetrieveWSDL"), isCancelled, false);    // NOI18N
 
         if ( isCancelled.get() ){

enterprise/web.core.syntax/src/org/netbeans/modules/web/core/syntax/JspHyperlinkProvider.java

@@ -25,7 +25,6 @@
 import java.util.concurrent.Callable;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.logging.Logger;
 import javax.lang.model.element.TypeElement;
 import javax.servlet.jsp.tagext.TagFileInfo;
 import javax.servlet.jsp.tagext.TagInfo;
@@ -44,7 +43,7 @@
 import org.netbeans.api.lexer.Token;
 import org.netbeans.api.lexer.TokenHierarchy;
 import org.netbeans.api.lexer.TokenSequence;
-import org.netbeans.api.progress.ProgressUtils;
+import org.netbeans.api.progress.BaseProgressUtils;
 import org.netbeans.editor.BaseDocument;
 import org.netbeans.editor.Utilities;
 import org.netbeans.lib.editor.hyperlink.spi.HyperlinkProvider;
@@ -422,7 +421,7 @@ public TypeElement process(CompilationInfo info) {
                                 }
                             });
 
-                    ProgressUtils.runOffEventDispatchThread(compute,
+                    BaseProgressUtils.runOffEventDispatchThread(compute,
                             NbBundle.getMessage(JspHyperlinkProvider.class, "MSG_goto-source"),
                             cancel,
                             false);

enterprise/web.el/src/org/netbeans/modules/web/el/navigation/ELHyperlinkProvider.java

@@ -53,7 +53,7 @@
 import org.netbeans.api.java.source.Task;
 import org.netbeans.api.java.source.ui.ElementOpen;
 import org.netbeans.api.lexer.TokenSequence;
-import org.netbeans.api.progress.ProgressUtils;
+import org.netbeans.api.progress.BaseProgressUtils;
 import org.netbeans.lib.editor.hyperlink.spi.HyperlinkProviderExt;
 import org.netbeans.lib.editor.hyperlink.spi.HyperlinkType;
 import org.netbeans.modules.csl.api.DataLoadersBridge;
@@ -113,7 +113,7 @@ public void run() {
     @Override
     public void performClickAction(final Document doc, final int offset, HyperlinkType type) {
         final AtomicBoolean cancel = new AtomicBoolean();
-        ProgressUtils.runOffEventDispatchThread(new Runnable() {
+        BaseProgressUtils.runOffEventDispatchThread(new Runnable() {
             @Override
             public void run() {
                 performGoTo(doc, offset, cancel);